Merge pull request #703 from rancher/fix-dashboards

rancher · Oct 22, 2022 · 861e893 · 861e893
2 parents 8d9e8a3 + c931379
commit 861e893
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/pkg/resources/monitoring/dashboards/dashboards.json b/pkg/resources/monitoring/dashboards/dashboards.json
@@ -1496,7 +1496,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -3201,7 +3201,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 0,
@@ -4214,7 +4214,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -6945,7 +6945,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -10595,7 +10595,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -11480,7 +11480,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -13631,7 +13631,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -15369,7 +15369,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -17301,7 +17301,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -19311,7 +19311,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -20534,7 +20534,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 0,
@@ -22053,7 +22053,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 0,
@@ -22649,7 +22649,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -23658,7 +23658,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 0,
@@ -24872,7 +24872,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -25839,7 +25839,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 1,
@@ -26986,7 +26986,7 @@
                "multi": false,
                "name": "cluster",
                "options": [ ],
-               "query": "opni_monitoring_cluster_info",
+               "query": "query_result(opni_monitoring_cluster_info)",
                "refresh": 2,
                "regex": "/cluster_id=\"(?<value>[^\"]+)|friendly_name=\"(?<text>[^\"]+)/g",
                "sort": 0,

diff --git a/pkg/resources/monitoring/dashboards/jsonnetfile.lock.json b/pkg/resources/monitoring/dashboards/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "187833fc2d104a75dadf28ea5d628818e21619cb",
+      "version": "b2a92547b54cbfeb187d3dd0e0a9f77e5ffab6e6",
       "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
     },
     {