Skip to content

Commit d52663f

Browse files
aknuds1tacole02
andauthored
operations/mimir: Upstream Jsonnet changes from r334 (#11602)
* dskit: Don't depend on Memcached on startup * operations/mimir: Set max buffered bytes in the Kafka client used by the ruler --------- Signed-off-by: Arve Knudsen <[email protected]> Co-authored-by: Taylor C <[email protected]>
1 parent 3bbf3fe commit d52663f

18 files changed

+32
-17
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* [CHANGE] Overrides-exporter: Don't export per-tenant overrides that are set to their default values. #11173
1414
* [CHANGE] gRPC/HTTP clients: Rename metric `cortex_client_request_invalid_cluster_validation_labels_total` to `cortex_client_invalid_cluster_validation_label_requests_total`. #11237
1515
* [CHANGE] Querier: Use Mimir Query Engine (MQE) by default. Set `-querier.query-engine=prometheus` to continue using Prometheus' engine. #11501
16+
* [CHANGE] Memcached: Ignore initial DNS resolution failure, meaning don't depend on Memcached on startup. #11602
1617
* [FEATURE] Distributor: Experimental support for Prometheus Remote-Write 2.0 protocol. Limitations: Created timestamp is ignored, per series metadata is merged on metric family level automatically, ingestion might fail if client sends ProtoBuf fields out of order. The label `version` is added to the metric `cortex_distributor_requests_in_total` with a value of either `1.0` or `2.0` depending on the detected Remote-Write protocol. #11100 #11101 #11192 #11143
1718
* [FEATURE] Query-frontend: expand `query-frontend.cache-errors` and `query-frontend.results-cache-ttl-for-errors` configuration options to cache non-transient response failures for instant queries. #11120
1819
* [FEATURE] Querier, query-frontend, ruler: Enable experimental support for duration expressions in PromQL, which are simple arithmetics on numbers in offset and range specification. #11344
@@ -97,6 +98,7 @@
9798
* [CHANGE] Increase the allowed number of rule groups for small, medium_small, and extra_small user tiers by 20%. #11152
9899
* [CHANGE] Update rollout-operator version to 0.26.0. #11232
99100
* [CHANGE] Memcached: Set a timeout of `500ms` for the `ruler-storage` cache instead of the default `200ms`. #11231
101+
* [CHANGE] Ruler: If ingest storage is enabled, set the maximum buffered bytes in the Kafka client used by the ruler based on the expected maximum rule evaluation response size, clamping it between 1 GB (default) and 4 GB. #11602
100102
* [FEATURE] Make ingest storage ingester HPA behavior configurable through `_config.ingest_storage_ingester_hpa_behavior`. #11168
101103
* [FEATURE] Add an alternate ingest storage HPA trigger that targets maximum owned series per pod. #11356
102104

cmd/mimir/config-descriptor.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7044,7 +7044,7 @@
70447044
"required": false,
70457045
"desc": "Allow client creation even if initial DNS resolution fails.",
70467046
"fieldValue": null,
7047-
"fieldDefaultValue": false,
7047+
"fieldDefaultValue": true,
70487048
"fieldFlag": "query-frontend.results-cache.memcached.dns-ignore-startup-failures",
70497049
"fieldType": "boolean",
70507050
"fieldCategory": "experimental"
@@ -9249,7 +9249,7 @@
92499249
"required": false,
92509250
"desc": "Allow client creation even if initial DNS resolution fails.",
92519251
"fieldValue": null,
9252-
"fieldDefaultValue": false,
9252+
"fieldDefaultValue": true,
92539253
"fieldFlag": "blocks-storage.bucket-store.index-cache.memcached.dns-ignore-startup-failures",
92549254
"fieldType": "boolean",
92559255
"fieldCategory": "experimental"
@@ -9812,7 +9812,7 @@
98129812
"required": false,
98139813
"desc": "Allow client creation even if initial DNS resolution fails.",
98149814
"fieldValue": null,
9815-
"fieldDefaultValue": false,
9815+
"fieldDefaultValue": true,
98169816
"fieldFlag": "blocks-storage.bucket-store.chunks-cache.memcached.dns-ignore-startup-failures",
98179817
"fieldType": "boolean",
98189818
"fieldCategory": "experimental"
@@ -10399,7 +10399,7 @@
1039910399
"required": false,
1040010400
"desc": "Allow client creation even if initial DNS resolution fails.",
1040110401
"fieldValue": null,
10402-
"fieldDefaultValue": false,
10402+
"fieldDefaultValue": true,
1040310403
"fieldFlag": "blocks-storage.bucket-store.metadata-cache.memcached.dns-ignore-startup-failures",
1040410404
"fieldType": "boolean",
1040510405
"fieldCategory": "experimental"
@@ -15721,7 +15721,7 @@
1572115721
"required": false,
1572215722
"desc": "Allow client creation even if initial DNS resolution fails.",
1572315723
"fieldValue": null,
15724-
"fieldDefaultValue": false,
15724+
"fieldDefaultValue": true,
1572515725
"fieldFlag": "ruler-storage.cache.memcached.dns-ignore-startup-failures",
1572615726
"fieldType": "boolean",
1572715727
"fieldCategory": "experimental"

cmd/mimir/help-all.txt.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ Usage of ./cmd/mimir/mimir:
448448
-blocks-storage.bucket-store.chunks-cache.memcached.connect-timeout duration
449449
The connection timeout. (default 200ms)
450450
-blocks-storage.bucket-store.chunks-cache.memcached.dns-ignore-startup-failures
451-
[experimental] Allow client creation even if initial DNS resolution fails.
451+
[experimental] Allow client creation even if initial DNS resolution fails. (default true)
452452
-blocks-storage.bucket-store.chunks-cache.memcached.max-async-buffer-size int
453453
The maximum number of enqueued asynchronous operations allowed. (default 25000)
454454
-blocks-storage.bucket-store.chunks-cache.memcached.max-async-concurrency int
@@ -552,7 +552,7 @@ Usage of ./cmd/mimir/mimir:
552552
-blocks-storage.bucket-store.index-cache.memcached.connect-timeout duration
553553
The connection timeout. (default 200ms)
554554
-blocks-storage.bucket-store.index-cache.memcached.dns-ignore-startup-failures
555-
[experimental] Allow client creation even if initial DNS resolution fails.
555+
[experimental] Allow client creation even if initial DNS resolution fails. (default true)
556556
-blocks-storage.bucket-store.index-cache.memcached.max-async-buffer-size int
557557
The maximum number of enqueued asynchronous operations allowed. (default 25000)
558558
-blocks-storage.bucket-store.index-cache.memcached.max-async-concurrency int
@@ -674,7 +674,7 @@ Usage of ./cmd/mimir/mimir:
674674
-blocks-storage.bucket-store.metadata-cache.memcached.connect-timeout duration
675675
The connection timeout. (default 200ms)
676676
-blocks-storage.bucket-store.metadata-cache.memcached.dns-ignore-startup-failures
677-
[experimental] Allow client creation even if initial DNS resolution fails.
677+
[experimental] Allow client creation even if initial DNS resolution fails. (default true)
678678
-blocks-storage.bucket-store.metadata-cache.memcached.max-async-buffer-size int
679679
The maximum number of enqueued asynchronous operations allowed. (default 25000)
680680
-blocks-storage.bucket-store.metadata-cache.memcached.max-async-concurrency int
@@ -2452,7 +2452,7 @@ Usage of ./cmd/mimir/mimir:
24522452
-query-frontend.results-cache.memcached.connect-timeout duration
24532453
The connection timeout. (default 200ms)
24542454
-query-frontend.results-cache.memcached.dns-ignore-startup-failures
2455-
[experimental] Allow client creation even if initial DNS resolution fails.
2455+
[experimental] Allow client creation even if initial DNS resolution fails. (default true)
24562456
-query-frontend.results-cache.memcached.max-async-buffer-size int
24572457
The maximum number of enqueued asynchronous operations allowed. (default 25000)
24582458
-query-frontend.results-cache.memcached.max-async-concurrency int
@@ -2722,7 +2722,7 @@ Usage of ./cmd/mimir/mimir:
27222722
-ruler-storage.cache.memcached.connect-timeout duration
27232723
The connection timeout. (default 200ms)
27242724
-ruler-storage.cache.memcached.dns-ignore-startup-failures
2725-
[experimental] Allow client creation even if initial DNS resolution fails.
2725+
[experimental] Allow client creation even if initial DNS resolution fails. (default true)
27262726
-ruler-storage.cache.memcached.max-async-buffer-size int
27272727
The maximum number of enqueued asynchronous operations allowed. (default 25000)
27282728
-ruler-storage.cache.memcached.max-async-concurrency int

docs/sources/mimir/configure/configuration-parameters/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5345,7 +5345,7 @@ The `memcached` block configures the Memcached-based caching backend. The suppor
53455345
53465346
# (experimental) Allow client creation even if initial DNS resolution fails.
53475347
# CLI flag: -<prefix>.memcached.dns-ignore-startup-failures
5348-
[dns_ignore_startup_failures: <boolean> | default = false]
5348+
[dns_ignore_startup_failures: <boolean> | default = true]
53495349
```
53505350

53515351
### redis

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-20250529170946-28928403e61e
21+
github.com/grafana/dskit v0.0.0-20250604055755-f6c457812872
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-20250529170946-28928403e61e h1:xszW9jlqA2Fsz1fXPc3aP494z3lRheGywP1pkFLuxbY=
563-
github.com/grafana/dskit v0.0.0-20250529170946-28928403e61e/go.mod h1:XgCfkrcj96DEvYCdTVTamQSo4vLTqoXrMZw5kUeWDAQ=
562+
github.com/grafana/dskit v0.0.0-20250604055755-f6c457812872 h1:XvE3CDRQHRuSxRPS+4cks08U+D4aPIcGsiR4EQxj6U0=
563+
github.com/grafana/dskit v0.0.0-20250604055755-f6c457812872/go.mod h1:XgCfkrcj96DEvYCdTVTamQSo4vLTqoXrMZw5kUeWDAQ=
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=

operations/mimir-tests/test-ingest-storage-autoscaling-custom-stabilization-window-generated.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,6 +1289,7 @@ spec:
12891289
- -ingest-storage.ingestion-partition-tenant-shard-size=1
12901290
- -ingest-storage.kafka.address=kafka.default.svc.cluster.local.:9092
12911291
- -ingest-storage.kafka.auto-create-topic-default-partitions=1000
1292+
- -ingest-storage.kafka.producer-max-buffered-bytes=1073741824
12921293
- -ingest-storage.kafka.topic=ingest
12931294
- -ingester.partition-ring.prefix=
12941295
- -ingester.ring.heartbeat-timeout=10m

operations/mimir-tests/test-ingest-storage-autoscaling-multiple-triggers-generated.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,6 +1289,7 @@ spec:
12891289
- -ingest-storage.ingestion-partition-tenant-shard-size=1
12901290
- -ingest-storage.kafka.address=kafka.default.svc.cluster.local.:9092
12911291
- -ingest-storage.kafka.auto-create-topic-default-partitions=1000
1292+
- -ingest-storage.kafka.producer-max-buffered-bytes=1073741824
12921293
- -ingest-storage.kafka.topic=ingest
12931294
- -ingester.partition-ring.prefix=
12941295
- -ingester.ring.heartbeat-timeout=10m

operations/mimir-tests/test-ingest-storage-autoscaling-one-trigger-generated.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,6 +1289,7 @@ spec:
12891289
- -ingest-storage.ingestion-partition-tenant-shard-size=1
12901290
- -ingest-storage.kafka.address=kafka.default.svc.cluster.local.:9092
12911291
- -ingest-storage.kafka.auto-create-topic-default-partitions=1000
1292+
- -ingest-storage.kafka.producer-max-buffered-bytes=1073741824
12921293
- -ingest-storage.kafka.topic=ingest
12931294
- -ingester.partition-ring.prefix=
12941295
- -ingester.ring.heartbeat-timeout=10m

operations/mimir-tests/test-ingest-storage-migration-step-10-generated.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,7 @@ spec:
12661266
- -ingest-storage.ingestion-partition-tenant-shard-size=1
12671267
- -ingest-storage.kafka.address=kafka.default.svc.cluster.local.:9092
12681268
- -ingest-storage.kafka.auto-create-topic-default-partitions=1000
1269+
- -ingest-storage.kafka.producer-max-buffered-bytes=1073741824
12691270
- -ingest-storage.kafka.topic=ingest
12701271
- -ingester.partition-ring.prefix=
12711272
- -ingester.ring.heartbeat-timeout=10m

0 commit comments

Comments
 (0)