Add the job annotation to all alloy instances and ksm. (#1087)

Make the job annotation configurable again Signed-off-by: Pete Wall <[email protected]>
grafana · Jan 9, 2025 · 8ba4eb5 · 8ba4eb5
1 parent 5d348a1
commit 8ba4eb5
Show file tree

Hide file tree

Showing 47 changed files with 162 additions and 1 deletion.
diff --git a/charts/k8s-monitoring/charts/feature-cluster-metrics/values.schema.json b/charts/k8s-monitoring/charts/feature-cluster-metrics/values.schema.json
@@ -313,6 +313,14 @@
                         }
                     }
                 },
+                "podAnnotations": {
+                    "type": "object",
+                    "properties": {
+                        "k8s.grafana.com/logs.job": {
+                            "type": "string"
+                        }
+                    }
+                },
                 "prometheusScrape": {
                     "type": "boolean"
                 },

diff --git a/charts/k8s-monitoring/charts/feature-cluster-metrics/values.yaml b/charts/k8s-monitoring/charts/feature-cluster-metrics/values.yaml
@@ -449,6 +449,10 @@ kube-state-metrics:
   nodeSelector:
     kubernetes.io/os: linux
 
+  # @ignored
+  podAnnotations:
+    k8s.grafana.com/logs.job: integrations/kubernetes/kube-state-metrics
+
   # @ignored - Enable the release label
   releaseLabel: true
 

diff --git a/charts/k8s-monitoring/charts/feature-pod-logs/templates/_common_pod_discovery.alloy.tpl b/charts/k8s-monitoring/charts/feature-pod-logs/templates/_common_pod_discovery.alloy.tpl
@@ -42,7 +42,7 @@ discovery.relabel "filtered_pods" {
 
   // set the job label from the k8s.grafana.com/logs.job annotation if it exists
   rule {
-    source_labels = ["{{ include "pod_annotation" "k8s.grafana.com/logs.job" }}"]
+    source_labels = ["{{ include "pod_annotation" .Values.annotations.job }}"]
     regex = "(.+)"
     target_label = "job"
   }

diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml b/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml b/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml b/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/output.yaml b/charts/k8s-monitoring/docs/examples/destinations/otlp-gateway/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/application-observability/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/application-observability/default/output.yaml
diff --git a/...nitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml b/...nitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml
diff --git a/...8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml b/...8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/grafana/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/loki/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/node-logs/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/node-logs/default/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/pod-logs/default/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml b/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml b/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml b/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/proxies/output.yaml b/charts/k8s-monitoring/docs/examples/proxies/output.yaml