Skip to content

Commit

Permalink
helm: add support for configuring distributor (grafana#10531)
Browse files Browse the repository at this point in the history
**What this PR does / why we need it**:

Add support for configuring distributor with Helm. Needed to be able to
enable IPv6 on that component.

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [x] N/A: Tests updated
- [x] `CHANGELOG.md` updated
- [x] N/A: If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [x] N/A: Changes that require user attention or interaction to upgrade
are documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](grafana@d10549e)

Signed-off-by: Marc 'risson' Schmitt <[email protected]>
  • Loading branch information
rissson authored and rhnasc committed Apr 12, 2024
1 parent 57b41e9 commit ab57592
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 2 deletions.
9 changes: 9 additions & 0 deletions docs/sources/setup/install/helm/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -1855,6 +1855,15 @@ See values.yaml
"readOnlyRootFilesystem": true
}
</pre>
</td>
</tr>
<tr>
<td>loki.distributor</td>
<td>object</td>
<td>Optional distributor configuration</td>
<td><pre lang="json">
{}
</pre>
</td>
</tr>
<tr>
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.)

## 5.35.0

- [FEATURE] Add support for configuring distributor.

## 5.34.0

- [BUGFIX] Fix missing annotations when using Loki in single binary mode.
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 2.9.2
version: 5.34.0
version: 5.35.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 5.34.0](https://img.shields.io/badge/Version-5.34.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)
![Version: 5.35.0](https://img.shields.io/badge/Version-5.35.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.2](https://img.shields.io/badge/AppVersion-2.9.2-informational?style=flat-square)

Helm chart for Grafana Loki in simple, scalable mode

Expand Down
7 changes: 7 additions & 0 deletions production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,11 @@ loki:
frontend_worker:
{{- tpl (. | toYaml) $ | nindent 4 }}
{{- end }}
{{- with .Values.loki.distributor }}
distributor:
{{- tpl (. | toYaml) $ | nindent 4 }}
{{- end }}
# Should authentication be enabled
auth_enabled: true
# -- memberlist configuration (overrides embedded default)
Expand Down Expand Up @@ -338,6 +343,8 @@ loki:
scheduler_address: '{{ include "loki.querySchedulerAddress" . }}'
frontend_worker:
scheduler_address: '{{ include "loki.querySchedulerAddress" . }}'
# -- Optional distributor configuration
distributor: {}
enterprise:
# Enable enterprise features, license must be provided
enabled: false
Expand Down

0 comments on commit ab57592

Please sign in to comment.