Skip to content

Commit

Permalink
Helm: Removed extra check preventing Grafana dashboards from getting …
Browse files Browse the repository at this point in the history
…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](d10549e)

---------

Signed-off-by: Itay Grudev <itay.grudev@essentim.com>
Co-authored-by: J Stickler <julie.stickler@grafana.com>
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
  • Loading branch information
3 people authored Oct 17, 2023
1 parent 34915c7 commit cfc4f0e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 4 additions & 2 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,18 @@ 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.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.
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.31.0
version: 5.32.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.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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit cfc4f0e

Please sign in to comment.