From 8037d9655860ba7db5faea99f6f027fb89bd6f8c Mon Sep 17 00:00:00 2001
From: wanddynosios <67467325+wanddynosios@users.noreply.github.com>
Date: Wed, 5 Jul 2023 11:06:22 +0200
Subject: [PATCH] helm: fix dashboard multiple levels (#9010)

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

**Which issue(s) this PR fixes**:
Fixes #9009

**Special notes for your reviewer**:
Dashboard from the helm chart had a `=` instead of a `=~` operator for
the level filter

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/upgrading/_index.md`

---------

Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
---
 production/helm/loki/CHANGELOG.md                  | 4 ++++
 production/helm/loki/Chart.yaml                    | 2 +-
 production/helm/loki/README.md                     | 2 +-
 production/helm/loki/src/dashboards/loki-logs.json | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index 4bfcc93758..011de21dd2 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
 
 [//]: # (<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.9
+
+- [BUGFIX] Fix loki/logs dashboard: allow querying multiple log level at once
+
 ## 5.8.8
 
 - [ENHANCEMENT] Add loki.storage.azure.endpointSuffix to support Azure private endpoint
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index 07adcc2c36..f9073a54c4 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.2
-version: 5.8.8
+version: 5.8.9
 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 59882675f6..51a0fb7630 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 5.8.8](https://img.shields.io/badge/Version-5.8.8-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.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)
 
 Helm chart for Grafana Loki in simple, scalable mode
 
diff --git a/production/helm/loki/src/dashboards/loki-logs.json b/production/helm/loki/src/dashboards/loki-logs.json
index c09d154936..bde101d357 100644
--- a/production/helm/loki/src/dashboards/loki-logs.json
+++ b/production/helm/loki/src/dashboards/loki-logs.json
@@ -772,7 +772,7 @@
             "steppedLine": false,
             "targets": [
                {
-                  "expr": "sum(rate({cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\" } |logfmt| level=\"$level\" |= \"$filter\" [5m])) by (level)",
+                  "expr": "sum(rate({cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\" } |logfmt| level=~\"$level\" |= \"$filter\" [5m])) by (level)",
                   "intervalFactor": 3,
                   "legendFormat": "{{level}}",
                   "refId": "A"
@@ -837,7 +837,7 @@
             },
             "targets": [
                {
-                  "expr": "{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\"} | logfmt | level=\"$level\" |= \"$filter\"",
+                  "expr": "{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\"} | logfmt | level=~\"$level\" |= \"$filter\"",
                   "refId": "A"
                }
             ],