Skip to content

feat(helm): add FOLDER_ANNOTATATION logic for sidecar container in loki helm chart, making multi-tenant alerting easier #13289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 22, 2025
+18 −0
Merged

feat(helm): add FOLDER_ANNOTATATION logic for sidecar container in loki helm chart, making multi-tenant alerting easier #13289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6abc01
add FOLDER_ANNOTATATION logic for loki helm chart sidecar
SamuZad Jun 22, 2024
0f91e50
Merge branch 'main' into main
JStickler Jul 21, 2025
aacec05
Merge branch 'main' into main
JStickler Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions docs/sources/setup/install/helm/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11137,6 +11137,15 @@ true
<td><pre lang="json">
"/rules"
</pre>
</td>
</tr>
<tr>
<td>sidecar.rules.folderAnnotation</td>
<td>string</td>
<td>The annotation overwriting the folder value. The annotation value can be either an absolute or a relative path. Relative paths will be relative to FOLDER. Useful for multi-tenancy setups.</td>
<td><pre lang="json">
null
</pre>
</td>
</tr>
<tr>
Expand Down
1 change: 1 addition & 0 deletions production/helm/loki/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ 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 FOLDER_ANNOTATATION logic for sidecar container. [#13289](https://github.com/grafana/loki/pull/13289)

## 6.32.0

Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/templates/backend/statefulset-backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ spec:
{{- end }}
- name: FOLDER
value: "{{ .Values.sidecar.rules.folder }}"
{{- if .Values.sidecar.rules.folderAnnotation }}
- name: FOLDER_ANNOTATION
value: "{{ .Values.sidecar.rules.folderAnnotation }}"
{{- end }}
- name: RESOURCE
value: {{ quote .Values.sidecar.rules.resource }}
{{- if .Values.sidecar.enableUniqueFilenames }}
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3606,6 +3606,10 @@ sidecar:
labelValue: ""
# -- Folder into which the rules will be placed.
folder: /rules
# -- The annotation overwriting the folder value.
# The annotation value can be either an absolute or a relative path. Relative paths will be relative to FOLDER.
# Useful for multi-tenancy setups.
folderAnnotation: null
# -- Comma separated list of namespaces. If specified, the sidecar will search for config-maps/secrets inside these namespaces.
# Otherwise the namespace in which the sidecar is running will be used.
# It's also possible to specify 'ALL' to search in all namespaces.
Expand Down