WIP

diff --git a/README.sh b/README.sh
index ba50a69..c7e8086 100755 (executable)
--- a/README.sh
+++ b/README.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 FORTUNE=juplo/wordcount--fortune:1.0.0
 #!/bin/bash
 
 FORTUNE=juplo/wordcount--fortune:1.0.0

-RECORDER=juplo/wordcount--recorder:1.0.1
-USERS=juplo/wordcount--users:1.0.4
-SPLITTER=juplo/wordcount--splitter:1.0.0
-COUNTER=juplo/wordcount--counter:1.1.0
-TOP10=juplo/wordcount--top10:1.0.1
-QUERY=juplo/wordcount--query:1.0.4
+RECORDER=juplo/wordcount--recorder:1.1.1
+USERS=juplo/wordcount--users:1.0.5
+SPLITTER=juplo/wordcount--splitter:1.1.5
+COUNTER=juplo/wordcount--counter:1.2.14
+TOP10=juplo/wordcount--top10:1.0.2
+QUERY=juplo/wordcount--query:1.0.5

 
 if [ "$1" = "cleanup" ]
 then
 
 if [ "$1" = "cleanup" ]
 then

-  docker-compose down -v --remove-orphans
+  docker compose down -v --remove-orphans

   docker image rm $FORTUNE
   docker image rm $RECORDER
   docker image rm $USERS
   docker image rm $FORTUNE
   docker image rm $RECORDER
   docker image rm $USERS


@@ -33,7 +33,7 @@ if [[
 ]]
 then
   mvn clean package || exit
 ]]
 then
   mvn clean package || exit

-  docker-compose rm -svf recorder users splitter counter top10 query
+  docker compose rm -svf recorder users splitter counter top10 query

   ( cd fortune; ./README.sh $FORTUNE; )
   mvn -f recorder/pom.xml docker:build
   mvn -f users/pom.xml docker:build
   ( cd fortune; ./README.sh $FORTUNE; )
   mvn -f recorder/pom.xml docker:build
   mvn -f users/pom.xml docker:build


@@ -53,20 +53,19 @@ else
 fi
 
 
 fi
 
 

-docker-compose up -d zookeeper kafka cli traefik
+docker compose up -d kafka cli traefik

 
 echo "Waiting for the Kafka-Cluster to become ready..."
 
 echo "Waiting for the Kafka-Cluster to become ready..."

-docker-compose exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
-docker-compose exec cli zookeeper-shell zookeeper:2181 ls /brokers/ids
+docker compose exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1

 
 

-docker-compose up -d users
+docker compose up -d users

 while [ "$(http users.localhost/actuator/health 2> /dev/null | jq -r .status 2> /dev/null)" != "UP" ]; do echo "Waiting for service users..."; sleep 1; done
 http -v post users.localhost username=bart firstName=Bart lastName=Simpson sex=MALE
 http -v post users.localhost username=nerd firstName=Jane lastName=Doe sex=FEMALE
 http -v post users.localhost username=riddler firstName=Rumpel lastName=Stilzchen sex=MALE
 
 echo "Starting all instances..."
 while [ "$(http users.localhost/actuator/health 2> /dev/null | jq -r .status 2> /dev/null)" != "UP" ]; do echo "Waiting for service users..."; sleep 1; done
 http -v post users.localhost username=bart firstName=Bart lastName=Simpson sex=MALE
 http -v post users.localhost username=nerd firstName=Jane lastName=Doe sex=FEMALE
 http -v post users.localhost username=riddler firstName=Rumpel lastName=Stilzchen sex=MALE
 
 echo "Starting all instances..."

-docker-compose up -d
+docker compose up -d

 
 while [ "$(http query.localhost/actuator/health 2>/dev/null | jq -r .status 2> /dev/null)" != "UP" ]; do echo "Waiting for service query..."; sleep 1; done
 http -v query.localhost/bart
 
 while [ "$(http query.localhost/actuator/health 2>/dev/null | jq -r .status 2> /dev/null)" != "UP" ]; do echo "Waiting for service query..."; sleep 1; done
 http -v query.localhost/bart


@@ -85,7 +84,7 @@ http -v query.localhost/bart
 http -v query.localhost/nerd
 http -v query.localhost/riddler
 
 http -v query.localhost/nerd
 http -v query.localhost/riddler
 

-// docker-compose up -d --scale query=5 query
+# docker compose up -d --scale query=5 query

 http -v --follow query.localhost/bart
 sleep 1
 http -v --follow query.localhost/bart
 http -v --follow query.localhost/bart
 sleep 1
 http -v --follow query.localhost/bart

diff --git a/counter b/counter
index fe04994..1b1ac5b 160000 (submodule)
--- a/counter
+++ b/counter
@@ -1 +1 @@
-Subproject commit fe049944648d9675ffe66b586b6bf860fbac696f
+Subproject commit 1b1ac5bca62f07dae4188a5797a36b0fbe72058d

diff --git a/docker-compose.yml b/docker-compose.yml
index c02465a..0252da4 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,29 +1,26 @@
-version: '3.2'

 services:
 services:

-  zookeeper:
-    image: confluentinc/cp-zookeeper:6.2.0
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-    ports:
-      - 2181:2181

 
   kafka:
 
   kafka:

-    image: confluentinc/cp-kafka:6.2.0
+    image: confluentinc/cp-kafka:7.5.1

     environment:
     environment:

-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENERS: DOCKER://:9092, LOCALHOST://:9082
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENERS: CONTROLLER://:9072, DOCKER://:9092, LOCALHOST://:9082

       KAFKA_ADVERTISED_LISTENERS: DOCKER://kafka:9092, LOCALHOST://localhost:9082
       KAFKA_INTER_BROKER_LISTENER_NAME: DOCKER
       KAFKA_ADVERTISED_LISTENERS: DOCKER://kafka:9092, LOCALHOST://localhost:9082
       KAFKA_INTER_BROKER_LISTENER_NAME: DOCKER

-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: DOCKER:PLAINTEXT, LOCALHOST:PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT, DOCKER:PLAINTEXT, LOCALHOST:PLAINTEXT
+      KAFKA_PROCESS_ROLES: broker, controller
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:9072
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      CLUSTER_ID: MkU3OEVBNTcwNTJENDM2Qk

       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1

+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1

       KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
     ports:
       - 9092:9082
       - 9082:9082
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
     ports:
       - 9092:9082
       - 9082:9082

-    depends_on:
-      - zookeeper
-
+    stop_grace_period: 120s

 
   traefik:
     image: "traefik:v2.5"
 
   traefik:
     image: "traefik:v2.5"


@@ -40,7 +37,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   recorder:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   recorder:

-    image: juplo/wordcount--recorder:1.0.1
+    image: juplo/wordcount--recorder:1.1.1

     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.recorder.rule=Host(`recorder.localhost`)"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.recorder.rule=Host(`recorder.localhost`)"


@@ -51,7 +48,7 @@ services:
       - kafka
 
   users:
       - kafka
 
   users:

-    image: juplo/wordcount--users:1.0.4
+    image: juplo/wordcount--users:1.0.5

     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.users.rule=Host(`users.localhost`)"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.users.rule=Host(`users.localhost`)"


@@ -62,7 +59,7 @@ services:
       - kafka
 
   splitter:
       - kafka
 
   splitter:

-    image: juplo/wordcount--splitter:1.0.0
+    image: juplo/wordcount--splitter:1.1.5

     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.splitter.rule=Host(`splitter.localhost`)"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.splitter.rule=Host(`splitter.localhost`)"


@@ -73,7 +70,7 @@ services:
       - kafka
 
   counter:
       - kafka
 
   counter:

-    image: juplo/wordcount--counter:1.1.0
+    image: juplo/wordcount--counter:1.2.14

     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.counter.rule=Host(`counter.localhost`)"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.counter.rule=Host(`counter.localhost`)"


@@ -84,7 +81,7 @@ services:
       - kafka
 
   top10:
       - kafka
 
   top10:

-    image: juplo/wordcount--top10:1.0.1
+    image: juplo/wordcount--top10:1.0.2

     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.top10.rule=Host(`top10.localhost`)"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.top10.rule=Host(`top10.localhost`)"


@@ -95,7 +92,7 @@ services:
       - kafka
 
   query:
       - kafka
 
   query:

-    image: juplo/wordcount--query:1.0.4
+    image: juplo/wordcount--query:1.0.5

     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.query.rule=Host(`query.localhost`)"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.query.rule=Host(`query.localhost`)"

diff --git a/query b/query
index 251cf79..3e27e5d 160000 (submodule)
--- a/query
+++ b/query
@@ -1 +1 @@
-Subproject commit 251cf79927d4c1c941467c8fee0349c1a7eb4b93
+Subproject commit 3e27e5d91b4920ffd3cd061595329b5499c3389f

diff --git a/recorder b/recorder
index c5700c2..7a5943c 160000 (submodule)
--- a/recorder
+++ b/recorder
@@ -1 +1 @@
-Subproject commit c5700c2117f6c445278f272572c8b5732bf53bbf
+Subproject commit 7a5943ce46684c9b469f38780d95955a9795044c

diff --git a/splitter b/splitter
index 3bc3ef7..36bd7f7 160000 (submodule)
--- a/splitter
+++ b/splitter
@@ -1 +1 @@
-Subproject commit 3bc3ef7ceb76e7643e1e373293cfdc78f870838a
+Subproject commit 36bd7f7a03be33a05f371ebb9dc7b398678a08dc

diff --git a/top10 b/top10
index b3c3b1c..1bfbd6c 160000 (submodule)
--- a/top10
+++ b/top10
@@ -1 +1 @@
-Subproject commit b3c3b1c1ab19d197d323d7c69e03d9bd09147690
+Subproject commit 1bfbd6c6fe3c35e0cd5470db632faf1a655487af

diff --git a/users b/users
index 58563cd..aa0d1c4 160000 (submodule)
--- a/users
+++ b/users
@@ -1 +1 @@
-Subproject commit 58563cdc022363375c00ac580672f7daa22f6453
+Subproject commit aa0d1c4c8e47b2fffc5fa0ca2cae83f64ed8dd4e