Merge pull request #52 from lightstep/gfast/LS-55580/fix-log-attributes

lightstep · Nov 1, 2023 · 904c452 · 904c452
2 parents 971100d + d6e071a
commit 904c452
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/charts/otel-cloud-stack/Chart.yaml b/charts/otel-cloud-stack/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.2.6"
+version: "0.2.7"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/otel-cloud-stack/values.yaml b/charts/otel-cloud-stack/values.yaml
@@ -658,12 +658,44 @@ logsCollector:
       k8sattributes:
         passthrough: false
         pod_association:
+          - sources:
+              - from: resource_attribute
+                name: k8s.pod.uid
+          - sources:
+              - from: resource_attribute
+                name: k8s.pod.name
+              - from: resource_attribute
+                name: k8s.namespace.name
+              - from: resource_attribute
+                name: k8s.node.name
+          - sources:
+              - from: resource_attribute
+                name: k8s.pod.ip
           - sources:
               - from: resource_attribute
                 name: k8s.pod.name
+              - from: resource_attribute
+                name: k8s.namespace.name
+          - sources:
+              - from: connection
         extract:
+          labels:
+            - tag_name: service.name
+              key: app.kubernetes.io/name
+              from: pod
+            - tag_name: service.name
+              key: k8s-app
+              from: pod
+            - tag_name: k8s.app.instance
+              key: app.kubernetes.io/instance
+              from: pod
+            - tag_name: service.version
+              key: app.kubernetes.io/version
+              from: pod
+            - tag_name: k8s.app.component
+              key: app.kubernetes.io/component
+              from: pod
           metadata:
-            - k8s.cluster.uid
             - k8s.namespace.name
             - k8s.pod.name
             - k8s.pod.uid
@@ -676,11 +708,13 @@ logsCollector:
             - k8s.daemonset.uid
             - k8s.job.name
             - k8s.job.uid
+            - k8s.container.name
             - k8s.cronjob.name
             - k8s.statefulset.name
             - k8s.statefulset.uid
             - container.image.tag
             - container.image.name
+            - k8s.cluster.uid
 
     exporters:
       otlp: