diff --git a/theodolite-benchmarks/definitions/install-configmaps.sh b/theodolite-benchmarks/definitions/install-configmaps.sh
index feb408be033055cf98a09bc6df6ca3a9a291715e..7ddd606a162185993ce402ef4d3b84d8d00eb82c 100755
--- a/theodolite-benchmarks/definitions/install-configmaps.sh
+++ b/theodolite-benchmarks/definitions/install-configmaps.sh
@@ -1,17 +1,8 @@
-cd uc1-flink/
-kubectl create configmap benchmark-resources-uc1-flink --from-file .
-cd ../uc2-flink/
-kubectl create configmap benchmark-resources-uc2-flink --from-file .
-cd ../uc3-flink/
-kubectl create configmap benchmark-resources-uc3-flink --from-file .
-cd ../uc4-flink/
-kubectl create configmap benchmark-resources-uc4-flink --from-file .
-cd ../uc1-kstreams/
-kubectl create configmap benchmark-resources-uc1-kstreams --from-file .
-cd ../uc2-kstreams/
-kubectl create configmap benchmark-resources-uc2-kstreams --from-file .
-cd ../uc3-kstreams/
-kubectl create configmap benchmark-resources-uc3-kstreams --from-file .
-cd ../uc4-kstreams/
-kubectl create configmap benchmark-resources-uc4-kstreams --from-file .
-cd ..
\ No newline at end of file
+kubectl create configmap benchmark-resources-uc1-flink --from-file uc1-flink/resources
+kubectl create configmap benchmark-resources-uc2-flink --from-file uc2-flink/resources
+kubectl create configmap benchmark-resources-uc3-flink --from-file uc3-flink/resources
+kubectl create configmap benchmark-resources-uc4-flink --from-file uc4-flink/resources
+kubectl create configmap benchmark-resources-uc1-kstreams --from-file uc1-kstreams/resources
+kubectl create configmap benchmark-resources-uc2-kstreams --from-file uc2-kstreams/resources
+kubectl create configmap benchmark-resources-uc3-kstreams --from-file uc3-kstreams/resources
+kubectl create configmap benchmark-resources-uc4-kstreams --from-file uc4-kstreams/resources
\ No newline at end of file
diff --git a/theodolite-benchmarks/definitions/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-benchmark-operator.yaml
deleted file mode 100644
index 4ec3b08d8f20b6b4e4f108b43c9375179b7aee81..0000000000000000000000000000000000000000
--- a/theodolite-benchmarks/definitions/uc1-benchmark-operator.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc1-kstreams
-spec:
- appResource:
- - "uc1-kstreams/uc1-kstreams-deployment.yaml"
- - "uc1-kstreams/uc1-kstreams-service.yaml"
- - "uc1-kstreams/uc1-jmx-configmap.yaml"
- - "uc1-kstreams/uc1-service-monitor.yaml"
- loadGenResource:
- - "uc1-kstreams/uc1-load-generator-deployment.yaml"
- - "uc1-kstreams/uc1-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc1-kstreams/uc1-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumSensors"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: "NumSensorsLoadGeneratorReplicaPatcher"
- resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
diff --git a/theodolite-benchmarks/definitions/uc1-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-service-monitor.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-kstreams/uc1-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
index 6964c1f91d4a295ad6b7b0501c7399d189b7ad2b..4ec3b08d8f20b6b4e4f108b43c9375179b7aee81 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml
@@ -4,28 +4,28 @@ metadata:
name: uc1-kstreams
spec:
appResource:
- - "uc1-kstreams-deployment.yaml"
- - "uc1-kstreams-service.yaml"
- - "uc1-jmx-configmap.yaml"
- - "uc1-service-monitor.yaml"
+ - "uc1-kstreams/uc1-kstreams-deployment.yaml"
+ - "uc1-kstreams/uc1-kstreams-service.yaml"
+ - "uc1-kstreams/uc1-jmx-configmap.yaml"
+ - "uc1-kstreams/uc1-service-monitor.yaml"
loadGenResource:
- - "uc1-load-generator-deployment.yaml"
- - "uc1-load-generator-service.yaml"
+ - "uc1-kstreams/uc1-load-generator-deployment.yaml"
+ - "uc1-kstreams/uc1-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc1-kstreams-deployment.yaml"
+ resource: "uc1-kstreams/uc1-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc1-load-generator-deployment.yaml"
+ resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: "NumSensorsLoadGeneratorReplicaPatcher"
- resource: "uc1-load-generator-deployment.yaml"
+ resource: "uc1-kstreams/uc1-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
deleted file mode 100644
index aa25c53d793fd319ba16e15f8e8a152f177e799e..0000000000000000000000000000000000000000
--- a/theodolite-benchmarks/definitions/uc2-benchmark-operator.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc2-kstreams
-spec:
- appResource:
- - "uc2-kstreams/uc2-kstreams-deployment.yaml"
- - "uc2-kstreams/uc2-kstreams-service.yaml"
- - "uc2-kstreams/uc2-jmx-configmap.yaml"
- - "uc2-kstreams/uc2-service-monitor.yaml"
- loadGenResource:
- - "uc2-kstreams/uc2-load-generator-deployment.yaml"
- - "uc2-kstreams/uc2-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumSensors"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
- - name: "output"
- numPartitions: 40
- replicationFactor: 1
- - name: "theodolite-.*"
- removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc2-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-service-monitor.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-kstreams/uc2-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
index b65bbdedb055c206c1ebcd7ab6a450318ee8c00f..aa25c53d793fd319ba16e15f8e8a152f177e799e 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml
@@ -1,31 +1,31 @@
apiVersion: theodolite.com/v1
kind: benchmark
+metadata:
+ name: uc2-kstreams
spec:
- metadata:
- name: uc2-kstreams
appResource:
- - "uc2-kstreams-deployment.yaml"
- - "uc2-kstreams-service.yaml"
- - "uc2-jmx-configmap.yaml"
- - "uc2-service-monitor.yaml"
+ - "uc2-kstreams/uc2-kstreams-deployment.yaml"
+ - "uc2-kstreams/uc2-kstreams-service.yaml"
+ - "uc2-kstreams/uc2-jmx-configmap.yaml"
+ - "uc2-kstreams/uc2-service-monitor.yaml"
loadGenResource:
- - "uc2-load-generator-deployment.yaml"
- - "uc2-load-generator-service.yaml"
+ - "uc2-kstreams/uc2-load-generator-deployment.yaml"
+ - "uc2-kstreams/uc2-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc2-kstreams-deployment.yaml"
+ resource: "uc2-kstreams/uc2-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc2-load-generator-deployment.yaml"
+ resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc2-load-generator-deployment.yaml"
+ resource: "uc2-kstreams/uc2-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
deleted file mode 100644
index e2679ed864d4b8673bf0d44a96683ccb86f44090..0000000000000000000000000000000000000000
--- a/theodolite-benchmarks/definitions/uc3-benchmark-operator.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc3-kstreams
-spec:
- appResource:
- - "uc3-kstreams/uc3-kstreams-deployment.yaml"
- - "uc3-kstreams/uc3-kstreams-service.yaml"
- - "uc3-kstreams/uc3-jmx-configmap.yaml"
- - "uc3-kstreams/uc3-service-monitor.yaml"
- loadGenResource:
- - "uc3-kstreams/uc3-load-generator-deployment.yaml"
- - "uc3-kstreams/uc3-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumSensors"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
- - name: "output"
- numPartitions: 40
- replicationFactor: 1
- - name: "theodolite-.*"
- removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc3-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-service-monitor.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc3-kstreams/uc3-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
index bfbd7191c5f4a315db29100bcc05341f88cffec2..e2679ed864d4b8673bf0d44a96683ccb86f44090 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml
@@ -1,31 +1,31 @@
apiVersion: theodolite.com/v1
kind: benchmark
+metadata:
+ name: uc3-kstreams
spec:
- metadata:
- name: uc3-kstreams
appResource:
- - "uc3-kstreams-deployment.yaml"
- - "uc3-kstreams-service.yaml"
- - "uc3-jmx-configmap.yaml"
- - "uc3-service-monitor.yaml"
+ - "uc3-kstreams/uc3-kstreams-deployment.yaml"
+ - "uc3-kstreams/uc3-kstreams-service.yaml"
+ - "uc3-kstreams/uc3-jmx-configmap.yaml"
+ - "uc3-kstreams/uc3-service-monitor.yaml"
loadGenResource:
- - "uc3-load-generator-deployment.yaml"
- - "uc3-load-generator-service.yaml"
+ - "uc3-kstreams/uc3-load-generator-deployment.yaml"
+ - "uc3-kstreams/uc3-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc3-kstreams-deployment.yaml"
+ resource: "uc3-kstreams/uc3-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumSensors"
patchers:
- type: "EnvVarPatcher"
- resource: "uc3-load-generator-deployment.yaml"
+ resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumSensorsLoadGeneratorReplicaPatcher
- resource: "uc3-load-generator-deployment.yaml"
+ resource: "uc3-kstreams/uc3-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
kafkaConfig:
diff --git a/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
deleted file mode 100644
index 3e10fd1aebf071e854cb31501030a50c11eab01d..0000000000000000000000000000000000000000
--- a/theodolite-benchmarks/definitions/uc4-benchmark-operator.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: theodolite.com/v1
-kind: benchmark
-metadata:
- name: uc4-kstreams
-spec:
- appResource:
- - "uc4-kstreams/uc4-kstreams-deployment.yaml"
- - "uc4-kstreams/uc4-kstreams-service.yaml"
- - "uc4-kstreams/uc4-jmx-configmap.yaml"
- - "uc4-kstreams/uc4-service-monitor.yaml"
- loadGenResource:
- - "uc4-kstreams/uc4-load-generator-deployment.yaml"
- - "uc4-kstreams/uc4-load-generator-service.yaml"
- resourceTypes:
- - typeName: "Instances"
- patchers:
- - type: "ReplicaPatcher"
- resource: "uc4-kstreams/uc4-kstreams-deployment.yaml"
- loadTypes:
- - typeName: "NumNestedGroups"
- patchers:
- - type: "EnvVarPatcher"
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
- properties:
- container: "workload-generator"
- variableName: "NUM_SENSORS"
- - type: NumNestedGroupsLoadGeneratorReplicaPatcher
- resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
- properties:
- loadGenMaxRecords: "15000"
- numSensors: "4.0"
- kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
- topics:
- - name: "input"
- numPartitions: 40
- replicationFactor: 1
- - name: "output"
- numPartitions: 40
- replicationFactor: 1
- - name: "configuration"
- numPartitions: 40
- replicationFactor: 1
- - name: "aggregation-feedback"
- numPartitions: 40
- replicationFactor: 1
- - name: "theodolite-.*"
- removeOnly: True
diff --git a/theodolite-benchmarks/definitions/uc4-flink/flink-configuration-configmap.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/flink-configuration-configmap.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/flink-configuration-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/jobmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/jobmanager-rest-service.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-rest-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/jobmanager-rest-service.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-rest-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/jobmanager-service.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/jobmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/service-monitor.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/taskmanager-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink/taskmanager-service.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink/taskmanager-service.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-flink-benchmark-operator.yaml
rename to theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-jmx-configmap.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-jmx-configmap.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-jmx-configmap.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-service.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-service.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-deployment.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-deployment.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-service.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-load-generator-service.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-load-generator-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-service-monitor.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc4-kstreams/uc4-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
index 0ed48c9afd0d8d02493f7afc2df3e440d0ffabdd..3e10fd1aebf071e854cb31501030a50c11eab01d 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml
@@ -1,31 +1,31 @@
apiVersion: theodolite.com/v1
kind: benchmark
+metadata:
+ name: uc4-kstreams
spec:
- metadata:
- name: uc4-kstreams
appResource:
- - "uc4-kstreams-deployment.yaml"
- - "uc4-kstreams-service.yaml"
- - "uc4-jmx-configmap.yaml"
- - "uc4-service-monitor.yaml"
+ - "uc4-kstreams/uc4-kstreams-deployment.yaml"
+ - "uc4-kstreams/uc4-kstreams-service.yaml"
+ - "uc4-kstreams/uc4-jmx-configmap.yaml"
+ - "uc4-kstreams/uc4-service-monitor.yaml"
loadGenResource:
- - "uc4-load-generator-deployment.yaml"
- - "uc4-load-generator-service.yaml"
+ - "uc4-kstreams/uc4-load-generator-deployment.yaml"
+ - "uc4-kstreams/uc4-load-generator-service.yaml"
resourceTypes:
- typeName: "Instances"
patchers:
- type: "ReplicaPatcher"
- resource: "uc4-kstreams-deployment.yaml"
+ resource: "uc4-kstreams/uc4-kstreams-deployment.yaml"
loadTypes:
- typeName: "NumNestedGroups"
patchers:
- type: "EnvVarPatcher"
- resource: "uc4-load-generator-deployment.yaml"
+ resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
properties:
container: "workload-generator"
variableName: "NUM_SENSORS"
- type: NumNestedGroupsLoadGeneratorReplicaPatcher
- resource: "uc4-load-generator-deployment.yaml"
+ resource: "uc4-kstreams/uc4-load-generator-deployment.yaml"
properties:
loadGenMaxRecords: "15000"
numSensors: "4.0"