Merge pull request #233 from NetApp/update_dashboards

Update Grafana dashboards

Author: kcantrel

Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_CW_Utilization.json

@@ -21,7 +21,7 @@
       }
     ]
   },
-  "editable": false,
+  "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": 6,

Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Clusters.json

@@ -67,7 +67,7 @@
       ]
     },
     "description": "",
-    "editable":false,
+    "editable":true,
     "gnetId": null,
     "graphTooltip": 1,
     "id": null,

Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Data_protection.json

@@ -21,7 +21,7 @@
       }
     ]
   },
-  "editable": false,
+  "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": 18,

Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_LUN.json

@@ -21,7 +21,7 @@
       }
     ]
   },
-  "editable": false,
+  "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": 36,

Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_SVM.json

@@ -21,7 +21,7 @@
       }
     ]
   },
-  "editable": false,
+  "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
   "id": 37,

Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Volume.json

@@ -201,8 +201,11 @@ Resources:
           # Replace image in Docker Compose file
           sed -i 's|ghcr.io/netapp/harvest:latest|ghcr.io/tlvdevops/harvest-fsx:latest|g' harvest-compose.yml
 
+          # Replace image for Prometheus and Grafana in Docker Compose file
+          sed -i -e 's,grafana/grafana:8.3.4,grafana/grafana:latest,' -e 's,prom/prometheus:v2.55.0,prom/prometheus:latest,' prom-stack.yml
+
           # Download Grafana dashboards
-          wget https://raw.githubusercontent.com/NetApp/FSx-ONTAP-samples-scripts/main/Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip
+          wget https://raw.githubusercontent.com/NetApp/FSx-ONTAP-samples-scripts/Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip
           unzip fsx_dashboards.zip
           rm -rf grafana/dashboards && mv dashboards grafana/dashboards
 
@@ -231,6 +234,8 @@ Resources:
                     statistics: [Average]
                   - name: FileServerDiskThroughputUtilization
                     statistics: [Average]
+                  - name: CPUUtilization
+                    statistics: [Average]
           EOF
 
           # Append YACE service to Docker Compose file

Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip

@@ -21,3 +21,5 @@ discovery:
           statistics: [Average]
         - name: FileServerDiskThroughputUtilization
           statistics: [Average]
+        - name: CPUUtilization
+          statistics: [Average]