From f7e58966812a8c36f3e7983292a39046e2a709bb Mon Sep 17 00:00:00 2001
From: Pete Wall <pete.wall@grafana.com>
Date: Wed, 14 May 2025 11:01:47 -0500
Subject: [PATCH] WIP

Signed-off-by: Pete Wall <pete.wall@grafana.com>
---
 .../templates/_common_pod_discovery.alloy.tpl       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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
index e3eafd4d05..86cafd59f3 100644
--- 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
@@ -54,6 +54,17 @@ discovery.relabel "filtered_pods" {
     regex = "__meta_kubernetes_pod_annotation_(.+)"
   }
 
+  rule {
+    source_labels = ["__meta_kubernetes_pod_controller_kind", "__meta_kubernetes_pod_controller_name"]
+    regex = "DaemonSet;(.*)"
+    target_label = "k8s_daemonset_name"
+  }
+  rule {
+    source_labels = ["__meta_kubernetes_pod_controller_kind", "__meta_kubernetes_pod_controller_name"]
+    regex = "StatefulSet;(.*)"
+    target_label = "k8s_statefulset_name"
+  }
+
   // explicitly set service_name. if not set, loki will automatically try to populate a default.
   // see https://grafana.com/docs/loki/latest/get-started/labels/#default-labels-for-all-users
   //
@@ -67,6 +78,8 @@ discovery.relabel "filtered_pods" {
     source_labels = [
       "__meta_kubernetes_pod_annotation_resource_opentelemetry_io_service_name",
       "__meta_kubernetes_pod_label_app_kubernetes_io_name",
+      "k8s_daemonset_name",
+      "k8s_statefulset_name",
       "__meta_kubernetes_pod_container_name",
     ]
     separator = ";"