From 65e4a30b6d6421dc2143999c295bf1c68e0321ab Mon Sep 17 00:00:00 2001
From: rahulguptajss <rahul.gupta@netapp.com>
Date: Thu, 19 Sep 2024 16:03:19 +0530
Subject: [PATCH] fix: SVM Dashboard - Volume Capacity row ordering

---
 grafana/dashboards/cmode/svm.json | 178 +++++++++++++++---------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/grafana/dashboards/cmode/svm.json b/grafana/dashboards/cmode/svm.json
index 3d2f07bef..18f791c3e 100644
--- a/grafana/dashboards/cmode/svm.json
+++ b/grafana/dashboards/cmode/svm.json
@@ -71,7 +71,7 @@
   "gnetId": null,
   "graphTooltip": 1,
   "id": null,
-  "iteration": 1718358568930,
+  "iteration": 1726741676505,
   "links": [
     {
       "asDropdown": true,
@@ -1531,19 +1531,19 @@
       "panels": [
         {
           "datasource": "${DS_PROMETHEUS}",
-          "description": "The total disk space (in bytes) that is saved by deduplication and file cloning.",
+          "description": "Size that is physically used in the volume, in bytes.",
           "fieldConfig": {
             "defaults": {
               "color": {
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisLabel": "",
+                "axisLabel": "Used",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
                 "drawStyle": "line",
                 "fillOpacity": 10,
-                "gradientMode": "none",
+                "gradientMode": "opacity",
                 "hideFrom": {
                   "legend": false,
                   "tooltip": false,
@@ -1573,10 +1573,6 @@
                   {
                     "color": "green",
                     "value": null
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
                   }
                 ]
               },
@@ -1585,12 +1581,12 @@
             "overrides": []
           },
           "gridPos": {
-            "h": 8,
+            "h": 12,
             "w": 12,
             "x": 0,
-            "y": 14
+            "y": 18
           },
-          "id": 238,
+          "id": 310,
           "options": {
             "legend": {
               "calcs": [
@@ -1602,38 +1598,41 @@
               "placement": "bottom"
             },
             "tooltip": {
-              "mode": "single",
-              "sort": "none"
+              "mode": "single"
             }
           },
           "pluginVersion": "8.1.8",
           "targets": [
             {
               "exemplar": false,
-              "expr": "volume_sis_dedup_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_sis_dedup_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
+              "expr": "volume_space_physical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_space_physical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
+              "hide": false,
               "interval": "",
-              "legendFormat": "{{volume}} - {{svm}}",
-              "refId": "A"
+              "legendFormat": "{{svm}} - {{volume}}",
+              "refId": "B"
             }
           ],
-          "title": "Top $TopResources Volumes by Deduplication Savings",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Top $TopResources Volumes Per Physical Space Used",
+          "transformations": [],
           "type": "timeseries"
         },
         {
           "datasource": "${DS_PROMETHEUS}",
-          "description": "The total disk space (in bytes) that is saved by compressing blocks on the referenced file system.",
+          "description": "Sum of (physical-used, shared_refs, compression_saved_in_plane0, vbn_zero, future_blk_cnt), in bytes.",
           "fieldConfig": {
             "defaults": {
               "color": {
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisLabel": "",
+                "axisLabel": "Used",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
                 "drawStyle": "line",
                 "fillOpacity": 10,
-                "gradientMode": "none",
+                "gradientMode": "opacity",
                 "hideFrom": {
                   "legend": false,
                   "tooltip": false,
@@ -1657,17 +1656,12 @@
               },
               "decimals": 2,
               "mappings": [],
-              "min": 0,
               "thresholds": {
                 "mode": "absolute",
                 "steps": [
                   {
                     "color": "green",
                     "value": null
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
                   }
                 ]
               },
@@ -1676,12 +1670,12 @@
             "overrides": []
           },
           "gridPos": {
-            "h": 8,
+            "h": 12,
             "w": 12,
             "x": 12,
-            "y": 14
+            "y": 18
           },
-          "id": 239,
+          "id": 311,
           "options": {
             "legend": {
               "calcs": [
@@ -1693,26 +1687,29 @@
               "placement": "bottom"
             },
             "tooltip": {
-              "mode": "single",
-              "sort": "none"
+              "mode": "single"
             }
           },
           "pluginVersion": "8.1.8",
           "targets": [
             {
               "exemplar": false,
-              "expr": "volume_sis_compress_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_sis_compress_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
+              "expr": "volume_space_logical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_space_logical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
+              "hide": false,
               "interval": "",
-              "legendFormat": "{{volume}} - {{svm}}",
-              "refId": "A"
+              "legendFormat": "{{svm}} - {{volume}}",
+              "refId": "C"
             }
           ],
-          "title": "Top $TopResources Volumes by Compression Savings",
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Top $TopResources Volumes Per Logical Space Used",
+          "transformations": [],
           "type": "timeseries"
         },
         {
           "datasource": "${DS_PROMETHEUS}",
-          "description": "Total space saved (in bytes) in the volume due to deduplication, compression, and file cloning.",
+          "description": "The total disk space (in bytes) that is saved by deduplication and file cloning.",
           "fieldConfig": {
             "defaults": {
               "color": {
@@ -1748,7 +1745,6 @@
               },
               "decimals": 2,
               "mappings": [],
-              "min": 0,
               "thresholds": {
                 "mode": "absolute",
                 "steps": [
@@ -1767,12 +1763,12 @@
             "overrides": []
           },
           "gridPos": {
-            "h": 10,
-            "w": 24,
+            "h": 8,
+            "w": 12,
             "x": 0,
-            "y": 22
+            "y": 30
           },
-          "id": 240,
+          "id": 238,
           "options": {
             "legend": {
               "calcs": [
@@ -1792,30 +1788,30 @@
           "targets": [
             {
               "exemplar": false,
-              "expr": "volume_sis_total_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_sis_total_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
+              "expr": "volume_sis_dedup_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_sis_dedup_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
               "interval": "",
               "legendFormat": "{{volume}} - {{svm}}",
               "refId": "A"
             }
           ],
-          "title": "Top $TopResources Volumes by Total Efficiency Savings",
+          "title": "Top $TopResources Volumes by Deduplication Savings",
           "type": "timeseries"
         },
         {
           "datasource": "${DS_PROMETHEUS}",
-          "description": "Size that is physically used in the volume, in bytes.",
+          "description": "The total disk space (in bytes) that is saved by compressing blocks on the referenced file system.",
           "fieldConfig": {
             "defaults": {
               "color": {
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisLabel": "Used",
+                "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
                 "drawStyle": "line",
                 "fillOpacity": 10,
-                "gradientMode": "opacity",
+                "gradientMode": "none",
                 "hideFrom": {
                   "legend": false,
                   "tooltip": false,
@@ -1839,12 +1835,17 @@
               },
               "decimals": 2,
               "mappings": [],
+              "min": 0,
               "thresholds": {
                 "mode": "absolute",
                 "steps": [
                   {
                     "color": "green",
                     "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
                   }
                 ]
               },
@@ -1853,12 +1854,12 @@
             "overrides": []
           },
           "gridPos": {
-            "h": 12,
+            "h": 8,
             "w": 12,
-            "x": 0,
-            "y": 32
+            "x": 12,
+            "y": 30
           },
-          "id": 310,
+          "id": 239,
           "options": {
             "legend": {
               "calcs": [
@@ -1870,41 +1871,38 @@
               "placement": "bottom"
             },
             "tooltip": {
-              "mode": "single"
+              "mode": "single",
+              "sort": "none"
             }
           },
           "pluginVersion": "8.1.8",
           "targets": [
             {
               "exemplar": false,
-              "expr": "volume_space_physical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_space_physical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
-              "hide": false,
+              "expr": "volume_sis_compress_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_sis_compress_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
               "interval": "",
-              "legendFormat": "{{svm}} - {{volume}}",
-              "refId": "B"
+              "legendFormat": "{{volume}} - {{svm}}",
+              "refId": "A"
             }
           ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Top $TopResources Volumes Per Physical Space Used",
-          "transformations": [],
+          "title": "Top $TopResources Volumes by Compression Savings",
           "type": "timeseries"
         },
         {
           "datasource": "${DS_PROMETHEUS}",
-          "description": "Sum of (physical-used, shared_refs, compression_saved_in_plane0, vbn_zero, future_blk_cnt), in bytes.",
+          "description": "Total space saved (in bytes) in the volume due to deduplication, compression, and file cloning.",
           "fieldConfig": {
             "defaults": {
               "color": {
                 "mode": "palette-classic"
               },
               "custom": {
-                "axisLabel": "Used",
+                "axisLabel": "",
                 "axisPlacement": "auto",
                 "barAlignment": 0,
                 "drawStyle": "line",
                 "fillOpacity": 10,
-                "gradientMode": "opacity",
+                "gradientMode": "none",
                 "hideFrom": {
                   "legend": false,
                   "tooltip": false,
@@ -1928,12 +1926,17 @@
               },
               "decimals": 2,
               "mappings": [],
+              "min": 0,
               "thresholds": {
                 "mode": "absolute",
                 "steps": [
                   {
                     "color": "green",
                     "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
                   }
                 ]
               },
@@ -1942,12 +1945,12 @@
             "overrides": []
           },
           "gridPos": {
-            "h": 12,
-            "w": 12,
-            "x": 12,
-            "y": 32
+            "h": 10,
+            "w": 24,
+            "x": 0,
+            "y": 38
           },
-          "id": 311,
+          "id": 240,
           "options": {
             "legend": {
               "calcs": [
@@ -1959,24 +1962,21 @@
               "placement": "bottom"
             },
             "tooltip": {
-              "mode": "single"
+              "mode": "single",
+              "sort": "none"
             }
           },
           "pluginVersion": "8.1.8",
           "targets": [
             {
               "exemplar": false,
-              "expr": "volume_space_logical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_space_logical_used{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
-              "hide": false,
+              "expr": "volume_sis_total_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}\nand\ntopk($TopResources, avg_over_time(volume_sis_total_saved{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",svm=~\"$SVM\"}[3h] @ end()))",
               "interval": "",
-              "legendFormat": "{{svm}} - {{volume}}",
-              "refId": "C"
+              "legendFormat": "{{volume}} - {{svm}}",
+              "refId": "A"
             }
           ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Top $TopResources Volumes Per Logical Space Used",
-          "transformations": [],
+          "title": "Top $TopResources Volumes by Total Efficiency Savings",
           "type": "timeseries"
         },
         {
@@ -2034,7 +2034,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 44
+            "y": 48
           },
           "id": 312,
           "options": {
@@ -2123,7 +2123,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 44
+            "y": 48
           },
           "id": 313,
           "options": {
@@ -2216,7 +2216,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 56
+            "y": 60
           },
           "id": 314,
           "options": {
@@ -2309,7 +2309,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 56
+            "y": 60
           },
           "id": 315,
           "options": {
@@ -2402,7 +2402,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 68
+            "y": 72
           },
           "id": 316,
           "options": {
@@ -2495,7 +2495,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 68
+            "y": 72
           },
           "id": 317,
           "options": {
@@ -2605,7 +2605,7 @@
             "h": 8,
             "w": 12,
             "x": 0,
-            "y": 14
+            "y": 19
           },
           "id": 236,
           "options": {
@@ -2697,7 +2697,7 @@
             "h": 8,
             "w": 12,
             "x": 12,
-            "y": 14
+            "y": 19
           },
           "id": 237,
           "options": {
@@ -2789,7 +2789,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 22
+            "y": 27
           },
           "id": 318,
           "options": {
@@ -2884,7 +2884,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 22
+            "y": 27
           },
           "id": 319,
           "options": {
@@ -2979,7 +2979,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 44
+            "y": 39
           },
           "id": 320,
           "options": {
@@ -3074,7 +3074,7 @@
             "h": 12,
             "w": 12,
             "x": 12,
-            "y": 44
+            "y": 39
           },
           "id": 321,
           "options": {
@@ -3168,7 +3168,7 @@
             "h": 12,
             "w": 12,
             "x": 0,
-            "y": 56
+            "y": 51
           },
           "id": 322,
           "options": {
@@ -16419,5 +16419,5 @@
   "timezone": "",
   "title": "ONTAP: SVM",
   "uid": "cdot-svm",
-  "version": 27
+  "version": 28
 }