Merge release-2.12 branch to main

grafana · Apr 3, 2024 · 7cd90b9 · 7cd90b9
2 parents c10c624 + c7aab9e
commit 7cd90b9
Show file tree

Hide file tree

Showing 77 changed files with 490 additions and 496 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,6 @@
 
 ### Grafana Mimir
 
-* [CHANGE] Querier: the CLI flag `-querier.minimize-ingester-requests` has been moved from "experimental" to "advanced". #7638
 * [CHANGE] Ingester: `/ingester/flush` endpoint is now only allowed to execute only while the ingester is in `Running` state. The 503 status code is returned if the endpoint is called while the ingester is not in `Running` state. #7486
 * [CHANGE] Distributor: Include label name in `err-mimir-label-value-too-long` error message: #7740
 * [FEATURE] Continuous-test: now runable as a module with `mimir -target=continuous-test`. #7747
@@ -76,14 +75,7 @@
 
 * [ENHANCEMENT] ulidtime: add option to show random part of ULID, timestamp in milliseconds and header. #7615
 
-## 2.12.0-rc.1
-
-### Grafana Mimir
-
-* [CHANGE] Querier: the CLI flag `-querier.minimize-ingester-requests` has been moved from "experimental" to "advanced". #7638
-* [BUGFIX] Query-frontend: Fix memory leak on every request. #7654
-
-## 2.12.0-rc.0
+## 2.12.0
 
 ### Grafana Mimir
 
@@ -132,6 +124,7 @@
 * [CHANGE] The configuration option `-querier.max-query-into-future` has been deprecated and will be removed in Mimir 2.14. #7496
 * [CHANGE] Distributor: the metric `cortex_distributor_sample_delay_seconds` has been deprecated and will be removed in Mimir 2.14. #7516
 * [CHANGE] Query-frontend: The deprecated YAML setting `frontend.cache_unaligned_requests` has been moved to `limits.cache_unaligned_requests`. #7519
+* [CHANGE] Querier: the CLI flag `-querier.minimize-ingester-requests` has been moved from "experimental" to "advanced". #7638
 * [FEATURE] Introduce `-server.log-source-ips-full` option to log all IPs from `Forwarded`, `X-Real-IP`, `X-Forwarded-For` headers. #7250
 * [FEATURE] Introduce `-tenant-federation.max-tenants` option to limit the max number of tenants allowed for requests when federation is enabled. #6959
 * [FEATURE] Cardinality API: added a new `count_method` parameter which enables counting active label names. #7085
@@ -205,6 +198,7 @@
 * [BUGFIX] Fix metadata API using wrong JSON field names. #7475
 * [BUGFIX] Ruler: fix native histogram recording rule result corruption. #7552
 * [BUGFIX] Querier: fix HTTP status code translations for remote read requests. Previously, remote-read had conflicting behaviours: when returning samples all internal errors were translated to HTTP 400; when returning chunks all internal errors were translated to HTTP 500. #7487
+* [BUGFIX] Query-frontend: Fix memory leak on every request. #7654
 
 ### Mixin
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.11.0
+2.12.0
diff --git a/...rafana-mimir/dashboards/alertmanager-resources/mimir-alertmanager-resources.png b/...rafana-mimir/dashboards/alertmanager-resources/mimir-alertmanager-resources.png
diff --git a/...mir/manage/monitor-grafana-mimir/dashboards/alertmanager/mimir-alertmanager.png b/...mir/manage/monitor-grafana-mimir/dashboards/alertmanager/mimir-alertmanager.png
diff --git a/...itor-grafana-mimir/dashboards/compactor-resources/mimir-compactor-resources.png b/...itor-grafana-mimir/dashboards/compactor-resources/mimir-compactor-resources.png
diff --git a/...ces/mimir/manage/monitor-grafana-mimir/dashboards/compactor/mimir-compactor.png b/...ces/mimir/manage/monitor-grafana-mimir/dashboards/compactor/mimir-compactor.png
diff --git a/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/config/mimir-config.png b/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/config/mimir-config.png
diff --git a/...mir/manage/monitor-grafana-mimir/dashboards/object-store/mimir-object-store.png b/...mir/manage/monitor-grafana-mimir/dashboards/object-store/mimir-object-store.png
diff --git a/...ces/mimir/manage/monitor-grafana-mimir/dashboards/overrides/mimir-overrides.png b/...ces/mimir/manage/monitor-grafana-mimir/dashboards/overrides/mimir-overrides.png
diff --git a/...itor-grafana-mimir/dashboards/overview-networking/mimir-overview-networking.png b/...itor-grafana-mimir/dashboards/overview-networking/mimir-overview-networking.png
diff --git a/...onitor-grafana-mimir/dashboards/overview-resources/mimir-overview-resources.png b/...onitor-grafana-mimir/dashboards/overview-resources/mimir-overview-resources.png
diff --git a/...urces/mimir/manage/monitor-grafana-mimir/dashboards/overview/mimir-overview.png b/...urces/mimir/manage/monitor-grafana-mimir/dashboards/overview/mimir-overview.png
diff --git a/...sources/mimir/manage/monitor-grafana-mimir/dashboards/queries/mimir-queries.png b/...sources/mimir/manage/monitor-grafana-mimir/dashboards/queries/mimir-queries.png
diff --git a/...ge/monitor-grafana-mimir/dashboards/reads-networking/mimir-reads-networking.png b/...ge/monitor-grafana-mimir/dashboards/reads-networking/mimir-reads-networking.png
diff --git a/...nage/monitor-grafana-mimir/dashboards/reads-resources/mimir-reads-resources.png b/...nage/monitor-grafana-mimir/dashboards/reads-resources/mimir-reads-resources.png
diff --git a/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/reads/mimir-reads.png b/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/reads/mimir-reads.png
diff --git a/.../dashboards/remote-ruler-reads-resources/mimir-remote-ruler-reads-resources.png b/.../dashboards/remote-ruler-reads-resources/mimir-remote-ruler-reads-resources.png
diff --git a/...onitor-grafana-mimir/dashboards/remote-ruler-reads/mimir-remote-ruler-reads.png b/...onitor-grafana-mimir/dashboards/remote-ruler-reads/mimir-remote-ruler-reads.png
diff --git a/...ge/monitor-grafana-mimir/dashboards/rollout-progress/mimir-rollout-progress.png b/...ge/monitor-grafana-mimir/dashboards/rollout-progress/mimir-rollout-progress.png
diff --git a/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/ruler/mimir-ruler.png b/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/ruler/mimir-ruler.png
diff --git a/...sources/mimir/manage/monitor-grafana-mimir/dashboards/scaling/mimir-scaling.png b/...sources/mimir/manage/monitor-grafana-mimir/dashboards/scaling/mimir-scaling.png
diff --git a/...sources/mimir/manage/monitor-grafana-mimir/dashboards/tenants/mimir-tenants.png b/...sources/mimir/manage/monitor-grafana-mimir/dashboards/tenants/mimir-tenants.png
diff --git a/.../monitor-grafana-mimir/dashboards/writes-networking/mimir-writes-networking.png b/.../monitor-grafana-mimir/dashboards/writes-networking/mimir-writes-networking.png
diff --git a/...ge/monitor-grafana-mimir/dashboards/writes-resources/mimir-writes-resources.png b/...ge/monitor-grafana-mimir/dashboards/writes-resources/mimir-writes-resources.png
diff --git a/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/writes/mimir-writes.png b/docs/sources/mimir/manage/monitor-grafana-mimir/dashboards/writes/mimir-writes.png
diff --git a/operations/mimir-rules-action/Dockerfile b/operations/mimir-rules-action/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
-FROM grafana/mimirtool:2.11.0
+FROM grafana/mimirtool:2.12.0
 
 COPY entrypoint.sh /entrypoint.sh
 

diff --git a/operations/mimir-tests/test-all-components-generated.yaml b/operations/mimir-tests/test-all-components-generated.yaml
@@ -534,7 +534,7 @@ spec:
           value: "8"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -631,7 +631,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -711,7 +711,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -783,7 +783,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -875,7 +875,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -952,7 +952,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1051,7 +1051,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1160,7 +1160,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1501,7 +1501,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-all-components-with-custom-max-skew-generated.yaml b/operations/mimir-tests/test-all-components-with-custom-max-skew-generated.yaml
@@ -534,7 +534,7 @@ spec:
           value: "8"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -631,7 +631,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -711,7 +711,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -783,7 +783,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -875,7 +875,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -952,7 +952,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1051,7 +1051,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1160,7 +1160,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1501,7 +1501,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-all-components-with-tsdb-head-early-compaction-generated.yaml b/operations/mimir-tests/test-all-components-with-tsdb-head-early-compaction-generated.yaml
@@ -534,7 +534,7 @@ spec:
           value: "8"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -631,7 +631,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -711,7 +711,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -783,7 +783,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -875,7 +875,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -952,7 +952,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1051,7 +1051,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1162,7 +1162,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1503,7 +1503,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-all-components-without-chunk-streaming-generated.yaml b/operations/mimir-tests/test-all-components-without-chunk-streaming-generated.yaml
@@ -535,7 +535,7 @@ spec:
           value: "8"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -632,7 +632,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -712,7 +712,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -784,7 +784,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -876,7 +876,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -953,7 +953,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1052,7 +1052,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1161,7 +1161,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1502,7 +1502,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.11.0
+        image: grafana/mimir:2.12.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports: