Skip to content

Commit

Permalink
Merge pull request #27 from qclaogui:mimir-2.11.0
Browse files Browse the repository at this point in the history
Bump Mimir to 2.11.0
  • Loading branch information
qclaogui authored Jan 18, 2024
2 parents 91ca47f + 8b24765 commit 0d930c6
Show file tree
Hide file tree
Showing 19 changed files with 503 additions and 417 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
depends_on:
ingester:
condition: service_started
image: &mimirImage grafana/mimir:2.10.3
image: &mimirImage grafana/mimir:2.11.0
volumes:
- ../../common/config/mimir/microservices-mode-metrics.yaml:/etc/mimir.yaml # Note: Mimir use microservices-mode-metrics.yaml
- ./config/mimir:/etc/mimir
Expand Down
8 changes: 4 additions & 4 deletions docker-compose/monolithic-mode/all-in-one/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
depends_on:
minio:
condition: service_healthy
image: grafana/mimir:2.10.3
image: grafana/mimir:2.11.0
volumes:
- ../../common/config/mimir/monolithic-mode-metrics.yaml:/etc/config.yaml
command:
Expand All @@ -60,7 +60,7 @@ services:
depends_on:
mimir:
condition: service_healthy
image: grafana/mimirtool:2.10.3
image: grafana/mimirtool:2.11.0
volumes:
- ../../../monitoring-mixins/mimir-mixin/deploy/rules.yaml:/mimir-mixin/rules.yaml
- ../../../monitoring-mixins/mimir-mixin/deploy/alerts.yaml:/mimir-mixin/alerts.yaml
Expand Down Expand Up @@ -98,7 +98,7 @@ services:
depends_on:
loki:
condition: service_healthy
image: grafana/mimirtool:2.10.3
image: grafana/mimirtool:2.11.0
volumes:
- ../../../monitoring-mixins/loki-mixin/deploy/rules.yaml:/loki-mixin/rules.yaml
- ../../../monitoring-mixins/loki-mixin/deploy/alerts.yaml:/loki-mixin/alerts.yaml
Expand Down Expand Up @@ -139,7 +139,7 @@ services:
depends_on:
tempo:
condition: service_healthy
image: grafana/mimirtool:2.10.3
image: grafana/mimirtool:2.11.0
volumes:
- ../../../monitoring-mixins/tempo-mixin/deploy/rules.yaml:/tempo-mixin/rules.yaml
- ../../../monitoring-mixins/tempo-mixin/deploy/alerts.yaml:/tempo-mixin/alerts.yaml
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/monolithic-mode/metrics/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
depends_on:
minio:
condition: service_healthy
image: grafana/mimir:2.10.3
image: grafana/mimir:2.11.0
command:
- -config.file=/etc/mimir.yaml
- -target=all
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/read-write-mode/metrics/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
depends_on:
minio:
condition: service_healthy
image: &mimirImage grafana/mimir:2.10.3
image: &mimirImage grafana/mimir:2.11.0
command:
- -config.file=/etc/mimir.yaml
- -target=backend
Expand Down
Loading

0 comments on commit 0d930c6

Please sign in to comment.