Skip to content

Commit 77906ef

Browse files
authored
Fix the self report destination ecosystem. (#878)
Also, don't include the platform label if it was not set Signed-off-by: Pete Wall <[email protected]>
1 parent 4eab7ee commit 77906ef

File tree

24 files changed

+25
-25
lines changed

24 files changed

+25
-25
lines changed

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

+1-1
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

+1-1
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

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

charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml

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

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

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

charts/k8s-monitoring/docs/examples/collector-storage/output.yaml

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

charts/k8s-monitoring/docs/examples/extra-rules/output.yaml

+1-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/annotation-autodiscovery/default/output.yaml

+1-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/annotation-autodiscovery/prom-annotations/output.yaml

+1-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/applicaiton-observability/default/output.yaml

+1-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/cluster-metrics/control-plane-monitoring/output.yaml

+1-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/cluster-metrics/default/output.yaml

+1-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/integrations/alloy/output.yaml

+1-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/integrations/cert-manager/output.yaml

+1-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/integrations/etcd/output.yaml

+1-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/integrations/mysql/output.yaml

+1-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/prometheus-operator-objects/default/output.yaml

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

charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml

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

charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml

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

charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml

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

charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml

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

charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml

+1-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/output.yaml

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

charts/k8s-monitoring/templates/features/_feature_self_reporting.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{{- define "features.selfReporting.validate" }}{{ end }}
2424
{{- define "features.selfReporting.include" }}
2525
{{- if eq (include "features.selfReporting.enabled" .) "true" }}
26-
{{- $destinations := include "destinations.get" (dict "destinations" $.Values.destinations "type" "metrics" "ecosystem" "otlp" "filter" $.Values.applicationObservability.destinations) | fromYamlArray -}}
26+
{{- $destinations := include "destinations.get" (dict "destinations" $.Values.destinations "type" "metrics" "ecosystem" "prometheus" "filter" $.Values.applicationObservability.destinations) | fromYamlArray -}}
2727

2828
// Self Reporting
2929
prometheus.exporter.unix "kubernetes_monitoring_telemetry" {
@@ -75,7 +75,7 @@ prometheus.relabel "kubernetes_monitoring_telemetry" {
7575
self-reporting-metric.prom: |
7676
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
7777
# TYPE grafana_kubernetes_monitoring_build_info gauge
78-
grafana_kubernetes_monitoring_build_info{version="{{ .Chart.Version }}", namespace="{{ .Release.Namespace }}", platform="{{ .Values.global.platform }}"} 1
78+
grafana_kubernetes_monitoring_build_info{version="{{ .Chart.Version }}", namespace="{{ .Release.Namespace }}"{{- if .Values.global.platform }}, platform="{{ .Values.global.platform }}"{{ end }}} 1
7979
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
8080
# TYPE grafana_kubernetes_monitoring_feature_info gauge
8181
{{- range $feature := include "features.list.enabled" . | fromYamlArray }}

0 commit comments

Comments
 (0)