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

grafana · Feb 2, 2023 · 0f0e0a0 · 0f0e0a0
2 parents f0c92b8 + f28920c
commit 0f0e0a0
Show file tree

Hide file tree

Showing 64 changed files with 366 additions and 366 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,7 +43,7 @@
 
 * [ENHANCEMENT] Document migration from microservices to read-write deployment mode. #3951
 
-## 2.6.0-rc.0
+## 2.6.0
 
 ### Grafana Mimir
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.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/...tors-guide/monitor-grafana-mimir/dashboards/alertmanager/mimir-alertmanager.png b/...tors-guide/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/.../operators-guide/monitor-grafana-mimir/dashboards/compactor/mimir-compactor.png b/.../operators-guide/monitor-grafana-mimir/dashboards/compactor/mimir-compactor.png
diff --git a/.../mimir/operators-guide/monitor-grafana-mimir/dashboards/config/mimir-config.png b/.../mimir/operators-guide/monitor-grafana-mimir/dashboards/config/mimir-config.png
diff --git a/...tors-guide/monitor-grafana-mimir/dashboards/object-store/mimir-object-store.png b/...tors-guide/monitor-grafana-mimir/dashboards/object-store/mimir-object-store.png
diff --git a/.../operators-guide/monitor-grafana-mimir/dashboards/overrides/mimir-overrides.png b/.../operators-guide/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/...ir/operators-guide/monitor-grafana-mimir/dashboards/overview/mimir-overview.png b/...ir/operators-guide/monitor-grafana-mimir/dashboards/overview/mimir-overview.png
diff --git a/...imir/operators-guide/monitor-grafana-mimir/dashboards/queries/mimir-queries.png b/...imir/operators-guide/monitor-grafana-mimir/dashboards/queries/mimir-queries.png
diff --git a/...de/monitor-grafana-mimir/dashboards/reads-networking/mimir-reads-networking.png b/...de/monitor-grafana-mimir/dashboards/reads-networking/mimir-reads-networking.png
diff --git a/...uide/monitor-grafana-mimir/dashboards/reads-resources/mimir-reads-resources.png b/...uide/monitor-grafana-mimir/dashboards/reads-resources/mimir-reads-resources.png
diff --git a/...es/mimir/operators-guide/monitor-grafana-mimir/dashboards/reads/mimir-reads.png b/...es/mimir/operators-guide/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/...de/monitor-grafana-mimir/dashboards/rollout-progress/mimir-rollout-progress.png b/...de/monitor-grafana-mimir/dashboards/rollout-progress/mimir-rollout-progress.png
diff --git a/...es/mimir/operators-guide/monitor-grafana-mimir/dashboards/ruler/mimir-ruler.png b/...es/mimir/operators-guide/monitor-grafana-mimir/dashboards/ruler/mimir-ruler.png
diff --git a/...imir/operators-guide/monitor-grafana-mimir/dashboards/scaling/mimir-scaling.png b/...imir/operators-guide/monitor-grafana-mimir/dashboards/scaling/mimir-scaling.png
diff --git a/...imir/operators-guide/monitor-grafana-mimir/dashboards/tenants/mimir-tenants.png b/...imir/operators-guide/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/...de/monitor-grafana-mimir/dashboards/writes-resources/mimir-writes-resources.png b/...de/monitor-grafana-mimir/dashboards/writes-resources/mimir-writes-resources.png
diff --git a/.../mimir/operators-guide/monitor-grafana-mimir/dashboards/writes/mimir-writes.png b/.../mimir/operators-guide/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.5.0
+FROM grafana/mimirtool:2.6.0
 
 COPY entrypoint.sh /entrypoint.sh
 

diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml
@@ -492,7 +492,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=distributor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -584,7 +584,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -658,7 +658,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -729,7 +729,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -813,7 +813,7 @@ spec:
         - -store-gateway.sharding-ring.store=memberlist
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -905,7 +905,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ruler-querier
         ports:
@@ -979,7 +979,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ruler-query-frontend
         ports:
@@ -1050,7 +1050,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ruler-query-scheduler
         ports:
@@ -1118,7 +1118,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1214,7 +1214,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1317,7 +1317,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1646,7 +1646,7 @@ spec:
         - -store-gateway.sharding-ring.wait-stability-min-duration=1m
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-consul-generated.yaml b/operations/mimir-tests/test-consul-generated.yaml
@@ -787,7 +787,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=distributor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -877,7 +877,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -949,7 +949,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -1020,7 +1020,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -1103,7 +1103,7 @@ spec:
         - -store-gateway.sharding-ring.store=consul
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -1178,7 +1178,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1270,7 +1270,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1369,7 +1369,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1694,7 +1694,7 @@ spec:
         - -store-gateway.sharding-ring.wait-stability-min-duration=1m
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-consul-multi-zone-generated.yaml b/operations/mimir-tests/test-consul-multi-zone-generated.yaml
@@ -938,7 +938,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=distributor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -1030,7 +1030,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -1102,7 +1102,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -1173,7 +1173,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -1303,7 +1303,7 @@ spec:
         - -store-gateway.sharding-ring.zone-awareness-enabled=true
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -1378,7 +1378,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1470,7 +1470,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1582,7 +1582,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1694,7 +1694,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1806,7 +1806,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -2145,7 +2145,7 @@ spec:
         - -store-gateway.sharding-ring.zone-awareness-enabled=true
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:
@@ -2272,7 +2272,7 @@ spec:
         - -store-gateway.sharding-ring.zone-awareness-enabled=true
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:
@@ -2399,7 +2399,7 @@ spec:
         - -store-gateway.sharding-ring.zone-awareness-enabled=true
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml b/operations/mimir-tests/test-consul-ruler-disabled-generated.yaml
@@ -769,7 +769,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=distributor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -859,7 +859,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -931,7 +931,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -1002,7 +1002,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -1068,7 +1068,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1160,7 +1160,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1259,7 +1259,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1584,7 +1584,7 @@ spec:
         - -store-gateway.sharding-ring.wait-stability-min-duration=1m
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.5.0
+        image: grafana/mimir:2.6.0
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports: