Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-cut r315 #9825

Merged
merged 8 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.14.0
2.14.1
8 changes: 6 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
1,186 changes: 1,123 additions & 63 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion operations/mimir-rules-action/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
18 changes: 9 additions & 9 deletions operations/mimir-tests/test-all-components-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading
Loading