Add toggle to inject the tenant ID to generated metrics#3638
Merged
yvrhdn merged 1 commit intografana:mainfrom May 28, 2024
Merged
Add toggle to inject the tenant ID to generated metrics#3638yvrhdn merged 1 commit intografana:mainfrom
yvrhdn merged 1 commit intografana:mainfrom
Conversation
yvrhdn
requested review from
annanay25,
electron0zero,
ie-pham,
joe-elliott,
knylander-grafana,
mapno,
mdisibio,
stoewer and
zalegrala
as code owners
yvrhdn
commented
May 1, 2024
Comment on lines
+382
to
+388
| # If set, the tenant ID will added as label with the given label name to all generated metrics. | ||
| [inject_tenant_id_as: <string>] |
Contributor
Author
There was a problem hiding this comment.
I'll be honest, I didn't really find a nice and concise way to describe this setting. Suggestion are welcome 😅
Also feedback about the name of the setting itself is welcome. It's a bit verbose now imo.
Contributor
There was a problem hiding this comment.
Even if it's long, it's clear what it does.
mdisibio
approved these changes
May 8, 2024
Comment on lines
+382
to
+388
| # If set, the tenant ID will added as label with the given label name to all generated metrics. | ||
| [inject_tenant_id_as: <string>] |
Contributor
knylander-grafana
left a comment
knylander-grafana
left a comment
There was a problem hiding this comment.
Approving for text and doc updates.
Contributor
|
This PR must be merged before a backport PR will be created. |
yvrhdn
force-pushed
the
kvrhdn/metrics-generator-inject-tenant
branch
from
08ab162 to
12ab9b7
Compare
Contributor
Author
|
Squashing so backport action can cherry pick the commit |
github-actions Bot
pushed a commit
that referenced
this pull request
May 28, 2024
(cherry picked from commit 6206fcd)
3 tasks
yvrhdn
pushed a commit
that referenced
this pull request
May 29, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does:
When a
inject_tenant_id_asis set, the Tempo tenant ID is added to all metrics generated by the metrics-generator.E.g. if set to
__tempo_tenant, metrics generated for tenantfoowill all have the label__tempo_tenant="foo".I made the config a string so users can pick a value that doesn't conflict with other labels.
This should make Tempo metrics-generator more useful with a single-tenant metrics backend.
Which issue(s) this PR fixes:
Fixes #3630
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]