Don't place on alloy-profiles or alloy-logs. That would cause too muc…

…h confusion Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Oct 21, 2024 · 7845616 · 7845616
1 parent d91c751
commit 7845616
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 78 deletions.
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
@@ -845,37 +845,3 @@ profiling "feature" {
   ]
 }
 
-// Self Reporting
-prometheus.exporter.unix "kubernetes_monitoring_telemetry" {
-  set_collectors = ["textfile"]
-  textfile {
-    directory = "/etc/alloy"
-  }
-}
-
-discovery.relabel "kubernetes_monitoring_telemetry" {
-  targets = prometheus.exporter.unix.kubernetes_monitoring_telemetry.targets
-  rule {
-    target_label = "instance"
-    action = "replace"
-    replacement = "ko"
-  }
-  rule {
-    target_label = "job"
-    action = "replace"
-    replacement = "integrations/kubernetes/kubernetes_monitoring_telemetry"
-  }
-}
-
-prometheus.scrape "kubernetes_monitoring_telemetry" {
-  job_name   = "integrations/kubernetes/kubernetes_monitoring_telemetry"
-  targets    = discovery.relabel.kubernetes_monitoring_telemetry.output
-  scrape_interval = "1h"
-  clustering {
-    enabled = true
-  }
-  forward_to = [
-
-  ]
-}
-
diff --git a/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/profiling/default/output.yaml
@@ -869,49 +869,6 @@ data:
         pyroscope.write.pyroscope.receiver,
       ]
     }
-    
-    // Self Reporting
-    prometheus.exporter.unix "kubernetes_monitoring_telemetry" {
-      set_collectors = ["textfile"]
-      textfile {
-        directory = "/etc/alloy"
-      }
-    }
-    
-    discovery.relabel "kubernetes_monitoring_telemetry" {
-      targets = prometheus.exporter.unix.kubernetes_monitoring_telemetry.targets
-      rule {
-        target_label = "instance"
-        action = "replace"
-        replacement = "ko"
-      }
-      rule {
-        target_label = "job"
-        action = "replace"
-        replacement = "integrations/kubernetes/kubernetes_monitoring_telemetry"
-      }
-    }
-    
-    prometheus.scrape "kubernetes_monitoring_telemetry" {
-      job_name   = "integrations/kubernetes/kubernetes_monitoring_telemetry"
-      targets    = discovery.relabel.kubernetes_monitoring_telemetry.output
-      scrape_interval = "1h"
-      clustering {
-        enabled = true
-      }
-      forward_to = [
-        
-      ]
-    }
-    
-    
-  self-reporting-metric.prom: |
-    # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart
-    # TYPE grafana_kubernetes_monitoring_build_info gauge
-    grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1
-    # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart
-    # TYPE grafana_kubernetes_monitoring_feature_info gauge
-    grafana_kubernetes_monitoring_feature_info{feature="profiling", method="", version="1.0.0"} 1
 ---
 # Source: k8s-monitoring/charts/alloy-profiles/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/k8s-monitoring/templates/features/_feature_self_reporting.tpl b/charts/k8s-monitoring/templates/features/_feature_self_reporting.tpl
@@ -5,7 +5,7 @@
 
 {{- define "features.selfReporting.collectors" -}}
 {{- if .Values.selfReporting.enabled}}
-  {{- $collectorsByIncreasingPreference := list "alloy-profiles" "alloy-logs" "alloy-receiver" "alloy-metrics" "alloy-singleton" }}
+  {{- $collectorsByIncreasingPreference := list "alloy-receiver" "alloy-metrics" "alloy-singleton" }}
   {{- $chosenCollector := "" }}
   {{- range $collector := $collectorsByIncreasingPreference }}
     {{- if (index $.Values $collector).enabled }}{{- $chosenCollector = $collector }}{{- end -}}