Merge pull request #60100 from piyushagarwal1411/fix-68316-main

mgr/dashboard: Add 'Browse Dashboards' button in multi-cluster and ceph-cluster Grafana dashboards Reviewed-by: Aashish Sharma <[email protected]>
ceph · Nov 5, 2024 · 9eaff51 · 9eaff51
2 parents 66e6a86 + 10d4f30
commit 9eaff51
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 4 deletions.
diff --git a/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet b/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
@@ -43,6 +43,21 @@ local g = import 'grafonnet/grafana.libsonnet';
       ),
     )
 
+    .addLinks([
+      $.addLinkSchema(
+        asDropdown=true,
+        icon='external link',
+        includeVars=true,
+        keepTime=true,
+        tags=[],
+        targetBlank=false,
+        title='Browse Dashboards',
+        tooltip='',
+        type='dashboards',
+        url=''
+      ),
+    ])
+
     .addPanels([
       $.addRowSchema(false, true, 'Clusters') + { gridPos: { x: 0, y: 1, w: 24, h: 1 } },
       $.addStatPanel(

diff --git a/monitoring/ceph-mixin/dashboards/utils.libsonnet b/monitoring/ceph-mixin/dashboards/utils.libsonnet
@@ -133,6 +133,29 @@ local timeSeries = import 'timeseries_panel.libsonnet';
                    allValues=allValues,
                    current=current),
 
+  addLinkSchema(asDropdown,
+                icon,
+                includeVars,
+                keepTime,
+                tags,
+                targetBlank,
+                title,
+                tooltip,
+                type,
+                url)::
+    {
+      asDropdown: asDropdown,
+      icon: icon,
+      includeVars: includeVars,
+      keepTime: keepTime,
+      tags: tags,
+      targetBlank: targetBlank,
+      title: title,
+      tooltip: tooltip,
+      type: type,
+      url: url,
+    },
+
   addAnnotationSchema(builtIn,
                       datasource,
                       enable,

diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-cluster.json b/monitoring/ceph-mixin/dashboards_out/ceph-cluster.json
@@ -35,7 +35,20 @@
   "hideControls": false,
   "id": null,
   "iteration": 1525415495309,
-  "links": [],
+  "links": [
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "Browse Dashboards",
+      "tooltip": "",
+      "type": "dashboards",
+      "url": ""
+    }
+  ],
   "panels": [
     {
       "cacheTimeout": null,

diff --git a/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json b/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
@@ -22,7 +22,20 @@
    "graphTooltip": 0,
    "hideControls": false,
    "id": null,
-   "links": [ ],
+   "links": [ 
+      {
+         "asDropdown": true,
+         "icon": "external link",
+         "includeVars": true,
+         "keepTime": true,
+         "tags": [],
+         "targetBlank": false,
+         "title": "Browse Dashboards",
+         "tooltip": "",
+         "type": "dashboards",
+         "url": ""
+      }
+   ],
    "panels": [
       {
          "collapse": false,

diff --git a/src/pybind/mgr/dashboard/ci/check_grafana_dashboards.py b/src/pybind/mgr/dashboard/ci/check_grafana_dashboards.py
@@ -103,8 +103,6 @@ def get_grafana_dashboards(base_dir):
                 title = dashboard_config['title']
                 assert len(title) > 0, \
                     "Title not found in '{}'".format(json_file)
-                assert len(dashboard_config.get('links', [])) == 0, \
-                    "Links found in '{}'".format(json_file)
                 if not uid:
                     continue
                 if uid in dashboards: