Commit 466c6ad8 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige config de puertos y listeners de Kafka

See merge request redmic-project/confluent/confluent-platform!19
parents 42673244 89eb8780

kafka/.env

+1 −0
Original line number Diff line number Diff line 
ZK_PORT=2181

KF_PORT=9092

KF_PORT_EXT=9093

KAFKA_LOG_DIRS=/var/lib/kafka/data/data

KAFKA_LOG_CLEANER_ENABLE=false

KAFKA_LOG_CLEANUP_POLICY=compact

kafka/docker-compose.dev.yml

+9 −6
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ version: '3.5' 


x-dev-environment:

  &dev-environment

  KAFKA_LISTENERS: 'PLAINTEXT://:${KF_PORT},EXT://0.0.0.0:${KF_PORT_EXT}'

  KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,EXT:PLAINTEXT

  KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT

  KAFKA_HEAP_OPTS: '-Xmx512m -Xms512m'



x-dev-deploy:
@@ -22,9 +25,9 @@ services: 
  kf-1:

    environment:

      << : *dev-environment

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${PUBLIC_HOSTNAME}:1${KF_PORT}'

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://:${KF_PORT},EXT://${PUBLIC_HOSTNAME}:1${KF_PORT}'

    ports:

      - target: ${KF_PORT}

      - target: ${KF_PORT_EXT}

        published: 1${KF_PORT}

        mode: host

      - target: 9997
@@ -35,9 +38,9 @@ services: 
  kf-2:

    environment:

      << : *dev-environment

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${PUBLIC_HOSTNAME}:2${KF_PORT}'

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://:${KF_PORT},EXT://${PUBLIC_HOSTNAME}:2${KF_PORT}'

    ports:

      - target: ${KF_PORT}

      - target: ${KF_PORT_EXT}

        published: 2${KF_PORT}

        mode: host

      - target: 9998
@@ -48,9 +51,9 @@ services: 
  kf-3:

    environment:

      << : *dev-environment

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://${PUBLIC_HOSTNAME}:3${KF_PORT}'

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://:${KF_PORT},EXT://${PUBLIC_HOSTNAME}:3${KF_PORT}'

    ports:

      - target: ${KF_PORT}

      - target: ${KF_PORT_EXT}

        published: 3${KF_PORT}

        mode: host

      - target: 9999

kafka/docker-compose.prod.yml

+5 −9
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ version: '3.5' 


x-prod-environment:

  &prod-environment

  KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://:${KF_PORT}'

  KAFKA_LISTENERS: 'PLAINTEXT://:${KF_PORT}'

  KAFKA_HEAP_OPTS: '-Xmx2g -Xms2g'



x-prod-deploy:
@@ -23,9 +25,7 @@ x-prod-deploy: 


services:

  kf-1:

    environment:

      << : *prod-environment

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kf-1:${KF_PORT}'

    environment: *prod-environment

    deploy:

      << : *prod-deploy

      placement:
@@ -33,9 +33,7 @@ services: 
          - engine.labels.availability_zone == ${AWS_REGION}a



  kf-2:

    environment:

      << : *prod-environment

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kf-2:${KF_PORT}'

    environment: *prod-environment

    deploy:

      << : *prod-deploy

      placement:
@@ -43,9 +41,7 @@ services: 
          - engine.labels.availability_zone == ${AWS_REGION}b



  kf-3:

    environment:

      << : *prod-environment

      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kf-3:${KF_PORT}'

    environment: *prod-environment

    deploy:

      << : *prod-deploy

      placement:

kafka/docker-compose.tmpl.yml

+3 −12
Original line number Diff line number Diff line
@@ -29,12 +29,9 @@ services: 
    environment:

      << : *tmpl-environment

      KAFKA_BROKER_ID: 1

      KAFKA_LISTENERS: 'PLAINTEXT://kf-1:${KF_PORT}'

      KAFKA_JMX_PORT: 9997

    networks:

      kafka-net:

        aliases:

          - kf-1

      - kafka-net

    volumes:

      - kf-1-data-vol:/var/lib/kafka/data

      - kf-1-secrets-vol:/etc/kafka/secrets
@@ -46,12 +43,9 @@ services: 
    environment:

      << : *tmpl-environment

      KAFKA_BROKER_ID: 2

      KAFKA_LISTENERS: 'PLAINTEXT://kf-2:${KF_PORT}'

      KAFKA_JMX_PORT: 9998

    networks:

      kafka-net:

        aliases:

          - kf-2

      - kafka-net

    volumes:

      - kf-2-data-vol:/var/lib/kafka/data

      - kf-2-secrets-vol:/etc/kafka/secrets
@@ -63,12 +57,9 @@ services: 
    environment:

      << : *tmpl-environment

      KAFKA_BROKER_ID: 3

      KAFKA_LISTENERS: 'PLAINTEXT://kf-3:${KF_PORT}'

      KAFKA_JMX_PORT: 9999

    networks:

      kafka-net:

        aliases:

          - kf-3

      - kafka-net

    volumes:

      - kf-3-data-vol:/var/lib/kafka/data

      - kf-3-secrets-vol:/etc/kafka/secrets

zookeeper/docker-compose.tmpl.yml

+3 −9
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ services: 
      ZOOKEEPER_SERVER_ID: 1

      KAFKA_JMX_PORT: 9990

    networks:

      kafka-net:

        aliases:

          - zk-1

      - kafka-net

    volumes:

      - zk-1-data-vol:/var/lib/zookeeper/data

      - zk-1-log-vol:/var/lib/zookeeper/log
@@ -43,9 +41,7 @@ services: 
      ZOOKEEPER_SERVER_ID: 2

      KAFKA_JMX_PORT: 9991

    networks:

      kafka-net:

        aliases:

          - zk-2

      - kafka-net

    volumes:

      - zk-2-data-vol:/var/lib/zookeeper/data

      - zk-2-log-vol:/var/lib/zookeeper/log
@@ -60,9 +56,7 @@ services: 
      ZOOKEEPER_SERVER_ID: 3

      KAFKA_JMX_PORT: 9992

    networks:

      kafka-net:

        aliases:

          - zk-2

      - kafka-net

    volumes:

      - zk-3-data-vol:/var/lib/zookeeper/data

      - zk-3-log-vol:/var/lib/zookeeper/log