Merge branch 'zookeeper-free-workload-generator'

docker-test/uc1-docker-compose/docker-compose.yml

@@ -26,8 +26,8 @@ services:
       - kafka
     expose:
       - "8081"
-    ports:
-      - 8081:8081
+    #ports:
+    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -38,16 +38,15 @@ services:
       - kafka
     environment:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
+      SCHEMA_REGISTRY_URL: http://schema-registry:8081
   uc-wg: 
     image: theodolite/theodolite-uc1-workload-generator:latest
     depends_on:
       - schema-registry
       - kafka
-      - zookeeper
     environment:
-      ZK_HOST: zookeeper
-      ZK_PORT: 2181
+      BOOTSTRAP_SERVER: uc-wg:5701
+      PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      INSTANCES: 1
-      NUM_SENSORS: 1
+      NUM_SENSORS: 10

docker-test/uc2-docker-compose/docker-compose.yml

@@ -10,8 +10,8 @@ services:
     image: wurstmeister/kafka
     expose:
       - "9092"
-    ports:
-      - 19092:19092
+    #ports:
+    #  - 19092:19092
     environment:
       KAFKA_LISTENERS: PLAINTEXT://:9092,CONNECTIONS_FROM_HOST://:19092
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,CONNECTIONS_FROM_HOST://localhost:19092
@@ -26,8 +26,8 @@ services:
       - kafka
     expose:
       - "8081"
-    ports:
-      - 8081:8081
+    #ports:
+    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -38,16 +38,16 @@ services:
       - kafka
     environment:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
+      SCHEMA_REGISTRY_URL: http://schema-registry:8081
   uc-wg: 
     image: theodolite/theodolite-uc2-workload-generator:latest
     depends_on:
       - schema-registry
       - kafka
-      - zookeeper
     environment:
-      ZK_HOST: zookeeper
-      ZK_PORT: 2181
+      BOOTSTRAP_SERVER: uc-wg:5701
+      PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      INSTANCES: 1
-      NUM_SENSORS: 1
\ No newline at end of file
+      NUM_SENSORS: 4
+      NUM_NESTED_GROUPS: 4
\ No newline at end of file

docker-test/uc3-docker-compose/docker-compose.yml

@@ -9,12 +9,10 @@ services:
       ZOOKEEPER_CLIENT_PORT: 2181
   kafka:
     image: wurstmeister/kafka
-    ports:
-      - "9092:9092"
     expose:
       - "9092"
-    ports:
-      - 19092:19092
+    #ports:
+    #  - 19092:19092
     environment:
       KAFKA_LISTENERS: PLAINTEXT://:9092,CONNECTIONS_FROM_HOST://:19092
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,CONNECTIONS_FROM_HOST://localhost:19092
@@ -27,8 +25,8 @@ services:
     depends_on:
       - zookeeper
       - kafka
-    ports:
-      - "8081:8081"
+    #ports:
+    #  - "8081:8081"
     expose:
       - "8081"
     environment:
@@ -48,11 +46,9 @@ services:
     depends_on:
       - schema-registry
       - kafka
-      - zookeeper
     environment:
-      ZK_HOST: zookeeper
-      ZK_PORT: 2181
+      BOOTSTRAP_SERVER: uc-wg:5701
+      PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      INSTANCES: 1
-      NUM_SENSORS: 1
\ No newline at end of file
+      NUM_SENSORS: 10
\ No newline at end of file

docker-test/uc4-docker-compose/docker-compose.yml

@@ -11,8 +11,8 @@ services:
     image: wurstmeister/kafka
     expose:
       - "9092"
-    ports:
-      - 19092:19092
+    #ports:
+    #  - 19092:19092
     environment:
       KAFKA_LISTENERS: PLAINTEXT://:9092,CONNECTIONS_FROM_HOST://:19092
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,CONNECTIONS_FROM_HOST://localhost:19092
@@ -25,8 +25,8 @@ services:
     depends_on:
       - zookeeper
       - kafka
-    ports:
-      - "8081:8081"
+    #ports:
+    #  - "8081:8081"
     expose:
       - "8081"
     environment:
@@ -45,11 +45,9 @@ services:
     depends_on:
       - schema-registry
       - kafka
-      - zookeeper
     environment:
-      ZK_HOST: zookeeper
-      ZK_PORT: 2181
+      BOOTSTRAP_SERVER: uc-wg:5701
+      PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      INSTANCES: 1
-      NUM_SENSORS: 100
+      NUM_SENSORS: 10