Be consistent with setting cluster and k8s.cluster.name

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Nov 8, 2024 · 94b8018 · 94b8018
1 parent b5b590d
commit 94b8018
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 0 deletions.
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/applicaiton-observability/default/alloy-receiver.alloy b/...-monitoring/docs/examples/features/applicaiton-observability/default/alloy-receiver.alloy
diff --git a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/features/profiling/default/alloy-profiles.alloy b/charts/k8s-monitoring/docs/examples/features/profiling/default/alloy-profiles.alloy
diff --git a/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml
diff --git a/charts/k8s-monitoring/docs/examples/proxies/alloy-profiles.alloy b/charts/k8s-monitoring/docs/examples/proxies/alloy-profiles.alloy
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/templates/destinations/_destination_otlp.tpl b/charts/k8s-monitoring/templates/destinations/_destination_otlp.tpl
@@ -30,14 +30,17 @@ otelcol.processor.transform {{ include "helper.alloy_name" .name | quote }} {
   error_mode = "ignore"
   metric_statements {
     context = "resource"
+    statements = ["set(attributes[\"cluster\"], \"{{ $.Values.cluster.name }}\") where attributes[\"cluster\"] == nil"]
     statements = ["set(attributes[\"k8s.cluster.name\"], \"{{ $.Values.cluster.name }}\") where attributes[\"k8s.cluster.name\"] == nil"]
   }
   log_statements {
     context = "resource"
+    statements = ["set(attributes[\"cluster\"], \"{{ $.Values.cluster.name }}\") where attributes[\"cluster\"] == nil"]
     statements = ["set(attributes[\"k8s.cluster.name\"], \"{{ $.Values.cluster.name }}\") where attributes[\"k8s.cluster.name\"] == nil"]
   }
   trace_statements {
     context = "resource"
+    statements = ["set(attributes[\"cluster\"], \"{{ $.Values.cluster.name }}\") where attributes[\"cluster\"] == nil"]
     statements = ["set(attributes[\"k8s.cluster.name\"], \"{{ $.Values.cluster.name }}\") where attributes[\"k8s.cluster.name\"] == nil"]
   }
 

diff --git a/charts/k8s-monitoring/templates/destinations/_destination_pyroscope.tpl b/charts/k8s-monitoring/templates/destinations/_destination_pyroscope.tpl
@@ -47,6 +47,7 @@ pyroscope.write {{ include "helper.alloy_name" .name | quote }} {
 
   external_labels = {
     cluster = {{ $.Values.cluster.name | quote }},
+    k8s.cluster.name = {{ $.Values.cluster.name | quote }},
   }
 }
 {{- end }}