feat: add pod_association sources

grafana · Feb 13, 2025 · 0361a2c · 0361a2c
1 parent 8143d78
commit 0361a2c
Show file tree

Hide file tree

Showing 19 changed files with 152 additions and 0 deletions.
diff --git a/...onitoring/charts/feature-application-observability/templates/_processor_k8sattributes.tpl b/...onitoring/charts/feature-application-observability/templates/_processor_k8sattributes.tpl
@@ -23,6 +23,14 @@ otelcol.processor.k8sattributes "{{ .name | default "default" }}" {
 {{- end }}
   }
   pod_association {
+    source {
+      from = "resource_attribute"
+      name = "k8s.pod.ip"
+    }
+    source {
+      from = "resource_attribute"
+      name = "k8s.pod.uid"
+    }
     source {
       from = "connection"
     }

diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-receiver.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-receiver.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.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-receiver.alloy b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-receiver.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/...-monitoring/docs/examples/features/application-observability/default/alloy-receiver.alloy b/...-monitoring/docs/examples/features/application-observability/default/alloy-receiver.alloy
diff --git a/charts/k8s-monitoring/docs/examples/features/application-observability/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/application-observability/default/output.yaml
diff --git a/...docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/alloy-receiver.alloy b/...docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/alloy-receiver.alloy
diff --git a/...nitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml b/...nitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-receiver.alloy
diff --git a/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml b/charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/pod-labels-and-annotations/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/pod-labels-and-annotations/alloy-receiver.alloy
diff --git a/charts/k8s-monitoring/docs/examples/pod-labels-and-annotations/output.yaml b/charts/k8s-monitoring/docs/examples/pod-labels-and-annotations/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/proxies/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/proxies/alloy-receiver.alloy
diff --git a/charts/k8s-monitoring/docs/examples/proxies/output.yaml b/charts/k8s-monitoring/docs/examples/proxies/output.yaml
diff --git a/charts/k8s-monitoring/tests/integration/auto-instrumentation/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/auto-instrumentation/.rendered/output.yaml
diff --git a/charts/k8s-monitoring/tests/platform/grafana-cloud/app-observability/.rendered/output.yaml b/charts/k8s-monitoring/tests/platform/grafana-cloud/app-observability/.rendered/output.yaml