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: do not remove x-scope-orgid header in single tenant modus #1554

Conversation

yvrhdn
Copy link
Member

@yvrhdn yvrhdn commented Jul 7, 2022

What this PR does:
When metrics-generator is run in single-tenant modus and an x-scope-orgid header is set in the remote write config, do not remove it. This is a protection added to multitenant system, in which you don't want each tenant to use the same remote write config. This doesn't make sense in single-tenant setups.

Which issue(s) this PR fixes:
Fixes #1448

Checklist

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

Copy link
Member

@mapno mapno left a comment

Choose a reason for hiding this comment

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

LGTM

@yvrhdn yvrhdn merged commit 3ae1b04 into grafana:main Jul 7, 2022
@yvrhdn yvrhdn deleted the kvrhdn/metrics-generator-single-tenant-x-scope-orgid branch July 7, 2022 16:24
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.

Allow set custom X-Scope-OrgID header in remote-write of metrics-generator
2 participants