Fix Pod log annotation and label assignment (#1222)

Signed-off-by: Pete Wall <[email protected]>

charts/k8s-monitoring/charts/feature-pod-logs/templates/_common_pod_discovery.alloy.tpl

@@ -98,12 +98,14 @@ discovery.relabel "filtered_pods" {
 {{- range $label, $k8sAnnotation := .Values.annotations }}
   rule {
     source_labels = ["{{ include "pod_annotation" $k8sAnnotation }}"]
+    regex = "(.+)"
     target_label = {{ $label | quote }}
   }
 {{- end }}
 {{- range $label, $k8sLabels := .Values.labels }}
   rule {
     source_labels = ["{{ include "pod_label" $k8sLabels }}"]
+    regex = "(.+)"
     target_label = {{ $label | quote }}
   }
 {{- end }}

charts/k8s-monitoring/charts/feature-pod-logs/tests/default_test.yaml

@@ -107,10 +107,12 @@ tests:
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_logs_job"]
+                  regex = "(.+)"
                   target_label = "job"
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                  regex = "(.+)"
                   target_label = "app_kubernetes_io_name"
                 }
               }
@@ -300,10 +302,12 @@ tests:
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_logs_job"]
+                  regex = "(.+)"
                   target_label = "job"
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                  regex = "(.+)"
                   target_label = "app_kubernetes_io_name"
                 }
               }
@@ -491,10 +495,12 @@ tests:
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_logs_job"]
+                  regex = "(.+)"
                   target_label = "job"
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                  regex = "(.+)"
                   target_label = "app_kubernetes_io_name"
                 }
               }
@@ -690,10 +696,12 @@ tests:
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_annotation_k8s_grafana_com_logs_job"]
+                  regex = "(.+)"
                   target_label = "job"
                 }
                 rule {
                   source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
+                  regex = "(.+)"
                   target_label = "app_kubernetes_io_name"
                 }
               }