diff --git a/charts/meta-monitoring/templates/agent/_helpers-agent.tpl b/charts/meta-monitoring/templates/agent/_helpers-agent.tpl index 9363c47..802890c 100644 --- a/charts/meta-monitoring/templates/agent/_helpers-agent.tpl +++ b/charts/meta-monitoring/templates/agent/_helpers-agent.tpl @@ -6,6 +6,15 @@ {{- join ", " $list }} {{- end }} +{{- define "agent.all_namespaces" -}} +{{- $list := list }} +{{- range .Values.namespacesToMonitor }} +{{- $list = append $list (printf "\"%s\"" .) }} +{{- end }} +{{- $list = append $list .Release.Namespace }} +{{- join "|" $list }} +{{- end }} + {{- define "agent.loki_write_targets" -}} {{- $list := list }} {{- if .Values.local.logs.enabled }} diff --git a/charts/meta-monitoring/templates/agent/config.yaml b/charts/meta-monitoring/templates/agent/config.yaml index 80dff45..969062a 100644 --- a/charts/meta-monitoring/templates/agent/config.yaml +++ b/charts/meta-monitoring/templates/agent/config.yaml @@ -137,6 +137,13 @@ data: action = "keep" } + rule { + source_labels = ["namespace"] + regex = "{{ include "agent.all_namespaces" . }}"" + + action = "keep" + } + forward_to = [ {{ include "agent.prometheus_write_targets" . }} ] } {{- if .Values.kubeStateMetrics.enabled }}