From 42b8a6cbcaf8211c0344c0f8e7d00a1617c911bf Mon Sep 17 00:00:00 2001 From: Roman Danko Date: Wed, 16 Aug 2023 15:25:32 +0200 Subject: [PATCH] helm: Use "loki.clusterLabel" template for PodLogs cluster label (#10215) **What this PR does / why we need it**: **Which issue(s) this PR fixes**: Fixes #10212 **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [ ] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] 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](https://github.com/grafana/loki/commit/d10549e3ece02120974929894ee333d07755d213) --- production/helm/loki/CHANGELOG.md | 6 ++++-- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- production/helm/loki/templates/monitoring/pod-logs.yaml | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 6465686364..b5a0ca2b9b 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 [//]: # ( : 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.13.0 + +- [ENHANCEMENT] Use "loki.clusterLabel" template for PodLogs cluster label + ## 5.12.0 - [ENHANCEMENT] Use tpl function in ingress and gateway-ingress for hosts @@ -21,12 +25,10 @@ Entries should include a reference to the pull request that introduced the chang - [CHANGE] Changed version of Loki to 2.8.4 - ## 5.10.0 - [CHANGE] Changed version of Grafana Enterprise Logs to v1.7.3 - ## 5.9.2 - [ENHANCEMENT] Add custom labels value for loki ingress diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 0d2f3fda43..3a01b28361 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 in simple, scalable mode type: application appVersion: 2.8.4 -version: 5.12.0 +version: 5.13.0 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 0f9c0b8f16..b3a5e74792 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.12.0](https://img.shields.io/badge/Version-5.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.4](https://img.shields.io/badge/AppVersion-2.8.4-informational?style=flat-square) +![Version: 5.13.0](https://img.shields.io/badge/Version-5.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.4](https://img.shields.io/badge/AppVersion-2.8.4-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/templates/monitoring/pod-logs.yaml b/production/helm/loki/templates/monitoring/pod-logs.yaml index e9d66d64dc..e8ced3dce6 100644 --- a/production/helm/loki/templates/monitoring/pod-logs.yaml +++ b/production/helm/loki/templates/monitoring/pod-logs.yaml @@ -41,7 +41,7 @@ spec: sourceLabels: - __meta_kubernetes_pod_container_name targetLabel: container - - replacement: "{{ include "loki.fullname" $ }}" + - replacement: "{{ include "loki.clusterLabel" $ }}" targetLabel: cluster {{- with .relabelings }} {{- toYaml . | nindent 4 }}