Skip to content

Commit 351392c

Browse files
authored
Upgrade to dskit@f84dc58e0bd9 (#11549)
* Upgrade to dskit@f84dc58e0bd9 --------- Signed-off-by: Arve Knudsen <[email protected]>
1 parent d8378da commit 351392c

File tree

6 files changed

+22
-14
lines changed

6 files changed

+22
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* [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 returned. #11012
2222
* [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
2323
* [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
24-
* [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
24+
* [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
2525
* `-server.cluster-validation.label`
2626
* `-server.cluster-validation.http.enabled`
2727
* `-server.cluster-validation.http.soft-validation`

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/golang/snappy v1.0.0
1919
github.com/google/gopacket v1.1.19
2020
github.com/gorilla/mux v1.8.1
21-
github.com/grafana/dskit v0.0.0-20250523172940-c9115f6be261
21+
github.com/grafana/dskit v0.0.0-20250527065258-f84dc58e0bd9
2222
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673
2323
github.com/hashicorp/golang-lru v1.0.2 // indirect
2424
github.com/influxdata/influxdb/v2 v2.7.12

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
559559
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
560560
github.com/grafana/alerting v0.0.0-20250522092815-92adaaa0147a h1:a6D8cpDxLLEgvmudcEFr02R2AoTcVSnmB+35Ows7GGY=
561561
github.com/grafana/alerting v0.0.0-20250522092815-92adaaa0147a/go.mod h1:pMfhRxL2LZ3Pm8iy7VcVsb9CLYuBtjFYbf1oxgx7yFA=
562-
github.com/grafana/dskit v0.0.0-20250523172940-c9115f6be261 h1:AErEg6PfLoPY0ZBkE8+FUrHmYDhd4eg+gCCOIHrJTDQ=
563-
github.com/grafana/dskit v0.0.0-20250523172940-c9115f6be261/go.mod h1:fhJZ61ABBt3UfAuwRTXynRC1QmNZToHasEq/KDFJukA=
562+
github.com/grafana/dskit v0.0.0-20250527065258-f84dc58e0bd9 h1:E4zYSDTLJF20R/6vn5gOxi71MI2kYbTF4oFst41jPC8=
563+
github.com/grafana/dskit v0.0.0-20250527065258-f84dc58e0bd9/go.mod h1:fhJZ61ABBt3UfAuwRTXynRC1QmNZToHasEq/KDFJukA=
564564
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673 h1:Va04sDlP33f1SFUHRTho4QJfDlGTz+/HnBIpYwlqV9Q=
565565
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
566566
github.com/grafana/goautoneg v0.0.0-20240607115440-f335c04c58ce h1:WI1olbgS+sEl77qxEYbmt9TgRUz7iLqmjh8lYPpGlKQ=

pkg/frontend/frontend_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func TestFrontend_ClusterValidationWhenDownstreamURLIsConfigured(t *testing.T) {
152152
expectedMetrics: `
153153
# HELP cortex_client_invalid_cluster_validation_label_requests_total Number of requests with invalid cluster validation label.
154154
# TYPE cortex_client_invalid_cluster_validation_label_requests_total counter
155-
cortex_client_invalid_cluster_validation_label_requests_total{client="querier",method="/api/v1/query_range",protocol="http"} 1
155+
cortex_client_invalid_cluster_validation_label_requests_total{client="querier",method="<unknown-route>",protocol="http"} 1
156156
`,
157157
},
158158
"if client has no cluster validation label and soft cluster validation is enabled no error is returned": {

vendor/github.com/grafana/dskit/middleware/http_cluster.go

Lines changed: 16 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)