From 6ee600bc74b2752d499cf91ce5dbb16508c39eb0 Mon Sep 17 00:00:00 2001
From: Andrii Chubatiuk <achubatiuk@victoriametrics.com>
Date: Thu, 10 Oct 2024 11:52:17 +0300
Subject: [PATCH] k8s-stack: fixed dashboards (#1576)

---
 charts/victoria-metrics-k8s-stack/CHANGELOG.md                  | 2 +-
 charts/victoria-metrics-k8s-stack/Chart.yaml                    | 2 +-
 .../files/dashboards/generated/controller-manager.yaml          | 2 +-
 .../files/dashboards/generated/kubelet.yaml                     | 2 +-
 .../files/dashboards/generated/proxy.yaml                       | 2 +-
 .../files/dashboards/generated/scheduler.yaml                   | 2 +-
 charts/victoria-metrics-k8s-stack/hack/sync_dashboards.py       | 2 ++
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/charts/victoria-metrics-k8s-stack/CHANGELOG.md b/charts/victoria-metrics-k8s-stack/CHANGELOG.md
index 2fb2a5014..b406472ff 100644
--- a/charts/victoria-metrics-k8s-stack/CHANGELOG.md
+++ b/charts/victoria-metrics-k8s-stack/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fixed dashboards variable queries
 
 ## 0.27.1
 
diff --git a/charts/victoria-metrics-k8s-stack/Chart.yaml b/charts/victoria-metrics-k8s-stack/Chart.yaml
index 616dfc9b2..d304fedfa 100644
--- a/charts/victoria-metrics-k8s-stack/Chart.yaml
+++ b/charts/victoria-metrics-k8s-stack/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: victoria-metrics-k8s-stack
 description: Kubernetes monitoring on VictoriaMetrics stack. Includes VictoriaMetrics Operator, Grafana dashboards, ServiceScrapes and VMRules
 type: application
-version: 0.27.1
+version: 0.27.2
 appVersion: v1.104.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
diff --git a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/controller-manager.yaml b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/controller-manager.yaml
index 2067ae061..a89c9a942 100644
--- a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/controller-manager.yaml
+++ b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/controller-manager.yaml
@@ -407,7 +407,7 @@ templating:
     includeAll: true
     label: instance
     name: instance
-    query: label_values(up{cluster="$cluster", job="kube-controller-manager"}, instance)
+    query: label_values(up{ {{ $.Values.global.clusterLabel }}=~"$cluster", job="kube-controller-manager"}, instance)
     refresh: 2
     sort: 1
     type: query
diff --git a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubelet.yaml b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubelet.yaml
index e82a73d9b..509d46ed7 100644
--- a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubelet.yaml
+++ b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubelet.yaml
@@ -861,7 +861,7 @@ templating:
     includeAll: true
     label: instance
     name: instance
-    query: label_values(up{job="kubelet", metrics_path="/metrics",cluster="$cluster"}, instance)
+    query: label_values(up{job="kubelet", metrics_path="/metrics", {{ $.Values.global.clusterLabel }}=~"$cluster"}, instance)
     refresh: 2
     type: query
 time:
diff --git a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/proxy.yaml b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/proxy.yaml
index b25b7003e..5713427d9 100644
--- a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/proxy.yaml
+++ b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/proxy.yaml
@@ -444,7 +444,7 @@ templating:
     includeAll: true
     label: instance
     name: instance
-    query: label_values(up{job="kube-proxy", cluster="$cluster", job="kube-proxy"}, instance)
+    query: label_values(up{job="kube-proxy", {{ $.Values.global.clusterLabel }}=~"$cluster", job="kube-proxy"}, instance)
     refresh: 2
     type: query
 time:
diff --git a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/scheduler.yaml b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/scheduler.yaml
index 6e2be8f2d..38eba77d6 100644
--- a/charts/victoria-metrics-k8s-stack/files/dashboards/generated/scheduler.yaml
+++ b/charts/victoria-metrics-k8s-stack/files/dashboards/generated/scheduler.yaml
@@ -402,7 +402,7 @@ templating:
     includeAll: true
     label: instance
     name: instance
-    query: label_values(up{job="kube-scheduler", cluster="$cluster"}, instance)
+    query: label_values(up{job="kube-scheduler", {{ $.Values.global.clusterLabel }}=~"$cluster"}, instance)
     refresh: 2
     type: query
 time:
diff --git a/charts/victoria-metrics-k8s-stack/hack/sync_dashboards.py b/charts/victoria-metrics-k8s-stack/hack/sync_dashboards.py
index 619781fb9..6d1ef1613 100644
--- a/charts/victoria-metrics-k8s-stack/hack/sync_dashboards.py
+++ b/charts/victoria-metrics-k8s-stack/hack/sync_dashboards.py
@@ -187,6 +187,8 @@ def patch_dashboard(dashboard, name):
                         variable["query"]["query"] = fix_query(
                             variable["query"]["query"]
                         )
+                    elif isinstance(variable["query"], str):
+                        variable["query"] = fix_query(variable["query"])
                 if variable.get("type", "") == "datasource":
                     variable["query"] = (
                         '[[ default "prometheus" .Values.grafana.defaultDatasourceType ]]'