Set the job label for annotation discovererd metric sources

order:
  * k8s.grafana.com/job (annotation)
  * app.kubernetes.io/name (label)
  * app (label)
  * container or service name

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

Author: petewall

charts/k8s-monitoring/charts/feature-annotation-autodiscovery/templates/_pods.alloy.tpl

@@ -71,6 +71,21 @@ discovery.relabel "annotation_autodiscovery_pods" {
     source_labels = ["{{ include "pod_annotation" .Values.annotations.job }}"]
     target_label = "job"
   }
+  rule {
+    source_labels = ["job", "{{ include "pod_label" "app.kubernetes.io/name" }}"]
+    regex = ";(.+)"
+    target_label = "job"
+  }
+  rule {
+    source_labels = ["job", "{{ include "pod_label" "app" }}"]
+    regex = ";(.+)"
+    target_label = "job"
+  }
+  rule {
+    source_labels = ["job", "container"]
+    regex = ";(.+)"
+    target_label = "job"
+  }
   rule {
     source_labels = ["{{ include "pod_annotation" .Values.annotations.instance }}"]
     target_label = "instance"

charts/k8s-monitoring/charts/feature-annotation-autodiscovery/templates/_services.alloy.tpl

@@ -56,6 +56,21 @@ discovery.relabel "annotation_autodiscovery_services" {
     source_labels = ["{{ include "service_annotation" .Values.annotations.job }}"]
     target_label = "job"
   }
+  rule {
+    source_labels = ["job", "{{ include "service_label" "app.kubernetes.io/name" }}"]
+    regex = ";(.+)"
+    target_label = "job"
+  }
+  rule {
+    source_labels = ["job", "{{ include "service_label" "app" }}"]
+    regex = ";(.+)"
+    target_label = "job"
+  }
+  rule {
+    source_labels = ["job", "service"]
+    regex = ";(.+)"
+    target_label = "job"
+  }
   rule {
     source_labels = ["{{ include "service_annotation" .Values.annotations.instance }}"]
     target_label = "instance"