From a3585f5f77baaf096805f556346b1d2f1ba3a674 Mon Sep 17 00:00:00 2001
From: DylanGuedes <djmgguedes@gmail.com>
Date: Wed, 21 Feb 2024 15:33:12 -0300
Subject: [PATCH] Cleanup logsInstance.

---
 .../templates/monitoring/_helpers-monitoring.tpl    | 10 +++++-----
 .../loki/templates/monitoring/logs-instance.yaml    | 13 +------------
 production/helm/loki/values.yaml                    |  4 ++--
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl b/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl
index 402bdd382ee78..b25e479c5fa88 100644
--- a/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl
+++ b/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl
@@ -10,11 +10,11 @@ Client definition for LogsInstance
   {{- $url = printf "https://%s.%s.svc.%s/loki/api/v1/push" (include "loki.gatewayFullname" .) .Release.Namespace .Values.global.clusterDomain }}
 {{- end -}}
 - url: {{ $url }}
-  tlsConfig:
-    caFile: /var/root-tls/tls.crt
-    certFile: /var/client-tls/tls.crt
-    keyFile: /var/client-tls/tls.key
-    serverName: loki-memberlist
+  # tlsConfig:
+  #   caFile: /var/root-tls/tls.crt
+  #   certFile: /var/client-tls/tls.crt
+  #   keyFile: /var/client-tls/tls.key
+  #   serverName: loki-memberlist
   externalLabels:
     cluster: {{ include "loki.clusterLabel" . }}
   {{- if .Values.enterprise.enabled }}
diff --git a/production/helm/loki/templates/monitoring/logs-instance.yaml b/production/helm/loki/templates/monitoring/logs-instance.yaml
index 94c4bfa9ee15d..5ae19179a1efb 100644
--- a/production/helm/loki/templates/monitoring/logs-instance.yaml
+++ b/production/helm/loki/templates/monitoring/logs-instance.yaml
@@ -27,15 +27,4 @@ spec:
     matchLabels:
       {{- include "loki.selectorLabels" $ | nindent 6 }}
 {{- end -}}
-{{- end -}}
-
-  volumes:
-  - name: tls-cert
-    secret:
-      secretName: my-demo-app-tls
-  - name: root-tls-cert
-    secret:
-      secretName: ca-tls
-  - name: client-tls
-    secret:
-      secretName: client-tls
+{{- end -}}
\ No newline at end of file
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 2eb69c8c62f5e..0ddf39dcec251 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -160,9 +160,9 @@ loki:
     schema_config:
       configs:
         - from: 2022-01-11
-          store: tsdb
+          store: boltdb-shipper
           object_store: {{ .Values.loki.storage.type }}
-          schema: v13
+          schema: v12
           index:
             prefix: loki_index_
             period: 24h