diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml index 4ed7c868323e249ddf2137f2d4295b7e6579704b..0c8e9edf92afcb6de19a46904dc8d30a3fcda87d 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml @@ -26,6 +26,8 @@ spec: variableName: "NUM_SENSORS" - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc1-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "15000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml index 02ea0ab3b7730843dad10fcf7d8bcb7e7eab490f..12cbd8ea310423d28e35de8185288b27257c15ec 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-standalone.yaml @@ -21,6 +21,8 @@ loadTypes: variableName: "NUM_SENSORS" - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc1-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "15000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml index a2a305413f6997bc427adac53263a0396b980fd3..b65bbdedb055c206c1ebcd7ab6a450318ee8c00f 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml @@ -1,37 +1,41 @@ -apiVersion: theodolite.com/v1alpha1 +apiVersion: theodolite.com/v1 kind: benchmark -metadata: - name: uc2-kstreams -appResource: - - "uc2-kstreams-deployment.yaml" - - "uc2-kstreams-service.yaml" - - "uc2-jmx-configmap.yaml" - - "uc2-service-monitor.yaml" -loadGenResource: - - "uc2-load-generator-deployment.yaml" - - "uc2-load-generator-service.yaml" -resourceTypes: - - typeName: "Instances" - patchers: - - type: "ReplicaPatcher" - resource: "uc2-kstreams-deployment.yaml" -loadTypes: - - typeName: "NumSensors" - patchers: - - type: "EnvVarPatcher" - resource: "uc2-load-generator-deployment.yaml" - container: "workload-generator" - variableName: "NUM_SENSORS" - - type: NumSensorsLoadGeneratorReplicaPatcher - resource: "uc2-load-generator-deployment.yaml" -kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" - topics: - - name: "input" - numPartitions: 40 - replicationFactor: 1 - - name: "output" - numPartitions: 40 - replicationFactor: 1 - - name: "theodolite-.*" - removeOnly: True +spec: + metadata: + name: uc2-kstreams + appResource: + - "uc2-kstreams-deployment.yaml" + - "uc2-kstreams-service.yaml" + - "uc2-jmx-configmap.yaml" + - "uc2-service-monitor.yaml" + loadGenResource: + - "uc2-load-generator-deployment.yaml" + - "uc2-load-generator-service.yaml" + resourceTypes: + - typeName: "Instances" + patchers: + - type: "ReplicaPatcher" + resource: "uc2-kstreams-deployment.yaml" + loadTypes: + - typeName: "NumSensors" + patchers: + - type: "EnvVarPatcher" + resource: "uc2-load-generator-deployment.yaml" + properties: + container: "workload-generator" + variableName: "NUM_SENSORS" + - type: NumSensorsLoadGeneratorReplicaPatcher + resource: "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-kstreams/uc2-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml index 874ecf51ae09dea00c90257f0d05341570e628a2..e38f83f5b05d05febb59c2f775a29b2d545acf0e 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-standalone.yaml @@ -17,10 +17,13 @@ loadTypes: patchers: - type: "EnvVarPatcher" resource: "uc2-load-generator-deployment.yaml" - container: "workload-generator" - variableName: "NUM_SENSORS" + properties: + container: "workload-generator" + variableName: "NUM_SENSORS" - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc2-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "15000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml index 8a8ad6ccb3e012ade0f2354bbfe05e663d2daf8f..bfbd7191c5f4a315db29100bcc05341f88cffec2 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml @@ -1,37 +1,41 @@ -apiVersion: theodolite.com/v1alpha1 +apiVersion: theodolite.com/v1 kind: benchmark -metadata: - name: uc3-kstreams -appResource: - - "uc3-kstreams-deployment.yaml" - - "uc3-kstreams-service.yaml" - - "uc3-jmx-configmap.yaml" - - "uc3-service-monitor.yaml" -loadGenResource: - - "uc3-load-generator-deployment.yaml" - - "uc3-load-generator-service.yaml" -resourceTypes: - - typeName: "Instances" - patchers: - - type: "ReplicaPatcher" - resource: "uc3-kstreams-deployment.yaml" -loadTypes: - - typeName: "NumSensors" - patchers: - - type: "EnvVarPatcher" - resource: "uc3-load-generator-deployment.yaml" - container: "workload-generator" - variableName: "NUM_SENSORS" - - type: NumSensorsLoadGeneratorReplicaPatcher - resource: "uc3-load-generator-deployment.yaml" -kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" - topics: - - name: "input" - numPartitions: 40 - replicationFactor: 1 - - name: "output" - numPartitions: 40 - replicationFactor: 1 - - name: "theodolite-.*" - removeOnly: True +spec: + metadata: + name: uc3-kstreams + appResource: + - "uc3-kstreams-deployment.yaml" + - "uc3-kstreams-service.yaml" + - "uc3-jmx-configmap.yaml" + - "uc3-service-monitor.yaml" + loadGenResource: + - "uc3-load-generator-deployment.yaml" + - "uc3-load-generator-service.yaml" + resourceTypes: + - typeName: "Instances" + patchers: + - type: "ReplicaPatcher" + resource: "uc3-kstreams-deployment.yaml" + loadTypes: + - typeName: "NumSensors" + patchers: + - type: "EnvVarPatcher" + resource: "uc3-load-generator-deployment.yaml" + properties: + container: "workload-generator" + variableName: "NUM_SENSORS" + - type: NumSensorsLoadGeneratorReplicaPatcher + resource: "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-kstreams/uc3-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml index 3c5d1046c512a5253b90695613224e1bd542996d..e00c1672c4a5a02128c2618b525573a4cddd6c72 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-standalone.yaml @@ -17,10 +17,13 @@ loadTypes: patchers: - type: "EnvVarPatcher" resource: "uc3-load-generator-deployment.yaml" - container: "workload-generator" - variableName: "NUM_SENSORS" + properties: + container: "workload-generator" + variableName: "NUM_SENSORS" - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc3-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "15000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml index 60b023259d0e1feb5ad5cb37a33c6c345141c565..0ed48c9afd0d8d02493f7afc2df3e440d0ffabdd 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml @@ -1,43 +1,48 @@ -apiVersion: theodolite.com/v1alpha1 +apiVersion: theodolite.com/v1 kind: benchmark -metadata: - name: uc4-kstreams -appResource: - - "uc4-kstreams-deployment.yaml" - - "uc4-kstreams-service.yaml" - - "uc4-jmx-configmap.yaml" - - "uc4-service-monitor.yaml" -loadGenResource: - - "uc4-load-generator-deployment.yaml" - - "uc4-load-generator-service.yaml" -resourceTypes: - - typeName: "Instances" - patchers: - - type: "ReplicaPatcher" - resource: "uc4-kstreams-deployment.yaml" -loadTypes: - - typeName: "NumNestedGroups" - patchers: - - type: "EnvVarPatcher" - resource: "uc4-load-generator-deployment.yaml" - container: "workload-generator" - variableName: "NUM_SENSORS" - - type: NumNestedGroupsLoadGeneratorReplicaPatcher - resource: "uc4-load-generator-deployment.yaml" -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 +spec: + metadata: + name: uc4-kstreams + appResource: + - "uc4-kstreams-deployment.yaml" + - "uc4-kstreams-service.yaml" + - "uc4-jmx-configmap.yaml" + - "uc4-service-monitor.yaml" + loadGenResource: + - "uc4-load-generator-deployment.yaml" + - "uc4-load-generator-service.yaml" + resourceTypes: + - typeName: "Instances" + patchers: + - type: "ReplicaPatcher" + resource: "uc4-kstreams-deployment.yaml" + loadTypes: + - typeName: "NumNestedGroups" + patchers: + - type: "EnvVarPatcher" + resource: "uc4-load-generator-deployment.yaml" + properties: + container: "workload-generator" + variableName: "NUM_SENSORS" + - type: NumNestedGroupsLoadGeneratorReplicaPatcher + resource: "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-kstreams/uc4-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml index e7fe7983e3ba5e18a0c203c47495bb07490e9a33..96e72c9b6d726267044464cce6deb32f60442e96 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-standalone.yaml @@ -17,10 +17,14 @@ loadTypes: patchers: - type: "EnvVarPatcher" resource: "uc4-load-generator-deployment.yaml" - container: "workload-generator" - variableName: "NUM_NESTED_GROUPS" + properties: + container: "workload-generator" + variableName: "NUM_NESTED_GROUPS" - type: "NumNestedGroupsLoadGeneratorReplicaPatcher" resource: "uc4-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "15000" + numSensors: "4.0" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: