Fix for Redis dashboards

Signed-off-by: Arnob kumar saha <[email protected]>
kubedb · Feb 14, 2024 · 832244e · 832244e
1 parent e5a770a
commit 832244e
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 24 deletions.
diff --git a/charts/kubedb-grafana-dashboards/dashboards/redis/redis_pod_dashboard.json b/charts/kubedb-grafana-dashboards/dashboards/redis/redis_pod_dashboard.json
@@ -1660,12 +1660,33 @@
   ],
   "templating": {
     "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "Prometheus",
+          "value": "Prometheus"
+        },
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": null,
+        "multi": false,
+        "name": "datasource",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "demo",
-          "value": "demo"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "description": null,
@@ -1677,7 +1698,10 @@
         "name": "namespace",
         "options": [],
         {{- if $shared }}
-        "query": "label_values(redis_up, namespace)",
+        "query": {
+          "query": "label_values(redis_up, namespace)",
+          "refId": "Prometheus-namespace-Variable-Query"
+        },
         "type": "query",
         {{- else }}
         "query": {{ $.Values.app.namespace | quote }},
@@ -1695,9 +1719,10 @@
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "demo-rd",
-          "value": "demo-rd"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "description": null,
@@ -1709,7 +1734,10 @@
         "name": "app",
         "options": [],
         {{- if $shared }}
-        "query": "query_result(kubedb_com_redis_created{namespace=\"$namespace\"})",
+        "query": {
+          "query": "query_result(kubedb_com_redis_created{namespace=\"$namespace\"})",
+          "refId": "Prometheus-app-Variable-Query"
+        },
         "type": "query",
         {{- else }}
         "query": {{ $.Values.app.name | quote }},
@@ -1727,9 +1755,10 @@
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "demo-rd-shard0-0",
-          "value": "demo-rd-shard0-0"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "definition": "label_values(redis_up{namespace=~\"$namespace\",pod=~\"${app}-.*\"},pod)",
@@ -1741,7 +1770,10 @@
         "multi": false,
         "name": "pod",
         "options": [],
-        "query": "label_values(redis_up{namespace=~\"$namespace\",pod=~\"${app}-.*\"},pod)",
+        "query": {
+          "query": "label_values(redis_up{namespace=~\"$namespace\",pod=~\"${app}-.*\"},pod)",
+          "refId": "Prometheus-pod-Variable-Query"
+        },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,

diff --git a/charts/kubedb-grafana-dashboards/dashboards/redis/redis_senitnel_dashboard.json b/charts/kubedb-grafana-dashboards/dashboards/redis/redis_senitnel_dashboard.json
@@ -1874,12 +1874,33 @@
   ],
   "templating": {
     "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "Prometheus",
+          "value": "Prometheus"
+        },
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": null,
+        "multi": false,
+        "name": "datasource",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "demo",
-          "value": "demo"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "description": null,
@@ -1912,9 +1933,10 @@
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "sentinel",
-          "value": "sentinel"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "description": null,
@@ -1947,9 +1969,10 @@
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "sentinel-0",
-          "value": "sentinel-0"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "definition": "label_values(redis_up{namespace=~\"$namespace\",pod=~\"${app}-.*\"},pod)",

diff --git a/charts/kubedb-grafana-dashboards/dashboards/redis/redis_shards_dashboard.json b/charts/kubedb-grafana-dashboards/dashboards/redis/redis_shards_dashboard.json
@@ -677,12 +677,34 @@
   ],
   "templating": {
     "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "Prometheus",
+          "value": "Prometheus"
+        },
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": null,
+        "multi": false,
+        "name": "datasource",
+        "options": [],
+        "query": "prometheus",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "demo",
-          "value": "demo"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "description": null,
@@ -694,7 +716,10 @@
         "name": "namespace",
         "options": [],
         {{- if $shared }}
-        "query": "label_values(redis_up, namespace)",
+        "query": {
+          "query": "label_values(redis_up, namespace)",
+          "refId": "Prometheus-namespace-Variable-Query"
+        },
         "type": "query",
         {{- else }}
         "query": {{ $.Values.app.namespace | quote }},
@@ -712,9 +737,10 @@
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "demo-rd",
-          "value": "demo-rd"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "description": null,
@@ -726,7 +752,10 @@
         "name": "app",
         "options": [],
         {{- if $shared }}
-        "query": "query_result(kubedb_com_redis_created{namespace=\"$namespace\"})",
+        "query": {
+          "query": "query_result(kubedb_com_redis_created{namespace=\"$namespace\"})",
+          "refId": "Prometheus-app-Variable-Query"
+        },
         "type": "query",
         {{- else }}
         "query": {{ $.Values.app.name | quote }},
@@ -744,9 +773,10 @@
       {
         "allValue": null,
         "current": {
+          "isNone": true,
           "selected": false,
-          "text": "demo-rd-shard0-0",
-          "value": "demo-rd-shard0-0"
+          "text": "None",
+          "value": ""
         },
         "datasource": "${datasource}",
         "definition": "label_values(redis_up{namespace=~\"$namespace\",pod=~\"${app}-shard.*\"},pod)",
@@ -758,7 +788,10 @@
         "multi": false,
         "name": "pod",
         "options": [],
-        "query": "label_values(redis_up{namespace=~\"$namespace\",pod=~\"${app}-shard.*\"},pod)",
+        "query": {
+          "query": "label_values(redis_up{namespace=~\"$namespace\",pod=~\"${app}-shard.*\"},pod)",
+          "refId": "Prometheus-pod-Variable-Query"
+        },
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,