Re-cut r315 (#9825)

* [release-2.14] fix(deps): update github.com/thanos-io/objstore digest to f90c89a (main) (#9625) * Update github.com/thanos-io/objstore digest to f90c89a (#9534) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 3c97a61) * update changelog Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com> --------- Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vladimir Varankin <vladimir.varankin@grafana.com> * 2.14.1 Prepare patch release (#9796) * bump patch version Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com> * rebuild assets Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com> --------- Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com> * MQE: Fix handling of string results (#9803) This would previously panic after the query was closed * chore(deps): update grafana/mimirtool docker tag to v2.14.1 (#9806) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Revert upgrade to google.golang.org/grpc v1.66.2 (#9811) * Revert "Don't free buffers after reading query stream (#9721)" This reverts commit f7b6017. * Revert: Upgrade to google.golang.org/grpc v1.66.2 / modify certain protobuf messages to retain their unmarshaling buffer (#9401) Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Revert "Distributor.queryIngesterStream: Free gRPC buffers upon error (#9756)" This reverts commit eda1a4b. --------- Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Improve lock contention affecting read and write latencies during TSDB head compaction (cherry-pick Prometheus PR 15242) (#9822) * Cherry-pick Prometheus PR 15242 Signed-off-by: Marco Pracucci <marco@pracucci.com> * Added CHANGELOG entry Signed-off-by: Marco Pracucci <marco@pracucci.com> * Updated CHANGELOG Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com> Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> Signed-off-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vladimir Varankin <vladimir.varankin@grafana.com> Co-authored-by: Joshua Hesketh <joshua.hesketh@grafana.com> Co-authored-by: Đurica Yuri Nikolić <durica.nikolic@grafana.com> Co-authored-by: Marco Pracucci <marco@pracucci.com>
grafana · Nov 4, 2024 · ebd284e · ebd284e
1 parent 91b8d6c
commit ebd284e
Show file tree

Hide file tree

Showing 176 changed files with 3,394 additions and 4,862 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,7 @@
 * [ENHANCEMENT] Ingester: Reduced lock contention in the `PostingsForMatchers` cache. #9773
 * [ENHANCEMENT] Storage: Allow HTTP client settings to be tuned for GCS and Azure backends via an `http` block or corresponding CLI flags. This was already supported by the S3 backend. #9778
 * [ENHANCEMENT] Ruler: Support `group_limit` and `group_next_token` parameters in the `<prometheus-http-prefix>/api/v1/rules` endpoint. #9563
+* [ENHANCEMENT] Ingester: improved lock contention affecting read and write latencies during TSDB head compaction. #9822
 * [BUGFIX] Fix issue where functions such as `rate()` over native histograms could return incorrect values if a float stale marker was present in the selected range. #9508
 * [BUGFIX] Fix issue where negation of native histograms (eg. `-some_native_histogram_series`) did nothing. #9508
 * [BUGFIX] Fix issue where `metric might not be a counter, name does not end in _total/_sum/_count/_bucket` annotation would be emitted even if `rate` or `increase` did not have enough samples to compute a result. #9508
@@ -110,6 +111,12 @@
   * `--kafka-sasl-password`
 * [ENHANCEMENT] Updated `KubePersistentVolumeFillingUp` runbook, including a sample command to debug the distroless image. #9802
 
+## 2.14.1
+
+### Grafana Mimir
+
+* [BUGFIX] Update objstore library to resolve issues observed for some S3-compatible object stores, which respond to `StatObject` with `Range` incorrectly. #9625
+
 ## 2.14.0
 
 ### Grafana Mimir

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.14.0
+2.14.1
diff --git a/go.mod b/go.mod
@@ -49,7 +49,7 @@ require (
 	golang.org/x/net v0.30.0
 	golang.org/x/sync v0.8.0
 	golang.org/x/time v0.6.0
-	google.golang.org/grpc v1.66.2
+	google.golang.org/grpc v1.66.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -282,7 +282,7 @@ require (
 )
 
 // Using a fork of Prometheus with Mimir-specific changes.
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241030085501-6c2603082009
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241104085513-57e1ca2a6f61
 
 // Replace memberlist with our fork which includes some fixes that haven't been
 // merged upstream yet:
@@ -316,3 +316,7 @@ replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-aler
 // - https://github.com/grafana/franz-go/pull/3
 // - https://github.com/grafana/franz-go/pull/4
 replace github.com/twmb/franz-go => github.com/grafana/franz-go v0.0.0-20241009100846-782ba1442937
+
+// Pin Google GRPC to v1.65.0 as v1.66.0 has API changes and also potentially performance regressions.
+// Following https://github.com/grafana/dskit/pull/581
+replace google.golang.org/grpc => google.golang.org/grpc v1.65.0
diff --git a/go.sum b/go.sum
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.14.0
+FROM grafana/mimirtool:2.14.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.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -712,7 +712,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -955,7 +955,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1165,7 +1165,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1506,7 +1506,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -712,7 +712,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -955,7 +955,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1165,7 +1165,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1506,7 +1506,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -640,7 +640,7 @@ spec:
           value: "5"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -721,7 +721,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -886,7 +886,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -964,7 +964,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1174,7 +1174,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1515,7 +1515,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -712,7 +712,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "5000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -955,7 +955,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.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.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1167,7 +1167,7 @@ spec:
           value: "9"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1508,7 +1508,7 @@ spec:
           value: "12884901888"
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1000"
-        image: grafana/mimir:2.14.0
+        image: grafana/mimir:2.14.1
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports: