metrics-generator disable x-scope-orgid header append #2974
+52
−10
Conversation
This file contains 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
vineetjp
requested review from
knylander-grafana,
joe-elliott,
annanay25,
mdisibio,
mapno,
kvrhdn,
zalegrala,
electron0zero,
ie-pham and
stoewer
as code owners
|
|
|
Fixes #2973 |
joe-elliott
reviewed
Oct 2, 2023
1. Changed removeOrgIdHeader to addOrgIdHeader 2. addOrgIdHeader default value will be true
joe-elliott
reviewed
Oct 3, 2023
Co-authored-by: Joe Elliott <joe.elliott@grafana.com>
kvrhdn
reviewed
Oct 4, 2023
| @@ -33,7 +33,9 @@ func generateTenantRemoteWriteConfigs(originalCfgs []prometheus_config.RemoteWri | |||
| } | |||
| } | |||
|
|
|||
| cloneCfg.Headers[user.OrgIDHeaderName] = tenant | |||
| if addOrgIDHeader { | |||
There was a problem hiding this comment.
I'm wondering if we should move this if-case higher and merge it with if tenant != util.FakeTenantID at line 24.
Make it:
if tenant != util.FakeTenantID && addOrgIDHeader {Reasoning: we only need to remove any pre-existing X-Scope-OrgID headers if we want to inject our own. If we are not injecting any, there won't be a conflict and we don't need to remove them either.
We have the following possible scenarios:
- single-tenant: we don't remove X-Scope-OrgID
- multi-tenant with
addOrgIDHeader = true: we remove X-Scope-OrgID headers and inject our own - multi-tenant with
addOrgIDHeader = false: we do not inject our own X-Scope-OrgID header so I don't think we need to remove them as well
There was a problem hiding this comment.
kvrhdn
approved these changes
Oct 5, 2023
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
Adds option to disable addition of X-Scope-OrgID header in metrics generator with remote writing
Which issue(s) this PR fixes:
Fixes #1554
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]