Skip to content

Commit 94b8018

Browse files
committed
Be consistent with setting cluster and k8s.cluster.name
Signed-off-by: Pete Wall <[email protected]>
1 parent b5b590d commit 94b8018

File tree

15 files changed

+38
-0
lines changed

15 files changed

+38
-0
lines changed

charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-receiver.alloy

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.alloy

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-receiver.alloy

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/alloy-receiver.alloy

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/features/profiling/default/alloy-profiles.alloy

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/proxies/alloy-profiles.alloy

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/proxies/alloy-receiver.alloy

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/docs/examples/proxies/output.yaml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/k8s-monitoring/templates/destinations/_destination_otlp.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@ otelcol.processor.transform {{ include "helper.alloy_name" .name | quote }} {
3030
error_mode = "ignore"
3131
metric_statements {
3232
context = "resource"
33+
statements = ["set(attributes[\"cluster\"], \"{{ $.Values.cluster.name }}\") where attributes[\"cluster\"] == nil"]
3334
statements = ["set(attributes[\"k8s.cluster.name\"], \"{{ $.Values.cluster.name }}\") where attributes[\"k8s.cluster.name\"] == nil"]
3435
}
3536
log_statements {
3637
context = "resource"
38+
statements = ["set(attributes[\"cluster\"], \"{{ $.Values.cluster.name }}\") where attributes[\"cluster\"] == nil"]
3739
statements = ["set(attributes[\"k8s.cluster.name\"], \"{{ $.Values.cluster.name }}\") where attributes[\"k8s.cluster.name\"] == nil"]
3840
}
3941
trace_statements {
4042
context = "resource"
43+
statements = ["set(attributes[\"cluster\"], \"{{ $.Values.cluster.name }}\") where attributes[\"cluster\"] == nil"]
4144
statements = ["set(attributes[\"k8s.cluster.name\"], \"{{ $.Values.cluster.name }}\") where attributes[\"k8s.cluster.name\"] == nil"]
4245
}
4346

charts/k8s-monitoring/templates/destinations/_destination_pyroscope.tpl

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ pyroscope.write {{ include "helper.alloy_name" .name | quote }} {
4747

4848
external_labels = {
4949
cluster = {{ $.Values.cluster.name | quote }},
50+
k8s.cluster.name = {{ $.Values.cluster.name | quote }},
5051
}
5152
}
5253
{{- end }}

0 commit comments

Comments
 (0)