fix: workload and workload_volume templates should invoke the instanc…

…e task before the data task.

cmd/collectors/restperf/restperf.go

@@ -1519,18 +1519,19 @@ func (r *RestPerf) PollInstance() (map[string]*matrix.Matrix, error) {
 		records []gjson.Result
 	)
 
-	dataQuery := path.Join(r.Prop.Query, "rows")
-	fields := "properties"
+	// The PollInstance method is only needed for `workload` and `workload_detail` objects.
+	if !(isWorkloadObject(r.Prop.Query) || isWorkloadDetailObject(r.Prop.Query)) {
+		return nil, nil
+	}
+
 	var filter []string
 
-	if isWorkloadObject(r.Prop.Query) || isWorkloadDetailObject(r.Prop.Query) {
-		fields = "*"
-		dataQuery = qosWorkloadQuery
-		if r.Prop.Query == qosVolumeQuery || r.Prop.Query == qosDetailVolumeQuery {
-			filter = append(filter, "workload_class="+r.loadWorkloadClassQuery(objWorkloadVolumeClass))
-		} else {
-			filter = append(filter, "workload_class="+r.loadWorkloadClassQuery(objWorkloadClass))
-		}
+	fields := "*"
+	dataQuery := qosWorkloadQuery
+	if r.Prop.Query == qosVolumeQuery || r.Prop.Query == qosDetailVolumeQuery {
+		filter = append(filter, "workload_class="+r.loadWorkloadClassQuery(objWorkloadVolumeClass))
+	} else {
+		filter = append(filter, "workload_class="+r.loadWorkloadClassQuery(objWorkloadClass))
 	}
 
 	r.pollInstanceCalls++

conf/restperf/default.yaml

@@ -4,6 +4,7 @@ collector:          RestPerf
 # Order here matters!
 schedule:
   - counter:  24h
+  - instance: 720h   # This is only needed for `workload` and `workload_volume` templates, which overwrite this value in their own templates.
   - data:      1m
 
 objects:
@@ -55,6 +56,5 @@ objects:
   Vscan:             vscan.yaml
   VscanSVM:          vscan_svm.yaml
 
-#  Uncomment to collect workload/QOS counters.
   Workload:             workload.yaml
   WorkloadVolume:       workload_volume.yaml

conf/zapiperf/default.yaml

@@ -61,6 +61,5 @@ objects:
   Vscan:                    vscan.yaml
   VscanSVM:                 vscan_svm.yaml
 
-#  Uncomment to collect workload/QOS counters.
   Workload:             workload.yaml
   WorkloadVolume:       workload_volume.yaml