From 261bfdb1b36544a55f9fb9788a76e7c4d8c882d4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 17:36:12 +0200
Subject: [PATCH] [release-2.4] fix: disables telemetry transmission for
 Grafana (#1538) (#1540)

fix: disables telemetry transmission for Grafana (#1538)

* fix: disables telemetry transmission for Grafana
* fix: disables telemetry on all additional Grafana instances
* fix: disables auto-update on all Grafana instances

(cherry picked from commit b197fe631f3992829157e0e8de07c4941b4df02a)

Co-authored-by: Till Toenshoff <toenshoff@me.com>
---
 services/centralized-grafana/40.0.0/defaults/cm.yaml     | 3 +++
 services/grafana-logging/6.38.1/defaults/cm.yaml         | 3 +++
 services/kube-prometheus-stack/40.0.0/defaults/cm.yaml   | 4 ++++
 services/kubecost/0.28.0/defaults/cm.yaml                | 3 +++
 services/project-grafana-logging/6.38.1/defaults/cm.yaml | 3 +++
 5 files changed, 16 insertions(+)

diff --git a/services/centralized-grafana/40.0.0/defaults/cm.yaml b/services/centralized-grafana/40.0.0/defaults/cm.yaml
index fab79dc88..61435a335 100644
--- a/services/centralized-grafana/40.0.0/defaults/cm.yaml
+++ b/services/centralized-grafana/40.0.0/defaults/cm.yaml
@@ -68,6 +68,9 @@ data:
           allow_loading_unsigned_plugins: "grafana-piechart-panel"
         dashboards:
           default_home_dashboard_path: "/tmp/dashboards/global-overview.json"
+        analytics:
+          reporting_enabled: false
+          check_for_updates: false
 
       datasources:
         datasources.yaml:
diff --git a/services/grafana-logging/6.38.1/defaults/cm.yaml b/services/grafana-logging/6.38.1/defaults/cm.yaml
index 05190cd0c..634d1137a 100644
--- a/services/grafana-logging/6.38.1/defaults/cm.yaml
+++ b/services/grafana-logging/6.38.1/defaults/cm.yaml
@@ -58,6 +58,9 @@ data:
         auto_assign_org_role: Admin
       plugins:
         allow_loading_unsigned_plugins: "grafana-piechart-panel"
+      analytics:
+        reporting_enabled: false
+        check_for_updates: false
 
     service:
       type: ClusterIP
diff --git a/services/kube-prometheus-stack/40.0.0/defaults/cm.yaml b/services/kube-prometheus-stack/40.0.0/defaults/cm.yaml
index 2772f0170..6721cfaf2 100644
--- a/services/kube-prometheus-stack/40.0.0/defaults/cm.yaml
+++ b/services/kube-prometheus-stack/40.0.0/defaults/cm.yaml
@@ -362,6 +362,10 @@ data:
           allow_loading_unsigned_plugins: "grafana-piechart-panel"
         dashboards:
           default_home_dashboard_path: "/tmp/dashboards/k8s-resources-cluster.json"
+        analytics:
+          reporting_enabled: false
+          check_for_updates: false
+
       service:
         type: ClusterIP
         port: 3000
diff --git a/services/kubecost/0.28.0/defaults/cm.yaml b/services/kubecost/0.28.0/defaults/cm.yaml
index f3adffaf8..80b35f3b2 100644
--- a/services/kubecost/0.28.0/defaults/cm.yaml
+++ b/services/kubecost/0.28.0/defaults/cm.yaml
@@ -57,6 +57,9 @@ data:
             enabled: false
           users:
             auto_assign_org_role: Admin
+          analytics:
+            reporting_enabled: false
+            check_for_updates: false
 
       kubecostProductConfigs:
         grafanaURL: "/dkp/kubecost/grafana"
diff --git a/services/project-grafana-logging/6.38.1/defaults/cm.yaml b/services/project-grafana-logging/6.38.1/defaults/cm.yaml
index fe0fee9d4..1f2a96e08 100644
--- a/services/project-grafana-logging/6.38.1/defaults/cm.yaml
+++ b/services/project-grafana-logging/6.38.1/defaults/cm.yaml
@@ -59,6 +59,9 @@ data:
         auto_assign_org_role: Admin
       plugins:
         allow_loading_unsigned_plugins: "grafana-piechart-panel"
+      analytics:
+        reporting_enabled: false
+        check_for_updates: false
 
     service:
       type: ClusterIP