update deps

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

Hide file tree

Showing 19 changed files with 22 additions and 22 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.3.0 fmt -w $$c ; \
+		docker run --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/alloy:v1.3.1 fmt -w $$c ; \
 	done
 
 .PHONY: go-fmt

diff --git a/ci/main.go b/ci/main.go
@@ -11,7 +11,7 @@ import (
 	"dagger.io/dagger"
 )
 
-const goImage = "golang:1.23.1"
+const goImage = "golang:1.23"
 
 func main() {
 	println("Dagger is a programmable CI/CD engine that runs your pipelines in containers.")

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.1.3}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.0}
     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.3.0}
+    image: ${ALLOY_IMAGE:-docker.io/grafana/alloy:v1.3.1}
     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.1.3}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.0}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/common/compose-include/loki.yaml b/docker-compose/common/compose-include/loki.yaml
@@ -9,7 +9,7 @@ services:
     labels:
       metrics.grafana.com/scrape: false
     depends_on: { minio: { condition: service_healthy } }
-    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.0}
+    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
     configs:
       - source: loki_config_file
         target: /etc/loki/config.yaml

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-08-03T04-33-23Z}
+    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-08-29T01-40-52Z}
     entrypoint:
       - sh
       - -euc

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,12 +1,12 @@
-ALLOY_IMAGE=grafana/alloy:v1.3.0
-LOKI_IMAGE=grafana/loki:3.1.0
-GRAFANA_IMAGE=grafana/grafana:11.1.3
+ALLOY_IMAGE=grafana/alloy:v1.3.1
+LOKI_IMAGE=grafana/loki:3.1.1
+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
 NGINX_IMAGE=nginxinc/nginx-unprivileged:1.27-alpine
-MINIO_IMAGE=minio/minio:RELEASE.2024-08-03T04-33-23Z
+MINIO_IMAGE=minio/minio:RELEASE.2024-08-29T01-40-52Z
 MEMCACHED_IMAGE=memcached:1.6.29-alpine
 MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.14.3
 INBUCKET_IMAGE=inbucket/inbucket:3.0.4
diff --git a/docker-compose/microservices-mode/logs/compose.yaml b/docker-compose/microservices-mode/logs/compose.yaml
@@ -62,7 +62,7 @@ services:
   distributor:
     labels: *loki-labels
     depends_on: { ingester: { condition: service_healthy } }
-    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.0}
+    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
     configs:
       - source: loki_config_file
         target: /etc/loki/config.yaml

diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml
@@ -68,7 +68,7 @@ services:
       metrics.grafana.com/scrape: false
       profiles.grafana.com/service_name: loki
     depends_on: { minio: { condition: service_healthy } }
-    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.0}
+    image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
     configs:
       - source: loki_config_file
         target: /etc/loki/config.yaml

diff --git a/docker-compose/read-write-mode/logs/compose.yaml b/docker-compose/read-write-mode/logs/compose.yaml
@@ -56,7 +56,7 @@ services:
 
   loki-read:
     depends_on: { minio: { condition: service_healthy } }
-    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.0}
+    image: &lokiImage ${LOKI_IMAGE:-docker.io/grafana/loki:3.1.1}
     configs:
       - source: loki_config_file
         target: /etc/loki/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.1.3}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.0}
     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.1.3}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.0}
     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.1.3}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.0}
     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.1.3}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.2.0}
     volumes:
       - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
     environment:

diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
@@ -6463,7 +6463,7 @@ spec:
         envFrom:
         - secretRef:
             name: loki-env-58m52b99kc
-        image: docker.io/grafana/loki:3.1.0
+        image: docker.io/grafana/loki:3.1.1
         imagePullPolicy: IfNotPresent
         name: loki
         ports:

diff --git a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml
@@ -6170,7 +6170,7 @@ spec:
         envFrom:
         - secretRef:
             name: loki-env-58m52b99kc
-        image: docker.io/grafana/loki:3.1.0
+        image: docker.io/grafana/loki:3.1.1
         imagePullPolicy: IfNotPresent
         name: loki
         ports:

diff --git a/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml
@@ -5145,7 +5145,7 @@ spec:
         envFrom:
         - secretRef:
             name: loki-env-58m52b99kc
-        image: docker.io/grafana/loki:3.1.0
+        image: docker.io/grafana/loki:3.1.1
         imagePullPolicy: IfNotPresent
         name: loki
         ports:

diff --git a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml
@@ -5568,7 +5568,7 @@ spec:
         envFrom:
         - secretRef:
             name: loki-env-58m52b99kc
-        image: docker.io/grafana/loki:3.1.0
+        image: docker.io/grafana/loki:3.1.1
         imagePullPolicy: IfNotPresent
         name: loki
         ports: