Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Metrics generator docker compose #1370

Merged
merged 4 commits into from
Apr 8, 2022

Conversation

mapno
Copy link
Member

@mapno mapno commented Apr 8, 2022

What this PR does:

  • Add metrics-generator to local docker-compose example
  • Remove unnecessary ring from metrics-generator. The metrics-generator's ring is instantiated as an independent module and used only by the distributor. There is no need for the metrics-generator to run it as well.

Which issue(s) this PR fixes:
Contributes to #1303

Copy link
Member

@yvrhdn yvrhdn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments but non are blocking. LGTM!

Also about exemplars, in the distributed example I configured links from Prometheus to Tempo:

jsonData:
exemplarTraceIdDestinations:
- datasourceUid: tempo
name: 'traceID'

I think we can simply copy this over to the shared/grafana-datasources.yaml.

example/docker-compose/local/docker-compose.yaml Outdated Show resolved Hide resolved
example/docker-compose/local/tempo-local.yaml Show resolved Hide resolved
Comment on lines -101 to -102
ringCfg := cfg.Ring.ToRingConfig()
g.ring, err = ring.NewWithStoreClientAndStrategy(ringCfg, ringNameForServer, RingKey, ringStore, ring.NewIgnoreUnhealthyInstancesReplicationStrategy(), prometheus.WrapRegistererWithPrefix("cortex_", reg), g.logger)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find! 🙌🏻 I did not know just the lifecycler was enough.

example/docker-compose/local/tempo-local.yaml Outdated Show resolved Hide resolved
@mapno mapno enabled auto-merge (squash) April 8, 2022 15:51
@mapno mapno merged commit ccb011d into grafana:main Apr 8, 2022
@mapno mapno deleted the metrics-generator-docker-compose branch April 8, 2022 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants