[release-2.13] Bump version to 2.13.1 (#10099)

* Add security fix to changelog * Bump version to 2.13.1 * Add v2.13.1 to release notes * Update screenshots --------- Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
grafana · Dec 3, 2024 · 5f430ac · 5f430ac
1 parent 51eebd1
commit 5f430ac
Show file tree

Hide file tree

Showing 95 changed files with 739 additions and 733 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Grafana Mimir
 
 * [BUGFIX] Upgrade Go to 1.22.9 to address [CVE-2024-34156](https://nvd.nist.gov/vuln/detail/CVE-2024-34156). #10097
+* [BUGFIX] Update module google.golang.org/grpc to v1.64.1 to address [GHSA-xr7q-jx4m-x55m](https://github.com/advisories/GHSA-xr7q-jx4m-x55m). #8717
 
 ## 2.13.0
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.13.0
+2.13.1
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/...ashboards/remote-ruler-reads-networking/mimir-remote-ruler-reads-networking.png b/...ashboards/remote-ruler-reads-networking/mimir-remote-ruler-reads-networking.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/docs/sources/mimir/release-notes/v2.13.md b/docs/sources/mimir/release-notes/v2.13.md
@@ -83,3 +83,8 @@ The following configuration options are deprecated and will be removed in a futu
 
 The Grafana Mimir and Grafana Enterprise Metrics Helm charts are released independently.
 Refer to the [Grafana Mimir Helm chart documentation](/docs/helm-charts/mimir-distributed/latest/).
+
+### v2.13.1
+
+- [BUGFIX] Upgrade Go to 1.22.9 to address [CVE-2024-34156](https://nvd.nist.gov/vuln/detail/CVE-2024-34156). [PR 10097](https://github.com/grafana/mimir/pull/10097)
+- [BUGFIX] Update module google.golang.org/grpc to v1.64.1 to address [GHSA-xr7q-jx4m-x55m](https://github.com/advisories/GHSA-xr7q-jx4m-x55m). [PR 8717](https://github.com/grafana/mimir/pull/8717)
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.13.1
 
 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.13.1
         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.13.1
         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.13.1
         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.13.1
         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.13.1
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -954,7 +954,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1053,7 +1053,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1162,7 +1162,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1503,7 +1503,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         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.13.1
         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.13.1
         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.13.1
         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.13.1
         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.13.1
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -954,7 +954,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1053,7 +1053,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1162,7 +1162,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1503,7 +1503,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         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.13.1
         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.13.1
         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.13.1
         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.13.1
         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.13.1
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -954,7 +954,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1053,7 +1053,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1164,7 +1164,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1505,7 +1505,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         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.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -632,7 +632,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -713,7 +713,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -785,7 +785,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.13.1
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -878,7 +878,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         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.13.1
         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.13.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1163,7 +1163,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1504,7 +1504,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.13.0
+        image: grafana/mimir:2.13.1
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports: