Cleanup logsInstance.

grafana · Feb 21, 2024 · a3585f5 · a3585f5
1 parent ae11f44
commit a3585f5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git 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
@@ -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 -}}
diff --git 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