Refactor Cilium measurements queries and update pod actions to use va…

…riable placeholders
Azure · Dec 23, 2024 · 0491879 · 0491879
1 parent f607a60
commit 0491879
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/modules/python/clusterloader2/slo/config/load-config.yaml b/modules/python/clusterloader2/slo/config/load-config.yaml
@@ -161,7 +161,7 @@ steps:
   - module:
       path: /modules/reconcile-objects.yaml
       params:
-        actionName: "Create 200 pods"
+        actionName: "Create {{$PODS}} pods"
         namespaces: {{$namespaces}}
         tuningSet: BurstLoad
         operationTimeout: {{$operationTimeout}}
@@ -177,7 +177,7 @@ steps:
   - module:
       path: /modules/reconcile-objects.yaml
       params:
-        actionName: "delete 200 pods"
+        actionName: "delete {{$PODS}} pods"
         namespaces: {{$namespaces}}
         tuningSet: BurstLoad
         operationTimeout: {{$operationTimeout}}
@@ -192,7 +192,7 @@ steps:
   - module:
       path: /modules/reconcile-objects.yaml
       params:
-        actionName: "recreate 200 pods"
+        actionName: "recreate {{$PODS}} pods"
         namespaces: {{$namespaces}}
         tuningSet: BurstLoad
         operationTimeout: {{$operationTimeout}}
@@ -208,7 +208,7 @@ steps:
   - module:
       path: /modules/reconcile-objects.yaml
       params:
-        actionName: "delete 250 pods"
+        actionName: "delete {{$PODS}} pods"
         namespaces: {{$namespaces}}
         tuningSet: BurstLoad
         operationTimeout: {{$operationTimeout}}

diff --git a/modules/python/clusterloader2/slo/config/modules/cilium-measurements.yaml b/modules/python/clusterloader2/slo/config/modules/cilium-measurements.yaml
@@ -197,18 +197,13 @@ steps:
           query: sum(cilium_api_limiter_requests_in_flight)
         - name: MaxOverTimeSum
           query: max_over_time(sum(cilium_api_limiter_requests_in_flight)[%v:])
-        - name: MaxOverTimeIndividual
-          query: max_over_time(max(cilium_api_limiter_requests_in_flight) by (instance)[%v:])
         - name: AvgOverTimeSum
           query: avg_over_time(sum(cilium_api_limiter_requests_in_flight)[%v:])
-        - name: AvgOverTimeIndividual
-          query: avg_over_time(avg(cilium_api_limiter_requests_in_flight) by (instance)[%v:])
         - name: SumOverTime
           query: sum_over_time(sum(cilium_api_limiter_requests_in_flight)[%v:])
         - name: MinOverTimeSum
           query: min_over_time(sum(cilium_api_limiter_requests_in_flight)[%v:])
-        - name: MinOverTimeIndividual
-          query: min_over_time(min(cilium_api_limiter_requests_in_flight) by (instance)[%v:])
+
     - Identifier: CiliumAPIRateLimiterWaitDuration
       Method: GenericPrometheusQuery
       Params: