From 0f66cad545c45f865fd71a18e74427c1362a885b Mon Sep 17 00:00:00 2001
From: Michel Hollands <michel.hollands@grafana.com>
Date: Mon, 19 Jun 2023 14:59:50 +0100
Subject: [PATCH] Add way to specify namespaces

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
---
 charts/meta-monitoring/Chart.lock             | 12 +++++++
 .../templates/agent/_helpers-agent.tpl        |  7 ++++
 .../templates/agent/config.yaml               | 34 +++++++++++++++++++
 charts/meta-monitoring/values.yaml            | 32 ++++-------------
 4 files changed, 60 insertions(+), 25 deletions(-)
 create mode 100644 charts/meta-monitoring/Chart.lock
 create mode 100644 charts/meta-monitoring/templates/agent/_helpers-agent.tpl
 create mode 100644 charts/meta-monitoring/templates/agent/config.yaml

diff --git a/charts/meta-monitoring/Chart.lock b/charts/meta-monitoring/Chart.lock
new file mode 100644
index 0000000..a6a6294
--- /dev/null
+++ b/charts/meta-monitoring/Chart.lock
@@ -0,0 +1,12 @@
+dependencies:
+- name: loki
+  repository: https://grafana.github.io/helm-charts
+  version: 5.8.0
+- name: grafana-agent
+  repository: https://grafana.github.io/helm-charts
+  version: 0.15.0
+- name: mimir-distributed
+  repository: https://grafana.github.io/helm-charts
+  version: 4.4.1
+digest: sha256:9238265d064bb85c3607f8be22c32c84837f2115c25978aebf6782b0a125c22c
+generated: "2023-06-19T11:29:07.999693+01:00"
diff --git a/charts/meta-monitoring/templates/agent/_helpers-agent.tpl b/charts/meta-monitoring/templates/agent/_helpers-agent.tpl
new file mode 100644
index 0000000..7ef0195
--- /dev/null
+++ b/charts/meta-monitoring/templates/agent/_helpers-agent.tpl
@@ -0,0 +1,7 @@
+{{- define "agent.namespaces" -}}
+{{- $list := list }}
+{{- range .Values.namespacesToMonitor }}
+{{- $list = append $list (printf "\"%s\"" .) }}
+{{- end }}
+{{- join ", " $list }}
+{{- end }}
diff --git a/charts/meta-monitoring/templates/agent/config.yaml b/charts/meta-monitoring/templates/agent/config.yaml
new file mode 100644
index 0000000..61c878b
--- /dev/null
+++ b/charts/meta-monitoring/templates/agent/config.yaml
@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: agent-configmap
+  namespace: {{ .Release.Namespace }}
+data:
+  config.river: |
+    discovery.kubernetes "pods" {
+      role = "pod"
+      namespaces {
+        names = [ {{ include "agent.namespaces" . }} ]
+
+      }
+    }
+    loki.source.kubernetes "pods" {
+      targets    = discovery.kubernetes.pods.targets
+      forward_to = [loki.write.local.receiver]
+    }
+    loki.write "local" {
+      endpoint {
+        url = "http://{{- .Release.Name -}}-loki.{{- .Release.Namespace -}}.svc.cluster.local:3100/loki/api/v1/push"
+      }
+    }
+    prometheus.scrape "pods" {
+      targets    = discovery.kubernetes.pods.targets
+      forward_to = [prometheus.remote_write.default.receiver]
+    }
+    prometheus.remote_write "default" {
+      endpoint {
+        url = "http://{{- .Release.Name -}}-mimir-nginx.{{- .Release.Namespace -}}.svc:80/api/v1/push"
+      }
+    }
+
+
diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml
index 4613946..d4232d6 100644
--- a/charts/meta-monitoring/values.yaml
+++ b/charts/meta-monitoring/values.yaml
@@ -1,3 +1,8 @@
+namespacesToMonitor:
+- loki
+- mimir
+- tempo
+
 loki:
   loki:
     auth_enabled: false
@@ -27,31 +32,8 @@ loki:
 grafana-agent:
   agent:
     configMap:
+      create: false
+      name: "agent-configmap"
       key: 'config.river'
-      content: |
-        discovery.kubernetes "pods" {
-          role = "pod"
-          namespaces {
-            names = ["loki"] // make configurable
-          }
-        }
-        loki.source.kubernetes "pods" {
-          targets    = discovery.kubernetes.pods.targets
-          forward_to = [loki.write.local.receiver]
-        }
-        loki.write "local" {
-          endpoint {
-            url = "http://meta-loki.meta.svc.cluster.local:3100/loki/api/v1/push"  // set namespace via config
-          }
-        }
-        prometheus.scrape "pods" {
-          targets    = discovery.kubernetes.pods.targets
-          forward_to = [prometheus.remote_write.default.receiver]
-        }
-        prometheus.remote_write "default" {
-          endpoint {
-            url = "http://meta-mimir-nginx.meta.svc:80/api/v1/push"  // set namespace via config
-          }
-        }
 
 # mimir-distributed: