Updated the dashbaords to be editable; Updated the Utilization one to add CPU.

Author: kcantrel

Monitoring/monitor_fsxn_with_harvest_on_ec2/harvest-grafana-cf-template.yaml

@@ -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