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

[release-v2.5] Add toggle to inject the tenant ID to generated metrics #3724

Merged
merged 1 commit into from
May 29, 2024

Conversation

github-actions[bot]
Copy link
Contributor

Backport 6206fcd from #3638


What this PR does:

When a inject_tenant_id_as is 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 tenant foo will all have the label __tempo_tenant="foo".

metrics_generator:
  registry:
    inject_tenant_id_as: "__tempo_tenant"

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

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@github-actions github-actions bot added backport type/docs Improvements or additions to documentation labels May 28, 2024
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.

Backport looks fine, just need to wait for tests to pass

@yvrhdn yvrhdn closed this May 28, 2024
@yvrhdn yvrhdn reopened this May 28, 2024
@yvrhdn
Copy link
Member

yvrhdn commented May 28, 2024

Triggering CI...

@yvrhdn yvrhdn merged commit e3e6c47 into release-v2.5 May 29, 2024
17 checks passed
@yvrhdn yvrhdn deleted the backport-3638-to-release-v2.5 branch May 29, 2024 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant