Merge branch merge-release-2.14-to-main to main.

grafana · Oct 10, 2024 · 14bc627 · 14bc627
2 parents 0c60705 + 385b8e2
commit 14bc627
Show file tree

Hide file tree

Showing 79 changed files with 853 additions and 853 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,6 @@
   * `cortex_alertmanager_state_replication_failed_total`
   * `cortex_alertmanager_alerts`
   * `cortex_alertmanager_silences`
-* [CHANGE] Cache: Deprecate experimental support for Redis as a cache backend. #9453
 * [FEATURE] Querier: add experimental streaming PromQL engine, enabled with `-querier.query-engine=mimir`. #9367 #9368 #9398 #9399 #9403 #9417 #9418 #9419 #9420 #9482 #9504 #9505 #9507 #9518 #9531 #9532 #9533 #9553
 * [FEATURE] Query-frontend: added experimental configuration options `query-frontend.cache-errors` and `query-frontend.results-cache-ttl-for-errors` to allow non-transient responses to be cached. When set to `true` error responses from hitting limits or bad data are cached for a short TTL. #9028
 * [FEATURE] gRPC: Support S2 compression. #9322
@@ -68,7 +67,7 @@
 * [FEATURE] `splitblocks`: add new tool to split blocks larger than a specified duration into multiple blocks. #9517
 * [ENHANCEMENT] `copyblocks`: Added `--skip-no-compact-block-duration-check`, which defaults to `false`, to simplify targeting blocks that are not awaiting compaction. #9439
 
-## v2.14.0-rc.0
+## 2.14.0
 
 ### Grafana Mimir
 
@@ -102,6 +101,7 @@
 * [CHANGE] Distributor: reject incoming requests until the distributor service has started. #9317
 * [CHANGE] Ingester, Distributor: Remove deprecated `-ingester.limit-inflight-requests-using-grpc-method-limiter` and `-distributor.limit-inflight-requests-using-grpc-method-limiter`. The feature was deprecated and enabled by default in Mimir 2.12. #9407
 * [CHANGE] Querier: Remove deprecated `-querier.max-query-into-future`. The feature was deprecated in Mimir 2.12. #9407
+* [CHANGE] Cache: Deprecate experimental support for Redis as a cache backend. The support is set to be removed in the next major release. #9453
 * [FEATURE] Alertmanager: Added `-alertmanager.log-parsing-label-matchers` to control logging when parsing label matchers. This flag is intended to be used with `-alertmanager.utf8-strict-mode-enabled` to validate UTF-8 strict mode is working as intended. The default value is `false`. #9173
 * [FEATURE] Alertmanager: Added `-alertmanager.utf8-migration-logging-enabled` to enable logging of tenant configurations that are incompatible with UTF-8 strict mode. The default value is `false`. #9174
 * [FEATURE] Querier: add experimental streaming PromQL engine, enabled with `-querier.query-engine=mimir`. #8422 #8430 #8454 #8455 #8360 #8490 #8508 #8577 #8660 #8671 #8677 #8747 #8850 #8872 #8838 #8911 #8909 #8923 #8924 #8925 #8932 #8933 #8934 #8962 #8986 #8993 #8995 #9008 #9017 #9018 #9019 #9120 #9121 #9136 #9139 #9140 #9145 #9191 #9192 #9194 #9196 #9201 #9212 #9225 #9260 #9272 #9277 #9278 #9280 #9281 #9342 #9343 #9371

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.13.0
+2.14.0
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.13.0
+FROM grafana/mimirtool:2.14.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.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -712,7 +712,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -877,7 +877,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -955,7 +955,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1054,7 +1054,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1165,7 +1165,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1506,7 +1506,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -712,7 +712,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -877,7 +877,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -955,7 +955,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1054,7 +1054,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1165,7 +1165,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1506,7 +1506,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-all-components-with-custom-runtime-config-generated.yaml b/operations/mimir-tests/test-all-components-with-custom-runtime-config-generated.yaml
@@ -543,7 +543,7 @@ spec:
           value: "8"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -640,7 +640,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -721,7 +721,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -793,7 +793,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -886,7 +886,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -964,7 +964,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1063,7 +1063,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1174,7 +1174,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1515,7 +1515,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -712,7 +712,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.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.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -877,7 +877,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -955,7 +955,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1054,7 +1054,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1167,7 +1167,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1508,7 +1508,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.14.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports: