From cfc4f0e84adc80570bbea4fc14b7104caee71f1e Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Tue, 17 Oct 2023 20:26:54 +0300 Subject: [PATCH] Helm: Removed extra check preventing Grafana dashboards from getting created (#10902) **What this PR does / why we need it**: Fixes a bug in the Loki Helm chart that prevents Grafana dashboards from getting created when external storage (`s3/gcs/azure`) isn't used or when in `singleBinary` mode. With this change dashboard creation is controlled solely by the `.Values.monitoring.dashboards.enabled` flag. **Which issue(s) this PR fixes**: Fixes #10885 **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 - [ ] 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) --------- Signed-off-by: Itay Grudev Co-authored-by: J Stickler Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> --- production/helm/loki/CHANGELOG.md | 6 ++++-- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- .../loki/templates/monitoring/dashboards/configmap-1.yaml | 3 +-- .../loki/templates/monitoring/dashboards/configmap-2.yaml | 3 +-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 7939e90c739b..c2fe1423004d 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,16 +13,18 @@ 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.32.0 + +- [CHANGE] Grafana dashboards are no longer created solely in scalable mode and with external cloud storage enabled. + ## 5.31.0 - [CHANGE] Changed version of Loki to 2.9.2 - ## 5.30.0 - [CHANGE] Changed version of Grafana Enterprise Logs to v1.8.3 - ## 5.29.0 - [ENHANCEMENT] Allow specifying `apiVersion` for Loki's PodLog CRD. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index efb2a10710f3..7276472ef0fb 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.9.2 -version: 5.31.0 +version: 5.32.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 9ebd9908d4b9..a17e80895e49 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.31.0](https://img.shields.io/badge/Version-5.31.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.32.0](https://img.shields.io/badge/Version-5.32.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 diff --git a/production/helm/loki/templates/monitoring/dashboards/configmap-1.yaml b/production/helm/loki/templates/monitoring/dashboards/configmap-1.yaml index 6447a49d13b7..6352f25336d4 100644 --- a/production/helm/loki/templates/monitoring/dashboards/configmap-1.yaml +++ b/production/helm/loki/templates/monitoring/dashboards/configmap-1.yaml @@ -1,6 +1,5 @@ -{{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}} {{- with .Values.monitoring.dashboards }} -{{- if and $isSimpleScalable .enabled }} +{{- if .enabled }} --- apiVersion: v1 kind: ConfigMap diff --git a/production/helm/loki/templates/monitoring/dashboards/configmap-2.yaml b/production/helm/loki/templates/monitoring/dashboards/configmap-2.yaml index 6c66d1589602..67d3cf4f9b0d 100644 --- a/production/helm/loki/templates/monitoring/dashboards/configmap-2.yaml +++ b/production/helm/loki/templates/monitoring/dashboards/configmap-2.yaml @@ -1,6 +1,5 @@ -{{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}} {{- with .Values.monitoring.dashboards }} -{{- if and $isSimpleScalable .enabled }} +{{- if .enabled }} --- apiVersion: v1 kind: ConfigMap