From d67a5bd3e0fd337b5950c6172d6cb0868d4273a9 Mon Sep 17 00:00:00 2001
From: Michel Hollands <michel.hollands@grafana.com>
Date: Thu, 29 Jun 2023 13:50:24 +0100
Subject: [PATCH] Use Loki SSD mode

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
---
 .../templates/agent/config.yaml               |  2 +-
 charts/meta-monitoring/values.yaml            | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/charts/meta-monitoring/templates/agent/config.yaml b/charts/meta-monitoring/templates/agent/config.yaml
index 18f1382..ff7f1ed 100644
--- a/charts/meta-monitoring/templates/agent/config.yaml
+++ b/charts/meta-monitoring/templates/agent/config.yaml
@@ -51,7 +51,7 @@ data:
     {{- if .Values.local.enabled }}
     loki.write "local" {
       endpoint {
-        url = "http://{{- .Release.Name -}}-loki.{{- .Release.Namespace -}}.svc.cluster.local:3100/loki/api/v1/push"
+        url = "http://loki-gateway.{{- .Release.Namespace -}}.svc.cluster.local:80/loki/api/v1/push"
       }
     }
 
diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml
index 0c17e39..a2434c0 100644
--- a/charts/meta-monitoring/values.yaml
+++ b/charts/meta-monitoring/values.yaml
@@ -16,23 +16,29 @@ cloud:
     username:
     password:
 
-# The following are configuration for the dependencies.
-# These should not be changed.
 global:
   minio:
     rootUser: "rootuser"
     rootPassword: "rootpassword"
 
+# The following are configuration for the dependencies.
+# These should not be changed.
+
 loki:
   loki:
     auth_enabled: false
     commonConfig:
       replication_factor: 1
     storage:
-      type: 'filesystem'
-  singleBinary:
-    replicas: 1
-    extraArgs: ["-log.level=debug"]
+      type: "s3"
+      s3:
+        endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+        access_key_id: "{{ .Values.global.minio.rootUser }}"
+        secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+        insecure: true
+      bucketNames:
+        chunks: loki-chunks
+        ruler: loki-ruler
   monitoring:
     dashboards:
       enabled: false
@@ -85,9 +91,13 @@ mimir-distributed:
           insecure: true
 
 minio:
-  rootUser: rootuser
+  rootUser: "{{ .Values.global.minio.rootUser }}"
+  rootPassword: "{{ .Values.global.minio.rootPassword }}" 
   buckets:
-    - name: loki
+    - name: loki-chunks
+      policy: none
+      purge: false
+    - name: loki-ruler
       policy: none
       purge: false
     - name: tempo
@@ -106,6 +116,5 @@ minio:
     requests:
       cpu: 100m
       memory: 128Mi
-  rootPassword: rootpassword
   # Changed the mc config path to '/tmp' from '/etc' as '/etc' is only writable by root and OpenShift will not permit this.
   configPathmc: "/tmp/minio/mc/"
\ No newline at end of file