Ruler: Refactoring remote-write config overrides #4429
Merged
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
added 2 commits
October 7, 2021 10:37
Replacing mergo.Merge because it cannot distinguish between a nil and an empty slice, which is needed to overwrite relabel configs Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
Adding extra check for header smuggling Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
dannykopping
force-pushed
the
dannykopping/fix-overrides
branch
from
ff595a4
to
e7b5404
Compare
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
owen-d
approved these changes
Oct 7, 2021
2 tasks
dannykopping
pushed a commit
that referenced
this pull request
Oct 8, 2021
* Refactoring remote-write config overrides Replacing mergo.Merge because it cannot distinguish between a nil and an empty slice, which is needed to overwrite relabel configs Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Simplifying condition Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Merging headers instead of overwriting blindly Adding extra check for header smuggling Signed-off-by: Danny Kopping <danny.kopping@grafana.com> * Unexporting OverwriteMarshalingStringMap field, preferring constructor Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
2 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 / why we need it:
Removes
mergo.Mergebecause it does not perform the way we would like. More details in #4428.Which issue(s) this PR fixes:
Fixes #4428
Special notes for your reviewer:
Checklist