update deps

bump to prom/memcached-exporter:v0.15.0 bump to minio/minio:RELEASE.2024-11-07T00-52-20Z bump to grafana/pyroscope:1.10.0 bump to grafana-11.3.1 bump to alloy-1.5.0
qclaogui · Nov 28, 2024 · 33f8903 · 33f8903
1 parent e126e4f
commit 33f8903
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ ALLOY_CONFIG_FILES_IN_DOCKER = $(subst ./, /data/, $(ALLOY_CONFIG_FILES))
 alloy-fmt: ## Uses Grafana Alloy to fmt the config
 	@for c in $(ALLOY_CONFIG_FILES_IN_DOCKER); do \
 		echo "$$c"; \
-		docker run --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/alloy:v1.4.2 fmt -w $$c ; \
+		docker run --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/alloy:v1.5.0 fmt -w $$c ; \
 	done
 
 .PHONY: go-fmt

diff --git a/compose.override.yaml b/compose.override.yaml
@@ -31,7 +31,7 @@ services:
       metrics.grafana.com/scrape: true
       profiles.grafana.com/service_name: grafana
       profiles.grafana.com/port: 6060
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.2}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.3.1}
     volumes:
       - ./monitoring-mixins/loki-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/loki-mixin
       - ./monitoring-mixins/tempo-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/tempo-mixin

diff --git a/docker-compose/common/compose-include/alloy.yaml b/docker-compose/common/compose-include/alloy.yaml
@@ -7,7 +7,7 @@ services:
   # https://github.com/grafana/alloy
   alloy:
     depends_on: { gateway: { condition: service_healthy } }
-    image: ${ALLOY_IMAGE:-docker.io/grafana/alloy:v1.4.2}
+    image: ${ALLOY_IMAGE:-docker.io/grafana/alloy:v1.5.0}
     configs:
       - source: alloy_config_file
         target: /etc/alloy/config.alloy

diff --git a/docker-compose/common/compose-include/grafana.yaml b/docker-compose/common/compose-include/grafana.yaml
@@ -25,7 +25,7 @@ services:
     # https://github.com/grafana/grafana
     labels:
       metrics.grafana.com/scrape: false
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.2}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.3.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/common/compose-include/memcached.yaml b/docker-compose/common/compose-include/memcached.yaml
@@ -7,7 +7,7 @@ services:
   memcached:
     labels:
       metrics.grafana.com/scrape: false
-    image: ${MEMCACHED_IMAGE:-docker.io/memcached:1.6.29-alpine}
+    image: ${MEMCACHED_IMAGE:-docker.io/memcached:1.6.32-alpine}
 
   # Use Alloy prometheus.exporter.memcached component instead of memcached-exporter
   # https://github.com/qclaogui/codelab-monitoring/pull/98
@@ -18,7 +18,7 @@ services:
   #     # - metrics.grafana.com/job=memcached
   #     - metrics.grafana.com/port=9150
   #     - metrics.grafana.com/interval=15s
-  #   image: ${MEMCACHED_EXPORTER_IMAGE:-prom/memcached-exporter:v0.14.3}
+  #   image: ${MEMCACHED_EXPORTER_IMAGE:-prom/memcached-exporter:v0.15.0}
   #   command:
   #     - --memcached.address=memcached:11211
   #     - --web.listen-address=0.0.0.0:9150
diff --git a/docker-compose/common/compose-include/minio.yaml b/docker-compose/common/compose-include/minio.yaml
@@ -15,7 +15,7 @@ services:
       metrics.grafana.com/port: 9000
       metrics.grafana.com/interval: 15s
       metrics.grafana.com/timeout: 10s
-    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-10-02T17-50-41Z}
+    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-11-07T00-52-20Z}
     entrypoint:
       - sh
       - -euc

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.8.0}
+    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.10.0}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,12 +1,12 @@
-ALLOY_IMAGE=grafana/alloy:v1.4.2
+ALLOY_IMAGE=grafana/alloy:v1.5.0
 LOKI_IMAGE=grafana/loki:3.3.0
-GRAFANA_IMAGE=grafana/grafana:11.2.2
+GRAFANA_IMAGE=grafana/grafana:11.3.1
 TEMPO_IMAGE=grafana/tempo:2.6.0
 MIMIR_IMAGE=grafana/mimir-alpine:2.14.0
 MIMIRTOOL_IMAGE=grafana/mimirtool:2.14.0
-PYROSCOPE_IMAGE=grafana/pyroscope:1.8.0
+PYROSCOPE_IMAGE=grafana/pyroscope:1.10.0
 NGINX_IMAGE=nginxinc/nginx-unprivileged:1.27-alpine
-MINIO_IMAGE=minio/minio:RELEASE.2024-10-02T17-50-41Z
-MEMCACHED_IMAGE=memcached:1.6.29-alpine
-MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.14.3
+MINIO_IMAGE=minio/minio:RELEASE.2024-11-07T00-52-20Z
+MEMCACHED_IMAGE=memcached:1.6.32-alpine
+MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.15.0
 INBUCKET_IMAGE=inbucket/inbucket:3.0.4
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.8.0}
+    image: &pyroscopeImage ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.10.0}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml

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.8.0}
+    image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.10.0}
     configs:
       - source: pyroscope_config_file
         target: /etc/pyroscope/config.yaml

diff --git a/examples/grafana-explore-logs/README.md b/examples/grafana-explore-logs/README.md
@@ -26,7 +26,7 @@ include:
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.2}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.3.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

diff --git a/examples/grafana-explore-logs/compose.override.yaml b/examples/grafana-explore-logs/compose.override.yaml
@@ -2,7 +2,7 @@
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.2}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.3.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

diff --git a/examples/grafana-explore-profiles/README.md b/examples/grafana-explore-profiles/README.md
@@ -18,7 +18,7 @@ include:
 services:
   # override included service grafana environment
   grafana:
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.2}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.3.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
     environment:

diff --git a/examples/grafana-explore-profiles/compose.override.yaml b/examples/grafana-explore-profiles/compose.override.yaml
@@ -8,7 +8,7 @@ services:
       profiles.grafana.com/goroutine.scrape: true
       profiles.grafana.com/service_name: grafana
       profiles.grafana.com/port: 6060
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.2}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.3.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
     environment:

diff --git a/kubernetes/common/minio-tenant/manifests/k8s-all-in-one.yaml b/kubernetes/common/minio-tenant/manifests/k8s-all-in-one.yaml
@@ -71,7 +71,7 @@ spec:
   features:
     bucketDNS: false
     enableSFTP: false
-  image: quay.io/minio/minio:RELEASE.2024-10-02T17-50-41Z
+  image: quay.io/minio/minio:RELEASE.2024-11-07T00-52-20Z
   imagePullPolicy: IfNotPresent
   mountPath: /export
   podManagementPolicy: Parallel