fix: query announced endpoints match relabel-config#8370
Merged
GiedriusS merged 8 commits intothanos-io:mainfrom Jul 15, 2025
Merged
fix: query announced endpoints match relabel-config#8370GiedriusS merged 8 commits intothanos-io:mainfrom
GiedriusS merged 8 commits intothanos-io:mainfrom
Conversation
98aab38 to
e176cf2
Compare
Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
e176cf2 to
8b3c29a
Compare
5fed3b3 to
0bb3e73
Compare
Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
MichaHoffmann
previously approved these changes
Jul 13, 2025
Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
dbed3a5 to
0972c43
Compare
added 3 commits
July 13, 2025 21:42
Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
Signed-off-by: Joel Verezhak <jverezhak@open-systems.com>
MichaHoffmann
approved these changes
Jul 15, 2025
Contributor
|
Awesome work 👍 |
GiedriusS
approved these changes
Jul 15, 2025
This file contains hidden or 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
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.
The
--selector.relabel-config flagwas only filtering stores during query execution, but not when announcing available label sets via the Info API or /stores endpoint. This caused a mismatch where:This happens because ProxyStore's
LabelSet()method ignored filtered results fromTSDBSelector.MatchLabelSets()and always included all label sets from matching stores.In this PR, label set announcements now match the actual queryable data, fixing confusion in multi-tier querier deployments where root queriers would see all tenant labels despite leaf queriers being configured to filter specific tenants.
Changes
ProxyStore.LabelSet()andTimeRange()/storesREST endpoint using same TSDBSelector logicVerification
I have this working in our DEV env. We have a leaf querier that's setup with a hashmod relabel config across our ingester fleet.
We also have a root querier plugged into all leaf querier shards.
Without the patch, in both the leaf and root queriers, the
/storesendpoint shows all external labels on every endpoint.With the patch, the result is more expected: