Merge pull request #90 from qclaogui:custom-default-dashboard

Bump up deps
qclaogui · Apr 5, 2024 · c986b1b · c986b1b
2 parents 12fbed5 + dd0101c
commit c986b1b
Show file tree

Hide file tree

Showing 22 changed files with 89 additions and 218 deletions.
diff --git a/compose.override.yaml b/compose.override.yaml
@@ -58,11 +58,7 @@ services:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: tempo
       logs.agent.grafana.com/log-format: logfmt
-    depends_on:
-      minio:
-        condition: service_healthy
-      mimir:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy }, mimir: { condition: service_healthy } }
     environment:
       <<: *jaeger-environment
       JAEGER_TAGS: app=tempo

diff --git a/docker-compose/common/compose-include/grafana-agent.yaml b/docker-compose/common/compose-include/grafana-agent.yaml
@@ -3,9 +3,7 @@ services:
   grafana-agent:
     labels:
       logs.agent.grafana.com/log-format: logfmt
-    depends_on:
-      gateway:
-        condition: service_healthy
+    depends_on: { gateway: { condition: service_healthy } }
     image: ${AGENT_IMAGE:-docker.io/grafana/agent:v0.40.3}
     volumes:
       - ../config/agent-flow:/etc/agent-config

diff --git a/docker-compose/common/compose-include/loki.yaml b/docker-compose/common/compose-include/loki.yaml
@@ -2,9 +2,7 @@ services:
   loki:
     labels:
       - logs.agent.grafana.com/log-format=json
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: ${LOKI_IMAGE:-docker.io/grafana/loki:2.9.6}
     volumes:
       - ../config/loki:/etc/loki

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

diff --git a/docker-compose/common/compose-include/pyroscope.yaml b/docker-compose/common/compose-include/pyroscope.yaml
@@ -1,8 +1,6 @@
 services:
   pyroscope:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.5.0}
     container_name: pyroscope
     volumes:

diff --git a/docker-compose/common/compose-include/tempo.yaml b/docker-compose/common/compose-include/tempo.yaml
@@ -1,8 +1,6 @@
 services:
   tempo:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.4.1}
     restart: always
     volumes:

diff --git a/docker-compose/common/config/grafana/grafana.ini b/docker-compose/common/config/grafana/grafana.ini
@@ -28,5 +28,4 @@ enabled = true
 disable_total_stats = false
 
 [dashboards]
-;default_home_dashboard_path = /usr/share/grafana/public/dashboards/home.json
 default_home_dashboard_path = /var/lib/grafana/dashboards/minio-dashboard.json
diff --git a/docker-compose/microservices-mode/logs/compose.yaml b/docker-compose/microservices-mode/logs/compose.yaml
@@ -30,9 +30,7 @@ services:
     labels:
       metrics.agent.grafana.com/scrape: false
       logs.agent.grafana.com/log-format: nginx
-    depends_on:
-      distributor:
-        condition: service_healthy
+    depends_on: { distributor: { condition: service_healthy } }
     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
@@ -56,9 +54,7 @@ services:
 
   distributor:
     labels: *loki-labels
-    depends_on:
-      ingester:
-        condition: service_started
+    depends_on: { ingester: { condition: service_healthy } }
     image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:2.9.6}
     volumes:
       - ../../common/config/loki:/etc/loki
@@ -80,9 +76,7 @@ services:
 
   ingester:
     labels: *loki-labels
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *lokiImage
     volumes:
       - ../../common/config/loki:/etc/loki
@@ -99,9 +93,7 @@ services:
 
   query-frontend:
     labels: *loki-labels
-    depends_on:
-      query-scheduler:
-        condition: service_started
+    depends_on: { query-scheduler: { condition: service_healthy } }
     image: *lokiImage
     volumes:
       - ../../common/config/loki:/etc/loki
@@ -128,9 +120,7 @@ services:
 
   querier:
     labels: *loki-labels
-    depends_on:
-      query-scheduler:
-        condition: service_started
+    depends_on: { query-scheduler: { condition: service_healthy } }
     image: *lokiImage
     volumes:
       - ../../common/config/loki:/etc/loki
@@ -141,9 +131,7 @@ services:
 
   ruler:
     labels: *loki-labels
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *lokiImage
     volumes:
       - ../../common/config/loki:/etc/loki

diff --git a/docker-compose/microservices-mode/metrics/compose.yaml b/docker-compose/microservices-mode/metrics/compose.yaml
@@ -17,11 +17,7 @@ services:
     # 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
-    depends_on:
-      distributor:
-        condition: service_healthy
-      ruler:
-        condition: service_healthy
+    depends_on: { distributor: { condition: service_healthy }, ruler: { condition: service_healthy } }
     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
@@ -42,9 +38,7 @@ services:
       - "38080:8080"
 
   distributor:
-    depends_on:
-      ingester:
-        condition: service_started
+    depends_on: { ingester: { condition: service_healthy } }
     image: &mimirImage ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.12.0}
     volumes:
       - ../../common/config/mimir:/etc/mimir
@@ -74,9 +68,7 @@ services:
       - -config.expand-env=true
 
   querier:
-    depends_on:
-      query-scheduler:
-        condition: service_healthy
+    depends_on: { query-scheduler: { condition: service_healthy } }
     image: *mimirImage
     volumes:
       - ../../common/config/mimir:/etc/mimir
@@ -92,9 +84,7 @@ services:
           - mimir-memberlist
 
   query-frontend:
-    depends_on:
-      query-scheduler:
-        condition: service_healthy
+    depends_on: { query-scheduler: { condition: service_healthy } }
     image: *mimirImage
     volumes:
       - ../../common/config/mimir:/etc/mimir
@@ -120,9 +110,7 @@ services:
       replicas: 2
 
   ruler:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *mimirImage
     volumes:
       - ../../common/config/mimir:/etc/mimir
@@ -141,9 +129,7 @@ services:
           - mimir-memberlist
 
   alertmanager:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *mimirImage
     volumes:
       - ../../common/config/mimir:/etc/mimir
@@ -157,9 +143,7 @@ services:
           - mimir-memberlist
 
   compactor:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *mimirImage
     volumes:
       - ../../common/config/mimir:/etc/mimir
@@ -173,9 +157,7 @@ services:
           - mimir-memberlist
 
   ingester:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *mimirImage
     volumes:
       - ../../common/config/mimir:/etc/mimir
@@ -191,9 +173,7 @@ services:
           - mimir-memberlist
 
   store-gateway:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *mimirImage
     volumes:
       - ../../common/config/mimir:/etc/mimir

diff --git a/docker-compose/microservices-mode/profiles/compose.yaml b/docker-compose/microservices-mode/profiles/compose.yaml
@@ -31,9 +31,7 @@ services:
     # 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
-    depends_on:
-      distributor:
-        condition: service_healthy
+    depends_on: { distributor: { condition: service_healthy } }
     image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     restart: always
     volumes:
@@ -56,9 +54,7 @@ services:
     labels:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: pyroscope-distributor
-    depends_on:
-      ingester:
-        condition: service_started
+    depends_on: { ingester: { condition: service_healthy } }
     image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.5.0}
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
@@ -85,9 +81,7 @@ services:
     labels:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: pyroscope-ingester
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *pyroscopeImage
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
@@ -109,9 +103,7 @@ services:
     labels:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: pyroscope-compactor
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *pyroscopeImage
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
@@ -133,9 +125,6 @@ services:
     labels:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: pyroscope-query-frontend
-    depends_on:
-      minio:
-        condition: service_healthy
     image: *pyroscopeImage
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
@@ -155,11 +144,6 @@ services:
     labels:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: pyroscope-querier
-    depends_on:
-      minio:
-        condition: service_healthy
-      query-frontend:
-        condition: service_started
     image: *pyroscopeImage
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
@@ -180,9 +164,6 @@ services:
     labels:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: pyroscope-query-scheduler
-    depends_on:
-      minio:
-        condition: service_healthy
     image: *pyroscopeImage
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope
@@ -202,9 +183,6 @@ services:
     labels:
       <<: *profiles-labels
       profiles.agent.grafana.com/service_name: pyroscope-store-gateway
-    depends_on:
-      minio:
-        condition: service_healthy
     image: *pyroscopeImage
     volumes:
       - ../../common/config/pyroscope:/etc/pyroscope

diff --git a/docker-compose/microservices-mode/traces/compose.yaml b/docker-compose/microservices-mode/traces/compose.yaml
@@ -39,9 +39,7 @@ services:
     # 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
-    depends_on:
-      distributor:
-        condition: service_healthy
+    depends_on: { distributor: { condition: service_healthy } }
     image: ${NGINX_IMAGE:-docker.io/nginxinc/nginx-unprivileged:1.25-alpine}
     restart: always
     volumes:
@@ -62,9 +60,7 @@ services:
       - "33200:3200"
 
   distributor:
-    depends_on:
-      ingester:
-        condition: service_started
+    depends_on: { ingester: { condition: service_healthy } }
     image: &tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.4.1}
     volumes:
       - ../../common/config/tempo:/etc/tempo
@@ -81,9 +77,7 @@ services:
       start_period: 10s
 
   ingester:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *tempoImage
     volumes:
       - ../../common/config/tempo:/etc/tempo
@@ -102,9 +96,6 @@ services:
           - tempo-memberlist
 
   query-frontend:
-    depends_on:
-      minio:
-        condition: service_healthy
     image: *tempoImage
     volumes:
       - ../../common/config/tempo:/etc/tempo
@@ -117,11 +108,6 @@ services:
       JAEGER_TAGS: app=query-frontend
 
   querier:
-    depends_on:
-      minio:
-        condition: service_healthy
-      query-frontend:
-        condition: service_started
     image: *tempoImage
     volumes:
       - ../../common/config/tempo:/etc/tempo
@@ -134,9 +120,7 @@ services:
       JAEGER_TAGS: app=querier
 
   compactor:
-    depends_on:
-      minio:
-        condition: service_healthy
+    depends_on: { minio: { condition: service_healthy } }
     image: *tempoImage
     volumes:
       - ../../common/config/tempo:/etc/tempo