feat(helm): Support separate loki ruler storage configuration (#18510)

Signed-off-by: Jan-Otto Kröpke <[email protected]>
Signed-off-by: Jay Clifford <[email protected]>
Co-authored-by: Jay Clifford <[email protected]>

Author: jkroepke

production/helm/loki/CHANGELOG.md

@@ -14,6 +14,9 @@ Entries should include a reference to the pull request that introduced the chang
 [//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
 - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-planner. [#18552](https://github.com/grafana/loki/pull/18552)
 
+
+- [FEATURE] Support separate loki ruler storage configuration [#18510](https://github.com/grafana/loki/pull/18510)
+
 ## 6.36.1
 - [BUGFIX] Fix missing s3 field in lokiStorageConfig templated value.[#18791](https://github.com/grafana/loki/pull/18791)
 

production/helm/loki/templates/_helpers.tpl

@@ -375,11 +375,7 @@ chunk_delimiter: {{ . }}
 {{/* Loki ruler config */}}
 {{- define "loki.rulerConfig" }}
 ruler:
-  storage:
-    {{- include "loki.rulerStorageConfig" . | nindent 4}}
-{{- if (not (empty .Values.loki.rulerConfig)) }}
-{{- toYaml .Values.loki.rulerConfig | nindent 2}}
-{{- end }}
+{{- mergeOverwrite (dict "storage" (include "loki.rulerStorageConfig" . | fromYaml)) (.Values.loki.rulerConfig | default dict) | toYaml | nindent 2 }}
 {{- end }}
 
 {{/* Ruler Thanos Storage Config */}}

production/helm/loki/values.schema.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://json-schema.org/draft-07/schema#",
+  "properties": {
+    "loki": {
+      "type": "object",
+      "properties": {
+        "rulerConfig": {
+          "type": ["object", "null"],
+          "properties": {
+            "storage": {
+              "type": ["object", "null"]
+            }
+          }
+        }
+      }
+    }
+  }
+}

production/helm/loki/values.yaml

@@ -528,6 +528,10 @@ loki:
         index:
           prefix: index_
           period: 24h
+  ## A separate loki ruler storage configuration can be provided via rulerStorage.storage section:
+  ##  rulerConfig:
+  ##    storage:
+  ##      type: local
   # -- Check https://grafana.com/docs/loki/latest/configuration/#ruler for more info on configuring ruler
   rulerConfig:
     wal: