diff --git a/docs/creating-a-benchmark.md b/docs/creating-a-benchmark.md
index fde8ba0759407ddea8befc18e244784a9ba34c1f..5a19be2ef840e9da45ce330eb95e4c25f5e3ac28 100644
--- a/docs/creating-a-benchmark.md
+++ b/docs/creating-a-benchmark.md
@@ -42,7 +42,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 243a49648b22c85167d5057b1d4bfb453180f93c..e3307341c3f455215c74a8449ac7160606524b63 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -24,11 +24,11 @@ dependencies:
version: 0.6.0
repository: https://soerenhenning.github.io/cp-helm-charts
condition: cp-helm-charts.enabled
- condition: kafka-lag-exporter.enabled
- name: strimzi-kafka-operator
version: 0.27.1
repository: https://strimzi.io/charts/
+
version: 0.7.0-SNAPSHOT
appVersion: 0.7.0-SNAPSHOT
diff --git a/helm/templates/prometheus/prometheus.yaml b/helm/templates/prometheus/prometheus.yaml
index 2b655dd70e920340d19e3aa29cd219ffc945bc27..e1faa92c4c8e3bef356c9f754ad4f6c68cde1e25 100644
--- a/helm/templates/prometheus/prometheus.yaml
+++ b/helm/templates/prometheus/prometheus.yaml
@@ -5,13 +5,8 @@ metadata:
name: {{ template "theodolite.fullname" . }}-prometheus
spec:
serviceAccountName: {{ template "theodolite.fullname" . }}-prometheus
- podMonitorSelector:
- matchLabels:
- app: theodolite
- serviceMonitorSelector:
- matchLabels:
- #app: cp-kafka
- appScope: theodolite
+ podMonitorSelector: {}
+ serviceMonitorSelector: {}
resources:
requests:
memory: 400Mi
diff --git a/helm/templates/strimzi/kafka-podmonitor.yaml b/helm/templates/strimzi/kafka-podmonitor.yaml
index d232d3d187e25a3ffbb07b60fe6486dc1c4c228c..56f5c37a3163605ba441c657af25169d7acf66e3 100644
--- a/helm/templates/strimzi/kafka-podmonitor.yaml
+++ b/helm/templates/strimzi/kafka-podmonitor.yaml
@@ -43,4 +43,4 @@ spec:
regex: (.*)
targetLabel: node_ip
replacement: $1
- action: replace
\ No newline at end of file
+ action: replace
diff --git a/helm/templates/theodolite/role.yaml b/helm/templates/theodolite/role.yaml
index 43ee0e43d6974cd95548df32d6c4b1df8f3e497e..ba5a223b6527df94b64fac3574ee5f90fdb3903b 100644
--- a/helm/templates/theodolite/role.yaml
+++ b/helm/templates/theodolite/role.yaml
@@ -38,6 +38,7 @@ rules:
- monitoring.coreos.com
resources:
- servicemonitors
+ - podmonitors
verbs:
- update
- delete
diff --git a/helm/values.yaml b/helm/values.yaml
index 2cc1adcc3663cd36544bc58c3157e166326caa13..0a5a24000ae535c1eda9d8d774131422d6cf7448 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -64,7 +64,7 @@ cp-helm-charts:
## Zookeeper
## ------------------------------------------------------
cp-zookeeper:
- enabled: true
+ enabled: false
nodeSelector: {}
servers: 3
image: confluentinc/cp-zookeeper
@@ -81,7 +81,7 @@ cp-helm-charts:
## Kafka
## ------------------------------------------------------
cp-kafka:
- enabled: true
+ enabled: false
nodeSelector: {}
brokers: 3
image: confluentinc/cp-enterprise-kafka
@@ -137,6 +137,10 @@ cp-helm-charts:
nodePort: 30099
annotations: {}
+
+ kafka:
+ bootstrapServers: theodolite-strimzi-kafka-bootstrap:9092
+
cp-kafka-rest:
enabled: false
@@ -149,20 +153,6 @@ cp-helm-charts:
cp-control-center:
enabled: false
-
-###
-# Kafka Lag Exporter
-###
-kafka-lag-exporter:
- enabled: false
- image:
- pullPolicy: IfNotPresent
- nodeSelector: {}
-
- clusters:
- - name: "theodolite-cp-kafka"
- bootstrapBrokers: "theodolite-cp-kafka:9092"
-
## The interval between refreshing metrics
pollIntervalSeconds: 15
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
index 1f328b1cd553c8036e570d28b97795fb2b00ec81..ff4d5cb5445ba029e9021d1761fa6196561aca35 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc1-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
index c2266a4aeb21302262279f147e6512d5264e1dc1..d178ec9d63b938fbcf7dee45d038792bf0a3ab92 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc1-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
index 89bac41ee5c8dcefa628b3cb01052df5a1df9292..40565db4ea7f85beb373143c87844ccc59c64738 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml
@@ -50,7 +50,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
index 171c3446db2719ee91bd8954233015316851fcf9..c1820500d440894b391e76350614694555c4a2e5 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: jmx
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
index fb5557c2df8b483164d3c1000717db4c7cface81..88cc383dd44c3e238148e2787df04361f6858be4 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml
@@ -37,7 +37,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml
index 5aaf87e724a4e8c728c3c15b998cb927ff57f3d5..8bb89b5d364729709a5d63926b610edc91cb63ce 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml
@@ -32,7 +32,7 @@ loadTypes:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
index 9f9ccc6ae39407bb1f027e1e23cb152944b869e0..424dddafb9b9131bd5afdbde6785f02ee082844b 100644
--- a/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
@@ -27,6 +27,6 @@ spec:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
index 87ea174f71c592bbffab4e5fc9ce6e3963596b9c..1b31959b1a01bf484147c19441069a216b182bd1 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc2-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
index c37df972a334a4a0e27f0420030f99f1dff15b53..2fce935d5ac617394f7212dc14576b9a7ea821a9 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc2-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
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 206fbf9683659fcc074341d7077da04c36909b75..e0bbc8180132c6af32bfc73fd192739ad51afa9f 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml
@@ -50,7 +50,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
index e07bb3f9e536655712c06a004c5d1fb60ffa67e0..af6f9f8eb4848d5b5a125ed86c57fce308c06ab2 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: jmx
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
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 0db22fa95f46d1cb484fa1a7730b8b6801dac67c..d7da5d0fcf08a48b50993f3b5eed87e9659cdc9c 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml
@@ -37,7 +37,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml
index 67376d76bf0a7cc4cd47563a1d8da8dc0aa3b944..d2ad077f0c2f46ca0d887f2271153347658e1736 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml
@@ -33,7 +33,7 @@ loadTypes:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
index dfc0af71543c15b12b5c850919feb0e0a4f52f28..86cbc7321d23a77e25422deb89564c63e2eebb4b 100644
--- a/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
@@ -27,6 +27,6 @@ spec:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
index d01123b13fe2d63637ee4000051091a99bad0546..c2acc46ffd4e5c9912dc9a9bb3e5ae65e4186c00 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc3-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
index 495f97817e43d692c30fe898c4ef3118cae682d7..b8f1f84adb7753ea395ba7a284326e65c6267f4f 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc3-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
diff --git a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
index 47b64d9890fc0f300ee1bd8e67acbdf7c8c4e4f9..4137ff1c1634522b14a47bd13da48956c061d7fe 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml
@@ -50,7 +50,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
index e3f63fae9e245e6116e0fe451480d9bc74b36433..22085aa1948a3f06e3310d48d576cc7553907a96 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: jmx
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
index 25374ad92a32782857cea5924ea6482060832eac..63976a83b519a8fb3a2750948c5bcf70b48d68b7 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml
@@ -37,7 +37,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml
index aa92913d2c992835078174747ea849ce296c3eb1..be79d9c827a3c94fcbabf172508273388c5b35bb 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml
@@ -33,7 +33,7 @@ loadTypes:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
index c1cad0b70fd82a5bbb43792ee79f9cf5cc71d95f..af073b7668b3e50b9e7252245d6b9c1b4aa81a5a 100644
--- a/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
@@ -27,6 +27,6 @@ spec:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
index 032499ea498f8155fd80e42ec4cbdd850498b217..cf659cb31bf0a434126226767d34bc90a82a9c2a 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc4-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
index 7af13f20b6b2edf3c8878adf4f381dc1c1add115..baf00f87855006fa2903fa0dcff67360ceca4890 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
@@ -20,7 +20,7 @@ spec:
image: ghcr.io/cau-se/theodolite-uc4-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: COMMIT_INTERVAL_MS
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 8a73f5b0f87198def7b152ea52008e3d4a1aa4ee..c01534c4b8b7f74696b6a6eda2bf9ef41b55288e 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml
@@ -51,7 +51,7 @@ spec:
loadGenMaxRecords: "150000"
numSensors: "4.0"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
index 20e0872d262df46b5c213d9d529983f5f4155735..13542cb29c54fbf12574497d4c8a11e3084719e5 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: jmx
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
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 655db2fd4122c9e0e844eed3bfe7c0a878c6d7ec..2fbb5d9f6af0ff5398171f3ea9c5544b0a0a0a20 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml
@@ -38,7 +38,7 @@ spec:
loadGenMaxRecords: "150000"
numSensors: "4.0"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml
index 5c50b6f95d796941c0b2830549ef825f4a4ff6fb..0c69aaaafcebf1d3471f9c40baa63b55f9701d38 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml
@@ -34,7 +34,7 @@ loadTypes:
loadGenMaxRecords: "150000"
numSensors: "4.0"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
index 7a69d13daae57b06c77f316da9aa953b21ac096b..1101f9e412a6d75c7798644709895f4675a596f9 100644
--- a/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
@@ -27,7 +27,7 @@ spec:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: NUM_NESTED_GROUPS
diff --git a/theodolite/examples/operator/example-benchmark.yaml b/theodolite/examples/operator/example-benchmark.yaml
index 5f68af04750bcd779c9682ede69d6c68b9fb3e92..54df10f818e0438e655fd957c79128e2630bb79e 100644
--- a/theodolite/examples/operator/example-benchmark.yaml
+++ b/theodolite/examples/operator/example-benchmark.yaml
@@ -34,7 +34,7 @@ spec:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite/examples/operator/example-configmap.yaml b/theodolite/examples/operator/example-configmap.yaml
index 210ce32d3fc0f75b9ffce874d1fa0a1ea9bdc3cd..4baee15860728e00bd5e1f1b6b6d7a14fe2dd950 100644
--- a/theodolite/examples/operator/example-configmap.yaml
+++ b/theodolite/examples/operator/example-configmap.yaml
@@ -24,7 +24,7 @@ data:
image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
@@ -65,7 +65,7 @@ data:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
uc1-load-generator-service.yaml: |
diff --git a/theodolite/examples/resources/uc1-kstreams-deployment.yaml b/theodolite/examples/resources/uc1-kstreams-deployment.yaml
index fdd1ff867ac83beb10856baec53569c88169232e..de8c32eba24e9601eb8e9deffd8801d6a4bb5d5e 100644
--- a/theodolite/examples/resources/uc1-kstreams-deployment.yaml
+++ b/theodolite/examples/resources/uc1-kstreams-deployment.yaml
@@ -21,7 +21,7 @@ spec:
name: jmx
env:
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
- name: JAVA_OPTS
diff --git a/theodolite/examples/resources/uc1-load-generator-deployment.yaml b/theodolite/examples/resources/uc1-load-generator-deployment.yaml
index 9f9ccc6ae39407bb1f027e1e23cb152944b869e0..424dddafb9b9131bd5afdbde6785f02ee082844b 100644
--- a/theodolite/examples/resources/uc1-load-generator-deployment.yaml
+++ b/theodolite/examples/resources/uc1-load-generator-deployment.yaml
@@ -27,6 +27,6 @@ spec:
- name: KUBERNETES_DNS_NAME
value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local"
- name: KAFKA_BOOTSTRAP_SERVERS
- value: "theodolite-cp-kafka:9092"
+ value: "theodolite-strimzi-kafka-bootstrap:9092"
- name: SCHEMA_REGISTRY_URL
value: "http://theodolite-cp-schema-registry:8081"
diff --git a/theodolite/examples/standalone/example-benchmark.yaml b/theodolite/examples/standalone/example-benchmark.yaml
index 4d67399231778c91cebb3ffe088e2d26ef388008..a6915cf289e2feb7dd86ccccfdf76fe9e3e35636 100644
--- a/theodolite/examples/standalone/example-benchmark.yaml
+++ b/theodolite/examples/standalone/example-benchmark.yaml
@@ -31,7 +31,7 @@ loadTypes:
properties:
loadGenMaxRecords: "150000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40
diff --git a/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/AbstractK8sLoader.kt b/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/AbstractK8sLoader.kt
index 871b8cf43907fcb8b0b5ea501c6b47f82e56ff69..36cfef9ce912886a638c200b502923dfe03ef5d0 100644
--- a/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/AbstractK8sLoader.kt
+++ b/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/AbstractK8sLoader.kt
@@ -13,6 +13,7 @@ abstract class AbstractK8sLoader: K8sResourceLoader {
"Deployment" -> loadDeployment(resourceString)
"Service" -> loadService(resourceString)
"ServiceMonitor" -> loadServiceMonitor(resourceString)
+ "PodMonitor" -> loadPodMonitor(resourceString)
"ConfigMap" -> loadConfigmap(resourceString)
"StatefulSet" -> loadStatefulSet(resourceString)
"Execution" -> loadExecution(resourceString)
@@ -51,6 +52,16 @@ abstract class AbstractK8sLoader: K8sResourceLoader {
return loadCustomResourceWrapper(resource, context)
}
+ override fun loadPodMonitor(resource: String): KubernetesResource {
+ val context = K8sContextFactory().create(
+ api = "v1",
+ scope = "Namespaced",
+ group = "monitoring.coreos.com",
+ plural = "podmonitors"
+ )
+ return loadCustomResourceWrapper(resource, context)
+ }
+
override fun loadExecution(resource: String): KubernetesResource {
val context = K8sContextFactory().create(
api = "v1",
diff --git a/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/K8sResourceLoader.kt b/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/K8sResourceLoader.kt
index c123ab2958132cb43ad188136f738b561e91310b..1487b64bf4f7fbcc735539a429be9237d41205bc 100644
--- a/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/K8sResourceLoader.kt
+++ b/theodolite/src/main/kotlin/theodolite/k8s/resourceLoader/K8sResourceLoader.kt
@@ -11,5 +11,6 @@ interface K8sResourceLoader {
fun loadBenchmark(resource: String): KubernetesResource
fun loadConfigmap(resource: String): KubernetesResource
fun loadServiceMonitor(resource: String): KubernetesResource
+ fun loadPodMonitor(resource: String): KubernetesResource
fun loadCustomResourceWrapper(resource: String, context: CustomResourceDefinitionContext): KubernetesResource
}
\ No newline at end of file
diff --git a/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml b/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml
index e690aa56d74d695b0b81469023ccf82d0046cf45..a7b298c9263ba9345d74e0de683b7aa2009b3c16 100644
--- a/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml
+++ b/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml
@@ -29,7 +29,7 @@ spec:
properties:
loadGenMaxRecords: "15000"
kafkaConfig:
- bootstrapServer: "theodolite-cp-kafka:9092"
+ bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092"
topics:
- name: "input"
numPartitions: 40