From 033ea4bea9b48b30a1152d79d2680c9a68a8d613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Sat, 10 Dec 2022 00:31:09 +0100
Subject: [PATCH] Fix PromQl queries + fix load dimension

---
 .../uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml     | 2 +-
 .../definitions/uc2-flink/uc2-flink-benchmark-operator.yaml   | 2 +-
 .../uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml | 2 +-
 .../uc2-kstreams/uc2-kstreams-benchmark-operator.yaml         | 2 +-
 .../uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml     | 2 +-
 .../definitions/uc4-flink/uc4-flink-benchmark-operator.yaml   | 2 +-
 .../uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml | 4 ++--
 .../uc4-kstreams/uc4-kstreams-benchmark-operator.yaml         | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml
index a113a9fb8..20ebf1e0f 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml
@@ -97,7 +97,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_org_apache_beam_runners_core_LateDataDroppingDoFnRunner_droppedDueToLateness[30s])) by (job) OR vector(0)"
+        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_org_apache_beam_runners_core_LateDataDroppingDoFnRunner_droppedDueToLateness[30s])) by (job) OR clamp_max(absent(notExists{job='absent'}),0)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
diff --git a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
index 51ebb7c27..0c30c88ff 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
@@ -97,7 +97,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_numLateRecordsDropped[30s])) by(job) OR vector(0)"
+        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_numLateRecordsDropped[30s])) by(job)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
index e207c4a1e..419326787 100644
--- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-hazelcastjet-benchmark-operator.yaml
@@ -72,7 +72,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(com_hazelcast_jet_metrics_lateeventsdropped[30s])) by(job) OR vector(0)"
+        promQLQuery: "sum(rate(com_hazelcast_jet_metrics_lateeventsdropped[30s])) by(job)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
index c20ef252d..3e82c08f3 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
@@ -77,7 +77,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(kafka_streams_stream_task_metrics_dropped_records_total[30s])) by (job) OR vector(0)"
+        promQLQuery: "sum(rate(kafka_streams_stream_task_metrics_dropped_records_total[30s])) by (job)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml
index 89461e5bc..36701522b 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml
@@ -98,7 +98,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_org_apache_beam_runners_core_LateDataDroppingDoFnRunner_droppedDueToLateness[30s])) by (job) OR vector(0)"
+        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_org_apache_beam_runners_core_LateDataDroppingDoFnRunner_droppedDueToLateness[30s])) by (job) OR clamp_max(absent(notExists{job='absent'}),0)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
diff --git a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
index 7820559f7..4eddd7771 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
@@ -98,7 +98,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_numLateRecordsDropped[30s])) by(job) OR vector(0)"
+        promQLQuery: "sum(rate(flink_taskmanager_job_task_operator_numLateRecordsDropped[30s])) by(job)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml
index d630b9753..2370bbbad 100644
--- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-hazelcastjet-benchmark-operator.yaml
@@ -51,7 +51,7 @@ spec:
           resource: "uc4-load-generator-deployment.yaml"
           properties:
             container: "workload-generator"
-            variableName: "NUM_SENSORS"
+            variableName: "NUM_NESTED_GROUPS"
         - type: NumNestedGroupsLoadGeneratorReplicaPatcher
           resource: "uc4-load-generator-deployment.yaml"
           properties:
@@ -73,7 +73,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(com_hazelcast_jet_metrics_lateeventsdropped[30s])) by(job) OR vector(0)"
+        promQLQuery: "sum(rate(com_hazelcast_jet_metrics_lateeventsdropped[30s])) by(job)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
index 693e85405..e43f210f6 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
@@ -56,7 +56,7 @@ spec:
           resource: "uc4-load-generator-deployment.yaml"
           properties:
             container: "workload-generator"
-            variableName: "NUM_SENSORS"
+            variableName: "NUM_NESTED_GROUPS"
         - type: NumNestedGroupsLoadGeneratorReplicaPatcher
           resource: "uc4-load-generator-deployment.yaml"
           properties:
@@ -78,7 +78,7 @@ spec:
       offset: 0
       properties:
         externalSloUrl: "http://localhost:8082"
-        promQLQuery: "sum(rate(kafka_streams_stream_task_metrics_dropped_records_total[30s])) by (job) OR vector(0)"
+        promQLQuery: "sum(rate(kafka_streams_stream_task_metrics_dropped_records_total[30s])) by (job)"
         warmup: 60 # in seconds
         queryAggregation: max
         repetitionAggregation: median
-- 
GitLab