From 15dd1fba0bdce5bf2320d09bbaa2e80ff3f26d91 Mon Sep 17 00:00:00 2001
From: zhenyus <zhenyus@mathmast.com>
Date: Mon, 21 Apr 2025 17:43:08 +0800
Subject: [PATCH] fix(opentelemetry): update resource attributes in distributor
 and log transformation for improved metadata extraction

Signed-off-by: zhenyus <zhenyus@mathmast.com>
---
 .../freeleaps-logging-system/loki/values.yaml  | 18 ++++++++++--------
 .../authentication/opentelemetry.yaml          |  7 ++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/cluster/manifests/freeleaps-logging-system/loki/values.yaml b/cluster/manifests/freeleaps-logging-system/loki/values.yaml
index 5318032c..40a64839 100644
--- a/cluster/manifests/freeleaps-logging-system/loki/values.yaml
+++ b/cluster/manifests/freeleaps-logging-system/loki/values.yaml
@@ -548,14 +548,16 @@ loki:
     scheduler_address: '{{ include "loki.querySchedulerAddress" . }}'
   # -- Optional distributor configuration
   distributor: 
-    default_resource_attributes_as_index_labels:
-      - application
-      - environment
-      - kubernetes_node_name
-      - kubernetes_node_ip
-      - kubernetes_deployment_name
-      - kubernetes_statefulset_name
-      - kubernetes_namespace
+    otlp_config:
+      default_resource_attributes_as_index_labels:
+        - application
+        - environment
+        - kubernetes_node_name
+        - kubernetes_pod_name
+        - kubernetes_pod_ip
+        - kubernetes_deployment_name
+        - kubernetes_statefulset_name
+        - kubernetes_namespace
   # -- Enable tracing
   tracing:
     enabled: true
diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
index 61818239..0c8c25dd 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml
@@ -58,7 +58,12 @@ spec:
             statements:
               - set(resource.attributes["application"], log.attributes["context"]["app"])
               - set(resource.attributes["environment"], log.attributes["context"]["env"])
-              - set(resource.attributes["kubernetes_node_name"])
+              - set(resource.attributes["kubernetes_node_name"], resource.attributes["k8s.node.name"])
+              - set(resource.attributes["kubernetes_pod_name"], resource.attributes["k8s.pod.name"])
+              - set(resource.attributes["kubernetes_pod_ip"], resource.attributes["k8s.pod.ip"])
+              - set(resource.attributes["kubernetes_deployment_name"], resource.attributes["k8s.deployment.name"])
+              - set(resource.attributes["kubernetes_statefulset_name"], resource.attributes["k8s.statefulset.name"])
+              - set(resource.attributes["kubernetes_namespace"], resource.attributes["k8s.namespace.name"])
               - set(log.body["kubernetes"]["pod"], resource.attributes["k8s.pod.name"])
               - set(log.body["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"])
               - set(log.body["kubernetes"]["pod_ip"], resource.attributes["k8s.pod.ip"])