From f4121b196528ca56088fa8d5d2b037b203e108f6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 03:11:13 +0800
Subject: [PATCH] fix: disables loki telemetry (2.5) (#1574)

* fix: disables loki telemetry (#1571)

* fix: disables loki telemetry

* fix: additional loki instance

(cherry picked from commit 4e1a2008812b84070651bdb702a2ccc25d05d07b)

* chore: bump Loki versions

---------

Co-authored-by: Till Toenshoff <toenshoff@me.com>
Co-authored-by: Casey Buto <cbuto@d2iq.com>
---
 services/grafana-loki/{0.69.5 => 0.69.6}/defaults/cm.yaml     | 4 +++-
 .../{0.69.5 => 0.69.6}/defaults/kustomization.yaml            | 0
 .../grafana-dashboards-logging/kustomization.yaml             | 0
 .../grafana-dashboards-logging/logging-loki-dashboard.json    | 0
 .../{0.69.5 => 0.69.6}/grafana-dashboards/grafana-loki.json   | 0
 .../{0.69.5 => 0.69.6}/grafana-dashboards/kustomization.yaml  | 0
 .../{0.69.5 => 0.69.6}/grafana-dashboards/loki-chunks.json    | 0
 .../{0.69.5 => 0.69.6}/grafana-dashboards/loki-deletion.json  | 0
 .../grafana-dashboards/loki-reads-resources.json              | 0
 .../{0.69.5 => 0.69.6}/grafana-dashboards/loki-retention.json | 0
 .../grafana-dashboards/loki-writes-resources.json             | 0
 .../{0.69.5 => 0.69.6}/grafana-loki-helmrelease.yaml          | 2 +-
 .../grafana-loki-helmrelease/grafana-loki.yaml                | 2 +-
 .../grafana-loki-pre-install-jobs/pre-install.yaml            | 0
 .../{0.69.5 => 0.69.6}/grafana-loki-pre-install.yaml          | 2 +-
 services/grafana-loki/{0.69.5 => 0.69.6}/kustomization.yaml   | 0
 .../project-grafana-loki/{0.69.5 => 0.69.6}/defaults/cm.yaml  | 4 +++-
 .../{0.69.5 => 0.69.6}/defaults/kustomization.yaml            | 0
 .../grafana-dashboards-logging/kustomization.yaml             | 0
 .../grafana-dashboards-logging/logging-loki-dashboard.json    | 0
 .../{0.69.5 => 0.69.6}/kustomization.yaml                     | 0
 .../{0.69.5 => 0.69.6}/object-bucket-claims.yaml              | 2 +-
 .../{0.69.5 => 0.69.6}/project-grafana-loki.yaml              | 2 +-
 23 files changed, 11 insertions(+), 7 deletions(-)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/defaults/cm.yaml (98%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/defaults/kustomization.yaml (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards-logging/kustomization.yaml (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards-logging/logging-loki-dashboard.json (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards/grafana-loki.json (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards/kustomization.yaml (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards/loki-chunks.json (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards/loki-deletion.json (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards/loki-reads-resources.json (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards/loki-retention.json (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards/loki-writes-resources.json (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-loki-helmrelease.yaml (92%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-loki-helmrelease/grafana-loki.yaml (92%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-loki-pre-install-jobs/pre-install.yaml (100%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/grafana-loki-pre-install.yaml (86%)
 rename services/grafana-loki/{0.69.5 => 0.69.6}/kustomization.yaml (100%)
 rename services/project-grafana-loki/{0.69.5 => 0.69.6}/defaults/cm.yaml (98%)
 rename services/project-grafana-loki/{0.69.5 => 0.69.6}/defaults/kustomization.yaml (100%)
 rename services/project-grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards-logging/kustomization.yaml (100%)
 rename services/project-grafana-loki/{0.69.5 => 0.69.6}/grafana-dashboards-logging/logging-loki-dashboard.json (100%)
 rename services/project-grafana-loki/{0.69.5 => 0.69.6}/kustomization.yaml (100%)
 rename services/project-grafana-loki/{0.69.5 => 0.69.6}/object-bucket-claims.yaml (93%)
 rename services/project-grafana-loki/{0.69.5 => 0.69.6}/project-grafana-loki.yaml (91%)

diff --git a/services/grafana-loki/0.69.5/defaults/cm.yaml b/services/grafana-loki/0.69.6/defaults/cm.yaml
similarity index 98%
rename from services/grafana-loki/0.69.5/defaults/cm.yaml
rename to services/grafana-loki/0.69.6/defaults/cm.yaml
index c33315486f..9d0ba9d69e 100644
--- a/services/grafana-loki/0.69.5/defaults/cm.yaml
+++ b/services/grafana-loki/0.69.6/defaults/cm.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-loki-0.69.5-d2iq-defaults
+  name: grafana-loki-0.69.6-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -15,6 +15,8 @@ data:
         common:
           compactor_address: http://{{ include "loki.compactorFullname" . }}:3100
         auth_enabled: false
+        analytics:
+          reporting_enabled: false
         server:
           http_listen_port: 3100
           log_level: warn
diff --git a/services/grafana-loki/0.69.5/defaults/kustomization.yaml b/services/grafana-loki/0.69.6/defaults/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.5/defaults/kustomization.yaml
rename to services/grafana-loki/0.69.6/defaults/kustomization.yaml
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml b/services/grafana-loki/0.69.6/grafana-dashboards-logging/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml
rename to services/grafana-loki/0.69.6/grafana-dashboards-logging/kustomization.yaml
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json b/services/grafana-loki/0.69.6/grafana-dashboards-logging/logging-loki-dashboard.json
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json
rename to services/grafana-loki/0.69.6/grafana-dashboards-logging/logging-loki-dashboard.json
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards/grafana-loki.json b/services/grafana-loki/0.69.6/grafana-dashboards/grafana-loki.json
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards/grafana-loki.json
rename to services/grafana-loki/0.69.6/grafana-dashboards/grafana-loki.json
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards/kustomization.yaml b/services/grafana-loki/0.69.6/grafana-dashboards/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards/kustomization.yaml
rename to services/grafana-loki/0.69.6/grafana-dashboards/kustomization.yaml
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards/loki-chunks.json b/services/grafana-loki/0.69.6/grafana-dashboards/loki-chunks.json
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards/loki-chunks.json
rename to services/grafana-loki/0.69.6/grafana-dashboards/loki-chunks.json
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards/loki-deletion.json b/services/grafana-loki/0.69.6/grafana-dashboards/loki-deletion.json
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards/loki-deletion.json
rename to services/grafana-loki/0.69.6/grafana-dashboards/loki-deletion.json
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards/loki-reads-resources.json b/services/grafana-loki/0.69.6/grafana-dashboards/loki-reads-resources.json
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards/loki-reads-resources.json
rename to services/grafana-loki/0.69.6/grafana-dashboards/loki-reads-resources.json
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards/loki-retention.json b/services/grafana-loki/0.69.6/grafana-dashboards/loki-retention.json
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards/loki-retention.json
rename to services/grafana-loki/0.69.6/grafana-dashboards/loki-retention.json
diff --git a/services/grafana-loki/0.69.5/grafana-dashboards/loki-writes-resources.json b/services/grafana-loki/0.69.6/grafana-dashboards/loki-writes-resources.json
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-dashboards/loki-writes-resources.json
rename to services/grafana-loki/0.69.6/grafana-dashboards/loki-writes-resources.json
diff --git a/services/grafana-loki/0.69.5/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.69.6/grafana-loki-helmrelease.yaml
similarity index 92%
rename from services/grafana-loki/0.69.5/grafana-loki-helmrelease.yaml
rename to services/grafana-loki/0.69.6/grafana-loki-helmrelease.yaml
index 87cb197169..11ac1b9a59 100644
--- a/services/grafana-loki/0.69.5/grafana-loki-helmrelease.yaml
+++ b/services/grafana-loki/0.69.6/grafana-loki-helmrelease.yaml
@@ -12,7 +12,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/grafana-loki/0.69.5/grafana-loki-helmrelease
+  path: ./services/grafana-loki/0.69.6/grafana-loki-helmrelease
   sourceRef:
     kind: GitRepository
     name: management
diff --git a/services/grafana-loki/0.69.5/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.69.6/grafana-loki-helmrelease/grafana-loki.yaml
similarity index 92%
rename from services/grafana-loki/0.69.5/grafana-loki-helmrelease/grafana-loki.yaml
rename to services/grafana-loki/0.69.6/grafana-loki-helmrelease/grafana-loki.yaml
index e4b2e1e42b..f995b262c1 100644
--- a/services/grafana-loki/0.69.5/grafana-loki-helmrelease/grafana-loki.yaml
+++ b/services/grafana-loki/0.69.6/grafana-loki-helmrelease/grafana-loki.yaml
@@ -26,4 +26,4 @@ spec:
   releaseName: grafana-loki
   valuesFrom:
     - kind: ConfigMap
-      name: grafana-loki-0.69.5-d2iq-defaults
+      name: grafana-loki-0.69.6-d2iq-defaults
diff --git a/services/grafana-loki/0.69.5/grafana-loki-pre-install-jobs/pre-install.yaml b/services/grafana-loki/0.69.6/grafana-loki-pre-install-jobs/pre-install.yaml
similarity index 100%
rename from services/grafana-loki/0.69.5/grafana-loki-pre-install-jobs/pre-install.yaml
rename to services/grafana-loki/0.69.6/grafana-loki-pre-install-jobs/pre-install.yaml
diff --git a/services/grafana-loki/0.69.5/grafana-loki-pre-install.yaml b/services/grafana-loki/0.69.6/grafana-loki-pre-install.yaml
similarity index 86%
rename from services/grafana-loki/0.69.5/grafana-loki-pre-install.yaml
rename to services/grafana-loki/0.69.6/grafana-loki-pre-install.yaml
index 3784822a10..75c23ff205 100644
--- a/services/grafana-loki/0.69.5/grafana-loki-pre-install.yaml
+++ b/services/grafana-loki/0.69.6/grafana-loki-pre-install.yaml
@@ -9,7 +9,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/grafana-loki/0.69.5/grafana-loki-pre-install-jobs
+  path: ./services/grafana-loki/0.69.6/grafana-loki-pre-install-jobs
   sourceRef:
     kind: GitRepository
     name: management
diff --git a/services/grafana-loki/0.69.5/kustomization.yaml b/services/grafana-loki/0.69.6/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.5/kustomization.yaml
rename to services/grafana-loki/0.69.6/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.5/defaults/cm.yaml b/services/project-grafana-loki/0.69.6/defaults/cm.yaml
similarity index 98%
rename from services/project-grafana-loki/0.69.5/defaults/cm.yaml
rename to services/project-grafana-loki/0.69.6/defaults/cm.yaml
index f7c30903f3..33655e4cb3 100644
--- a/services/project-grafana-loki/0.69.5/defaults/cm.yaml
+++ b/services/project-grafana-loki/0.69.6/defaults/cm.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: project-grafana-loki-0.69.5-d2iq-defaults
+  name: project-grafana-loki-0.69.6-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -36,6 +36,8 @@ data:
         common:
           compactor_address: http://{{ include "loki.compactorFullname" . }}:3100
         auth_enabled: false
+        analytics:
+          reporting_enabled: false
         server:
           http_listen_port: 3100
           log_level: warn
diff --git a/services/project-grafana-loki/0.69.5/defaults/kustomization.yaml b/services/project-grafana-loki/0.69.6/defaults/kustomization.yaml
similarity index 100%
rename from services/project-grafana-loki/0.69.5/defaults/kustomization.yaml
rename to services/project-grafana-loki/0.69.6/defaults/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml b/services/project-grafana-loki/0.69.6/grafana-dashboards-logging/kustomization.yaml
similarity index 100%
rename from services/project-grafana-loki/0.69.5/grafana-dashboards-logging/kustomization.yaml
rename to services/project-grafana-loki/0.69.6/grafana-dashboards-logging/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json b/services/project-grafana-loki/0.69.6/grafana-dashboards-logging/logging-loki-dashboard.json
similarity index 100%
rename from services/project-grafana-loki/0.69.5/grafana-dashboards-logging/logging-loki-dashboard.json
rename to services/project-grafana-loki/0.69.6/grafana-dashboards-logging/logging-loki-dashboard.json
diff --git a/services/project-grafana-loki/0.69.5/kustomization.yaml b/services/project-grafana-loki/0.69.6/kustomization.yaml
similarity index 100%
rename from services/project-grafana-loki/0.69.5/kustomization.yaml
rename to services/project-grafana-loki/0.69.6/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.5/object-bucket-claims.yaml b/services/project-grafana-loki/0.69.6/object-bucket-claims.yaml
similarity index 93%
rename from services/project-grafana-loki/0.69.5/object-bucket-claims.yaml
rename to services/project-grafana-loki/0.69.6/object-bucket-claims.yaml
index ccdc03759b..b58c9656f8 100644
--- a/services/project-grafana-loki/0.69.5/object-bucket-claims.yaml
+++ b/services/project-grafana-loki/0.69.6/object-bucket-claims.yaml
@@ -25,7 +25,7 @@ spec:
   releaseName: project-loki-object-bucket-claims
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-loki-0.69.5-d2iq-defaults
+      name: project-grafana-loki-0.69.6-d2iq-defaults
     - kind: ConfigMap
       name: project-grafana-loki-overrides
       optional: true
diff --git a/services/project-grafana-loki/0.69.5/project-grafana-loki.yaml b/services/project-grafana-loki/0.69.6/project-grafana-loki.yaml
similarity index 91%
rename from services/project-grafana-loki/0.69.5/project-grafana-loki.yaml
rename to services/project-grafana-loki/0.69.6/project-grafana-loki.yaml
index a6d3011512..ecbfffb18c 100644
--- a/services/project-grafana-loki/0.69.5/project-grafana-loki.yaml
+++ b/services/project-grafana-loki/0.69.6/project-grafana-loki.yaml
@@ -26,4 +26,4 @@ spec:
   releaseName: project-grafana-loki
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-loki-0.69.5-d2iq-defaults
+      name: project-grafana-loki-0.69.6-d2iq-defaults