8000 [r344] Upgrade to dskit@f84dc58e0bd9 (#11549) by aknuds1 · Pull Request #11561 · grafana/mimir · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[r344] Upgrade to dskit@f84dc58e0bd9 (#11549) #11561

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 27, 2025
Merged

[r344] Upgrade to dskit@f84dc58e0bd9 (#11549) #11561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* [ENHANCEMENT] Added `-ingest-storage.kafka.fetch-max-wait` configuration option to configure the maximum amount of time a Kafka broker waits for some records before a Fetch response is retu 8000 rned. #11012
* [ENHANCEMENT] Ingester: Add `cortex_ingester_tsdb_forced_compactions_in_progress` metric reporting a value of 1 when there's a forced TSDB head compaction in progress. #11006
* [ENHANCEMENT] Ingester: Add `cortex_ingest_storage_reader_records_batch_fetch_max_bytes` metric reporting the distribution of `MaxBytes` specified in the Fetch requests sent to Kafka. #11014
* [ENHANCEMENT] All: Add experimental support for cluster validation in HTTP calls. When it is enabled, HTTP server verifies if a request coming from an HTTP client comes from an expected cluster. This validation can be configured by the following experimental configuration options: #11010
* [ENHANCEMENT] All: Add experimental support for cluster validation in HTTP calls. When it is enabled, HTTP server verifies if a request coming from an HTTP client comes from an expected cluster. This validation can be configured by the following experimental configuration options: #11010 #11549
* `-server.cluster-validation.label`
* `-server.cluster-validation.http.enabled`
* `-server.cluster-validation.http.soft-validation`
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/golang/snappy v1.0.0
github.com/google/gopacket v1.1.19
github.com/gorilla/mux v1.8.1
github.com/grafana/dskit v0.0.0-20250519165046-78afbb506eb9
github.com/grafana/dskit v0.0.0-20250527103656-516aaed3f621
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/influxdata/influxdb/v2 v2.7.11
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
github.com/grafana/alerting v0.0.0-20250522092815-92adaaa0147a h1:a6D8cpDxLLEgvmudcEFr02R2AoTcVSnmB+35Ows7GGY=
github.com/grafana/alerting v0.0.0-20250522092815-92adaaa0147a/go.mod h1:pMfhRxL2LZ3Pm8iy7VcVsb9CLYuBtjFYbf1oxgx7yFA=
github.com/grafana/dskit v0.0.0-20250519165046-78afbb506eb9 h1:u09z5ng3R9tH0J+uTV9kffTQyvIVc6h3sZRYy0lfuW0=
github.com/grafana/dskit v0.0.0-20250519165046-78afbb506eb9/go.mod h1:qAaZ2E+2GyDJVJVOz5wibs3mt+Uq/c4W+py9WNQMUu0=
github.com/grafana/dskit v0.0.0-20250527103656-516aaed3f621 h1:UCt3nln/FfKyecLgC75OPfr2AmWV7Skd1u5xHYhIhao=
github.com/grafana/dskit v0.0.0-20250527103656-516aaed3f621/go.mod h1:qAaZ2E+2GyDJVJVOz5wibs3mt+Uq/c4W+py9WNQMUu0=
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673 h1:Va04sDlP33f1SFUHRTho4QJfDlGTz+/HnBIpYwlqV9Q=
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
github.com/grafana/goautoneg v0.0.0-20240607115440-f335c04c58ce h1:WI1olbgS+sEl77qxEYbmt9TgRUz7iLqmjh8lYPpGlKQ=
Expand Down
2 changes: 1 addition & 1 deletion pkg/frontend/frontend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func TestFrontend_ClusterValidationWhenDownstreamURLIsConfigured(t *testing.T) {
expectedMetrics: `
# HELP cortex_client_invalid_cluster_validation_label_requests_total Number of requests with invalid cluster validation label.
# TYPE cortex_client_invalid_cluster_validation_label_requests_total counter
cortex_client_invalid_cluster_validation_label_requests_total{client="querier",method="/api/v1/query_range",protocol="http"} 1
cortex_client_invalid_cluster_validation_label_requests_total{client="querier",method="<unknown-route>",protocol="http"} 1
`,
},
"if client has no cluster validation label and soft cluster validation is enabled no error is returned": {
Expand Down
24 changes: 16 additions & 8 deletions vendor/github.com/grafana/dskit/middleware/http_cluster.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
0