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

Merge release-2.12 to main #7798

Merged
merged 8 commits into from
Apr 3, 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
12 changes: 3 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

### Grafana Mimir

* [CHANGE] Querier: the CLI flag `-querier.minimize-ingester-requests` has been moved from "experimental" to "advanced". #7638
* [CHANGE] Ingester: `/ingester/flush` endpoint is now only allowed to execute only while the ingester is in `Running` state. The 503 status code is returned if the endpoint is called while the ingester is not in `Running` state. #7486
* [CHANGE] Distributor: Include label name in `err-mimir-label-value-too-long` error message: #7740
* [FEATURE] Continuous-test: now runable as a module with `mimir -target=continuous-test`. #7747
Expand Down Expand Up @@ -76,14 +75,7 @@

* [ENHANCEMENT] ulidtime: add option to show random part of ULID, timestamp in milliseconds and header. #7615

## 2.12.0-rc.1

### Grafana Mimir

* [CHANGE] Querier: the CLI flag `-querier.minimize-ingester-requests` has been moved from "experimental" to "advanced". #7638
* [BUGFIX] Query-frontend: Fix memory leak on every request. #7654

## 2.12.0-rc.0
## 2.12.0

### Grafana Mimir

Expand Down Expand Up @@ -132,6 +124,7 @@
* [CHANGE] The configuration option `-querier.max-query-into-future` has been deprecated and will be removed in Mimir 2.14. #7496
* [CHANGE] Distributor: the metric `cortex_distributor_sample_delay_seconds` has been deprecated and will be removed in Mimir 2.14. #7516
* [CHANGE] Query-frontend: The deprecated YAML setting `frontend.cache_unaligned_requests` has been moved to `limits.cache_unaligned_requests`. #7519
* [CHANGE] Querier: the CLI flag `-querier.minimize-ingester-requests` has been moved from "experimental" to "advanced". #7638
* [FEATURE] Introduce `-server.log-source-ips-full` option to log all IPs from `Forwarded`, `X-Real-IP`, `X-Forwarded-For` headers. #7250
* [FEATURE] Introduce `-tenant-federation.max-tenants` option to limit the max number of tenants allowed for requests when federation is enabled. #6959
* [FEATURE] Cardinality API: added a new `count_method` parameter which enables counting active label names. #7085
Expand Down Expand Up @@ -205,6 +198,7 @@
* [BUGFIX] Fix metadata API using wrong JSON field names. #7475
* [BUGFIX] Ruler: fix native histogram recording rule result corruption. #7552
* [BUGFIX] Querier: fix HTTP status code translations for remote read requests. Previously, remote-read had conflicting behaviours: when returning samples all internal errors were translated to HTTP 400; when returning chunks all internal errors were translated to HTTP 500. #7487
* [BUGFIX] Query-frontend: Fix memory leak on every request. #7654

### Mixin

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.11.0
2.12.0
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.11.0
FROM grafana/mimirtool:2.12.0

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.11.0
image: grafana/mimir:2.12.0
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.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: querier
ports:
Expand Down Expand Up @@ -711,7 +711,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: query-frontend
ports:
Expand Down Expand Up @@ -783,7 +783,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-scheduler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -875,7 +875,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -952,7 +952,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1051,7 +1051,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1160,7 +1160,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1501,7 +1501,7 @@ spec:
value: "12884901888"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
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.11.0
image: grafana/mimir:2.12.0
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.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: querier
ports:
Expand Down Expand Up @@ -711,7 +711,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: query-frontend
ports:
Expand Down Expand Up @@ -783,7 +783,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-scheduler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -875,7 +875,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -952,7 +952,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1051,7 +1051,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1160,7 +1160,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1501,7 +1501,7 @@ spec:
value: "12884901888"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
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.11.0
image: grafana/mimir:2.12.0
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.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: querier
ports:
Expand Down Expand Up @@ -711,7 +711,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: query-frontend
ports:
Expand Down Expand Up @@ -783,7 +783,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-scheduler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -875,7 +875,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -952,7 +952,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1051,7 +1051,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1162,7 +1162,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1503,7 +1503,7 @@ spec:
value: "12884901888"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ spec:
value: "8"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: distributor
ports:
Expand Down Expand Up @@ -632,7 +632,7 @@ spec:
value: "5"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
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.11.0
image: grafana/mimir:2.12.0
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.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -876,7 +876,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -953,7 +953,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1052,7 +1052,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1161,7 +1161,7 @@ spec:
env:
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1502,7 +1502,7 @@ spec:
value: "12884901888"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "1000"
image: grafana/mimir:2.11.0
image: grafana/mimir:2.12.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down
Loading
Loading