Skip to content

Commit 078f353

Browse files
iamhaljeJStickler
andauthored
feat(helm): support templated loki.operational_config (#17045)
Signed-off-by: Dmitry Ponomaryov <me@halje.ru> Signed-off-by: Dmitry Ponomaryov <iamhalje@gmail.com> Co-authored-by: J Stickler <julie.stickler@grafana.com>
1 parent 52e721f commit 078f353

3 files changed

Lines changed: 17 additions & 0 deletions

File tree

‎docs/sources/setup/install/helm/reference.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6301,6 +6301,15 @@ null
63016301
<td><pre lang="json">
63026302
{}
63036303
</pre>
6304+
</td>
6305+
</tr>
6306+
<tr>
6307+
<td>loki.operational_config</td>
6308+
<td>object</td>
6309+
<td>Optional operational configuration</td>
6310+
<td><pre lang="json">
6311+
{}
6312+
</pre>
63046313
</td>
63056314
</tr>
63066315
<tr>

‎production/helm/loki/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang
1313

1414
[//]: # (<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.)
1515

16+
- [FEATURE] Add support for templated `loki.operational_config` [#17045](https://github.com/grafana/loki/pull/17045)
1617
- [ENHANCEMENT] Allow specifying additional labels for memcached statefulsets volume claim templates [#15554](https://github.com/grafana/loki/pull/15554)
1718
- [BUGFIX] Gateway Ingester endpoints points to inexistent service when zone aware replication are enabled [#17362](https://github.com/grafana/loki/pull/17362)
1819
- [BUGFIX] add missing flush=true to preStop hook [#16063](https://github.com/grafana/loki/pull/16063)

‎production/helm/loki/values.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,11 @@ loki:
331331
bloom_gateway:
332332
{{- tpl (. | toYaml) $ | nindent 4 }}
333333
{{- end }}
334+
335+
{{- with .Values.loki.operational_config }}
336+
operational_config:
337+
{{- tpl (. | toYaml) $ | nindent 4 }}
338+
{{- end }}
334339
# Should authentication be enabled
335340
auth_enabled: true
336341
# -- memberlist configuration (overrides embedded default)
@@ -541,6 +546,8 @@ loki:
541546
enabled: false
542547
client:
543548
addresses: '{{ include "loki.bloomGatewayAddresses" . }}'
549+
# -- Optional operational configuration
550+
operational_config: {}
544551
######################################################################################################################
545552
#
546553
# Enterprise Loki Configs

0 commit comments

Comments
 (0)