Set service.instance.id to k8s.pod.uid if it is not already set (#…

…772) Signed-off-by: Pete Wall <[email protected]> Co-authored-by: Cyrille Le Clerc <[email protected]>
grafana · Oct 8, 2024 · 7fa9b8f · 7fa9b8f
1 parent 388ee8e
commit 7fa9b8f
Show file tree

Hide file tree

Showing 66 changed files with 196 additions and 0 deletions.
diff --git a/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/metrics.alloy
@@ -84,6 +84,7 @@ otelcol.processor.transform "default" {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"alloy-autoscaling-and-storage-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   log_statements {
@@ -93,6 +94,7 @@ otelcol.processor.transform "default" {
       "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
       "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
       "set(attributes[\"k8s.cluster.name\"], \"alloy-autoscaling-and-storage-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/output.yaml b/charts/k8s-monitoring-v1/docs/examples/alloy-autoscaling-and-storage/output.yaml
@@ -216,6 +216,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"alloy-autoscaling-and-storage-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -225,6 +226,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"alloy-autoscaling-and-storage-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {
@@ -68617,6 +68619,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"alloy-autoscaling-and-storage-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -68626,6 +68629,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"alloy-autoscaling-and-storage-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/application-observability/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/application-observability/metrics.alloy
@@ -107,6 +107,7 @@ otelcol.processor.transform "default" {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   log_statements {
@@ -116,12 +117,14 @@ otelcol.processor.transform "default" {
       "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
       "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
       "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   trace_statements {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/application-observability/output.yaml b/charts/k8s-monitoring-v1/docs/examples/application-observability/output.yaml
@@ -281,6 +281,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -290,12 +291,14 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       trace_statements {
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {
@@ -69848,6 +69851,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -69857,12 +69861,14 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       trace_statements {
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"application-observability-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/azure-aks/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/azure-aks/metrics.alloy
@@ -84,6 +84,7 @@ otelcol.processor.transform "default" {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"aks-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   log_statements {
@@ -93,6 +94,7 @@ otelcol.processor.transform "default" {
       "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
       "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
       "set(attributes[\"k8s.cluster.name\"], \"aks-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/azure-aks/output.yaml b/charts/k8s-monitoring-v1/docs/examples/azure-aks/output.yaml
@@ -216,6 +216,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"aks-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -225,6 +226,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"aks-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {
@@ -68561,6 +68563,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"aks-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -68570,6 +68573,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"aks-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/metrics.alloy
@@ -84,6 +84,7 @@ otelcol.processor.transform "default" {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"default-values-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   log_statements {
@@ -93,6 +94,7 @@ otelcol.processor.transform "default" {
       "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
       "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
       "set(attributes[\"k8s.cluster.name\"], \"default-values-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/output.yaml b/charts/k8s-monitoring-v1/docs/examples/bearer-token-auth/output.yaml
@@ -215,6 +215,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"default-values-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -224,6 +225,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"default-values-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {
@@ -68549,6 +68551,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"default-values-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -68558,6 +68561,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"default-values-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/beyla/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/beyla/metrics.alloy
@@ -107,6 +107,7 @@ otelcol.processor.transform "default" {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   log_statements {
@@ -116,12 +117,14 @@ otelcol.processor.transform "default" {
       "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
       "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
       "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   trace_statements {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/beyla/output.yaml b/charts/k8s-monitoring-v1/docs/examples/beyla/output.yaml
@@ -268,6 +268,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -277,12 +278,14 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       trace_statements {
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {
@@ -68859,6 +68862,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -68868,12 +68872,14 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       trace_statements {
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"beyla-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/metrics.alloy
@@ -84,6 +84,7 @@ otelcol.processor.transform "default" {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"control-plane-metrics-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   log_statements {
@@ -93,6 +94,7 @@ otelcol.processor.transform "default" {
       "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
       "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
       "set(attributes[\"k8s.cluster.name\"], \"control-plane-metrics-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/output.yaml b/charts/k8s-monitoring-v1/docs/examples/control-plane-metrics/output.yaml
@@ -217,6 +217,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"control-plane-metrics-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -226,6 +227,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"control-plane-metrics-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {
@@ -68710,6 +68712,7 @@ data:
         context = "resource"
         statements = [
           "set(attributes[\"k8s.cluster.name\"], \"control-plane-metrics-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       log_statements {
@@ -68719,6 +68722,7 @@ data:
           "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
           "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
           "set(attributes[\"k8s.cluster.name\"], \"control-plane-metrics-test\") where attributes[\"k8s.cluster.name\"] == nil",
+          "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
         ]
       }
       output {

diff --git a/charts/k8s-monitoring-v1/docs/examples/custom-config/metrics.alloy b/charts/k8s-monitoring-v1/docs/examples/custom-config/metrics.alloy
@@ -84,6 +84,7 @@ otelcol.processor.transform "default" {
     context = "resource"
     statements = [
       "set(attributes[\"k8s.cluster.name\"], \"custom-config-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   log_statements {
@@ -93,6 +94,7 @@ otelcol.processor.transform "default" {
       "set(attributes[\"namespace\"], attributes[\"k8s.namespace.name\"])",
       "set(attributes[\"loki.resource.labels\"], \"cluster, namespace, job, pod\")",
       "set(attributes[\"k8s.cluster.name\"], \"custom-config-test\") where attributes[\"k8s.cluster.name\"] == nil",
+      "set(attributes[\"service.instance.id\"], attributes[\"k8s.pod.uid\"]) where attributes[\"service.instance.id\"] == nil",
     ]
   }
   output {