-
Notifications
You must be signed in to change notification settings - Fork 561
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
frontend: Allow blocking raw http requests #10484
Conversation
5c96d7a
to
06bd242
Compare
💻 Deploy preview deleted. |
06bd242
to
4a66c1d
Compare
This is a setting that can be set in user overrides like this: ``` user1: blocked_requests: - path: /api/v1/series - method: DELETE - query_params foo: bar ``` Or a combination of these. Each entry is an AND condition
4a66c1d
to
1777468
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very nice work! LGTM. Please remember a CHANGELOG entry before merging. I left a couple of comments, but they're non blocking.
832db8a
to
ebf7793
Compare
df6a871
to
231c530
Compare
231c530
to
548c218
Compare
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-10484-to-r325 origin/r325
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 557830d5a75709de7e299a0a5151a37d8236ea9e
# Push it to GitHub
git push --set-upstream origin backport-10484-to-r325
git switch main
# Remove the local backport branch
git branch -D backport-10484-to-r325 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-10484-to-r324 origin/r324
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 557830d5a75709de7e299a0a5151a37d8236ea9e
# Push it to GitHub
git push --set-upstream origin backport-10484-to-r324
git switch main
# Remove the local backport branch
git branch -D backport-10484-to-r324 Then, create a pull request where the |
* frontend: Allow blocking raw http requests This is a setting that can be set in user overrides like this: ``` user1: blocked_requests: - path: /api/v1/series - method: DELETE - query_params foo: bar ``` Or a combination of these. Each entry is an AND condition * Add Roundtripper test * linting... * Allow for regexps on the query params + add changelog * Add test for unmarshalling * Fix linting (cherry picked from commit 557830d)
* frontend: Allow blocking raw http requests This is a setting that can be set in user overrides like this: ``` user1: blocked_requests: - path: /api/v1/series - method: DELETE - query_params foo: bar ``` Or a combination of these. Each entry is an AND condition * Add Roundtripper test * linting... * Allow for regexps on the query params + add changelog * Add test for unmarshalling * Fix linting (cherry picked from commit 557830d)
@@ -25,6 +25,7 @@ | |||
* [ENHANCEMENT] Query-frontend: include more information about read consistency in trace spans produced when using experimental ingest storage. #10412 | |||
* [ENHANCEMENT] Ingester: Hide tokens in ingester ring status page when ingest storage is enabled #10399 | |||
* [ENHANCEMENT] Ingester: add `active_series_additional_custom_trackers` configuration, in addition to the already existing `active_series_custom_trackers`. The `active_series_additional_custom_trackers` configuration allows you to configure additional custom trackers that get merged with `active_series_custom_trackers` at runtime. #10428 | |||
* [ENHANCEMENT] Query-frontend: Allow blocking raw http requests with the `blocked_requests` configuration. Requests can be blocked based on their path, method |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks changelog has been truncated here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have fixed it here: #10497
* frontend: Allow blocking raw http requests This is a setting that can be set in user overrides like this: ``` user1: blocked_requests: - path: /api/v1/series - method: DELETE - query_params foo: bar ``` Or a combination of these. Each entry is an AND condition * Add Roundtripper test * linting... * Allow for regexps on the query params + add changelog * Add test for unmarshalling * Fix linting (cherry picked from commit 557830d) Co-authored-by: Julien Duchesne <[email protected]>
* Update about-versioning.md Forgot to add some experimental features here: - #10460 - #10484 * Update docs/sources/mimir/configure/about-versioning.md Co-authored-by: Charles Korn <[email protected]> --------- Co-authored-by: Charles Korn <[email protected]>
* Update about-versioning.md Forgot to add some experimental features here: - #10460 - #10484 * Update docs/sources/mimir/configure/about-versioning.md Co-authored-by: Charles Korn <[email protected]> --------- Co-authored-by: Charles Korn <[email protected]>
* Update about-versioning.md Forgot to add some experimental features here: - #10460 - #10484 * Update docs/sources/mimir/configure/about-versioning.md Co-authored-by: Charles Korn <[email protected]> --------- Co-authored-by: Charles Korn <[email protected]>
What this PR does
This is a setting that can be set in user overrides like this:
Or a combination of these. Each entry is an AND condition
BlockedRequest
could be expanded to support headers, body content, etc, but we don't need these feature right now.Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]
.about-versioning.md
updated with experimental features.