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.

Sign up for GitHub

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

Jump to bottom

Merge release-2.11 to main #7002

Merged
merged 2 commits into from
Dec 26, 2023
Merged

Merge release-2.11 to main #7002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8939ea
Prep for release 2.11.0 (#6984)
leizor Dec 21, 2023
e29d81e
Merge release-2.11 branch to main
leizor Dec 26, 2023
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

### Tools

## 2.11.0-rc.0
## 2.11.0

### Grafana Mimir

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10.4
2.11.0
2 changes: 1 addition & 1 deletion operations/mimir-rules-action/Dockerfile
View file
Open in desktop
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.10.5
FROM grafana/mimirtool:2.11.0

COPY entrypoint.sh /entrypoint.sh

Expand Down
18 changes: 9 additions & 9 deletions operations/mimir-tests/test-all-components-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ spec:
env:
- name: GOMAXPROCS
value: "8"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: distributor
ports:
Expand Down Expand Up @@ -624,7 +624,7 @@ spec:
value: "5"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: querier
ports:
Expand Down Expand Up @@ -699,7 +699,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-frontend
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-frontend
ports:
Expand Down Expand Up @@ -770,7 +770,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-scheduler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -857,7 +857,7 @@ spec:
- -store-gateway.sharding-ring.store=memberlist
- -target=ruler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1031,7 +1031,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1136,7 +1136,7 @@ spec:
- -server.http-listen-port=8080
- -target=ingester
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1475,7 +1475,7 @@ spec:
value: "5"
- name: GOMEMLIMIT
value: "12884901888"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down
18 changes: 9 additions & 9 deletions operations/mimir-tests/test-all-components-with-tsdb-head-early-compaction-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ spec:
env:
- name: GOMAXPROCS
value: "8"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: distributor
ports:
Expand Down Expand Up @@ -624,7 +624,7 @@ spec:
value: "5"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: querier
ports:
Expand Down Expand Up @@ -699,7 +699,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-frontend
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-frontend
ports:
Expand Down Expand Up @@ -770,7 +770,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-scheduler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -857,7 +857,7 @@ spec:
- -store-gateway.sharding-ring.store=memberlist
- -target=ruler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -934,7 +934,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1031,7 +1031,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1138,7 +1138,7 @@ spec:
- -server.http-listen-port=8080
- -target=ingester
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1477,7 +1477,7 @@ spec:
value: "5"
- name: GOMEMLIMIT
value: "12884901888"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down
18 changes: 9 additions & 9 deletions operations/mimir-tests/test-all-components-without-chunk-streaming-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ spec:
env:
- name: GOMAXPROCS
value: "8"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: distributor
ports:
Expand Down Expand Up @@ -625,7 +625,7 @@ spec:
value: "5"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: querier
ports:
Expand Down Expand Up @@ -700,7 +700,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-frontend
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-frontend
ports:
Expand Down Expand Up @@ -771,7 +771,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-scheduler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -858,7 +858,7 @@ spec:
- -store-gateway.sharding-ring.store=memberlist
- -target=ruler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -935,7 +935,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1032,7 +1032,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1137,7 +1137,7 @@ spec:
- -server.http-listen-port=8080
- -target=ingester
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1476,7 +1476,7 @@ spec:
value: "5"
- name: GOMEMLIMIT
value: "12884901888"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down
26 changes: 13 additions & 13 deletions operations/mimir-tests/test-automated-downscale-generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ spec:
env:
- name: GOMAXPROCS
value: "8"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: distributor
ports:
Expand Down Expand Up @@ -803,7 +803,7 @@ spec:
value: "5"
- name: JAEGER_REPORTER_MAX_QUEUE_SIZE
value: "5000"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: querier
ports:
Expand Down Expand Up @@ -878,7 +878,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-frontend
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-frontend
ports:
Expand Down Expand Up @@ -949,7 +949,7 @@ spec:
- -server.http-listen-port=8080
- -target=query-scheduler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: query-scheduler
ports:
Expand Down Expand Up @@ -1083,7 +1083,7 @@ spec:
- -store-gateway.sharding-ring.zone-awareness-enabled=true
- -target=ruler
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ruler
ports:
Expand Down Expand Up @@ -1160,7 +1160,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: alertmanager
ports:
Expand Down Expand Up @@ -1257,7 +1257,7 @@ spec:
- -server.http-listen-port=8080
- -target=compactor
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: compactor
ports:
Expand Down Expand Up @@ -1379,7 +1379,7 @@ spec:
- -server.http-listen-port=8080
- -target=ingester
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1501,7 +1501,7 @@ spec:
- -server.http-listen-port=8080
- -target=ingester
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1623,7 +1623,7 @@ spec:
- -server.http-listen-port=8080
- -target=ingester
- -usage-stats.installation-mode=jsonnet
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: ingester
ports:
Expand Down Expand Up @@ -1980,7 +1980,7 @@ spec:
value: "5"
- name: GOMEMLIMIT
value: "12884901888"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down Expand Up @@ -2121,7 +2121,7 @@ spec:
value: "5"
- name: GOMEMLIMIT
value: "12884901888"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down Expand Up @@ -2262,7 +2262,7 @@ spec:
value: "5"
- name: GOMEMLIMIT
value: "12884901888"
image: grafana/mimir:2.10.5
image: grafana/mimir:2.11.0
imagePullPolicy: IfNotPresent
name: store-gateway
ports:
Expand Down
Loading
Loading