From 08c70cca2e7b3a7444b0ec9822a6d5fd58ae70d5 Mon Sep 17 00:00:00 2001
From: Nicolas Giard <github@ngpixel.com>
Date: Thu, 3 Oct 2024 14:04:41 -0400
Subject: [PATCH] fix(helm): add missing `loki.storage.azure.chunkDelimiter`
 parameter to Helm chart (#14011)

Co-authored-by: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>
---
 docs/sources/setup/install/helm/reference.md | 1 +
 production/helm/loki/CHANGELOG.md            | 4 ++++
 production/helm/loki/Chart.yaml              | 2 +-
 production/helm/loki/README.md               | 2 +-
 production/helm/loki/templates/_helpers.tpl  | 3 +++
 production/helm/loki/values.yaml             | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index c8d5f7bbbd107..43d246ec1fad1 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -6186,6 +6186,7 @@ null
   "azure": {
     "accountKey": null,
     "accountName": null,
+    "chunkDelimiter": null,
     "connectionString": null,
     "endpointSuffix": null,
     "requestTimeout": null,
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 18d0aca93a3d6..55ed8d2ed6849 100644
--- 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.17.1
+
+- [BUGFIX] Added missing `loki.storage.azure.chunkDelimiter` parameter to Helm chart.
+
 ## 6.17.0
 
 - [CHANGE] Changed version of Grafana Loki to 3.2.0
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index 07941278dfa0a..2381bac048101 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -3,7 +3,7 @@ name: loki
 description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 type: application
 appVersion: 3.2.0
-version: 6.17.0
+version: 6.17.1
 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
index 12ebf95948e23..6f7566c606f9f 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.17.0](https://img.shields.io/badge/Version-6.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.0](https://img.shields.io/badge/AppVersion-3.2.0-informational?style=flat-square)
+![Version: 6.17.1](https://img.shields.io/badge/Version-6.17.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.0](https://img.shields.io/badge/AppVersion-3.2.0-informational?style=flat-square)
 
 Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 
diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
index 9a4ab135db922..f302bc5a621a3 100644
--- a/production/helm/loki/templates/_helpers.tpl
+++ b/production/helm/loki/templates/_helpers.tpl
@@ -284,6 +284,9 @@ azure:
   {{- with .endpointSuffix }}
   endpoint_suffix: {{ . }}
   {{- end }}
+  {{- with .chunkDelimiter }}
+  chunk_delimiter: {{ . }}
+  {{- end }}
 {{- end -}}
 {{- else if eq .Values.loki.storage.type "alibabacloud" -}}
 {{- with .Values.loki.storage.alibabacloud }}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 9640891480513..3185f780ccd29 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -351,6 +351,7 @@ loki:
       userAssignedId: null
       requestTimeout: null
       endpointSuffix: null
+      chunkDelimiter: null
     swift:
       auth_version: null
       auth_url: null