bump to grafana:10.2.2 grafana/agent:v0.38.0

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Nov 21, 2023 · 9dbd881 · 9dbd881
1 parent 4fb7449
commit 9dbd881
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 118 deletions.
diff --git a/Makefile b/Makefile
@@ -54,7 +54,7 @@ CONFIG_FILES_IN_DOCKER = $(subst ./, /data/, $(CONFIG_FILES))
 fmt: ## Uses Grafana Agent to fmt the river config
 	@for c in $(CONFIG_FILES_IN_DOCKER); do \
 		echo "$$c"; \
-		docker run -e AGENT_MODE=flow --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/agent:v0.37.4 fmt -w $$c ; \
+		docker run -e AGENT_MODE=flow --rm --volume "$(shell pwd):/data" -u $(shell id -u) grafana/agent:v0.38.0 fmt -w $$c ; \
 	done
 
 ##@ Docker compose

diff --git a/docker-compose/common/compose-include/agent-collect-logs.yaml b/docker-compose/common/compose-include/agent-collect-logs.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: grafana/agent:v0.37.2
+    image: grafana/agent:v0.38.0
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock

diff --git a/docker-compose/common/compose-include/agent-collect-metrics.yaml b/docker-compose/common/compose-include/agent-collect-metrics.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: grafana/agent:v0.37.2
+    image: grafana/agent:v0.38.0
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock

diff --git a/docker-compose/common/compose-include/agent-collect-profiles.yaml b/docker-compose/common/compose-include/agent-collect-profiles.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_started
-    image: grafana/agent:v0.37.2
+    image: grafana/agent:v0.38.0
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock

diff --git a/docker-compose/common/compose-include/agent-collect-traces.yaml b/docker-compose/common/compose-include/agent-collect-traces.yaml
@@ -4,7 +4,7 @@ services:
     depends_on:
       gateway:
         condition: service_healthy
-    image: grafana/agent:v0.37.2
+    image: grafana/agent:v0.38.0
     volumes:
       - ../config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock

diff --git a/docker-compose/microservices-mode/logs/docker-compose.yaml b/docker-compose/microservices-mode/logs/docker-compose.yaml
@@ -139,7 +139,7 @@ services:
           - loki-memberlist
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/microservices-mode/metrics/docker-compose.yaml b/docker-compose/microservices-mode/metrics/docker-compose.yaml
@@ -205,7 +205,7 @@ services:
           - mimir-memberlist
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/microservices-mode/profiles/docker-compose.yaml b/docker-compose/microservices-mode/profiles/docker-compose.yaml
@@ -174,7 +174,7 @@ services:
           - pyroscope-memberlist
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/microservices-mode/traces/docker-compose.yaml b/docker-compose/microservices-mode/traces/docker-compose.yaml
@@ -111,7 +111,7 @@ services:
     depends_on:
       agent:
         condition: service_started
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
         condition: service_healthy
       loki:
         condition: service_healthy
-    image: grafana/agent:v0.37.2
+    image: grafana/agent:v0.38.0
     volumes:
       - ../../common/config/agent-flow:/etc/agent-config
       - /var/run/docker.sock:/var/run/docker.sock
@@ -152,7 +152,7 @@ services:
     #   - "4040:4040"
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/monolithic-mode/logs/docker-compose.yaml b/docker-compose/monolithic-mode/logs/docker-compose.yaml
@@ -61,7 +61,7 @@ services:
           - loki-memberlist
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/monolithic-mode/metrics/docker-compose.yaml b/docker-compose/monolithic-mode/metrics/docker-compose.yaml
@@ -64,7 +64,7 @@ services:
           - mimir-memberlist
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/monolithic-mode/profiles/docker-compose.yaml b/docker-compose/monolithic-mode/profiles/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
           - gateway
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     hostname: grafana
     command:
       - --config=/etc/grafana-config/grafana.ini

diff --git a/docker-compose/monolithic-mode/traces/docker-compose.yaml b/docker-compose/monolithic-mode/traces/docker-compose.yaml
@@ -64,7 +64,7 @@ services:
     depends_on:
       minio:
         condition: service_started
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/read-write-mode/logs/docker-compose.yaml b/docker-compose/read-write-mode/logs/docker-compose.yaml
@@ -101,7 +101,7 @@ services:
       retries: 5
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     command:
       - --config=/etc/grafana-config/grafana.ini
     volumes:

diff --git a/docker-compose/read-write-mode/metrics/docker-compose.yaml b/docker-compose/read-write-mode/metrics/docker-compose.yaml
@@ -94,7 +94,7 @@ services:
           - mimir-memberlist
 
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:10.2.2
     hostname: grafana
     command:
       - --config=/etc/grafana-config/grafana.ini

diff --git a/kubernetes/common/grafana-agent/k8s-all-in-one.yaml b/kubernetes/common/grafana-agent/k8s-all-in-one.yaml
@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent
   namespace: monitoring-system
 ---
@@ -17,8 +17,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent
 rules:
 - apiGroups:
@@ -103,8 +103,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -464,8 +464,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent
   namespace: monitoring-system
 spec:
@@ -486,8 +486,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent-cluster
   namespace: monitoring-system
 spec:
@@ -509,8 +509,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent
   namespace: monitoring-system
 spec:
@@ -547,14 +547,16 @@ spec:
         env:
         - name: AGENT_MODE
           value: flow
+        - name: AGENT_DEPLOY_MODE
+          value: helm
         - name: HOSTNAME
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
         envFrom:
         - secretRef:
             name: agent-env
-        image: docker.io/grafana/agent:v0.38.0-rc.0
+        image: docker.io/grafana/agent:v0.38.0
         imagePullPolicy: IfNotPresent
         name: grafana-agent
         ports:
@@ -608,8 +610,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent
   namespace: monitoring-system
 spec:
@@ -628,8 +630,8 @@ metadata:
     app.kubernetes.io/instance: grafana-agent
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana-agent
-    app.kubernetes.io/version: v0.37.4
-    helm.sh/chart: grafana-agent-0.27.2
+    app.kubernetes.io/version: v0.38.0
+    helm.sh/chart: grafana-agent-0.28.0
   name: grafana-agent
   namespace: monitoring-system
 spec:

diff --git a/kubernetes/common/grafana-agent/kustomization.yaml b/kubernetes/common/grafana-agent/kustomization.yaml
@@ -5,7 +5,7 @@ namespace: monitoring-system
 
 helmCharts:
 - name: grafana-agent
-  version: 0.27.2
+  version: 0.28.0
   repo: https://grafana.github.io/helm-charts
   releaseName: grafana-agent
   namespace: monitoring-system
@@ -14,7 +14,7 @@ helmCharts:
 
 images:
 - name: docker.io/grafana/agent
-  newTag: v0.38.0-rc.0
+  newTag: v0.38.0
 
 configMapGenerator:
 - name: agent-config

diff --git a/kubernetes/common/grafana/k8s-all-in-one.yaml b/kubernetes/common/grafana/k8s-all-in-one.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana
   namespace: monitoring-system
 ---
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana
   namespace: monitoring-system
 rules: []
@@ -36,7 +36,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana-clusterrole
 rules:
 - apiGroups:
@@ -57,7 +57,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana
   namespace: monitoring-system
 roleRef:
@@ -77,7 +77,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -156,7 +156,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana-config-dashboards
   namespace: monitoring-system
 ---
@@ -3350,7 +3350,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana
   namespace: monitoring-system
 spec:
@@ -3372,7 +3372,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana
   namespace: monitoring-system
 spec:
@@ -3389,7 +3389,7 @@ spec:
       annotations:
         checksum/config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-        checksum/sc-dashboard-provider-config: eeb32ac4580a7c57e39b245bcaa0038f191b3b2f37506d4dfb9c40f60fb79764
+        checksum/sc-dashboard-provider-config: 8d71ea9c11146f8c439d477feab1447c1178f5fd966361f6e052af868d400663
         kubectl.kubernetes.io/default-container: grafana
         logs.agent.grafana.com/scrape: "true"
         logs.agent.grafana.com/scrub-level: debug
@@ -3508,7 +3508,7 @@ spec:
         - configMapRef:
             name: grafana-env-dkmb477tfh
             optional: true
-        image: docker.io/grafana/grafana:10.2.1
+        image: docker.io/grafana/grafana:10.2.2
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 10
@@ -3581,7 +3581,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
     team: team-infra
   name: grafana
   namespace: monitoring-system
@@ -3610,7 +3610,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: grafana
     app.kubernetes.io/version: 10.1.5
-    helm.sh/chart: grafana-7.0.4
+    helm.sh/chart: grafana-7.0.8
   name: grafana
   namespace: monitoring-system
 spec: