make -C "charts/k8s-monitoring" clean build

grafana · Jan 29, 2025 · f4efad0 · f4efad0
1 parent 923e4e5
commit f4efad0
Show file tree

Hide file tree

Showing 52 changed files with 1,124 additions and 39 deletions.
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
@@ -67,30 +67,21 @@ discovery.relabel "filtered_pods" {
   // choose the first value found from the following ordered list:
   // - pod.annotation[resource.opentelemetry.io/service.name]
   // - pod.label[app.kubernetes.io/name]
-  // - k8s.deployment.name (excluded: discovery.kubernetes does note expose this data)
-  // - k8s.replicaset.name (excluded: discovery.kubernetes does not expose this data)
-  // - k8s.statefulset.name (excluded: discovery.kubernetes does not expose this data)
-  // - k8s.daemonset.name (excluded: discovery.kubernetes does not expose this data)
-  // - k8s.cronjob.name (excluded: discovery.kubernetes does not have cronjob role)
-  // - k8s.job.name (excluded: discovery.kubernetes does not have job role)
   // - k8s.pod.name
   // - k8s.container.name
   rule {
-      action = "replace"
-      source_labels = [
-        "__meta_kubernetes_pod_annotation_resource_opentelemetry_io_service_name",
-        "__meta_kubernetes_pod_label_app_kubernetes_io_name",
-        "__meta_kubernetes_pod_name",
-        "__meta_kubernetes_pod_container_name",
-      ]
-      separator = ";"
-      regex = "^(?:;*)?([^;]+).*$"
-      replacement = "$1"
-      target_label = "service_name"
-    }
-
-
-
+    action = "replace"
+    source_labels = [
+      "__meta_kubernetes_pod_annotation_resource_opentelemetry_io_service_name",
+      "__meta_kubernetes_pod_label_app_kubernetes_io_name",
+      "__meta_kubernetes_pod_name",
+      "__meta_kubernetes_pod_container_name",
+    ]
+    separator = ";"
+    regex = "^(?:;*)?([^;]+).*$"
+    replacement = "$1"
+    target_label = "service_name"
+  }
 
 {{- if .Values.extraDiscoveryRules }}
 {{ .Values.extraDiscoveryRules | indent 2 }}

diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-logs.alloy
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/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-logs.alloy
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/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-logs.alloy
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/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-logs.alloy
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/collector-storage/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/collector-storage/alloy-logs.alloy
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-endpoint/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/alloy-logs.alloy
diff --git a/charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/output.yaml b/charts/k8s-monitoring/docs/examples/destinations/otlp-endpoint/output.yaml