Cleanup

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

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

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

helm/templates/strimzi/kafka-podmonitor.yaml

@@ -43,4 +43,4 @@ spec:
       regex: (.*)
       targetLabel: node_ip
       replacement: $1
-      action: replace
+      action: replace
\ No newline at end of file

helm/templates/theodolite/role.yaml

@@ -38,6 +38,7 @@ rules:
     - monitoring.coreos.com
     resources:
     - servicemonitors
+    - podmonitors
     verbs:
     - update
     - delete

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
 

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

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

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

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

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

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

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"

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

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

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

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

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

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

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"