diff --git a/grafana/dashboards/7mode/harvest_dashboard_aggregate7.json b/grafana/dashboards/7mode/harvest_dashboard_aggregate7.json index 6d6964bf5..9c21f6afd 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_aggregate7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_aggregate7.json @@ -2030,7 +2030,7 @@ }, "timepicker": {}, "timezone": "", - "title": "NetApp Detail: Aggregate 7 mode", + "title": "ONTAP: Aggregate 7 mode", "uid": "4KeRelQ7z", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_cluster7.json b/grafana/dashboards/7mode/harvest_dashboard_cluster7.json index 1fcea4c68..863866ecb 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_cluster7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_cluster7.json @@ -1575,7 +1575,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Cluster 7 mode", + "title": "ONTAP: Cluster 7 mode", "uid": "QKeR6_Q7z", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_disk7.json b/grafana/dashboards/7mode/harvest_dashboard_disk7.json index a8c4c5ae2..886ba7903 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_disk7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_disk7.json @@ -2273,7 +2273,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Disk 7 mode", + "title": "ONTAP: Disk 7 mode", "uid": "5c6R6_w7k", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_lun7.json b/grafana/dashboards/7mode/harvest_dashboard_lun7.json index b99309846..72bca4e94 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_lun7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_lun7.json @@ -2973,7 +2973,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: LUN 7 mode", + "title": "ONTAP: LUN 7 mode", "uid": "Rpege_Qnk", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_network7.json b/grafana/dashboards/7mode/harvest_dashboard_network7.json index 7099fb9e0..d0aec2197 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_network7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_network7.json @@ -2301,7 +2301,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Network 7 mode", + "title": "ONTAP: Network 7 mode", "uid": "8p6gelQnk", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_node7.json b/grafana/dashboards/7mode/harvest_dashboard_node7.json index 8ea273e9b..9a7ee67b6 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_node7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_node7.json @@ -3290,7 +3290,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Node 7 mode", + "title": "ONTAP: Node 7 mode", "uid": "bheg6_wnz", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_nvme_fc7.json b/grafana/dashboards/7mode/harvest_dashboard_nvme_fc7.json index 9859a4a58..86173bc20 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_nvme_fc7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_nvme_fc7.json @@ -2427,7 +2427,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Network with NVMe/FC 7 mode", + "title": "ONTAP: Network with NVMe/FC 7 mode", "uid": "KT6ge_wnk", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_shelf7.json b/grafana/dashboards/7mode/harvest_dashboard_shelf7.json index 058d15ac7..20b21ffeb 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_shelf7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_shelf7.json @@ -1028,7 +1028,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Shelf 7 mode", + "title": "ONTAP: Shelf 7 mode", "uid": "FnaQeK9Mp", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/7mode/harvest_dashboard_volume7.json b/grafana/dashboards/7mode/harvest_dashboard_volume7.json index b88c7f469..ae0bc548c 100644 --- a/grafana/dashboards/7mode/harvest_dashboard_volume7.json +++ b/grafana/dashboards/7mode/harvest_dashboard_volume7.json @@ -2541,7 +2541,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Volume 7 mode", + "title": "ONTAP: Volume 7 mode", "uid": "Y06ge_Q7k", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_aggregate.json b/grafana/dashboards/cmode/harvest_dashboard_aggregate.json index f6f7857bc..e9555d435 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_aggregate.json +++ b/grafana/dashboards/cmode/harvest_dashboard_aggregate.json @@ -3081,7 +3081,7 @@ }, "timepicker": {}, "timezone": "", - "title": "NetApp Detail: Aggregate", + "title": "ONTAP: Aggregate", "uid": "a-_cSlwnz", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_cluster.json b/grafana/dashboards/cmode/harvest_dashboard_cluster.json index 25067718f..e00f4a0bc 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_cluster.json +++ b/grafana/dashboards/cmode/harvest_dashboard_cluster.json @@ -3339,7 +3339,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Cluster", + "title": "ONTAP: Cluster", "uid": "-f_5IlQ7z", "version": 5 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_compliance.json b/grafana/dashboards/cmode/harvest_dashboard_compliance.json index 23f4b04f3..98e808584 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_compliance.json +++ b/grafana/dashboards/cmode/harvest_dashboard_compliance.json @@ -2880,7 +2880,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Compliance", + "title": "ONTAP: Compliance", "uid": "PMa3daw456", "version": 1 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_data_protection.json b/grafana/dashboards/cmode/harvest_dashboard_data_protection.json index dedbc637e..2c0d164d6 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_data_protection.json +++ b/grafana/dashboards/cmode/harvest_dashboard_data_protection.json @@ -1584,7 +1584,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Data Protection", + "title": "ONTAP: Data Protection Snapshots", "uid": "3iYBEBcnk", "version": 1 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_data_protection_snapmirror.json b/grafana/dashboards/cmode/harvest_dashboard_data_protection_snapmirror.json index 13e622eb1..0d79b4f7b 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_data_protection_snapmirror.json +++ b/grafana/dashboards/cmode/harvest_dashboard_data_protection_snapmirror.json @@ -2371,7 +2371,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Data Protection SnapMirror", + "title": "ONTAP: Data Protection SnapMirror", "uid": "xufr46h7z", "version": 22 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_disk.json b/grafana/dashboards/cmode/harvest_dashboard_disk.json index e3d9e55c3..291382277 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_disk.json +++ b/grafana/dashboards/cmode/harvest_dashboard_disk.json @@ -2365,7 +2365,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Disk", + "title": "ONTAP: Disk", "uid": "DIc93hunk", "version": 23 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_lun.json b/grafana/dashboards/cmode/harvest_dashboard_lun.json index c1d057e4c..77d55038f 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_lun.json +++ b/grafana/dashboards/cmode/harvest_dashboard_lun.json @@ -4499,7 +4499,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: LUN", + "title": "ONTAP: LUN", "uid": "AUlcSlQ7z", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_mcc_cluster.json b/grafana/dashboards/cmode/harvest_dashboard_mcc_cluster.json index dbd19af47..cdaa3c8a2 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_mcc_cluster.json +++ b/grafana/dashboards/cmode/harvest_dashboard_mcc_cluster.json @@ -2723,7 +2723,7 @@ "type": "timepicker" }, "timezone": "browser", - "title": "NetApp Detail: MetroCluster", + "title": "ONTAP: MetroCluster", "uid": "i6KRsKQ7z", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_network_detail.json b/grafana/dashboards/cmode/harvest_dashboard_network_detail.json index 3dfa93fd8..ea3bd4abb 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_network_detail.json +++ b/grafana/dashboards/cmode/harvest_dashboard_network_detail.json @@ -2774,7 +2774,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Network - Details", + "title": "ONTAP: Network", "uid": "3__cIlwnz", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_nfs4storePool_detail.json b/grafana/dashboards/cmode/harvest_dashboard_nfs4storePool_detail.json index bb57dc8db..e32adcdf0 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_nfs4storePool_detail.json +++ b/grafana/dashboards/cmode/harvest_dashboard_nfs4storePool_detail.json @@ -2059,7 +2059,7 @@ }, "timepicker": {}, "timezone": "", - "title": "NetApp Detail: NFSv4 StorePool Monitors", + "title": "ONTAP: NFSv4 StorePool Monitors", "uid": "Lul5S_wnz", "version": 5 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_node_details.json b/grafana/dashboards/cmode/harvest_dashboard_node_details.json index 77cebb9f2..dbe356416 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_node_details.json +++ b/grafana/dashboards/cmode/harvest_dashboard_node_details.json @@ -4788,7 +4788,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Node - Details", + "title": "ONTAP: Node", "uid": "Arl5I_Q7z", "version": 7 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_nvme_fc.json b/grafana/dashboards/cmode/harvest_dashboard_nvme_fc.json index 6be8716d8..99653d773 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_nvme_fc.json +++ b/grafana/dashboards/cmode/harvest_dashboard_nvme_fc.json @@ -3270,7 +3270,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Network with NVMe/FC", + "title": "ONTAP: Network with NVMe/FC", "uid": "cC_5SlQ7z", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_power.json b/grafana/dashboards/cmode/harvest_dashboard_power.json index dff7c81c9..5a59dfd87 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_power.json +++ b/grafana/dashboards/cmode/harvest_dashboard_power.json @@ -2466,7 +2466,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Power", + "title": "ONTAP: Power", "uid": "Mq_5Slwnk", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_qtree.json b/grafana/dashboards/cmode/harvest_dashboard_qtree.json index 51ba7772b..92e7828b8 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_qtree.json +++ b/grafana/dashboards/cmode/harvest_dashboard_qtree.json @@ -490,7 +490,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Qtree", + "title": "ONTAP: Qtree", "uid": "P3lcIlw7z", "version": 2 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_security.json b/grafana/dashboards/cmode/harvest_dashboard_security.json index e358bc428..300564b69 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_security.json +++ b/grafana/dashboards/cmode/harvest_dashboard_security.json @@ -2149,7 +2149,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Security", + "title": "ONTAP: Security", "uid": "h1RE0pynk", "version": 1 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_shelf.json b/grafana/dashboards/cmode/harvest_dashboard_shelf.json index 8d34ee89a..05e11738d 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_shelf.json +++ b/grafana/dashboards/cmode/harvest_dashboard_shelf.json @@ -2252,7 +2252,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Shelf", + "title": "ONTAP: Shelf", "uid": "ee_cI_w7z", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_snapmirror.json b/grafana/dashboards/cmode/harvest_dashboard_snapmirror.json index 37264c71f..5e90978e7 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_snapmirror.json +++ b/grafana/dashboards/cmode/harvest_dashboard_snapmirror.json @@ -2293,7 +2293,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: SnapMirror", + "title": "ONTAP: SnapMirror", "uid": "YRX5I_w7k", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_svm_details.json b/grafana/dashboards/cmode/harvest_dashboard_svm_details.json index b094518ef..c3f457405 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_svm_details.json +++ b/grafana/dashboards/cmode/harvest_dashboard_svm_details.json @@ -12736,7 +12736,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: SVM - Details", + "title": "ONTAP: SVM", "uid": "rErZJO_7z", "version": 16 } \ No newline at end of file diff --git a/grafana/dashboards/cmode/harvest_dashboard_volume_details.json b/grafana/dashboards/cmode/harvest_dashboard_volume_details.json index f6ebc7a83..498a2b012 100644 --- a/grafana/dashboards/cmode/harvest_dashboard_volume_details.json +++ b/grafana/dashboards/cmode/harvest_dashboard_volume_details.json @@ -4430,7 +4430,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Volume - Details", + "title": "ONTAP: Volume", "uid": "FWucSlwnz", "version": 4 } \ No newline at end of file diff --git a/grafana/dashboards/influxdb/harvest_dashboard_aggregate.json b/grafana/dashboards/influxdb/harvest_dashboard_aggregate.json index 7c0861cb6..a82734e5c 100644 --- a/grafana/dashboards/influxdb/harvest_dashboard_aggregate.json +++ b/grafana/dashboards/influxdb/harvest_dashboard_aggregate.json @@ -3256,7 +3256,7 @@ }, "timepicker": {}, "timezone": "", - "title": "NetApp Detail: Aggregate", + "title": "ONTAP: Aggregate", "uid": "d7rkR4Vnz", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/influxdb/harvest_dashboard_cluster.json b/grafana/dashboards/influxdb/harvest_dashboard_cluster.json index 4f732c6dd..f2c0dd0aa 100644 --- a/grafana/dashboards/influxdb/harvest_dashboard_cluster.json +++ b/grafana/dashboards/influxdb/harvest_dashboard_cluster.json @@ -2107,7 +2107,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Datacenter & Cluster", + "title": "ONTAP: Datacenter & Cluster", "uid": "pS--IV4nz", "version": 8 } \ No newline at end of file diff --git a/grafana/dashboards/influxdb/harvest_dashboard_headroom.json b/grafana/dashboards/influxdb/harvest_dashboard_headroom.json index 5009d93da..8c7a29ca3 100644 --- a/grafana/dashboards/influxdb/harvest_dashboard_headroom.json +++ b/grafana/dashboards/influxdb/harvest_dashboard_headroom.json @@ -3389,7 +3389,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Headroom", + "title": "ONTAP: Headroom", "uid": "MhKmRVV7z", "version": 3 } \ No newline at end of file diff --git a/grafana/dashboards/influxdb/harvest_dashboard_network.json b/grafana/dashboards/influxdb/harvest_dashboard_network.json index 1b368ac3f..a2a19a6ab 100644 --- a/grafana/dashboards/influxdb/harvest_dashboard_network.json +++ b/grafana/dashboards/influxdb/harvest_dashboard_network.json @@ -4124,7 +4124,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Network", + "title": "ONTAP: Network", "uid": "ozZZRV4nz", "version": 8 } \ No newline at end of file diff --git a/grafana/dashboards/influxdb/harvest_dashboard_shelf.json b/grafana/dashboards/influxdb/harvest_dashboard_shelf.json index 9c0067f23..98454c4fe 100644 --- a/grafana/dashboards/influxdb/harvest_dashboard_shelf.json +++ b/grafana/dashboards/influxdb/harvest_dashboard_shelf.json @@ -1735,7 +1735,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: Shelf", + "title": "ONTAP: Shelf", "uid": "TZMMg44nz", "version": 5 } \ No newline at end of file diff --git a/grafana/dashboards/influxdb/harvest_dashboard_snapmirror.json b/grafana/dashboards/influxdb/harvest_dashboard_snapmirror.json index 3215421fb..a79d83c9b 100644 --- a/grafana/dashboards/influxdb/harvest_dashboard_snapmirror.json +++ b/grafana/dashboards/influxdb/harvest_dashboard_snapmirror.json @@ -3392,7 +3392,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: SnapMirror", + "title": "ONTAP: SnapMirror", "uid": "S_AMg4V7z", "version": 4 } \ No newline at end of file diff --git a/grafana/dashboards/influxdb/harvest_dashboard_svm.json b/grafana/dashboards/influxdb/harvest_dashboard_svm.json index 6648c2966..c868f9454 100644 --- a/grafana/dashboards/influxdb/harvest_dashboard_svm.json +++ b/grafana/dashboards/influxdb/harvest_dashboard_svm.json @@ -1188,7 +1188,7 @@ ] }, "timezone": "", - "title": "NetApp Detail: SVM", + "title": "ONTAP: SVM", "uid": "bVZnRV47z", "version": 8 } \ No newline at end of file diff --git a/integration/test/dashboard_test.go b/integration/test/dashboard_test.go index 99230963a..b532b5c7a 100644 --- a/integration/test/dashboard_test.go +++ b/integration/test/dashboard_test.go @@ -73,24 +73,24 @@ func (suite *DashboardImportTestSuite) TestCModeDashboardCount() { folderId := GetFolderId(cDotFolder, suite.T()) expectedName := []string{ "Harvest Metadata", - "NetApp Detail: Aggregate", - "NetApp Detail: Cluster", - "NetApp Detail: Disk", - "NetApp Detail: LUN", - "NetApp Detail: Network - Details", - "NetApp Detail: Network with NVMe/FC", - "NetApp Detail: Node - Details", - "NetApp Detail: Shelf", - "NetApp Detail: SnapMirror", - "NetApp Detail: SVM - Details", - "NetApp Detail: Volume - Details", - "NetApp Detail: MetroCluster", - "NetApp Detail: Data Protection", - "NetApp Detail: Data Protection SnapMirror", - "NetApp Detail: Qtree", - "NetApp Detail: Security", - "NetApp Detail: Compliance", - "NetApp Detail: Power", + "ONTAP: Aggregate", + "ONTAP: Cluster", + "ONTAP: Disk", + "ONTAP: LUN", + "ONTAP: Network", + "ONTAP: Network with NVMe/FC", + "ONTAP: Node", + "ONTAP: Shelf", + "ONTAP: SnapMirror", + "ONTAP: SVM", + "ONTAP: Volume", + "ONTAP: MetroCluster", + "ONTAP: Data Protection Snapshots", + "ONTAP: Data Protection SnapMirror", + "ONTAP: Qtree", + "ONTAP: Security", + "ONTAP: Compliance", + "ONTAP: Power", } VerifyDashboards(folderId, expectedName, suite.T()) @@ -100,15 +100,15 @@ func (suite *DashboardImportTestSuite) TestSevenModeDashboardCount() { folderId := GetFolderId(sevenModeFolder, suite.T()) expectedName := []string{ - "NetApp Detail: Aggregate 7 mode", - "NetApp Detail: Cluster 7 mode", - "NetApp Detail: Disk 7 mode", - "NetApp Detail: LUN 7 mode", - "NetApp Detail: Network 7 mode", - "NetApp Detail: Network with NVMe/FC 7 mode", - "NetApp Detail: Node 7 mode", - "NetApp Detail: Shelf 7 mode", - "NetApp Detail: Volume 7 mode", + "ONTAP: Aggregate 7 mode", + "ONTAP: Cluster 7 mode", + "ONTAP: Disk 7 mode", + "ONTAP: LUN 7 mode", + "ONTAP: Network 7 mode", + "ONTAP: Network with NVMe/FC 7 mode", + "ONTAP: Node 7 mode", + "ONTAP: Shelf 7 mode", + "ONTAP: Volume 7 mode", } VerifyDashboards(folderId, expectedName, suite.T()) }