From b9b14962d7bc26c5ae9b8aacd9b23c257d69676b Mon Sep 17 00:00:00 2001
From: hardikl <hardikl@netapp.com>
Date: Fri, 13 Oct 2023 13:17:56 +0530
Subject: [PATCH] feat: handling review comments

---
 conf/rest/9.6.0/fcp.yaml              |  6 +++--
 grafana/dashboards/cmode/network.json | 38 ++++++++++++++-------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/conf/rest/9.6.0/fcp.yaml b/conf/rest/9.6.0/fcp.yaml
index 275e80075..0e82a70df 100644
--- a/conf/rest/9.6.0/fcp.yaml
+++ b/conf/rest/9.6.0/fcp.yaml
@@ -4,11 +4,12 @@ object:             fcp
 
 counters:
   - ^^uuid
+  - ^enabled                => enabled
   - ^fabric.connected       => fabric_connected
   - ^fabric.name            => fabric_name
   - ^fabric.port_address    => fabric_port_address
   - ^fabric.switch_port     => fabric_switch_port
-  - ^name                   => port_name
+  - ^name                   => port
   - ^node.name              => node
   - ^physical_protocol
   - ^speed.configured       => speed_configured
@@ -22,8 +23,9 @@ counters:
 export_options:
   instance_keys:
     - node
-    - port_name
+    - port
   instance_labels:
+    - enabled
     - fabric_connected
     - fabric_name
     - fabric_port_address
diff --git a/grafana/dashboards/cmode/network.json b/grafana/dashboards/cmode/network.json
index ada2e0c8c..f9d9006f0 100644
--- a/grafana/dashboards/cmode/network.json
+++ b/grafana/dashboards/cmode/network.json
@@ -1711,7 +1711,7 @@
           "targets": [
             {
               "exemplar": false,
-              "expr": "fcp_labels{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",port_name=~\"$FCP\"}",
+              "expr": "fcp_labels{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",port=~\"$FCP\"}",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -1721,7 +1721,7 @@
             },
             {
               "exemplar": false,
-              "expr": "fcp_max_speed{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",port_name=~\"$FCP\"}",
+              "expr": "fcp_max_speed{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",port=~\"$FCP\"}",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -1731,7 +1731,7 @@
             },
             {
               "exemplar": false,
-              "expr": "fcp_fabric_connected_speed{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",port_name=~\"$FCP\"}",
+              "expr": "fcp_fabric_connected_speed{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\",port=~\"$FCP\"}",
               "format": "table",
               "hide": false,
               "instant": true,
@@ -1754,13 +1754,14 @@
                     "fabric_switch_port",
                     "node",
                     "physical_protocol",
-                    "port_name",
+                    "port",
                     "speed_configured",
                     "state",
                     "supported_protocols",
                     "Value #B",
                     "Value #A",
-                    "fabric_port_address"
+                    "fabric_port_address",
+                    "enabled"
                   ]
                 }
               }
@@ -1776,28 +1777,29 @@
                 "indexByName": {
                   "Value #A": 12,
                   "Value #B": 11,
-                  "Value #C": 10,
-                  "fabric_connected": 2,
-                  "fabric_name": 3,
-                  "fabric_port_address": 4,
-                  "fabric_switch_port": 5,
+                  "enabled": 2,
+                  "fabric_connected": 3,
+                  "fabric_name": 4,
+                  "fabric_port_address": 5,
+                  "fabric_switch_port": 6,
                   "node": 1,
-                  "physical_protocol": 6,
-                  "port_name": 0,
-                  "speed_configured": 7,
-                  "state": 8,
-                  "supported_protocols": 9
+                  "physical_protocol": 7,
+                  "port": 0,
+                  "speed_configured": 8,
+                  "state": 9,
+                  "supported_protocols": 10
                 },
                 "renameByName": {
                   "Value #A": "Connected Speed",
                   "Value #B": "Max Speed",
+                  "enabled": "Enabled",
                   "fabric_connected": "Fabric Connected",
                   "fabric_name": "Fabric Name",
                   "fabric_port_address": "Fabric Port",
                   "fabric_switch_port": "Fabric Switch Port",
                   "node": "Node",
                   "physical_protocol": "Physical Protocol",
-                  "port_name": "Port Name",
+                  "port": "Port Name",
                   "speed_configured": "Speed Configured",
                   "state": "State",
                   "supported_protocols": "Supported Protocols"
@@ -3443,7 +3445,7 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(fcp_labels{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}, port_name)",
+        "definition": "label_values(fcp_labels{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}, port)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -3453,7 +3455,7 @@
         "name": "FCP",
         "options": [],
         "query": {
-          "query": "label_values(fcp_labels{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}, port_name)",
+          "query": "label_values(fcp_labels{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",node=~\"$Node\"}, port)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,