regenerates k8s manifests

Signed-off-by: Weifeng Wang <[email protected]>

Update Grafana image version to 11.5.1 and add version source for automated updates

.github/updatecli.d/update-docker-image.yaml

@@ -1,6 +1,14 @@
 name: Update Docker Compose image versions
 
 sources:
+  grafana-version:
+    kind: dockerimage
+    spec:
+      image: docker.io/grafana/grafana
+      versionfilter:
+        kind: semver
+        pattern: "~11.x"
+
   alloy-version:
     kind: dockerimage
     spec:
@@ -18,6 +26,13 @@ sources:
         pattern: "~3.x"
 
 conditions:
+  check-grafana-image:
+    kind: dockerimage
+    disablesourceinput: true
+    spec:
+      image: docker.io/grafana/grafana
+      tag: '{{ source "grafana-version" }}'
+
   check-alloy-image:
     kind: dockerimage
     disablesourceinput: true
@@ -33,6 +48,25 @@ conditions:
       tag: '{{ source "loki-version" }}'
 
 targets:
+  update-grafana-image-version-in-compose-include:
+    kind: yaml
+    sourceid: grafana-version
+    transformers:
+      - addprefix: "${GRAFANA_IMAGE:-docker.io/grafana/grafana:"
+      - addsuffix: "}"
+    spec:
+      file: docker-compose/common/compose-include/grafana.yaml
+      key: $.services.grafana.image
+
+  update-grafana-image-version-in-env:
+    kind: "file"
+    sourceid: grafana-version
+    spec:
+      files:
+        - docker-compose/common/config/.env
+      matchpattern: 'GRAFANA_IMAGE=grafana/grafana:.*'
+      replacepattern: 'GRAFANA_IMAGE=grafana/grafana:{{ source "grafana-version" }}'
+
   update-alloy-image-version-in-compose-include:
     kind: yaml
     sourceid: alloy-version

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.4.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.5.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

docker-compose/common/compose-include/grafana.yaml

@@ -1,4 +1,3 @@
-
 services:
   # Inbucket is an email testing service; it will accept email for any email
   # address and make it available to view without a password
@@ -25,7 +24,7 @@ services:
     # https://github.com/grafana/grafana
     labels:
       metrics.grafana.com/scrape: false
-    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.4.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.5.1}
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:
@@ -45,5 +44,5 @@ services:
       - "3000:3000"
 
 volumes:
-  inbucket_data:
-  dashboards_data:
+  inbucket_data: {}
+  dashboards_data: {}

docker-compose/common/compose-include/minio.yaml

@@ -44,4 +44,4 @@ services:
       - "9001:9001"
 
 volumes:
-  minio_data:
+  minio_data: {}

docker-compose/common/compose-include/pyroscope.yaml

@@ -36,4 +36,4 @@ services:
       - "34040:4040"
 
 volumes:
-  pyroscope_data:
+  pyroscope_data: {}

docker-compose/common/config/.env

@@ -1,6 +1,6 @@
 ALLOY_IMAGE=grafana/alloy:v1.6.1
 LOKI_IMAGE=grafana/loki:3.3.2
-GRAFANA_IMAGE=grafana/grafana:11.4.0
+GRAFANA_IMAGE=grafana/grafana:11.5.1
 TEMPO_IMAGE=grafana/tempo:2.6.0
 MIMIR_IMAGE=grafana/mimir-alpine:2.14.0
 MIMIRTOOL_IMAGE=grafana/mimirtool:2.14.0

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.4.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.5.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

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.4.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.5.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
     environment:

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.4.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.5.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
     environment:

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.4.0}
+    image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.5.1}
     volumes:
       - ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
     environment:

kubernetes/common/kube-prometheus-stack/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 helmCharts:
 - name: kube-prometheus-stack
   repo: https://prometheus-community.github.io/helm-charts
-  version: 68.4.4
+  version: 68.4.5
   releaseName: kube-prometheus-stack
   namespace: monitoring-system
   includeCRDs: false