refactor: normalize schedules to minutes

NetApp · Aug 17, 2023 · e84c275 · e84c275
1 parent 076707a
commit e84c275
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 44 deletions.
diff --git a/cmd/collectors/restperf/testdata/conf/restperf/9.12.1/workload_volume.yaml b/cmd/collectors/restperf/testdata/conf/restperf/9.12.1/workload_volume.yaml
@@ -9,9 +9,9 @@ object:                   qos_volume
 # recommended to use large interval, since workload objects are expensive
 client_timeout:           1m30s
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - ^^uuid

diff --git a/conf/rest/9.12.0/security_certificate.yaml b/conf/rest/9.12.0/security_certificate.yaml
@@ -19,7 +19,7 @@ counters:
 plugins:
   - Certificate:
       schedule:
-        - data: 180s  # should be multiple of data poll duration
+        - data: 3m  # should be multiple of data poll duration
 
 export_options:
   instance_keys:

diff --git a/conf/restperf/9.12.0/workload.yaml b/conf/restperf/9.12.0/workload.yaml
@@ -8,9 +8,9 @@ object:                   qos
 client_timeout:           1m30s
 
 schedule:
-  - counter:  1200s
-  - instance: 600s
-  - data:     180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - ^^uuid

diff --git a/conf/restperf/9.12.0/workload_detail.yaml b/conf/restperf/9.12.0/workload_detail.yaml
@@ -9,9 +9,9 @@ object:                   qos_detail
 client_timeout:           1m30s
 
 schedule:
-  - counter:  1200s
-  - instance: 600s
-  - data:     180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - ^^id

diff --git a/conf/restperf/9.12.0/workload_detail_volume.yaml b/conf/restperf/9.12.0/workload_detail_volume.yaml
@@ -8,9 +8,9 @@ object:                   qos_detail
 client_timeout:           1m30s
 
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - ^^id

diff --git a/conf/restperf/9.12.0/workload_volume.yaml b/conf/restperf/9.12.0/workload_volume.yaml
@@ -10,9 +10,9 @@ object:                   qos
 client_timeout:           1m30s
 
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - ^^uuid

diff --git a/conf/zapi/cdot/9.8.0/security.yaml b/conf/zapi/cdot/9.8.0/security.yaml
@@ -12,7 +12,7 @@ no_max_records: true
 plugins:
   - Security:
       schedule:
-        - data: 180s  # should be multiple of data poll duration
+        - data: 3m  # should be multiple of data poll duration
 
 export_options:
   instance_keys:

diff --git a/conf/zapi/cdot/9.8.0/security_certificate.yaml b/conf/zapi/cdot/9.8.0/security_certificate.yaml
@@ -18,7 +18,7 @@ plugins:
         - type `server`
   - Certificate:
       schedule:
-        - data: 180s  # should be multiple of data poll duration
+        - data: 3m  # should be multiple of data poll duration
 
 export_options:
   instance_keys:

diff --git a/conf/zapi/default.yaml b/conf/zapi/default.yaml
@@ -3,7 +3,7 @@ collector:          Zapi
 
 # Order here matters!
 schedule:
-  - data: 180s
+  - data: 3m
 
 objects:
   Aggregate:                   aggr.yaml

diff --git a/conf/zapiperf/cdot/9.8.0/workload.yaml b/conf/zapiperf/cdot/9.8.0/workload.yaml
@@ -10,9 +10,9 @@ instance_key:             uuid
 # recommended to use large interval, since workload objects are expensive
 client_timeout:           1m30s
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - concurrency

diff --git a/conf/zapiperf/cdot/9.8.0/workload_detail.yaml b/conf/zapiperf/cdot/9.8.0/workload_detail.yaml
@@ -11,9 +11,9 @@ instance_key:             name
 client_timeout:           1m30s
 
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - instance_name

diff --git a/conf/zapiperf/cdot/9.8.0/workload_detail_volume.yaml b/conf/zapiperf/cdot/9.8.0/workload_detail_volume.yaml
@@ -10,9 +10,9 @@ instance_key:             name
 client_timeout:           1m30s
 
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 counters:
   - instance_name

diff --git a/conf/zapiperf/cdot/9.8.0/workload_volume.yaml b/conf/zapiperf/cdot/9.8.0/workload_volume.yaml
@@ -9,9 +9,9 @@ object:                   qos
 # recommended to use large interval, since workload objects are expensive
 client_timeout:           1m30s
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 180s
+  - counter:  20m
+  - instance: 10m
+  - data:      3m
 
 instance_key:             name
 

diff --git a/conf/zapiperf/default.yaml b/conf/zapiperf/default.yaml
@@ -3,9 +3,9 @@ collector:          ZapiPerf
 
 # Order here matters!
 schedule:
-  - counter: 1200s
-  - instance: 600s
-  - data: 60s
+  - counter:  20m
+  - instance: 10m
+  - data:      1m
 
 objects:
   # Node-level metrics

diff --git a/pkg/conf/conf/zapiperf/limited1.yaml b/pkg/conf/conf/zapiperf/limited1.yaml
@@ -3,9 +3,9 @@ collector:          ZapiPerf
 
 # Order here matters!
 schedule:
-- counter: 1200s
-- instance: 600s
-- data: 60s
+- counter:  20m
+- instance: 10m
+- data:      1m
 
 objects:
   SystemNode:             system_node.yaml
diff --git a/pkg/conf/testdata/conf/zapiperf/limited1.yaml b/pkg/conf/testdata/conf/zapiperf/limited1.yaml
@@ -3,9 +3,9 @@ collector:          ZapiPerf
 
 # Order here matters!
 schedule:
-- counter: 1200s
-- instance: 600s
-- data: 60s
+- counter:  20m
+- instance: 10m
+- data:      1m
 
 objects:
   SystemNode:             system_node.yaml
diff --git a/pkg/test/preProcessResultData/p_default_collector.yaml b/pkg/test/preProcessResultData/p_default_collector.yaml
@@ -1,7 +1,7 @@
 collector: Zapi
 schedule:
-  instance: 600s
-  data: 180s
+  instance: 10m
+  data:      3m
 objects:
   Node: node.yaml
   Aggregate: aggr.yaml

diff --git a/pkg/test/testdata/default_collector.yaml b/pkg/test/testdata/default_collector.yaml
@@ -1,7 +1,7 @@
 collector:          Zapi
 schedule:
-  - instance: 600s
-  - data: 180s
+  - instance: 10m
+  - data:      3m
 objects:
   Node:             node.yaml
   Aggregate:        aggr.yaml