Merge pull request #23 from grafana/update_chart_dependencies

Update agent version and enable clustering

charts/meta-monitoring/Chart.lock

@@ -4,7 +4,7 @@ dependencies:
   version: 5.8.0
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: 0.15.0
+  version: 0.37.0
 - name: mimir-distributed
   repository: https://grafana.github.io/helm-charts
   version: 4.4.1
@@ -14,5 +14,5 @@ dependencies:
 - name: minio
   repository: https://charts.min.io
   version: 5.0.11
-digest: sha256:da0e744b5046eb7972e0bf82d1d0ba4786e9600af63b65f35b16118105248074
-generated: "2023-08-18T10:58:08.978123+01:00"
+digest: sha256:31eae0a46ac4af90db6054af2f3eb15f65affd18dd350cfc2d9e56ae8cb9a3a8
+generated: "2024-03-27T09:18:20.213047Z"

charts/meta-monitoring/Chart.yaml

@@ -30,7 +30,7 @@ dependencies:
   condition: local.logs.enabled
 - name: grafana-agent
   repository: https://grafana.github.io/helm-charts
-  version: "0.15.0"
+  version: "0.37.0"
 - name: mimir-distributed
   repository: https://grafana.github.io/helm-charts
   version: "4.4.1"

charts/meta-monitoring/templates/agent/config.yaml

@@ -41,6 +41,9 @@ data:
 
     {{- if or .Values.local.logs.enabled .Values.cloud.logs.enabled }}
     loki.source.kubernetes "pods" {
+      clustering {
+        enabled = true
+      }
       targets    = discovery.relabel.rename_meta_labels.output
       forward_to = [ {{ include "agent.loki_process_targets" . }} ]
     }
@@ -73,12 +76,18 @@ data:
 
     {{- if or .Values.local.metrics.enabled .Values.cloud.metrics.enabled }}
     prometheus.scrape "pods" {
+      clustering {
+        enabled = true
+      }
       targets    = discovery.relabel.rename_meta_labels.output
       forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
     }
     {{- if .Values.kubeStateMetrics.enabled }}
 
     prometheus.scrape "kubeStateMetrics" {
+      clustering {
+        enabled = true
+      }
       targets    = [ { "__address__" = "{{ .Values.kubeStateMetrics.endpoint }}" } ]
       forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
     }
@@ -118,6 +127,9 @@ data:
     }
 
     prometheus.scrape "cadvisor" {
+      clustering {
+        enabled = true
+      }
       targets    = discovery.relabel.all_nodes.output
       forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
 
@@ -131,6 +143,9 @@ data:
     }
 
     prometheus.scrape "kubelet" {
+      clustering {
+        enabled = true
+      }
       targets    = discovery.relabel.all_nodes.output
       forward_to = [ {{ include "agent.prometheus_write_targets" . }} ]
 
@@ -143,10 +158,13 @@ data:
       }
     }
 
-    prometheus.exporter.unix {}
+    prometheus.exporter.unix "promexporter" {}
 
     prometheus.scrape "node_exporter" {
-      targets = prometheus.exporter.unix.targets
+      clustering {
+        enabled = true
+      }
+      targets = prometheus.exporter.unix.promexporter.targets
       forward_to = [prometheus.relabel.node_exporter.receiver]
 
       job_name = "node-exporter"

charts/meta-monitoring/values.yaml

@@ -118,10 +118,26 @@ loki:
 
 grafana-agent:
   agent:
+    clustering:
+      enabled: true
     configMap:
       create: false
       name: "agent-configmap"
       key: 'config.river'
+    resources:
+      requests:
+        cpu: '1000m'
+        memory: '600Mi'
+      limits:
+        memory: '4Gi'
+  controller:
+    type: "statefulset"
+    autoscaling:
+      enabled: true
+      minReplicas: 3
+      maxReplicas: 30
+      targetMemoryUtilizationPercentage: 90
+      targetCPUUtilizationPercentage: 90
 
 mimir-distributed:
   minio: