feat: rest perf template fixes

NetApp · Nov 2, 2022 · 4e9dd9c · 4e9dd9c
1 parent 3217b49
commit 4e9dd9c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/conf/restperf/9.12.0/iscsi_lif.yaml b/conf/restperf/9.12.0/iscsi_lif.yaml
@@ -11,13 +11,13 @@ counters:
   - read_data
   - write_data
   - iscsi_read_ops
-  - average_read_latency
-  - average_write_latency
-  - average_other_latency
+  - average_read_latency   => avg_read_latency
+  - average_write_latency  => avg_write_latency
+  - average_other_latency  => avg_other_latency
   - iscsi_write_ops
   - iscsi_other_ops
   - cmd_transferred
-  - average_latency
+  - average_latency        => avg_latency
 
 override:
   - cmd_transferred: rate

diff --git a/conf/restperf/9.12.0/system_node.yaml b/conf/restperf/9.12.0/system_node.yaml
@@ -17,7 +17,7 @@ counters:
   - nfs_ops
   - iscsi_ops
   - fcp_ops
-  - nvme_fc_ops                        => nvme_fc_ops
+  - nvme_fc_ops                        => nvme_fc_ops          #deprecated counter in zapi nvmf_ops
   - disk_data_read
   - disk_data_written
   - hdd_data_read
@@ -28,8 +28,8 @@ counters:
   - network_data_sent                  => net_data_sent
   - fcp_data_received                  => fcp_data_recv
   - fcp_data_sent
-  - nvme_fc_data_received              => nvme_fc_data_recv
-  - nvme_fc_data_sent                  => nvme_fc_data_sent
+  - nvme_fc_data_received              => nvme_fc_data_recv   #deprecated counter in zapi nvmf_data_recv
+  - nvme_fc_data_sent                  => nvme_fc_data_sent   #deprecated counter in zapi nvmf_data_sent
 
 export_options:
   instance_keys:

diff --git a/conf/restperf/9.12.0/volume.yaml b/conf/restperf/9.12.0/volume.yaml
@@ -22,6 +22,10 @@ counters:
 
 plugins:
   - Volume
+  - Aggregator:
+      # plugin will create summary/average for each object
+      # any names after the object names will be treated as label names that will be added to instances
+      - node
 #  - LabelAgent:
 #      # To prevent visibility of transient volumes, uncomment the following lines
 #      exclude_regex: [todo: need to test after Restperf infra completed]

diff --git a/conf/restperf/9.12.0/wafl.yaml b/conf/restperf/9.12.0/wafl.yaml
@@ -3,7 +3,6 @@ name:                     WAFL
 query:                    api/cluster/counter/tables/wafl
 object:                   wafl
 
-#counter name doesn't exactly with zapiperf but these look better.
 counters:
   - ^^id
   - ^node.name                         => node

diff --git a/conf/zapiperf/cdot/9.8.0/system_node.yaml b/conf/zapiperf/cdot/9.8.0/system_node.yaml
@@ -31,7 +31,7 @@ counters:
   - fcp_data_recv
   - fcp_data_sent
   - nvmf_data_recv
-  - mvmf_data_sent
+  - nvmf_data_sent
 
 export_options:
   instance_keys: