Store: fix returned labels on external label conflict when skipping chunks #6874
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
MichaHoffmann
force-pushed
the
mhoffm-fix-prometheus-labels-when-skipping-chunks
branch
from
8fbfcec
to
3002646
Compare
…hunks Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
MichaHoffmann
force-pushed
the
mhoffm-fix-prometheus-labels-when-skipping-chunks
branch
from
3002646
to
ce2e61e
Compare
GiedriusS
approved these changes
Nov 5, 2023
rabenhorst
pushed a commit
to rabenhorst/thanos
that referenced
this pull request
Nov 15, 2023
…hunks (thanos-io#6874) Signed-off-by: Michael Hoffmann <mhoffm@posteo.de> Signed-off-by: Sebastian Rabenhorst <sebastian.rabenhorst@shopify.com>
nicolastakashi
pushed a commit
to nicolastakashi/thanos
that referenced
this pull request
Nov 15, 2023
…hunks (thanos-io#6874) Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
nicolastakashi
pushed a commit
to nicolastakashi/thanos
that referenced
this pull request
Nov 15, 2023
…hunks (thanos-io#6874) Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
douglascamata
pushed a commit
to douglascamata/thanos
that referenced
this pull request
Dec 13, 2023
…hunks (thanos-io#6874) Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
douglascamata
pushed a commit
to douglascamata/thanos
that referenced
this pull request
Dec 13, 2023
…hunks (thanos-io#6874) Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
SuperQ
reviewed
Jan 15, 2024
| lset = append(lset, labelpb.ZLabelsFromPromLabels(finalExtLset)...) | ||
| sort.Slice(lset, func(i, j int) bool { | ||
| return lset[i].Name < lset[j].Name | ||
| // external labels should take precedence |
There was a problem hiding this comment.
I think it would be good to include the fixed behavior in the changelog. Otherwise it's unclear what the "fix" does in the case of conflicts.
There was a problem hiding this comment.
On conflict external labes take precedence over internal ones ( in thanos )
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.
Changes
When skipping chunks we would send invalid labelsets in prometheus store if external and inner labels conflicted
Verification
Added a acceptance testcase
Fixes #6844