Skip to content

Commit 870f5f0

Browse files
committed
Don't place on alloy-profiles or alloy-logs. That would cause too much confusion
Signed-off-by: Pete Wall <pete.wall@grafana.com>
1 parent bb54b24 commit 870f5f0

File tree

3 files changed

+1
-78
lines changed

3 files changed

+1
-78
lines changed

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -845,37 +845,3 @@ profiling "feature" {
845845
]
846846
}
847847

848-
// Self Reporting
849-
prometheus.exporter.unix "kubernetes_monitoring_telemetry" {
850-
set_collectors = ["textfile"]
851-
textfile {
852-
directory = "/etc/alloy"
853-
}
854-
}
855-
856-
discovery.relabel "kubernetes_monitoring_telemetry" {
857-
targets = prometheus.exporter.unix.kubernetes_monitoring_telemetry.targets
858-
rule {
859-
target_label = "instance"
860-
action = "replace"
861-
replacement = "ko"
862-
}
863-
rule {
864-
target_label = "job"
865-
action = "replace"
866-
replacement = "integrations/kubernetes/kubernetes_monitoring_telemetry"
867-
}
868-
}
869-
870-
prometheus.scrape "kubernetes_monitoring_telemetry" {
871-
job_name = "integrations/kubernetes/kubernetes_monitoring_telemetry"
872-
targets = discovery.relabel.kubernetes_monitoring_telemetry.output
873-
scrape_interval = "1h"
874-
clustering {
875-
enabled = true
876-
}
877-
forward_to = [
878-
879-
]
880-
}
881-

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -869,49 +869,6 @@ data:
869869
pyroscope.write.pyroscope.receiver,
870870
]
871871
}
872-
873-
// Self Reporting
874-
prometheus.exporter.unix "kubernetes_monitoring_telemetry" {
875-
set_collectors = ["textfile"]
876-
textfile {
877-
directory = "/etc/alloy"
878-
}
879-
}
880-
881-
discovery.relabel "kubernetes_monitoring_telemetry" {
882-
targets = prometheus.exporter.unix.kubernetes_monitoring_telemetry.targets
883-
rule {
884-
target_label = "instance"
885-
action = "replace"
886-
replacement = "ko"
887-
}
888-
rule {
889-
target_label = "job"
890-
action = "replace"
891-
replacement = "integrations/kubernetes/kubernetes_monitoring_telemetry"
892-
}
893-
}
894-
895-
prometheus.scrape "kubernetes_monitoring_telemetry" {
896-
job_name = "integrations/kubernetes/kubernetes_monitoring_telemetry"
897-
targets = discovery.relabel.kubernetes_monitoring_telemetry.output
898-
scrape_interval = "1h"
899-
clustering {
900-
enabled = true
901-
}
902-
forward_to = [
903-
904-
]
905-
}
906-
907-
908-
self-reporting-metric.prom: |
909-
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
910-
# TYPE grafana_kubernetes_monitoring_build_info gauge
911-
grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
912-
# HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
913-
# TYPE grafana_kubernetes_monitoring_feature_info gauge
914-
grafana_kubernetes_monitoring_feature_info{feature="profiling", method="", version="1.0.0"} 1
915872
---
916873
# Source: k8s-monitoring/charts/alloy-profiles/templates/rbac.yaml
917874
apiVersion: rbac.authorization.k8s.io/v1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
{{- define "features.selfReporting.collectors" -}}
77
{{- if .Values.selfReporting.enabled}}
8-
{{- $collectorsByIncreasingPreference := list "alloy-profiles" "alloy-logs" "alloy-receiver" "alloy-metrics" "alloy-singleton" }}
8+
{{- $collectorsByIncreasingPreference := list "alloy-receiver" "alloy-metrics" "alloy-singleton" }}
99
{{- $chosenCollector := "" }}
1010
{{- range $collector := $collectorsByIncreasingPreference }}
1111
{{- if (index $.Values $collector).enabled }}{{- $chosenCollector = $collector }}{{- end -}}

0 commit comments

Comments
 (0)