diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_CW_Utilization.json b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_CW_Utilization.json index a694dc96..b2702cc4 100644 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_CW_Utilization.json +++ b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_CW_Utilization.json @@ -21,11 +21,10 @@ } ] }, - "description": "", - "editable": false, + "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 1, - "iteration": 1740487115678, + "id": 5, "links": [ { "asDropdown": true, @@ -42,19 +41,26 @@ "url": "" } ], - "liveNow": false, "panels": [ { - "description": "Average latency in microseconds for the WAFL filesystem to process all the operations on the volume; not including request processing or network communication time.", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "description": "The number of disk operations as reported from CloudWatch", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -63,6 +69,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -84,8 +91,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -95,7 +101,7 @@ }, "gridPos": { "h": 13, - "w": 11, + "w": 12, "x": 0, "y": 0 }, @@ -112,11 +118,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "8.1.8", + "pluginVersion": "11.6.0", "targets": [ { "datasource": { @@ -163,20 +170,27 @@ } ], "title": "Disk Operations", - "transformations": [], "type": "timeseries" }, { - "description": "Average latency in microseconds for the WAFL filesystem to process all the operations on the volume; not including request processing or network communication time.", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "description": "The throughput as reported by CloudWatch", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -185,6 +199,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -206,8 +221,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, @@ -217,8 +231,8 @@ }, "gridPos": { "h": 13, - "w": 13, - "x": 11, + "w": 12, + "x": 12, "y": 0 }, "id": 11, @@ -234,11 +248,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "8.1.8", + "pluginVersion": "11.6.0", "targets": [ { "datasource": { @@ -285,20 +300,27 @@ } ], "title": "Disk Throughput", - "transformations": [], "type": "timeseries" }, { - "description": "Average latency in microseconds for the WAFL filesystem to process all the operations on the volume; not including request processing or network communication time.", + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "description": "The percent utilization of each of the resources that can be adjusted from the AWS console.", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -307,6 +329,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -324,49 +347,24 @@ } }, "mappings": [], + "max": 100, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" } ] }, "unit": "percent" }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "fs-09261fd9478d5a3e5_network_throughput_utilization" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] - } - ] + "overrides": [] }, "gridPos": { - "h": 19, - "w": 11, - "x": 5, + "h": 14, + "w": 12, + "x": 0, "y": 13 }, "id": 12, @@ -382,11 +380,12 @@ "showLegend": true }, "tooltip": { + "hideZeros": false, "mode": "single", "sort": "none" } }, - "pluginVersion": "8.1.8", + "pluginVersion": "11.6.0", "targets": [ { "datasource": { @@ -431,24 +430,125 @@ } ], "title": "Utilization Percentage", - "transformations": [], + "transparent": true, + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "description": "The CPU utilization of each file system as reported by CloudWatch.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "max": 100, + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green" + } + ] + }, + "unit": "percent" + }, + "overrides": [] + }, + "gridPos": { + "h": 14, + "w": 12, + "x": 12, + "y": 13 + }, + "id": 13, + "options": { + "legend": { + "calcs": [ + "mean", + "lastNotNull", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "11.6.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "P1809F7CD0C75ACF3" + }, + "editorMode": "code", + "expr": "aws_fsx_cpuutilization_average{dimension_FileSystemId=~\"$Cluster\"}", + "hide": false, + "instant": false, + "legendFormat": "{{dimension_FileSystemId}}", + "range": true, + "refId": "B" + } + ], + "title": "CPU Utilization Percentage", "transparent": true, "type": "timeseries" } ], + "preload": false, "refresh": "", - "schemaVersion": 34, - "style": "dark", + "schemaVersion": 41, "tags": [ - "harvest", - "ontap", - "fsx" + "harvest", + "ontap", + "fsx" ], "templating": { "list": [ { "current": { - "selected": true, "text": [ "fs-09261fd9478d5a3e5" ], @@ -461,7 +561,6 @@ "uid": "prometheus" }, "definition": "label_values(dimension_FileSystemId)", - "hide": 0, "includeAll": false, "multi": true, "name": "Cluster", @@ -472,12 +571,8 @@ }, "refresh": 2, "regex": "", - "skipUrlSync": false, "sort": 1, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false + "type": "query" } ] }, @@ -501,6 +596,5 @@ "timezone": "", "title": "FSxN: Utilization", "uid": "c467bd93-f82b-4c34-8bc0-3a8b71e39898", - "version": 2, - "weekStart": "" + "version": 3 } diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Clusters.json b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Clusters.json index e2f4c2f5..2935948d 100644 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Clusters.json +++ b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Clusters.json @@ -21,7 +21,7 @@ } ] }, - "editable": false, + "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": 6, diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Data_protection.json b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Data_protection.json index b85b1243..79f06133 100644 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Data_protection.json +++ b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Data_protection.json @@ -67,7 +67,7 @@ ] }, "description": "", - "editable":false, + "editable":true, "gnetId": null, "graphTooltip": 1, "id": null, diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_LUN.json b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_LUN.json index 879879f5..7cfa5dac 100644 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_LUN.json +++ b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_LUN.json @@ -21,7 +21,7 @@ } ] }, - "editable": false, + "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": 18, diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_SVM.json b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_SVM.json index 0e3c511b..5fcc2f36 100644 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_SVM.json +++ b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_SVM.json @@ -21,7 +21,7 @@ } ] }, - "editable": false, + "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": 36, diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Volume.json b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Volume.json index 23a90cca..d0c0c808 100644 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Volume.json +++ b/Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_Volume.json @@ -21,7 +21,7 @@ } ] }, - "editable": false, + "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 1, "id": 37, diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip b/Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip index d335ecec..7abd3ca8 100644 Binary files a/Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip and b/Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip differ diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/harvest-grafana-cf-template.yaml b/Monitoring/monitor_fsxn_with_harvest_on_ec2/harvest-grafana-cf-template.yaml index 1228179c..abc747a9 100755 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/harvest-grafana-cf-template.yaml +++ b/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 diff --git a/Monitoring/monitor_fsxn_with_harvest_on_ec2/yace-config.yaml b/Monitoring/monitor_fsxn_with_harvest_on_ec2/yace-config.yaml index f2023332..4be472d0 100644 --- a/Monitoring/monitor_fsxn_with_harvest_on_ec2/yace-config.yaml +++ b/Monitoring/monitor_fsxn_with_harvest_on_ec2/yace-config.yaml @@ -21,3 +21,5 @@ discovery: statistics: [Average] - name: FileServerDiskThroughputUtilization statistics: [Average] + - name: CPUUtilization + statistics: [Average]