feat: add node handling for cm2

cmd/collectors/cmperf/cm2.go

@@ -420,6 +420,10 @@ func (c *CmPerf) populateMatrix(oc *cmmetrics.ObjectCollection, curMat *matrix.M
 			stringVals["instance_uuid"] = inst.UUID
 		}
 
+		if oc.Node != "" {
+			stringVals["node_name"] = oc.Node
+		}
+
 		for _, ct := range inst.Counters {
 			cs, csOK := schemaMap[ct.Index]
 			if !csOK {

conf/cmperf/9.19.1/cifs_node.yaml

@@ -6,16 +6,17 @@ object:                   node_cifs
 allow_partial_aggregation: true
 
 counters:
+  - ^^instance_uuid
+  - ^instance_name           => node
   - cifs_latency             => latency
   - cifs_op_count            => op_count
-  - cifs_ops                 => total_ops     # "cifs_ops" already used in system_node.yaml
+  - cifs_ops                 => total_ops # "cifs_ops" already used in system_node.yaml
   - cifs_read_latency        => read_latency
   - cifs_read_ops            => read_ops
   - cifs_write_latency       => write_latency
   - cifs_write_ops           => write_ops
   - connections
   - established_sessions
-  - instance_name            => node
   - open_files
 
 export_options:

conf/cmperf/9.19.1/cifs_vserver.yaml

@@ -4,6 +4,8 @@ query:                    cifs:vserver
 object:                   svm_cifs
 
 counters:
+  - ^^instance_uuid
+  - ^instance_name          => svm
   - cifs_latency            => latency
   - cifs_op_count           => op_count
   - cifs_ops                => ops
@@ -13,8 +15,6 @@ counters:
   - cifs_write_ops          => write_ops
   - connections
   - established_sessions
-  - instance_name           => svm
-  - instance_uuid
   - open_files
   - signed_sessions
 

conf/cmperf/9.19.1/disk.yaml

@@ -3,21 +3,21 @@ query:                    disk:constituent
 object:                   disk
 
 counters:
+  - ^^instance_uuid
+  - ^instance_name         => partition
+  - ^node_name             => node
+  - ^physical_disk_name    => disk
+  - ^physical_disk_uuid    => disk_uuid
+  - ^raid_group
+  - ^raid_type
   - cp_read_chain
   - cp_read_latency
   - cp_reads
   - disk_busy
   - disk_capacity
   - disk_speed
-  - instance_name         => partition
-  - instance_uuid
   - io_pending
   - io_queued
-  - node_name             => node
-  - physical_disk_name    => disk
-  - physical_disk_uuid    => disk_uuid
-  - raid_group
-  - raid_type
   - total_data
   - total_transfers
   - user_read_blocks

conf/cmperf/9.19.1/external_service_operation.yaml

@@ -4,23 +4,23 @@ query:                    external_service_op
 object:                   external_service_op
 
 counters:
-  - instance_name
-  - instance_uuid
-  - node_name              => node
+  - ^^instance_uuid
+  - ^instance_name
+  - ^node_name              => node
+  - ^operation
+  - ^process_name
+  - ^server_ip_address
+  - ^server_name
+  - ^service_name
+  - ^vserver_name           => svm
   - num_not_found_responses
   - num_request_failures
   - num_requests_sent
   - num_responses_received
   - num_successful_responses
   - num_timeouts
-  - operation
-  - process_name
   - request_latency
   - request_latency_hist
-  - server_ip_address
-  - server_name
-  - service_name
-  - vserver_name           => svm
 
 plugins:
 #  - ExternalServiceOperation #TODO implement

conf/cmperf/9.19.1/fcp.yaml

@@ -3,23 +3,23 @@ query:                    fcp_port
 object:                   fcp
 
 counters:
+  - ^^instance_uuid
+  - ^instance_name          => port
+  - ^link_speed             => speed
+  - ^node_name              => node
   - avg_other_latency
   - avg_read_latency
   - avg_write_latency
   - discarded_frames_count
-  - instance_name          => port
-  - instance_uuid
   - int_count
   - invalid_crc
   - invalid_transmission_word
   - isr_count
   - link_down
   - link_failure
-  - link_speed             => speed
   - link_up
   - loss_of_signal
   - loss_of_sync
-  - node_name              => node
   - nvmf_avg_other_latency
   - nvmf_avg_read_latency
   - nvmf_avg_remote_other_latency

conf/cmperf/9.19.1/fcvi.yaml

@@ -4,16 +4,16 @@ query:                    fcvi
 object:                   fcvi
 
 counters:
+  - ^^instance_uuid
+  - ^instance_name          => fcvi
+  - ^node_name              => node
   - fw_SyStatDiscardFrames  => firmware_systat_discard_frames
   - fw_invalid_crc          => firmware_invalid_crc_count
   - fw_invalid_xmit_words   => firmware_invalid_transmit_word_count
   - fw_link_failure         => firmware_link_failure_count
   - fw_loss_of_signal       => firmware_loss_of_signal_count
   - fw_loss_of_sync         => firmware_loss_of_sync_count
   - hard_reset_cnt          => hard_reset_count
-  - instance_name           => fcvi
-  - instance_uuid
-  - node_name               => node
   - rdma_write_avg_latency
   - rdma_write_ops
   - rdma_write_throughput

conf/cmperf/9.19.1/lun.yaml

@@ -4,7 +4,8 @@ query:                    lun
 object:                   lun
 
 counters:
-  - ^^instance_name     => lun
+  - ^^instance_uuid
+  - ^instance_name      => lun
   - ^vserver_name       => svm
   - avg_read_latency
   - avg_write_latency

conf/cmperf/9.19.1/netstat.yaml

@@ -4,16 +4,16 @@ query:                    netstat
 object:                   netstat
 
 counters:
+  - ^^instance_uuid
+  - ^faddr
+  - ^fport_hbo                => fport
+  - ^laddr
+  - ^lport_hbo                => lport
+  - ^node_name                => node
   - bytes_recvd
   - bytes_sent
   - cong_win
   - cong_win_th
-  - faddr
-  - fport_hbo                => fport
-  - instance_uuid
-  - laddr
-  - lport_hbo                => lport
-  - node_name                => node
   - ooorcv_pkts
   - recv_window
   - rexmit_pkts
@@ -33,4 +33,4 @@ export_options:
   instance_keys:
     - faddr
     - laddr
-    - node
+    - node

conf/cmperf/9.19.1/nfsv4_pool.yaml

@@ -6,8 +6,8 @@ global_labels:
   - nfsv: v4
 
 counters:
-  - instance_uuid
-  - node_name       => node
+  - ^^instance_uuid
+  - ^node_name       => node
   - storePool_ByteLockAlloc
   - storePool_ByteLockMax
   - storePool_ClientAlloc

conf/cmperf/9.19.1/nvmf_rdma_port.yaml

@@ -4,20 +4,20 @@ query:                    nvmf_rdma_port
 object:                   nvmf_rdma_port
 
 counters:
+  - ^^instance_uuid
+  - ^node_name             => node
+  - ^port_id               => lif
+  - ^port_ip_addr
+  - ^vserver_name          => svm
   - avg_latency
   - avg_other_latency
   - avg_read_latency
   - avg_write_latency
-  - instance_uuid
-  - node_name             => node
   - other_ops
-  - port_id               => lif
-  - port_ip_addr
   - read_data
   - read_ops
   - total_data
   - total_ops
-  - vserver_name          => svm
   - write_data
   - write_ops
 

conf/cmperf/9.19.1/nvmf_tcp_port.yaml

@@ -4,20 +4,20 @@ query:                    nvmf_tcp_port
 object:                   nvmf_tcp_port
 
 counters:
+  - ^^instance_uuid
+  - ^node_name             => node
+  - ^port_id               => lif
+  - ^port_ip_addr
+  - ^vserver_name          => svm
   - avg_latency
   - avg_other_latency
   - avg_read_latency
   - avg_write_latency
-  - instance_uuid
-  - node_name             => node
   - other_ops
-  - port_id               => lif
-  - port_ip_addr
   - read_data
   - read_ops
   - total_data
   - total_ops
-  - vserver_name          => svm
   - write_data
   - write_ops
 

conf/cmperf/9.19.1/object_store_client_op.yaml

@@ -4,11 +4,11 @@ query:                    object_store_client_op
 object:                   fabricpool
 
 counters:
-  - ^^instance_name        => fabricpool
+  - ^^instance_uuid
+  - ^instance_name => fabricpool
+  - ^node_name     => node
   - average_latency
   - get_throughput_bytes
-  - instance_uuid
-  - node_name              => node
   - put_throughput_bytes
   - stats
   - throughput_ops

conf/cmperf/9.19.1/ontap_s3_svm.yaml

@@ -3,6 +3,9 @@ query:                    object_store_server
 object:                   ontaps3_svm
 
 counters:
+  - ^^instance_uuid
+  - ^node_name                                           => node
+  - ^vserver_name                                        => svm
   - abort_multipart_upload_failed
   - abort_multipart_upload_failed_client_close
   - abort_multipart_upload_latency
@@ -102,7 +105,6 @@ counters:
   - max_connected_connections
   - max_requests_outstanding
   - multi_delete_reqs
-  - node_name                                           => node
   - output_flow_control_entry
   - output_flow_control_exit
   - presigned_url_reqs
@@ -132,7 +134,6 @@ counters:
   - upload_part_latency
   - upload_part_rate
   - upload_part_total
-  - vserver_name                                        => svm
 
 plugins:
   - Aggregator:

conf/cmperf/9.19.1/qtree.yaml

@@ -3,15 +3,15 @@ query:                    qtree
 object:                   qtree
 
 counters:
+  - ^^instance_uuid
+  - ^instance_name         => qtreefull
+  - ^node_name             => node
+  - ^parent_vol            => volume
+  - ^vserver_name          => svm
   - cifs_ops
-  - instance_name         => qtreefull
-  - instance_uuid
   - internal_ops
   - nfs_ops
-  - node_name             => node
-  - parent_vol            => volume
   - total_ops
-  - vserver_name          => svm
 
 plugins:
   - LabelAgent:
@@ -23,4 +23,4 @@ export_options:
   instance_keys:
     - qtree
     - svm
-    - volume
+    - volume

conf/cmperf/9.19.1/token_manager.yaml

@@ -3,9 +3,9 @@ query:                    token_manager
 object:                   token
 
 counters:
-  - ^^instance_name        => token
-  - instance_uuid
-  - node_name              => node
+  - ^^instance_uuid
+  - ^instance_name => token
+  - ^node_name     => node
   - token_copy_bytes
   - token_copy_failure
   - token_copy_success

conf/cmperf/9.19.1/volume_node.yaml

@@ -9,6 +9,8 @@ object:                   node_vol
 allow_partial_aggregation: true
 
 counters:
+  - ^^instance_uuid
+  - ^instance_name           => node
   - cifs_other_latency
   - cifs_other_ops
   - cifs_read_data
@@ -25,7 +27,6 @@ counters:
   - fcp_write_data
   - fcp_write_latency
   - fcp_write_ops
-  - instance_name           => node
   - iscsi_other_latency
   - iscsi_other_ops
   - iscsi_read_data