fix: disables loki telemetry (2.5) (#1574)

* fix: disables loki telemetry (#1571) * fix: disables loki telemetry * fix: additional loki instance (cherry picked from commit 4e1a200) * chore: bump Loki versions --------- Co-authored-by: Till Toenshoff <[email protected]> Co-authored-by: Casey Buto <[email protected]>
mesosphere · Sep 11, 2023 · f4121b1 · f4121b1
1 parent 68520f5
commit f4121b1
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 7 deletions.
diff --git a/...ices/grafana-loki/0.69.5/defaults/cm.yaml → ...ices/grafana-loki/0.69.6/defaults/cm.yaml b/...ices/grafana-loki/0.69.5/defaults/cm.yaml → ...ices/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/...a-loki/0.69.5/defaults/kustomization.yaml → ...a-loki/0.69.6/defaults/kustomization.yaml b/...a-loki/0.69.5/defaults/kustomization.yaml → ...a-loki/0.69.6/defaults/kustomization.yaml
diff --git a/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml b/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml
diff --git a/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json b/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json
diff --git a/...69.5/grafana-dashboards/grafana-loki.json → ...69.6/grafana-dashboards/grafana-loki.json b/...69.5/grafana-dashboards/grafana-loki.json → ...69.6/grafana-dashboards/grafana-loki.json
diff --git a/...9.5/grafana-dashboards/kustomization.yaml → ...9.6/grafana-dashboards/kustomization.yaml b/...9.5/grafana-dashboards/kustomization.yaml → ...9.6/grafana-dashboards/kustomization.yaml
diff --git a/....69.5/grafana-dashboards/loki-chunks.json → ....69.6/grafana-dashboards/loki-chunks.json b/....69.5/grafana-dashboards/loki-chunks.json → ....69.6/grafana-dashboards/loki-chunks.json
diff --git a/...9.5/grafana-dashboards/loki-deletion.json → ...9.6/grafana-dashboards/loki-deletion.json b/...9.5/grafana-dashboards/loki-deletion.json → ...9.6/grafana-dashboards/loki-deletion.json
diff --git a/...fana-dashboards/loki-reads-resources.json → ...fana-dashboards/loki-reads-resources.json b/...fana-dashboards/loki-reads-resources.json → ...fana-dashboards/loki-reads-resources.json
diff --git a/....5/grafana-dashboards/loki-retention.json → ....6/grafana-dashboards/loki-retention.json b/....5/grafana-dashboards/loki-retention.json → ....6/grafana-dashboards/loki-retention.json
diff --git a/...ana-dashboards/loki-writes-resources.json → ...ana-dashboards/loki-writes-resources.json b/...ana-dashboards/loki-writes-resources.json → ...ana-dashboards/loki-writes-resources.json
diff --git a/...loki/0.69.5/grafana-loki-helmrelease.yaml → ...loki/0.69.6/grafana-loki-helmrelease.yaml b/...loki/0.69.5/grafana-loki-helmrelease.yaml → ...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/...rafana-loki-helmrelease/grafana-loki.yaml → ...rafana-loki-helmrelease/grafana-loki.yaml b/...rafana-loki-helmrelease/grafana-loki.yaml → ...rafana-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/...na-loki-pre-install-jobs/pre-install.yaml → ...na-loki-pre-install-jobs/pre-install.yaml b/...na-loki-pre-install-jobs/pre-install.yaml → ...na-loki-pre-install-jobs/pre-install.yaml
diff --git a/...loki/0.69.5/grafana-loki-pre-install.yaml → ...loki/0.69.6/grafana-loki-pre-install.yaml b/...loki/0.69.5/grafana-loki-pre-install.yaml → ...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/...es/grafana-loki/0.69.5/kustomization.yaml → ...es/grafana-loki/0.69.6/kustomization.yaml b/...es/grafana-loki/0.69.5/kustomization.yaml → ...es/grafana-loki/0.69.6/kustomization.yaml
diff --git a/...ject-grafana-loki/0.69.5/defaults/cm.yaml → ...ject-grafana-loki/0.69.6/defaults/cm.yaml b/...ject-grafana-loki/0.69.5/defaults/cm.yaml → ...ject-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/...a-loki/0.69.5/defaults/kustomization.yaml → ...a-loki/0.69.6/defaults/kustomization.yaml b/...a-loki/0.69.5/defaults/kustomization.yaml → ...a-loki/0.69.6/defaults/kustomization.yaml
diff --git a/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml b/...ana-dashboards-logging/kustomization.yaml → ...ana-dashboards-logging/kustomization.yaml
diff --git a/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json b/...oards-logging/logging-loki-dashboard.json → ...oards-logging/logging-loki-dashboard.json
diff --git a/...ct-grafana-loki/0.69.5/kustomization.yaml → ...ct-grafana-loki/0.69.6/kustomization.yaml b/...ct-grafana-loki/0.69.5/kustomization.yaml → ...ct-grafana-loki/0.69.6/kustomization.yaml
diff --git a/...ana-loki/0.69.5/object-bucket-claims.yaml → ...ana-loki/0.69.6/object-bucket-claims.yaml b/...ana-loki/0.69.5/object-bucket-claims.yaml → ...ana-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/...ana-loki/0.69.5/project-grafana-loki.yaml → ...ana-loki/0.69.6/project-grafana-loki.yaml b/...ana-loki/0.69.5/project-grafana-loki.yaml → ...ana-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