Update loki

charts/meta-monitoring/Chart.lock

@@ -1,7 +1,7 @@
 dependencies:
 - name: loki
   repository: https://grafana.github.io/helm-charts
-  version: 6.4.2
+  version: 6.5.0
 - name: alloy
   repository: https://grafana.github.io/helm-charts
   version: 0.1.1
@@ -14,5 +14,5 @@ dependencies:
 - name: minio
   repository: https://charts.min.io
   version: 5.2.0
-digest: sha256:1b5cc2c89ce11b6f0f1c02d7459ac9202577ac4e56bae9cc7e54e253a27df265
-generated: "2024-05-03T07:02:27.762464734Z"
+digest: sha256:6244c08b5829d6dbd363b736e55c5182274d65191672e7aeecaf3bb62f3f34fb
+generated: "2024-05-07T07:02:47.839270709Z"

charts/meta-monitoring/Chart.yaml

@@ -22,7 +22,7 @@ appVersion: "0.0.1"
 dependencies:
 - name: loki
   repository: https://grafana.github.io/helm-charts
-  version: 6.4.2
+  version: 6.5.0
   condition: local.logs.enabled
 - name: alloy
   repository: https://grafana.github.io/helm-charts

charts/meta-monitoring/templates/ruler/ruler.yaml

@@ -49,9 +49,6 @@ spec:
             - containerPort: 7946
               name: memberlist
               protocol: TCP
-          envFrom:
-          - secretRef:
-             name: mmc-minio
           readinessProbe:
             failureThreshold: 3
             httpGet:

charts/meta-monitoring/values.yaml

@@ -229,9 +229,9 @@ loki:
       common:
         storage:
           s3:
-            access_key_id: "${rootUser}"
+            access_key_id: "{{ .Values.global.minio.rootUser }}"
             endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-            secret_access_key: "${rootPassword}"
+            secret_access_key: "{{ .Values.global.minio.rootPassword }}"
       compactor:
         retention_enabled: true
         delete_request_store: s3
@@ -254,24 +254,8 @@ loki:
         installOperator: false
     lokiCanary:
       enabled: false
-  write:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
-  read:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
-  backend:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
+  test:
+    enabled: false
 
 alloy:
   alloy:
@@ -308,31 +292,30 @@ alloy:
 mimir-distributed:
   minio:
     enabled: false
-  global:
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
   mimir:
     structuredConfig:
       alertmanager_storage:
         s3:
           bucket_name: mimir-ruler
+          access_key_id: "{{ .Values.global.minio.rootUser }}"
+          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+          secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+          insecure: true
       blocks_storage:
         backend: s3
         s3:
           bucket_name: mimir-tsdb
+          access_key_id: "{{ .Values.global.minio.rootUser }}"
+          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+          secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+          insecure: true
       ruler_storage:
         s3:
           bucket_name: mimir-ruler
-      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
+          access_key_id: "{{ .Values.global.minio.rootUser }}"
+          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+          secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+          insecure: true
       limits:
         compactor_blocks_retention_period: 30d
 
@@ -345,39 +328,12 @@ tempo-distributed:
           s3:
             bucket: tempo
             endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-            access_key: "${rootUser}"
-            secret_key: "${rootPassword}"
+            access_key: "{{ .Values.global.minio.rootUser }}"
+            secret_key: "{{ .Values.global.minio.rootPassword }}"
             insecure: true
-  distributor:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
-  ingester:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
-  compactor:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
-  querier:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
-  queryFrontend:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "mmc-minio"
+      compactor:
+        compaction:
+          block_retention: 30d
   traces:
     otlp:
       http:
@@ -386,7 +342,8 @@ tempo-distributed:
         enabled: true
 
 minio:
-  existingSecret: "minio"
+  rootUser: rootuser
+  rootPassword: rootpassword
   buckets:
     - name: loki-chunks
       policy: none

docs/installation.md

@@ -25,17 +25,17 @@
    ```
    kubectl create secret generic logs -n meta \
     --from-literal=username=<logs username> \
-    --from-literal=password=<token> \
+    --from-literal=password=<token>
     --from-literal=endpoint='https://logs-prod-us-central1.grafana.net/loki/api/v1/push'
 
    kubectl create secret generic metrics -n meta \
     --from-literal=username=<metrics username> \
-    --from-literal=password=<token> \
+    --from-literal=password=<token>
     --from-literal=endpoint='https://prometheus-us-central1.grafana.net/api/prom/push'
 
    kubectl create secret generic traces -n meta \
     --from-literal=username=<OTLP instance ID> \
-    --from-literal=password=<token> \
+    --from-literal=password=<token>
     --from-literal=endpoint='https://otlp-gateway-prod-us-east-0.grafana.net/otlp'
    ```
 
@@ -67,14 +67,6 @@
    kubectl create namespace meta
    ```
 
-1. Create a secret with the user and password for the local Minio:
-
-   ```
-   kubectl create secret generic minio -n meta \
-    --from-literal=rootPassword=<password> \
-    --from-literal=rootUser=<user>
-   ```
-
 1. Create a values.yaml file based on the [default one](../charts/meta-monitoring/values.yaml). An example minimal values.yaml looks like this:
 
    ```