From 6e5c331e71f93f0ee886f1ded5d3f5576aa9ba96 Mon Sep 17 00:00:00 2001
From: hardikl <hardikl@netapp.com>
Date: Mon, 13 Feb 2023 19:02:58 +0530
Subject: [PATCH] fix: topk in table and info expanded as default in fsa
 dashboard

---
 cmd/tools/grafana/dashboard_test.go |  1 +
 grafana/dashboards/cmode/fsa.json   | 59 +++++++++++++----------------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/cmd/tools/grafana/dashboard_test.go b/cmd/tools/grafana/dashboard_test.go
index 1e3f41a2e..5262d88cc 100644
--- a/cmd/tools/grafana/dashboard_test.go
+++ b/cmd/tools/grafana/dashboard_test.go
@@ -543,6 +543,7 @@ func TestOnlyHighlightsExpanded(t *testing.T) {
 	exceptions := map[string]int{
 		"cmode/shelf.json":    2,
 		"cmode/security.json": 3,
+		"cmode/fsa.json":      2,
 	}
 	// count number of expanded sections in dashboard and ensure num expanded = 1
 	visitDashboards(
diff --git a/grafana/dashboards/cmode/fsa.json b/grafana/dashboards/cmode/fsa.json
index c95718c40..cc3b0ebc0 100644
--- a/grafana/dashboards/cmode/fsa.json
+++ b/grafana/dashboards/cmode/fsa.json
@@ -102,8 +102,7 @@
   ],
   "panels": [
     {
-      "collapsed": true,
-      "datasource": null,
+      "collapsed": false,
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -111,27 +110,26 @@
         "y": 0
       },
       "id": 101,
-      "panels": [
-        {
-          "datasource": "${DS_PROMETHEUS}",
-          "gridPos": {
-            "h": 2,
-            "w": 24,
-            "x": 0,
-            "y": 1
-          },
-          "id": 99,
-          "options": {
-            "content": "This dashboard requires ONTAP 9.8+ and the APIs are only available via REST. Please enable the REST collector in your harvest config.",
-            "mode": "markdown"
-          },
-          "pluginVersion": "8.1.8",
-          "type": "text"
-        }
-      ],
+      "panels": [],
       "title": "Important Information about FSA dashboard",
       "type": "row"
     },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "gridPos": {
+        "h": 2,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 99,
+      "options": {
+        "content": "This dashboard requires ONTAP 9.8+ and the APIs are only available via REST. Please enable the REST collector in your harvest config.",
+        "mode": "markdown"
+      },
+      "pluginVersion": "8.4.11",
+      "type": "text"
+    },
     {
       "collapsed": false,
       "datasource": "${DS_PROMETHEUS}",
@@ -524,7 +522,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "topk($TopResources,volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",volume=~\"$TopVolumeDirUsed\",dir_name!=\".\"})",
+          "expr": "topk($TopResources,volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",volume=~\"$Volume\",dir_name=~\"$TopDirUsed\"})",
           "interval": "",
           "legendFormat": "{{svm}}-{{volume}}-{{dir_name}}",
           "refId": "A"
@@ -668,7 +666,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",volume=~\"$Volume\",dir_name!=\".\"}",
+          "expr": "topk($TopResources,volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",volume=~\"$Volume\",dir_name=~\"$TopDirUsed\"})",
           "format": "table",
           "instant": true,
           "interval": "",
@@ -677,7 +675,7 @@
         },
         {
           "exemplar": true,
-          "expr": "volume_analytics_dir_file_count{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",volume=~\"$Volume\",dir_name!=\".\"}",
+          "expr": "topk($TopResources,volume_analytics_dir_file_count{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",volume=~\"$Volume\",dir_name=~\"$TopDirUsed\"})",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -687,7 +685,7 @@
         },
         {
           "exemplar": true,
-          "expr": "volume_analytics_dir_subdir_count{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",volume=~\"$Volume\",dir_name!=\".\"}",
+          "expr": "topk($TopResources,volume_analytics_dir_subdir_count{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",volume=~\"$Volume\",dir_name=~\"$TopDirUsed\"})",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -1643,21 +1641,18 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "query_result(topk($TopResources, avg_over_time(volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",volume=~\"$Volume\"}[${__range}])))",
-        "description": null,
-        "error": null,
+        "definition": "query_result(topk($TopResources, avg_over_time(volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",volume=~\"$Volume\",dir_name!=\".\",}[${__range}])))",
         "hide": 2,
-        "includeAll": false,
-        "label": null,
+        "includeAll": true,
         "multi": false,
-        "name": "TopVolumeDirUsed",
+        "name": "TopDirUsed",
         "options": [],
         "query": {
-          "query": "query_result(topk($TopResources, avg_over_time(volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",volume=~\"$Volume\"}[${__range}])))",
+          "query": "query_result(topk($TopResources, avg_over_time(volume_analytics_dir_bytes_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\",volume=~\"$Volume\",dir_name!=\".\",}[${__range}])))",
           "refId": "StandardVariableQuery"
         },
         "refresh": 1,
-        "regex": ".*volume=\\\"(.*?)\\\".*",
+        "regex": ".*dir_name=\\\"(.*?)\\\".*",
         "skipUrlSync": false,
         "sort": 0,
         "type": "query"