Add support for HTTP cluster validation #11010
Merged
+511
−28
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
|
💻 Deploy preview deleted. |
duricanikolic
force-pushed
the
yuri/http-cluster-validation
branch
from
34cc981 to
f120ade
Compare
Signed-off-by: Yuri Nikolic <[email protected]>
duricanikolic
force-pushed
the
yuri/http-cluster-validation
branch
from
f120ade to
18787fe
Compare
aknuds1
reviewed
Mar 26, 2025
| enabled: true, | ||
| softValidation: false, | ||
| expectedStatusCode: 511, | ||
| expectedError: "rejected request with empty cluster validation label - it should be \\\"server-cluster\\\"", |
There was a problem hiding this comment.
[Nit] Could you write this as a raw string literal instead, so we can avoid so many backslashes for readability?
pkg/frontend/frontend_test.go
Outdated
| } | ||
|
|
||
| defer downstreamServer.Shutdown(context.Background()) //nolint:errcheck | ||
| go downstreamServer.Serve(downstreamListen) //nolint:errcheck |
There was a problem hiding this comment.
To make sure that goroutines don't hang around after tests finish (never fun to debug, if it should become a problem), please use a WaitGroup:
Suggested change
| go downstreamServer.Serve(downstreamListen) //nolint:errcheck | |
| var wg sync.WaitGroup | |
| wg.Add(1) | |
| go func() { | |
| defer wg.Done() | |
| downstreamServer.Serve(downstreamListen) //nolint:errcheck | |
| }() | |
| t.Cleanup(wg.Wait) |
There was a problem hiding this comment.
I have fixed this
Signed-off-by: Yuri Nikolic <[email protected]>
Signed-off-by: Yuri Nikolic <[email protected]>
Signed-off-by: Yuri Nikolic <[email protected]>
duricanikolic
requested review from
stevesg,
grafanabot,
a team and
tacole02
as code owners
colega
approved these changes
Mar 31, 2025
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
This PR adds support for HTTP cluster validation in the query-frontend.
On client side, cluster validation label propagation through HTTP request headers can be enabled by setting
-query-frontend.client-cluster-validation.labelconfiguration option.On server side, cluster validation can be enabled through the following configuration options (inherited from grafana/dskit#671):
-server.cluster-validation.label, that defines the server's cluster validation label. When the validation is enabled, this value will be compared with the cluster validation label received through the requests.-server.cluster-validation.http.enabled, used for enabling the cluster validation.-server.cluster-validation.http.soft-validation, that can be enabled only together with the cluster validation, and that implies a soft validation.-server.cluster-validation.http.exclude-paths, a comma-separated list of url paths that are excluded from the cluster validation check.Which issue(s) this PR fixes or relates to
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.