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

grafana · Dec 26, 2023 · e168c48 · e168c48
2 parents bc9f39c + e29d81e
commit e168c48
Show file tree

Hide file tree

Showing 53 changed files with 479 additions and 479 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -88,7 +88,7 @@
 
 ### Tools
 
-## 2.11.0-rc.0
+## 2.11.0
 
 ### Grafana Mimir
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.10.4
+2.11.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.10.5
+FROM grafana/mimirtool:2.11.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
@@ -529,7 +529,7 @@ spec:
         env:
         - name: GOMAXPROCS
           value: "8"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -624,7 +624,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -699,7 +699,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -770,7 +770,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -857,7 +857,7 @@ spec:
         - -store-gateway.sharding-ring.store=memberlist
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -934,7 +934,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1031,7 +1031,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1136,7 +1136,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1475,7 +1475,7 @@ spec:
           value: "5"
         - name: GOMEMLIMIT
           value: "12884901888"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.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
@@ -529,7 +529,7 @@ spec:
         env:
         - name: GOMAXPROCS
           value: "8"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -624,7 +624,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -699,7 +699,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -770,7 +770,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -857,7 +857,7 @@ spec:
         - -store-gateway.sharding-ring.store=memberlist
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -934,7 +934,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1031,7 +1031,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1138,7 +1138,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1477,7 +1477,7 @@ spec:
           value: "5"
         - name: GOMEMLIMIT
           value: "12884901888"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.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
@@ -530,7 +530,7 @@ spec:
         env:
         - name: GOMAXPROCS
           value: "8"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -625,7 +625,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -700,7 +700,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -771,7 +771,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -858,7 +858,7 @@ spec:
         - -store-gateway.sharding-ring.store=memberlist
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -935,7 +935,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1032,7 +1032,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1137,7 +1137,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1476,7 +1476,7 @@ spec:
           value: "5"
         - name: GOMEMLIMIT
           value: "12884901888"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-automated-downscale-generated.yaml b/operations/mimir-tests/test-automated-downscale-generated.yaml
@@ -706,7 +706,7 @@ spec:
         env:
         - name: GOMAXPROCS
           value: "8"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -803,7 +803,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -878,7 +878,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -949,7 +949,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -1083,7 +1083,7 @@ spec:
         - -store-gateway.sharding-ring.zone-awareness-enabled=true
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -1160,7 +1160,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1257,7 +1257,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1379,7 +1379,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1501,7 +1501,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1623,7 +1623,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1980,7 +1980,7 @@ spec:
           value: "5"
         - name: GOMEMLIMIT
           value: "12884901888"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:
@@ -2121,7 +2121,7 @@ spec:
           value: "5"
         - name: GOMEMLIMIT
           value: "12884901888"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:
@@ -2262,7 +2262,7 @@ spec:
           value: "5"
         - name: GOMEMLIMIT
           value: "12884901888"
-        image: grafana/mimir:2.10.5
+        image: grafana/mimir:2.11.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports: