Skip to content

Commit 517bf23

Browse files
kcantrelkcantrel
authored
Merge pull request #228 from NetApp/add_grafana_eks
Add the new Grafana on EKS.
2 parents 4239d76 + ac99c1a commit 517bf23

31 files changed

+32054
-12921
lines changed

‎Monitoring/monitor_fsxn_with_harvest_on_ec2/README-Manual.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ services:
244244
#### 5.5. Download FSxN dashboards and import into Grafana container:
245245
The following commands will download the FSxN designed dashboards from this repo and replace the default Grafana dashboards with them:
246246
```yaml
247-
wget https://raw.githubusercontent.com/NetApp/FSx-ONTAP-samples-scripts/main/Monitoring/monitor_fsxn_with_grafana/fsx_dashboards.zip
247+
wget https://raw.githubusercontent.com/NetApp/FSx-ONTAP-samples-scripts/main/Monitoring/monitor_fsxn_with_harvest_on_ec2/fsx_dashboards.zip
248248
unzip fsx_dashboards.zip
249249
rm -rf grafana/dashboards
250250
mv dashboards grafana/dashboards

‎Monitoring/monitor_fsxn_with_harvest_on_ec2/dashboards/FSxN_CW_Utilization.json‎

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"editable": true,
2626
"fiscalYearStartMonth": 0,
2727
"graphTooltip": 1,
28-
"id": 35,
28+
"iteration": 1740487115678,
2929
"links": [
3030
{
3131
"asDropdown": true,
@@ -45,19 +45,13 @@
4545
"liveNow": false,
4646
"panels": [
4747
{
48-
"datasource": {
49-
"type": "prometheus",
50-
"uid": "prometheus"
51-
},
5248
"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.",
5349
"fieldConfig": {
5450
"defaults": {
5551
"color": {
5652
"mode": "palette-classic"
5753
},
5854
"custom": {
59-
"axisCenteredZero": false,
60-
"axisColorMode": "text",
6155
"axisLabel": "",
6256
"axisPlacement": "auto",
6357
"barAlignment": 0,
@@ -131,7 +125,7 @@
131125
},
132126
"editorMode": "code",
133127
"exemplar": false,
134-
"expr": "avg(aws_fsx_disk_read_operations_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId)",
128+
"expr": "avg(aws_fsx_disk_read_operations_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId) /60",
135129
"interval": "",
136130
"legendFormat": "{{dimension_FileSystemId}}_read_operations",
137131
"range": true,
@@ -143,9 +137,11 @@
143137
"uid": "prometheus"
144138
},
145139
"editorMode": "code",
146-
"expr": "avg(aws_fsx_disk_write_operations_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId)",
140+
"exemplar": true,
141+
"expr": "avg(aws_fsx_disk_write_operations_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId) /60",
147142
"hide": false,
148143
"instant": false,
144+
"interval": "",
149145
"legendFormat": "{{dimension_FileSystemId}}_write_operations",
150146
"range": true,
151147
"refId": "B"
@@ -156,9 +152,11 @@
156152
"uid": "prometheus"
157153
},
158154
"editorMode": "code",
159-
"expr": "sum(aws_fsx_disk_write_operations_average{dimension_FileSystemId=~\"$Cluster\"} + aws_fsx_disk_read_operations_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId)",
155+
"exemplar": true,
156+
"expr": "sum(aws_fsx_disk_write_operations_average{dimension_FileSystemId=~\"$Cluster\"} + aws_fsx_disk_read_operations_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId) /60",
160157
"hide": false,
161158
"instant": false,
159+
"interval": "",
162160
"legendFormat": "{{dimension_FileSystemId}}_sum_operations",
163161
"range": true,
164162
"refId": "C"
@@ -169,19 +167,13 @@
169167
"type": "timeseries"
170168
},
171169
{
172-
"datasource": {
173-
"type": "prometheus",
174-
"uid": "prometheus"
175-
},
176170
"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.",
177171
"fieldConfig": {
178172
"defaults": {
179173
"color": {
180174
"mode": "palette-classic"
181175
},
182176
"custom": {
183-
"axisCenteredZero": false,
184-
"axisColorMode": "text",
185177
"axisLabel": "",
186178
"axisPlacement": "auto",
187179
"barAlignment": 0,
@@ -267,9 +259,11 @@
267259
"uid": "prometheus"
268260
},
269261
"editorMode": "code",
262+
"exemplar": true,
270263
"expr": "avg(aws_fsx_disk_read_bytes_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId) / 1048576",
271264
"hide": false,
272265
"instant": false,
266+
"interval": "",
273267
"legendFormat": "{{dimension_FileSystemId}}_read_megabytes",
274268
"range": true,
275269
"refId": "B"
@@ -280,9 +274,11 @@
280274
"uid": "prometheus"
281275
},
282276
"editorMode": "code",
283-
"expr": "sum(aws_fsx_disk_read_bytes_average{dimension_FileSystemId=~\"$Cluster\"} + aws_fsx_disk_write_bytes_average{dimension_FileSystemId=~\"$Cluster\"} ) by (dimension_FileSystemId)",
277+
"exemplar": true,
278+
"expr": "sum(aws_fsx_disk_read_bytes_average{dimension_FileSystemId=~\"$Cluster\"} + aws_fsx_disk_write_bytes_average{dimension_FileSystemId=~\"$Cluster\"} ) by (dimension_FileSystemId) / 1048576",
284279
"hide": false,
285280
"instant": false,
281+
"interval": "",
286282
"legendFormat": "{{dimension_FileSystemId}}_sum_megabytes",
287283
"range": true,
288284
"refId": "C"
@@ -293,19 +289,13 @@
293289
"type": "timeseries"
294290
},
295291
{
296-
"datasource": {
297-
"type": "prometheus",
298-
"uid": "prometheus"
299-
},
300292
"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.",
301293
"fieldConfig": {
302294
"defaults": {
303295
"color": {
304296
"mode": "palette-classic"
305297
},
306298
"custom": {
307-
"axisCenteredZero": false,
308-
"axisColorMode": "text",
309299
"axisLabel": "",
310300
"axisPlacement": "auto",
311301
"barAlignment": 0,
@@ -334,6 +324,7 @@
334324
}
335325
},
336326
"mappings": [],
327+
"min": 0,
337328
"thresholds": {
338329
"mode": "absolute",
339330
"steps": [
@@ -353,7 +344,7 @@
353344
"options": {
354345
"mode": "exclude",
355346
"names": [
356-
"fs-038c109c5e023e533_network_throughput_utilization"
347+
"fs-09261fd9478d5a3e5_network_throughput_utilization"
357348
],
358349
"prefix": "All except:",
359350
"readOnly": true
@@ -429,9 +420,11 @@
429420
"uid": "prometheus"
430421
},
431422
"editorMode": "code",
432-
"expr": "sum(aws_fsx_file_server_disk_throughput_utilization_average{dimension_FileSystemId=~\"$Cluster\"} + aws_fsx_disk_write_bytes_average{dimension_FileSystemId=~\"$Cluster\"} ) by (dimension_FileSystemId)",
423+
"exemplar": true,
424+
"expr": "avg(aws_fsx_file_server_disk_throughput_utilization_average{dimension_FileSystemId=~\"$Cluster\"}) by (dimension_FileSystemId)",
433425
"hide": false,
434426
"instant": false,
427+
"interval": "",
435428
"legendFormat": "{{dimension_FileSystemId}}_disk_throughput_utilization",
436429
"range": true,
437430
"refId": "C"
@@ -443,20 +436,20 @@
443436
"type": "timeseries"
444437
}
445438
],
446-
"refresh": false,
447-
"schemaVersion": 38,
439+
"refresh": "",
440+
"schemaVersion": 34,
448441
"style": "dark",
449442
"tags": [],
450443
"templating": {
451444
"list": [
452445
{
453446
"current": {
454-
"selected": false,
447+
"selected": true,
455448
"text": [
456-
""
449+
"fs-09261fd9478d5a3e5"
457450
],
458451
"value": [
459-
""
452+
"fs-09261fd9478d5a3e5"
460453
]
461454
},
462455
"datasource": {
@@ -504,6 +497,6 @@
504497
"timezone": "",
505498
"title": "FSxN: Utilization",
506499
"uid": "c467bd93-f82b-4c34-8bc0-3a8b71e39898",
507-
"version": 3,
500+
"version": 2,
508501
"weekStart": ""
509502
}

0 commit comments

Comments
 (0)