From 23d14110a0a34a577f8ba861b347aaf99af4d085 Mon Sep 17 00:00:00 2001
From: Michel Hollands <michel.hollands@gmail.com>
Date: Tue, 15 Aug 2023 10:47:33 +0100
Subject: [PATCH 1/2] Add 1 day retention to Tempo and Mimir

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

diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml
index 92abdb8..f82019c 100644
--- a/charts/meta-monitoring/values.yaml
+++ b/charts/meta-monitoring/values.yaml
@@ -128,6 +128,8 @@ mimir-distributed:
           endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
           secret_access_key: "{{ .Values.global.minio.rootPassword }}"
           insecure: true
+      limits:
+        compactor_blocks_retention_period: 24h
 
 tempo-distributed:
   tempo:
@@ -141,6 +143,9 @@ tempo-distributed:
             access_key: "{{ .Values.global.minio.rootUser }}"
             secret_key: "{{ .Values.global.minio.rootPassword }}"
             insecure: true
+      compactor:
+        compaction:
+          block_retention: 24h
   traces:
     otlp:
       http:

From 18d24c39f79b0f1c160270a9307fe0c029eee10d Mon Sep 17 00:00:00 2001
From: Michel Hollands <michel.hollands@gmail.com>
Date: Tue, 15 Aug 2023 15:21:24 +0100
Subject: [PATCH 2/2] Add Loki retention

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

diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml
index f82019c..d170495 100644
--- a/charts/meta-monitoring/values.yaml
+++ b/charts/meta-monitoring/values.yaml
@@ -71,13 +71,22 @@ loki:
     storage:
       type: "s3"
       s3:
-        endpoint: "meta-minio.meta.svc:9000"
-        access_key_id: rootuser
-        secret_access_key: rootpassword
         insecure: true
+        s3ForcePathStyle: true
       bucketNames:
         chunks: loki-chunks
         ruler: loki-ruler
+    structuredConfig:
+      common:
+        storage:
+          s3:
+            access_key_id: "{{ .Values.global.minio.rootUser }}"
+            endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+            secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+      compactor:
+        retention_enabled: true
+      limits_config:
+        retention_period: 24h
   monitoring:
     dashboards:
       enabled: false