From c6889131a7485b44afc566b8c379378f36e15f29 Mon Sep 17 00:00:00 2001
From: Michel Hollands <michel.hollands@gmail.com>
Date: Mon, 6 May 2024 16:12:48 +0100
Subject: [PATCH] Use structuredConfig correctly

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
---
 charts/meta-monitoring/values.yaml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml
index ea69f48..7e44b62 100644
--- a/charts/meta-monitoring/values.yaml
+++ b/charts/meta-monitoring/values.yaml
@@ -317,25 +317,22 @@ mimir-distributed:
       alertmanager_storage:
         s3:
           bucket_name: mimir-ruler
-          access_key_id: ${rootUser}
-          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-          secret_access_key: ${rootPassword}
-          insecure: true
       blocks_storage:
         backend: s3
         s3:
           bucket_name: mimir-tsdb
-          access_key_id: ${rootUser}
-          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-          secret_access_key: ${rootPassword}
-          insecure: true
       ruler_storage:
         s3:
           bucket_name: mimir-ruler
-          access_key_id: "${rootUser4}"
-          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-          secret_access_key: ${rootPassword}
-          insecure: true
+      common:
+        storage:
+          backend: s3
+          s3:
+            bucket_name: mimir-ruler
+            access_key_id: "${rootUser}"
+            endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+            secret_access_key: "${rootPassword}"
+            insecure: true
       limits:
         compactor_blocks_retention_period: 30d
 
@@ -351,9 +348,6 @@ tempo-distributed:
             access_key: "${rootUser}"
             secret_key: "${rootPassword}"
             insecure: true
-      compactor:
-        compaction:
-          block_retention: 30d
   distributor:
     extraArgs:
     - "-config.expand-env=true"