From 01a42b74cf8206fc368d0ed1b210cea2fb31dcda Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Fri, 10 Jan 2025 17:22:48 +0800 Subject: [PATCH] Update Grafana image version to 11.4.0 in multiple configurations --- compose.override.yaml | 2 +- docker-compose/common/compose-include/grafana.yaml | 2 +- docker-compose/common/config/.env | 2 +- examples/grafana-explore-logs/README.md | 2 +- examples/grafana-explore-logs/compose.override.yaml | 2 +- examples/grafana-explore-profiles/README.md | 2 +- examples/grafana-explore-profiles/compose.override.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compose.override.yaml b/compose.override.yaml index 60deb5ac..cd544cbf 100644 --- 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.3.1} + image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.4.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/grafana.yaml b/docker-compose/common/compose-include/grafana.yaml index be2ceb01..705e9f11 100644 --- 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.3.1} + image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.4.0} command: - --config=/etc/grafana-config/grafana.ini volumes: diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env index 9ab1aeab..4ae83022 100644 --- a/docker-compose/common/config/.env +++ b/docker-compose/common/config/.env @@ -1,6 +1,6 @@ ALLOY_IMAGE=grafana/alloy:v1.5.0 LOKI_IMAGE=grafana/loki:3.3.0 -GRAFANA_IMAGE=grafana/grafana:11.3.1 +GRAFANA_IMAGE=grafana/grafana:11.4.0 TEMPO_IMAGE=grafana/tempo:2.6.0 MIMIR_IMAGE=grafana/mimir-alpine:2.14.0 MIMIRTOOL_IMAGE=grafana/mimirtool:2.14.0 diff --git a/examples/grafana-explore-logs/README.md b/examples/grafana-explore-logs/README.md index 814b9c2d..f013868a 100644 --- 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.3.1} + image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.4.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 index 373c09ec..01965340 100644 --- 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.3.1} + image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.4.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 index 83f174a2..5d74db58 100644 --- 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.3.1} + image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.4.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 index 3122e8f7..481b31ef 100644 --- 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.3.1} + image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.4.0} volumes: - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml environment: