From efea1c50544f3f6e4a304d14fdaeb91e400a4bd8 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Thu, 28 Mar 2024 11:00:09 +0000 Subject: [PATCH] Fix filtering of log lines Signed-off-by: Michel Hollands --- charts/meta-monitoring/templates/agent/config.yaml | 11 +++++------ charts/meta-monitoring/values.yaml | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/meta-monitoring/templates/agent/config.yaml b/charts/meta-monitoring/templates/agent/config.yaml index 310111d..ef0d53a 100644 --- a/charts/meta-monitoring/templates/agent/config.yaml +++ b/charts/meta-monitoring/templates/agent/config.yaml @@ -31,11 +31,10 @@ data: replacement = "${1}/${2}-${3}" target_label = "job" } - // rule { - // source_labels = ["__meta_kubernetes_pod_container_port_name"] - // regex="http-metrics" - // action = "keep" - // } + rule { + target_label = "cluster" + replacement = "{{- .Values.clusterName -}}" + } } // Logs @@ -55,7 +54,7 @@ data: {{- if not (empty .Values.logs.retain) }} stage.match { - selector = "{cluster=\"{{- .Values.clusterName -}}\"} !~ \"{{ join "|" .Values.logs.retain }}\"" + selector = "{cluster=\"{{- .Values.clusterName -}}\", namespace=\"{{- .Values.lokiNamespace -}}\"} !~ \"{{ join "|" .Values.logs.retain }}\"" action = "drop" } {{- end }} diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml index c8310d4..544d3ec 100644 --- a/charts/meta-monitoring/values.yaml +++ b/charts/meta-monitoring/values.yaml @@ -5,6 +5,7 @@ namespacesToMonitor: - tempo # The name of the cluster where this will be installed clusterName: "meta-monitoring" +lokiNamespace: "loki" httpPort: 3100 # Set to true to write logs, metrics or traces to Grafana Cloud