helm: Allow altering the canary label name (#9945)

**What this PR does / why we need it**:

Allows changing the label name at the canary in the helm chart.

**Which issue(s) this PR fixes**:
Idk, none?

**Special notes for your reviewer**:

This is a very trivial change.

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [x] Tests updated
- [x] `CHANGELOG.md` updated
- [x] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [x] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/upgrading/_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](d10549e3ec)

---------

Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
Co-authored-by: Travis Patterson <travis.patterson@grafana.com>
pull/10000/head^2 helm-loki-5.8.10
MOZGIII 3 years ago committed by GitHub
parent 3f161f5c1a
commit 08e741b7c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      docs/sources/installation/helm/reference.md
  2. 4
      production/helm/loki/CHANGELOG.md
  3. 2
      production/helm/loki/Chart.yaml
  4. 2
      production/helm/loki/README.md
  5. 2
      production/helm/loki/templates/loki-canary/daemonset.yaml
  6. 2
      production/helm/loki/values.yaml

@ -2411,6 +2411,15 @@ null
<td><pre lang="json">
null
</pre>
</td>
</tr>
<tr>
<td>monitoring.lokiCanary.labelname</td>
<td>string</td>
<td>The name of the label to look for at loki when doing the checks.</td>
<td><pre lang="json">
"pod"
</pre>
</td>
</tr>
<tr>

@ -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.8.10
- [ENHANCEMENT] Canary labelname can now be configured via monitoring.lokiCanary.labelname
## 5.8.9
- [BUGFIX] Fix loki/logs dashboard: allow querying multiple log level at once

@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 2.8.2
version: 5.8.9
version: 5.8.10
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki

@ -1,6 +1,6 @@
# loki
![Version: 5.8.9](https://img.shields.io/badge/Version-5.8.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
![Version: 5.8.10](https://img.shields.io/badge/Version-5.8.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
Helm chart for Grafana Loki in simple, scalable mode

@ -42,7 +42,7 @@ spec:
imagePullPolicy: {{ $.Values.loki.image.pullPolicy }}
args:
- -addr={{- include "loki.host" $ }}
- -labelname=pod
- -labelname={{ .labelname }}
- -labelvalue=$(POD_NAME)
{{- if $.Values.enterprise.enabled }}
- -user=$(USER)

@ -637,6 +637,8 @@ monitoring:
# that it's working correctly
lokiCanary:
enabled: true
# -- The name of the label to look for at loki when doing the checks.
labelname: pod
# -- Additional annotations for the `loki-canary` Daemonset
annotations: {}
# -- Additional labels for each `loki-canary` pod

Loading…
Cancel
Save