From 1b5533ede1691530c1a79dc4ac9700f1465a67fe Mon Sep 17 00:00:00 2001 From: Alex Kuretz <100612600+alexkuretz@users.noreply.github.com> Date: Sun, 6 Oct 2024 14:34:20 -0600 Subject: [PATCH] Fix grafana dashboard to handle wildcard scaledObject variables (#6215) * Fix grafana dashboard to handle wildcard scaledObject variables Signed-off-by: Alex Kuretz * Update changelog Signed-off-by: Alex Kuretz * Fix changelog order to be alphabetical Signed-off-by: Alex Kuretz --------- Signed-off-by: Alex Kuretz Co-authored-by: Jorge Turrado Ferrero --- CHANGELOG.md | 1 + config/grafana/keda-dashboard.json | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edf4fc572a8..989302b24b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,7 @@ Here is an overview of all new **experimental** features: - **AWS CloudWatch Scaler**: Add support for ignoreNullValues ([#5352](https://github.com/kedacore/keda/issues/5352)) - **GCP Scalers**: Added custom time horizon in GCP scalers ([#5778](https://github.com/kedacore/keda/issues/5778)) - **GitHub Scaler**: Fixed pagination, fetching repository list ([#5738](https://github.com/kedacore/keda/issues/5738)) +- **Grafana dashboard**: Fix dashboard to handle wildcard scaledObject variables ([#6214](https://github.com/kedacore/keda/issues/6214)) - **Kafka**: Fix logic to scale to zero on invalid offset even with earliest offsetResetPolicy ([#5689](https://github.com/kedacore/keda/issues/5689)) - **RabbitMQ Scaler**: Add connection name for AMQP ([#5958](https://github.com/kedacore/keda/issues/5958)) - TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX)) diff --git a/config/grafana/keda-dashboard.json b/config/grafana/keda-dashboard.json index afcb3d4f0bb..26c10b6c541 100644 --- a/config/grafana/keda-dashboard.json +++ b/config/grafana/keda-dashboard.json @@ -546,7 +546,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "sum by(metric) (keda_scaler_metrics_value{exported_namespace=~\"$namespace\", metric=~\"$metric\", scaledObject=\"$scaledObject\"})", + "expr": "sum by(metric) (keda_scaler_metrics_value{exported_namespace=~\"$namespace\", metric=~\"$metric\", scaledObject=~\"$scaledObject\"})", "legendFormat": "{{ metric }}", "range": true, "refId": "A" @@ -640,7 +640,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_horizontalpodautoscaler_status_current_replicas{namespace=\"$namespace\",horizontalpodautoscaler=\"keda-hpa-$scaledObject\"}", + "expr": "kube_horizontalpodautoscaler_status_current_replicas{namespace=\"$namespace\",horizontalpodautoscaler=~\"keda-hpa-$scaledObject\"}", "format": "time_series", "instant": false, "interval": "", @@ -655,7 +655,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_horizontalpodautoscaler_spec_max_replicas{namespace=\"$namespace\",horizontalpodautoscaler=\"keda-hpa-$scaledObject\"}", + "expr": "kube_horizontalpodautoscaler_spec_max_replicas{namespace=\"$namespace\",horizontalpodautoscaler=~\"keda-hpa-$scaledObject\"}", "format": "time_series", "hide": false, "instant": false, @@ -763,7 +763,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "delta(kube_horizontalpodautoscaler_status_current_replicas{namespace=\"$namespace\",horizontalpodautoscaler=\"keda-hpa-$scaledObject\"}[1m])", + "expr": "delta(kube_horizontalpodautoscaler_status_current_replicas{namespace=\"$namespace\",horizontalpodautoscaler=~\"keda-hpa-$scaledObject\"}[1m])", "format": "time_series", "instant": false, "interval": "", @@ -832,7 +832,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_horizontalpodautoscaler_status_current_replicas{namespace=\"$namespace\",horizontalpodautoscaler=\"keda-hpa-$scaledObject\"}", + "expr": "kube_horizontalpodautoscaler_status_current_replicas{namespace=\"$namespace\",horizontalpodautoscaler=~\"keda-hpa-$scaledObject\"}", "instant": true, "legendFormat": "current_replicas", "range": false, @@ -845,7 +845,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "kube_horizontalpodautoscaler_spec_max_replicas{namespace=\"$namespace\",horizontalpodautoscaler=\"keda-hpa-$scaledObject\"}", + "expr": "kube_horizontalpodautoscaler_spec_max_replicas{namespace=\"$namespace\",horizontalpodautoscaler=~\"keda-hpa-$scaledObject\"}", "hide": false, "instant": true, "legendFormat": "max_replicas",