add service_name to pod logs discovery

Signed-off-by: Robbie Lankford <robert.lankford@grafana.com>

.gitattributes

@@ -2,3 +2,4 @@ charts/**/docs/examples/** linguist-generated=true
 charts/**/docs/examples/README.md linguist-generated=false
 charts/**/docs/examples/**/README.md linguist-generated=false
 charts/**/docs/examples/**/values.yaml linguist-generated=false
+charts/k8s-monitoring/tests/**/.rendered/output.yaml linguist-generated=true

.github/workflows/unit-test.yml

@@ -119,11 +119,11 @@ jobs:
           if [ "${{ matrix.dir }}" == "k8s-monitoring" ]; then
             # Skip checking subchart files for k8s-monitoring, which are always modified, even if the contents are identical
             if ! git diff --exit-code -- ':!charts/*.tgz'; then
-              echo "Generated files in charts/${{ matrix.dir }} are not up to date. Please run 'make all' and commit the changes."
+              echo "Generated files in charts/${{ matrix.dir }} are not up to date. Please run 'make build' and commit the changes."
               exit 1
             fi
           elif ! git diff --exit-code .; then
-            echo "Generated files in charts/${{ matrix.dir }} are not up to date. Please run 'make all' and commit the changes."
+            echo "Generated files in charts/${{ matrix.dir }} are not up to date. Please run 'make build' and commit the changes."
             exit 1
           else
             echo "Generated files in charts/${{ matrix.dir }} are up to date."

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

@@ -61,6 +61,28 @@ discovery.relabel "filtered_pods" {
     regex = "__meta_kubernetes_pod_annotation_(.+)"
   }
 
+  // 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
+  //
+  // choose the first value found from the following ordered list:
+  // - pod.annotation[resource.opentelemetry.io/service.name]
+  // - pod.label[app.kubernetes.io/name]
+  // - 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"
+  }
+
 {{- if .Values.extraDiscoveryRules }}
 {{ .Values.extraDiscoveryRules | indent 2 }}
 {{- end }}

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

@@ -71,6 +71,28 @@ tests:
                   action = "labelmap"
                   regex = "__meta_kubernetes_pod_annotation_(.+)"
                 }
+
+                // 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
+                //
+                // choose the first value found from the following ordered list:
+                // - pod.annotation[resource.opentelemetry.io/service.name]
+                // - pod.label[app.kubernetes.io/name]
+                // - 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"
+                }
               }
 
               discovery.kubernetes "pods" {
@@ -222,6 +244,28 @@ tests:
                   action = "labelmap"
                   regex = "__meta_kubernetes_pod_annotation_(.+)"
                 }
+
+                // 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
+                //
+                // choose the first value found from the following ordered list:
+                // - pod.annotation[resource.opentelemetry.io/service.name]
+                // - pod.label[app.kubernetes.io/name]
+                // - 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"
+                }
               }
 
               discovery.kubernetes "pods" {
@@ -371,6 +415,28 @@ tests:
                   action = "labelmap"
                   regex = "__meta_kubernetes_pod_annotation_(.+)"
                 }
+
+                // 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
+                //
+                // choose the first value found from the following ordered list:
+                // - pod.annotation[resource.opentelemetry.io/service.name]
+                // - pod.label[app.kubernetes.io/name]
+                // - 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"
+                }
               }
 
               discovery.kubernetes "pods" {
@@ -528,6 +594,28 @@ tests:
                   action = "labelmap"
                   regex = "__meta_kubernetes_pod_annotation_(.+)"
                 }
+
+                // 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
+                //
+                // choose the first value found from the following ordered list:
+                // - pod.annotation[resource.opentelemetry.io/service.name]
+                // - pod.label[app.kubernetes.io/name]
+                // - 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"
+                }
               }
 
               discovery.kubernetes "pods" {