Merge pull request #170 from qclaogui:mimir-2.13.0

bump to grafana/mimir:2.13.0
qclaogui · Jul 12, 2024 · bdd36d2 · bdd36d2
2 parents bf824a5 + f327dbc
commit bdd36d2
Show file tree

Hide file tree

Showing 67 changed files with 9,880 additions and 3,779 deletions.
diff --git a/docker-compose/common/compose-include/mimir.yaml b/docker-compose/common/compose-include/mimir.yaml
@@ -4,7 +4,7 @@ services:
     labels:
       metrics.grafana.com/scrape: false
     depends_on: { minio: { condition: service_healthy } }
-    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.12.0}
+    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir-alpine:2.13.0}
     configs:
       - source: mimir_config_file
         target: /etc/mimir/config.yaml
@@ -30,7 +30,7 @@ services:
   mimirtool:
     labels:
       metrics.grafana.com/scrape: false
-    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.12.0}
+    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.13.0}
     volumes:
       - ../../../monitoring-mixins/crontab:/etc/crontabs/root
       - ../../../monitoring-mixins/alloy-mixin/deploy/alloy-mixin-alerts.yaml:/rules/alloy-mixin-alerts.yaml

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -2,8 +2,8 @@ ALLOY_IMAGE=grafana/alloy:v1.2.0
 LOKI_IMAGE=grafana/loki:3.1.0
 GRAFANA_IMAGE=grafana/grafana:11.1.0
 TEMPO_IMAGE=grafana/tempo:2.5.0
-MIMIR_IMAGE=grafana/mimir:2.12.0
-MIMIRTOOL_IMAGE=grafana/mimirtool:2.12.0
+MIMIR_IMAGE=grafana/mimir-alpine:2.13.0
+MIMIRTOOL_IMAGE=grafana/mimirtool:2.13.0
 PYROSCOPE_IMAGE=grafana/pyroscope:1.6.1
 NGINX_IMAGE=nginxinc/nginx-unprivileged:1.25-alpine
 MINIO_IMAGE=minio/minio:RELEASE.2024-06-22T05-26-45Z

diff --git a/docker-compose/common/config/mimir/gateway_mimir.conf b/docker-compose/common/config/mimir/gateway_mimir.conf
@@ -26,6 +26,21 @@ server {
     location = /multitenant_alertmanager/status {
       proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
     }
+    location = /api/v1/alerts {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/config {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/state {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/receivers {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/templates/test {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
     # https://github.com/grafana/mimir/releases/tag/mimir-2.12.0
     # Alertmanager deprecated the v1 API. All endpoints have a v2 equivalent.
     location = /api/v2/alerts {

diff --git a/docker-compose/microservices-mode/metrics/compose.yaml b/docker-compose/microservices-mode/metrics/compose.yaml
@@ -50,7 +50,7 @@ services:
 
   distributor:
     depends_on: { ingester: { condition: service_healthy } }
-    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.12.0}
+    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir-alpine:2.13.0}
     configs:
       - source: mimir_config_file
         target: /etc/mimir/config.yaml
@@ -227,7 +227,7 @@ services:
   mimirtool:
     labels:
       metrics.grafana.com/scrape: false
-    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.12.0}
+    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.13.0}
     volumes:
       - ../../../monitoring-mixins/crontab:/etc/crontabs/root
       - ../../../monitoring-mixins/alloy-mixin/deploy/alloy-mixin-alerts.yaml:/rules/alloy-mixin-alerts.yaml

diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml
@@ -125,7 +125,7 @@ services:
       metrics.grafana.com/scrape: false
       profiles.grafana.com/service_name: mimir
     depends_on: { minio: { condition: service_healthy } }
-    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.12.0}
+    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir-alpine:2.13.0}
     configs:
       - source: mimir_config_file
         target: /etc/mimir/config.yaml
@@ -153,7 +153,7 @@ services:
   mimirtool:
     labels:
       metrics.grafana.com/scrape: false
-    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.12.0}
+    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.13.0}
     volumes:
       - ../../../monitoring-mixins/crontab:/etc/crontabs/root
       - ../../../monitoring-mixins/alloy-mixin/deploy/alloy-mixin-alerts.yaml:/rules/alloy-mixin-alerts.yaml

diff --git a/docker-compose/read-write-mode/metrics/compose.yaml b/docker-compose/read-write-mode/metrics/compose.yaml
@@ -50,7 +50,7 @@ services:
 
   mimir-backend:
     depends_on: { minio: { condition: service_healthy } }
-    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.12.0}
+    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir-alpine:2.13.0}
     configs:
       - source: mimir_config_file
         target: /etc/mimir/config.yaml
@@ -107,7 +107,7 @@ services:
   mimirtool:
     labels:
       metrics.grafana.com/scrape: false
-    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.12.0}
+    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.13.0}
     volumes:
       - ../../../monitoring-mixins/crontab:/etc/crontabs/root
       - ../../../monitoring-mixins/alloy-mixin/deploy/alloy-mixin-alerts.yaml:/rules/alloy-mixin-alerts.yaml

diff --git a/kubernetes/common/gateway/nginx/gateway_mimir.conf b/kubernetes/common/gateway/nginx/gateway_mimir.conf
@@ -26,6 +26,21 @@ server {
     location = /multitenant_alertmanager/status {
       proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
     }
+    location = /api/v1/alerts {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/config {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/state {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/receivers {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/templates/test {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
     # https://github.com/grafana/mimir/releases/tag/mimir-2.12.0
     # Alertmanager deprecated the v1 API. All endpoints have a v2 equivalent.
     location = /api/v2/alerts {

diff --git a/kubernetes/microservices-mode/traces/configs/gateway_mimir.conf b/kubernetes/microservices-mode/traces/configs/gateway_mimir.conf
@@ -26,6 +26,21 @@ server {
     location = /multitenant_alertmanager/status {
       proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
     }
+    location = /api/v1/alerts {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/config {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/state {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/receivers {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/templates/test {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
     # https://github.com/grafana/mimir/releases/tag/mimir-2.12.0
     # Alertmanager deprecated the v1 API. All endpoints have a v2 equivalent.
     location = /api/v2/alerts {

diff --git a/kubernetes/monolithic-mode/traces/configs/gateway_mimir.conf b/kubernetes/monolithic-mode/traces/configs/gateway_mimir.conf
@@ -26,6 +26,21 @@ server {
     location = /multitenant_alertmanager/status {
       proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
     }
+    location = /api/v1/alerts {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/config {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/state {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/receivers {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
+    location = /api/v1/grafana/templates/test {
+      proxy_pass      http://${MIMIR_ALERT_MANAGER_HOST}:8080$request_uri;
+    }
     # https://github.com/grafana/mimir/releases/tag/mimir-2.12.0
     # Alertmanager deprecated the v1 API. All endpoints have a v2 equivalent.
     location = /api/v2/alerts {