feat: collect external_service_op perf object

cmd/tools/grafana/dashboard_test.go

@@ -484,6 +484,7 @@ func TestIDIsBlank(t *testing.T) {
 		[]string{"../../../grafana/dashboards/cmode", "../../../grafana/dashboards/storagegrid"},
 		func(path string, data []byte) {
 			checkUIDIsBlank(t, path, data)
+			checkIDIsNull(t, path, data)
 		})
 }
 
@@ -508,6 +509,13 @@ func checkUIDIsBlank(t *testing.T, path string, data []byte) {
 	}
 }
 
+func checkIDIsNull(t *testing.T, path string, data []byte) {
+	id := gjson.GetBytes(data, "id").String()
+	if id != "" {
+		t.Errorf(`dashboard=%s id should be null but is %s`, shortPath(path), id)
+	}
+}
+
 func TestUniquePanelIDs(t *testing.T) {
 	visitDashboards(
 		[]string{"../../../grafana/dashboards/cmode", "../../../grafana/dashboards/storagegrid"},

conf/zapiperf/cdot/9.8.0/external_service_op.yaml

@@ -0,0 +1,35 @@
+
+name:                     ExternalServiceOperation
+query:                    external_service_op
+object:                   external_service_op
+
+instance_key:             uuid
+
+counters:
+  - instance_name
+  - instance_uuid
+  - node_name              => node
+  - 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
+
+export_options:
+  instance_keys:
+    - node
+    - operation
+    - process_name
+    - server_ip_address
+    - server_name
+    - service_name
+    - svm

conf/zapiperf/default.yaml

@@ -9,54 +9,55 @@ schedule:
 
 objects:
   # Node-level metrics
-  CIFSNode:               cifs_node.yaml
-  Disk:                   disk.yaml
-  ExtCacheObj:            ext_cache_obj.yaml
-  FCVI:                   fcvi.yaml
-  FcpPort:                fcp.yaml
-  HeadroomAggr:           resource_headroom_aggr.yaml
-  HeadroomCPU:            resource_headroom_cpu.yaml
-  HostAdapter:            hostadapter.yaml
-#  Netstat:                netstat.yaml
-  NFSv3Node:              nfsv3_node.yaml
-  NFSv41Node:             nfsv4_1_node.yaml
-  NFSv42Node:             nfsv4_2_node.yaml
-  NFSv4Node:              nfsv4_node.yaml
-  NVMfLif:                nvmf_lif.yaml
-  Namespace:              namespace.yaml
-  NicCommon:              nic_common.yaml
-  ObjectStoreClient:      object_store_client_op.yaml
-  Path:                   path.yaml
-  Qtree:                  qtree.yaml
-  SystemNode:             system_node.yaml
-  TokenManager:           token_manager.yaml
-  VolumeNode:             volume_node.yaml
-  WAFL:                   wafl.yaml
-  WAFLAggr:               wafl_hya_per_aggr.yaml
-  WAFLSizer:              wafl_hya_sizer.yaml
-#  NFSv4Pool:              nfsv4_pool.yaml
+  CIFSNode:                 cifs_node.yaml
+  Disk:                     disk.yaml
+  ExtCacheObj:              ext_cache_obj.yaml
+  FCVI:                     fcvi.yaml
+  FcpPort:                  fcp.yaml
+  HeadroomAggr:             resource_headroom_aggr.yaml
+  HeadroomCPU:              resource_headroom_cpu.yaml
+  HostAdapter:              hostadapter.yaml
+#  Netstat:                  netstat.yaml
+  NFSv3Node:                nfsv3_node.yaml
+  NFSv41Node:               nfsv4_1_node.yaml
+  NFSv42Node:               nfsv4_2_node.yaml
+  NFSv4Node:                nfsv4_node.yaml
+  NVMfLif:                  nvmf_lif.yaml
+  Namespace:                namespace.yaml
+  NicCommon:                nic_common.yaml
+  ObjectStoreClient:        object_store_client_op.yaml
+  Path:                     path.yaml
+  Qtree:                    qtree.yaml
+  SystemNode:               system_node.yaml
+  TokenManager:             token_manager.yaml
+  VolumeNode:               volume_node.yaml
+  WAFL:                     wafl.yaml
+  WAFLAggr:                 wafl_hya_per_aggr.yaml
+  WAFLSizer:                wafl_hya_sizer.yaml
+#  NFSv4Pool:                nfsv4_pool.yaml
 
   # SVM-level metrics
-  CIFSvserver:            cifs_vserver.yaml
-  CopyManager:            copy_manager.yaml
-  FcpLif:                 fcp_lif.yaml
-  ISCSI:                  iscsi_lif.yaml
-  LIF:                    lif.yaml
-  Lun:                    lun.yaml
-  NFSv3:                  nfsv3.yaml
-  NFSv41:                 nfsv4_1.yaml
-  NFSv42:                 nfsv4_2.yaml
-  NFSv4:                  nfsv4.yaml
-  OntapS3SVM:             ontap_s3_svm.yaml
-  SMB2:                   smb2.yaml
-  Volume:                 volume.yaml
-  VolumeSvm:              volume_svm.yaml
-  WAFLCompBin:            wafl_comp_aggr_vol_bin.yaml
-  Vscan:                  vscan.yaml
-  VscanSVM:               vscan_svm.yaml
+  CIFSvserver:              cifs_vserver.yaml
+  CopyManager:              copy_manager.yaml
+#  ExternalServiceOperation: external_service_op.yaml
+  FcpLif:                   fcp_lif.yaml
+  ISCSI:                    iscsi_lif.yaml
+  LIF:                      lif.yaml
+  Lun:                      lun.yaml
+  NFSv3:                    nfsv3.yaml
+  NFSv41:                   nfsv4_1.yaml
+  NFSv42:                   nfsv4_2.yaml
+  NFSv4:                    nfsv4.yaml
+  OntapS3SVM:               ontap_s3_svm.yaml
+  SMB2:                     smb2.yaml
+  Volume:                   volume.yaml
+  VolumeSvm:                volume_svm.yaml
+  WAFLCompBin:              wafl_comp_aggr_vol_bin.yaml
+  Vscan:                    vscan.yaml
+  VscanSVM:                 vscan_svm.yaml
 
 #  Uncomment to collect workload/QOS counters  
-#  Workload:               workload.yaml
-#  WorkloadDetail:         workload_detail.yaml
-#  WorkloadVolume:         workload_volume.yaml
-#  WorkloadDetailVolume:   workload_detail_volume.yaml
+#  Workload:                 workload.yaml
+#  WorkloadDetail:           workload_detail.yaml
+#  WorkloadVolume:           workload_volume.yaml
+#  WorkloadDetailVolume:     workload_detail_volume.yaml