fix: Kafka external broker connect. (#93)

adempiere · Apr 23, 2024 · 0d1be09 · 0d1be09
1 parent 1d077a7
commit 0d1be09
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 21 deletions.
diff --git a/docker-compose/.env b/docker-compose/.env
@@ -159,8 +159,11 @@ KAFKA_IMAGE="confluentinc/cp-kafka:7.6.0"
 KAFKA_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.kafka"
 KAFKA_HOSTNAME="${CLIENT_NAME}.kafka"
 KAFKA_PORT=9092
-KAFKA_EXTERNAL_PORT=29092
+KAFKA_EXTERNAL_PORT=9092
 KAFKA_BROKERCONNECT="kafka:${KAFKA_PORT}"
+KAFKA_BROKER_PORT=29092
+KAFKA_BROKER_EXTERNAL_PORT=29092
+KAFKA_EXTERNAL_BROKERCONNECT="${HOST_IP}:${KAFKA_BROKER_EXTERNAL_PORT}"
 
 # Kafdrop Kafka Cluster Overview
 KAFDROP_IMAGE="obsidiandynamics/kafdrop:4.0.1"

diff --git a/docker-compose/13a-kafka_service.yml b/docker-compose/13a-kafka_service.yml
@@ -17,12 +17,13 @@
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:${ZOOKEEPER_PORT}
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://${KAFKA_BROKER_HOST}:${KAFKA_EXTERNAL_PORT}
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_EXTERNAL_BROKERCONNECT}
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-    ports:
-      - ${KAFKA_EXTERNAL_PORT}:${KAFKA_EXTERNAL_PORT}
+    # ports:
+      # - ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT} # it is not necessary to expose
+    #   - ${KAFKA_BROKER_EXTERNAL_PORT}:${KAFKA_BROKER_PORT}
     volumes:
       - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS}    # Map the Timezone  of the host to the Timezone of the container
       - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container

diff --git a/docker-compose/13b-kafka_service_with_kafdrop.yml b/docker-compose/13b-kafka_service_with_kafdrop.yml
@@ -17,12 +17,13 @@
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:${ZOOKEEPER_PORT}
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_BROKER_HOST}:${KAFKA_EXTERNAL_PORT}
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_EXTERNAL_BROKERCONNECT}
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-    #ports:
-      #- ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT}
+    ports:
+      # - ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT} # it is not necessary to expose
+      - ${KAFKA_BROKER_EXTERNAL_PORT}:${KAFKA_BROKER_PORT}
     volumes:
       - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS}    # Map the Timezone  of the host to the Timezone of the container
       - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container

diff --git a/docker-compose/docker-compose-auth.yml b/docker-compose/docker-compose-auth.yml
@@ -376,15 +376,16 @@ services:
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:${ZOOKEEPER_PORT}
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://${KAFKA_BROKER_HOST}:${KAFKA_EXTERNAL_PORT}
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_EXTERNAL_BROKERCONNECT}
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
     volumes:
       - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS}    # Map the Timezone  of the host to the Timezone of the container
       - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container
-    ports:
-      - ${KAFKA_EXTERNAL_PORT}:${KAFKA_EXTERNAL_PORT}
+    # ports:
+    #   # - ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT} # it is not necessary to expose
+    #   - ${KAFKA_BROKER_EXTERNAL_PORT}:${KAFKA_BROKER_PORT}
     networks:
       - adempiere_network
 

diff --git a/docker-compose/docker-compose-cache.yml b/docker-compose/docker-compose-cache.yml
@@ -199,12 +199,13 @@ services:
       retries: 60
       start_period: 20s
       timeout: 10s
-    ports:
-      - ${KAFKA_EXTERNAL_PORT}:${KAFKA_EXTERNAL_PORT}
+    # ports:
+    #   # - ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT} # it is not necessary to expose
+    #   - ${KAFKA_BROKER_EXTERNAL_PORT}:${KAFKA_BROKER_PORT}
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:${ZOOKEEPER_PORT}
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://${KAFKA_BROKER_HOST}:${KAFKA_EXTERNAL_PORT}
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_EXTERNAL_BROKERCONNECT}
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1

diff --git a/docker-compose/docker-compose-develop.yml b/docker-compose/docker-compose-develop.yml
@@ -369,12 +369,13 @@ services:
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:${ZOOKEEPER_PORT}
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_BROKER_HOST}:${KAFKA_EXTERNAL_PORT}
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_EXTERNAL_BROKERCONNECT}
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-    #ports:
-      #- ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT}
+    ports:
+      - ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT}
+      - ${KAFKA_BROKER_EXTERNAL_PORT}:${KAFKA_BROKER_PORT}
     volumes:
       - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS}    # Map the Timezone  of the host to the Timezone of the container
       - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container

diff --git a/docker-compose/docker-compose-standard.yml b/docker-compose/docker-compose-standard.yml
@@ -310,7 +310,8 @@ services:
     #   - ${ZOOKEEPER_PORT}:2181
     networks:
       - adempiere_network
-
+
+
   kafka:
     image: ${KAFKA_IMAGE}
     container_name: ${KAFKA_CONTAINER_NAME}
@@ -328,15 +329,16 @@ services:
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:${ZOOKEEPER_PORT}
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://${KAFKA_BROKER_HOST}:${KAFKA_EXTERNAL_PORT}
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://${KAFKA_BROKERCONNECT},PLAINTEXT_HOST://${KAFKA_EXTERNAL_BROKERCONNECT}
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
     volumes:
       - ${TIMEZONE_PATH_ON_HOST}:${TIMEZONE_PATH_ON_CONTAINER}:${TIMEZONE_OPTIONS}    # Map the Timezone  of the host to the Timezone of the container
       - ${LOCALTIME_PATH_ON_HOST}:${LOCALTIME_PATH_ON_CONTAINER}:${LOCALTIME_OPTIONS} # Map the Localtime of the host to the Timezone of the container
-    ports:
-      - ${KAFKA_EXTERNAL_PORT}:${KAFKA_EXTERNAL_PORT}
+    # ports:
+    #   # - ${KAFKA_EXTERNAL_PORT}:${KAFKA_PORT} # it is not necessary to expose
+    #   - ${KAFKA_BROKER_EXTERNAL_PORT}:${KAFKA_BROKER_PORT}
     networks:
       - adempiere_network
 

diff --git a/docker-compose/env_template.env b/docker-compose/env_template.env
@@ -159,8 +159,11 @@ KAFKA_IMAGE="confluentinc/cp-kafka:7.6.0"
 KAFKA_CONTAINER_NAME="${COMPOSE_PROJECT_NAME}.kafka"
 KAFKA_HOSTNAME="${CLIENT_NAME}.kafka"
 KAFKA_PORT=9092
-KAFKA_EXTERNAL_PORT=29092
+KAFKA_EXTERNAL_PORT=9092
 KAFKA_BROKERCONNECT="kafka:${KAFKA_PORT}"
+KAFKA_BROKER_PORT=29092
+KAFKA_BROKER_EXTERNAL_PORT=29092
+KAFKA_EXTERNAL_BROKERCONNECT="${HOST_IP}:${KAFKA_BROKER_EXTERNAL_PORT}"
 
 # Kafdrop Kafka Cluster Overview
 KAFDROP_IMAGE="obsidiandynamics/kafdrop:4.0.1"