deps no latest version

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Mar 24, 2024 · f9f66d1 · f9f66d1
1 parent a9bdfb8
commit f9f66d1
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 59 deletions.
diff --git a/compose.yaml b/compose.yaml
@@ -9,6 +9,7 @@ version: '3.9'
 include:
   - path: ./docker-compose/common/compose-include/minio.yaml
   - path: ./docker-compose/common/compose-include/memcached.yaml
+  - path: ./docker-compose/common/compose-include/load-rules-to-mimir.yaml
 
 # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md
 x-labels: &profiles-labels
@@ -169,29 +170,6 @@ services:
         aliases:
           - mimir-memberlist
 
-  load-rules-to-mimir:
-    depends_on:
-      gateway:
-        condition: service_healthy
-    image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.11.0}
-    volumes:
-      - ./monitoring-mixins/crontab:/etc/crontabs/root
-      - ./monitoring-mixins/agent-flow-mixin/deploy/agent-flow-mixin-alerts.yaml:/rules/agent-flow-mixin-alerts.yaml
-      - ./monitoring-mixins/loki-mixin/deploy/loki-mixin-rules.yaml:/rules/loki-mixin-rules.yaml
-      - ./monitoring-mixins/loki-mixin/deploy/loki-mixin-alerts.yaml:/rules/loki-mixin-alerts.yaml
-      - ./monitoring-mixins/memcached-mixin/deploy/memcached-mixin-alerts.yaml:/rules/memcached-mixin-alerts.yaml
-      - ./monitoring-mixins/mimir-mixin/deploy/mimir-mixin-rules.yaml:/rules/mimir-mixin-rules.yaml
-      - ./monitoring-mixins/mimir-mixin/deploy/mimir-mixin-alerts.yaml:/rules/mimir-mixin-alerts.yaml
-      - ./monitoring-mixins/pyroscope-mixin/deploy/pyroscope-mixin-rules.yaml:/rules/pyroscope-mixin-rules.yaml
-      # - ./monitoring-mixins/tempo-mixin/deploy/tempo-mixin-rules.yaml:/rules/tempo-mixin-rules.yaml
-      # - ./monitoring-mixins/tempo-mixin/deploy/tempo-mixin-alerts.yaml:/rules/tempo-mixin-alerts.yaml
-    environment:
-      - MIMIR_ADDRESS=http://gateway:8080
-      - MIMIR_TENANT_ID=anonymous
-    entrypoint: crond -f
-    restart: always
-
-
   pyroscope:
     labels:
       - logs.agent.grafana.com/log-format=logfmt

diff --git a/docker-compose/common/compose-include/agent-collect-logs.yaml b/docker-compose/common/compose-include/agent-collect-logs.yaml
@@ -6,7 +6,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: ${AGENT_IMAGE:-docker.io/grafana/agent:latest}
+    image: ${AGENT_IMAGE:-docker.io/grafana/agent:v0.40.3}
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock:ro

diff --git a/docker-compose/common/compose-include/agent-collect-metrics.yaml b/docker-compose/common/compose-include/agent-collect-metrics.yaml
@@ -6,7 +6,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: ${AGENT_IMAGE:-docker.io/grafana/agent:latest}
+    image: ${AGENT_IMAGE:-docker.io/grafana/agent:v0.40.3}
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock:ro

diff --git a/docker-compose/common/compose-include/agent-collect-profiles.yaml b/docker-compose/common/compose-include/agent-collect-profiles.yaml
@@ -6,7 +6,7 @@ services:
     depends_on:
       gateway:
         condition: service_started
-    image: ${AGENT_IMAGE:-docker.io/grafana/agent:latest}
+    image: ${AGENT_IMAGE:-docker.io/grafana/agent:v0.40.3}
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock:ro

diff --git a/docker-compose/common/compose-include/agent-collect-traces.yaml b/docker-compose/common/compose-include/agent-collect-traces.yaml
@@ -6,7 +6,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: ${AGENT_IMAGE:-docker.io/grafana/agent:latest}
+    image: ${AGENT_IMAGE:-docker.io/grafana/agent:v0.40.3}
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock:ro

diff --git a/docker-compose/common/compose-include/load-rules-to-mimir.yaml b/docker-compose/common/compose-include/load-rules-to-mimir.yaml
@@ -1,5 +1,8 @@
 services:
   load-rules-to-mimir:
+    # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md
+    labels:
+      metrics.agent.grafana.com/scrape: false
     image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:latest}
     volumes:
       - ../../../monitoring-mixins/crontab:/etc/crontabs/root

diff --git a/docker-compose/common/compose-include/mimir.yaml b/docker-compose/common/compose-include/mimir.yaml
@@ -9,7 +9,7 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:latest}
+    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.11.0}
     volumes:
       - ../config/mimir:/etc/mimir
     command:

diff --git a/docker-compose/common/compose-include/minio.yaml b/docker-compose/common/compose-include/minio.yaml
@@ -10,7 +10,7 @@ services:
       - metrics.agent.grafana.com/port=9000
       - metrics.agent.grafana.com/interval=15s
       - metrics.agent.grafana.com/timeout=10s
-    image: ${MINIO_IMAGE:-docker.io/minio/minio:latest}
+    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-03-15T01-07-19Z}
     entrypoint:
       - sh
       - -euc

diff --git a/docker-compose/microservices-mode/logs/compose.yaml b/docker-compose/microservices-mode/logs/compose.yaml
@@ -26,7 +26,7 @@ services:
     depends_on:
       distributor:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
@@ -52,7 +52,7 @@ services:
     depends_on:
       ingester:
         condition: service_started
-    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:latest}
+    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:2.9.6}
     volumes:
       - ../../common/config/loki:/etc/loki
     command:
@@ -166,7 +166,7 @@ services:
   grafana:
     labels:
       logs.agent.grafana.com/log-format: logfmt
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/microservices-mode/metrics/compose.yaml b/docker-compose/microservices-mode/metrics/compose.yaml
@@ -22,7 +22,7 @@ services:
         condition: service_healthy
       ruler:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
@@ -45,7 +45,7 @@ services:
     depends_on:
       ingester:
         condition: service_started
-    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir:latest}
+    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.11.0}
     volumes:
       - ../../common/config/mimir:/etc/mimir
     command:
@@ -207,7 +207,7 @@ services:
           - mimir-memberlist
 
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/microservices-mode/profiles/compose.yaml b/docker-compose/microservices-mode/profiles/compose.yaml
@@ -27,7 +27,7 @@ services:
     depends_on:
       distributor:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     restart: always
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
@@ -52,7 +52,7 @@ services:
     depends_on:
       ingester:
         condition: service_started
-    image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:latest}
+    image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.5.0}
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
     command:
@@ -211,7 +211,7 @@ services:
       <<: *profiles-labels
       profiles.agent.grafana.com/port: 6060
       profiles.agent.grafana.com/service_name: grafana
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/microservices-mode/traces/compose.yaml b/docker-compose/microservices-mode/traces/compose.yaml
@@ -27,7 +27,7 @@ services:
     depends_on:
       distributor:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     restart: always
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
@@ -51,7 +51,7 @@ services:
     depends_on:
       ingester:
         condition: service_started
-    image: &tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:latest}
+    image: &tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.4.1}
     volumes:
       - ../../common/config/tempo:/etc/tempo
     command:
@@ -136,7 +136,7 @@ services:
       JAEGER_TAGS: app=compactor
 
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/monolithic-mode/logs/compose.yaml b/docker-compose/monolithic-mode/logs/compose.yaml
@@ -22,7 +22,7 @@ services:
     depends_on:
       loki:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
@@ -40,7 +40,7 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: ${LOKI_IMAGE:-docker.io/grafana/loki:latest}
+    image: ${LOKI_IMAGE:-docker.io/grafana/loki:2.9.6}
     volumes:
       - ../../common/config/loki:/etc/loki
     command:
@@ -63,7 +63,7 @@ services:
   grafana:
     labels:
       - logs.agent.grafana.com/log-format=logfmt
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/monolithic-mode/metrics/compose.yaml b/docker-compose/monolithic-mode/metrics/compose.yaml
@@ -20,7 +20,7 @@ services:
     depends_on:
       mimir:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
@@ -35,7 +35,7 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:latest}
+    image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.11.0}
     volumes:
       - ../../common/config/mimir:/etc/mimir
     command:
@@ -56,7 +56,7 @@ services:
           - mimir-memberlist
 
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/monolithic-mode/profiles/compose.yaml b/docker-compose/monolithic-mode/profiles/compose.yaml
@@ -36,7 +36,7 @@ services:
     depends_on:
       pyroscope:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
@@ -52,7 +52,7 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:latest}
+    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.5.0}
     container_name: pyroscope
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
@@ -77,7 +77,7 @@ services:
       profiles.agent.grafana.com/service_name: grafana
       profiles.agent.grafana.com/port: 6060
       logs.agent.grafana.com/log-format: logfmt
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     hostname: grafana
     command:
       - --config=/etc/grafana-config/grafana.ini

diff --git a/docker-compose/monolithic-mode/traces/compose.yaml b/docker-compose/monolithic-mode/traces/compose.yaml
@@ -27,7 +27,7 @@ services:
     depends_on:
       tempo:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     restart: always
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
@@ -44,7 +44,7 @@ services:
     depends_on:
       minio:
         condition: service_started
-    image: &tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:latest}
+    image: &tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.4.1}
     restart: always
     volumes:
       - ../../common/config/tempo:/etc/tempo
@@ -68,7 +68,7 @@ services:
     depends_on:
       minio:
         condition: service_started
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/read-write-mode/logs/compose.yaml b/docker-compose/read-write-mode/logs/compose.yaml
@@ -25,7 +25,7 @@ services:
     depends_on:
       loki-write:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
@@ -51,7 +51,7 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:latest}
+    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:2.9.6}
     volumes:
       - ../../common/config/loki:/etc/loki
     command:
@@ -119,7 +119,7 @@ services:
   grafana:
     labels:
       logs.agent.grafana.com/log-format: logfmt
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/read-write-mode/metrics/compose.yaml b/docker-compose/read-write-mode/metrics/compose.yaml
@@ -22,7 +22,7 @@ services:
         condition: service_healthy
       mimir-backend:
         condition: service_healthy
-    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:latest}
+    image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     volumes:
       - ../../common/config/nginx/10-default-lgtmp.envsh:/docker-entrypoint.d/10-default-lgtmp.envsh
       - ../../common/config/nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template
@@ -45,7 +45,7 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir:latest}
+    image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.11.0}
     volumes:
       - ../../common/config/mimir:/etc/mimir
     command:
@@ -99,7 +99,7 @@ services:
           - mimir-memberlist
 
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:latest}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     hostname: grafana
     command:
       - --config=/etc/grafana-config/grafana.ini