compose: bump to grafana/pyroscope 1.8.0

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Sep 16, 2024 · ec44422 · ec44422
1 parent df5b992
commit ec44422
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/docker-compose/common/compose-include/pyroscope.yaml b/docker-compose/common/compose-include/pyroscope.yaml
@@ -11,7 +11,7 @@ services:
       profiles.grafana.com/memory.scrape: true
       profiles.grafana.com/goroutine.scrape: true
     depends_on: { minio: { condition: service_healthy } }
-    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.1}
+    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.8.0}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml
@@ -27,7 +27,7 @@ services:
       ## execute the `test` in a shell use the form `["CMD-SHELL", "command"]`
       # test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:4040/ready || exit 1" ]
       ## execute the `test` without a shell, use the form: `["CMD", "command", "arg1", "arg2"]`
-      test: [ "CMD", "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:4040/ready" ]
+      test: [ "CMD", "profilecli", "ready" ]
       interval: 2s
       timeout: 1s
       retries: 15

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -4,7 +4,7 @@ GRAFANA_IMAGE=grafana/grafana:11.2.0
 TEMPO_IMAGE=grafana/tempo:2.5.0
 MIMIR_IMAGE=grafana/mimir-alpine:2.13.0
 MIMIRTOOL_IMAGE=grafana/mimirtool:2.13.0
-PYROSCOPE_IMAGE=grafana/pyroscope:1.6.1
+PYROSCOPE_IMAGE=grafana/pyroscope:1.8.0
 NGINX_IMAGE=nginxinc/nginx-unprivileged:1.27-alpine
 MINIO_IMAGE=minio/minio:RELEASE.2024-08-29T01-40-52Z
 MEMCACHED_IMAGE=memcached:1.6.29-alpine

diff --git a/docker-compose/microservices-mode/profiles/compose.yaml b/docker-compose/microservices-mode/profiles/compose.yaml
@@ -62,7 +62,7 @@ services:
       <<: *profiles-labels
       profiles.grafana.com/service_name: pyroscope-distributor
     depends_on: { ingester: { condition: service_healthy } }
-    image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.1}
+    image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.8.0}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml
@@ -77,7 +77,7 @@ services:
       - -memberlist.join=pyroscope-memberlist:7946
       # - -runtime-config.file=/etc/pyroscope/configs/overrides.yaml
     healthcheck:
-      test: [ "CMD", "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:4040/ready" ]
+      test: [ "CMD", "profilecli", "ready" ]
       <<: *status-healthcheck
     networks:
       default:
@@ -103,7 +103,7 @@ services:
       - -memberlist.cluster-label=profiles-system
       - -memberlist.join=pyroscope-memberlist:7946
     healthcheck:
-      test: [ "CMD", "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:4040/ready" ]
+      test: [ "CMD", "profilecli", "ready" ]
       <<: *status-healthcheck
     deploy:
       replicas: 3

diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml
@@ -169,7 +169,7 @@ services:
       metrics.grafana.com/scrape: false
       profiles.grafana.com/service_name: pyroscope
     depends_on: { minio: { condition: service_healthy } }
-    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.6.1}
+    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.8.0}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml
@@ -185,7 +185,7 @@ services:
       <<: *jaeger-environment
       JAEGER_TAGS: app=pyroscope
     healthcheck:
-      test: [ "CMD", "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:4040/ready" ]
+      test: [ "CMD", "profilecli", "ready" ]
       <<: *status-healthcheck
     # expose 34040 port so we can directly access pyroscope inside container
     ports:

diff --git a/docker-compose/monolithic-mode/profiles/compose.yaml b/docker-compose/monolithic-mode/profiles/compose.yaml
@@ -33,7 +33,7 @@ services:
       - ../../common/config/pyroscope/gateway_pyroscope.conf:/etc/nginx/templates/gateway_pyroscope.conf.template
       - ../../common/config/mimir/gateway_mimir.conf:/etc/nginx/templates/gateway_mimir.conf.template
     healthcheck:
-      test: [ "CMD", "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:4040/" ]
+      test: [ "CMD", "profilecli", "ready" ]
       interval: 3s
       timeout: 1s
       retries: 20