feat: Add pattern ingester support in SSD mode (grafana#12685)

mraboosk · Apr 19, 2024 · 0fc4567 · 0fc4567
1 parent 7a9fd70
commit 0fc4567
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,10 @@ 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.)
 
+## 6.2.2
+
+- [FEATURE] Add support for enabling pattern ingester config via `loki.pattern_ingester.enabled`.
+
 ## 6.2.1
 
 - [BUGFIX] Removed duplicate bucketNames from documentation and fixed key name `deploymentMode`
@@ -44,7 +48,6 @@ Entries should include a reference to the pull request that introduced the chang
 
 - [CHANGE] Changed version of Loki to 2.9.6
 
-
 ## 5.46.0
 
 - [CHANGE] Changed version of Loki to 2.9.5
@@ -202,7 +205,6 @@ Entries should include a reference to the pull request that introduced the chang
 
 - [CHANGE] Changed version of Grafana Enterprise Logs to v1.8.4
 
-
 ## 5.32.0
 
 - [CHANGE] Grafana dashboards are no longer created solely in scalable mode and with external cloud storage enabled.
@@ -454,12 +456,10 @@ Entries should include a reference to the pull request that introduced the chang
 
 - [CHANGE] Changed version of Grafana Enterprise Logs to v1.7.2
 
-
 ## 5.4.0
 
 - [CHANGE] Changed version of Loki to 2.8.2
 
-
 - [CHANGE] Change default GEL and Loki versions to 1.7.1 and 2.8.1 respectively
 - [BUGFIX] Fix dns port in network-policy
 
@@ -469,12 +469,10 @@ Entries should include a reference to the pull request that introduced the chang
 
 - [BUGFIX] Add projected volume type to psp
 
-
 ## 4.9.0
 
 - [CHANGE] Changed version of Loki to 2.7.5
 
-
 - [BUGFIX] Fix role/PSP mapping
 
 - [BUGFIX] Fix service/ingress mapping

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -3,7 +3,7 @@ name: loki
 description: Helm chart for Grafana Loki in simple, scalable mode
 type: application
 appVersion: 3.0.0
-version: 6.2.1
+version: 6.2.2
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.2.1](https://img.shields.io/badge/Version-6.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 6.2.2](https://img.shields.io/badge/Version-6.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 Helm chart for Grafana Loki in simple, scalable mode
 

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -122,7 +122,6 @@ loki:
   # The value will be passed through tpl.
   generatedConfigObjectName: '{{ include "loki.name" . }}'
 
-
   # -- Config file contents for Loki
   # @default -- See values.yaml
   config: |
@@ -137,6 +136,9 @@ loki:
       {{- toYaml . | nindent 2}}
     {{- end}}
 
+    pattern_ingester:
+      enabled: {{ .Values.loki.pattern_ingester.enabled }}
+
     memberlist:
     {{- if .Values.loki.memberlistConfig }}
       {{- toYaml .Values.loki.memberlistConfig | nindent 2 }}
@@ -415,6 +417,9 @@ loki:
       up_to: 3
   # --  Optional compactor configuration
   compactor: {}
+  # --  Optional pattern ingester configuration
+  pattern_ingester:
+    enabled: false
   # --  Optional analytics configuration
   analytics: {}
   # --  Optional querier configuration
@@ -851,7 +856,6 @@ adminApi:
   # -- Grace period to allow the admin-api to shutdown before it is killed
   terminationGracePeriodSeconds: 60
 
-
 ######################################################################################################################
 #
 # Gateway and Ingress
@@ -1175,7 +1179,6 @@ ingress:
 #       - loki.example.com
 #      secretName: loki-distributed-tls
 
-
 ######################################################################################################################
 #
 # Migration
@@ -1192,7 +1195,6 @@ migrate:
     # memberlist service DNS so the new deployment can join its ring.
     memberlistService: ""
 
-
 ######################################################################################################################
 #
 # Single Binary Deployment