Commit 75e89cf8 authored by Noel Alonso's avatar Noel Alonso
Browse files

Actualiza deploy 

Añade nuevas propiedades
Añade variables para permitir sobreescritura
Cambia formato de algunas configuraciones
Añade restricción de despliegue en pre para que se despliegue siempre en el mismo nodo
parent e2749ebd

deploy/.env

+13 −3
Original line number Diff line number Diff line 
ZK_PORT=2181

JMX_PORT=9999

IMAGE_NAME=confluentinc/cp-zookeeper

IMAGE_TAG=latest

JMX_PROMETHEUS_JAVAAGENT_PATH=/jmx_prometheus_javaagent.jar

JMX_HTTP_PORT=9998

LOG_LEVEL=ERROR
 
JMX_PROMETHEUS_CONFIG_PATH=/config.yaml

ZOOKEEPER_CLIENT_PORT=2181

KAFKA_JMX_PORT=9999

ZOOKEEPER_TICK_TIME=2000

ZOOKEEPER_INIT_LIMIT=5

ZOOKEEPER_SYNC_LIMIT=2

ZOOKEEPER_AUTOPURGE_SNAP_RETAIN_COUNT=3

ZOOKEEPER_AUTOPURGE_PURGE_INTERVAL=24

ZOOKEEPER_SERVERS=zk-1:2888:3888;zk-2:2888:3888;zk-3:2888:3888

ZOOKEEPER_LOG4J_ROOT_LOGLEVEL=ERROR

deploy/docker-compose.zookeeper-1.dev.yml

+8 −9
Original line number Diff line number Diff line
@@ -3,19 +3,18 @@ version: '3.5' 
services:

  zookeeper-1:

    environment:

      - KAFKA_HEAP_OPTS=-Xmx128m -Xms128m

      KAFKA_HEAP_OPTS: -Xmx128m -Xms128m

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        delay: 30s

        window: 2m

      placement:

        constraints:

          - node.hostname == ${ZK_1_PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}

      resources:

        limits:

          cpus: '0.5'

          memory: 256M

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          memory: 205M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-205M}



volumes:

  zk-data-vol:

deploy/docker-compose.zookeeper-1.prod.yml

+8 −12
Original line number Diff line number Diff line
@@ -3,31 +3,27 @@ version: '3.5' 
services:

  zookeeper-1:

    environment:

      - KAFKA_HEAP_OPTS=-Xmx256m -Xms256m

      KAFKA_HEAP_OPTS: -Xmx256m -Xms256m

    deploy:

      mode: replicated

      replicas: 1

      placement:

        constraints:

          - node.role == worker

          - engine.labels.availability_zone == ${AWS_REGION}a

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          memory: 410M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-410M}



x-prod-default-volume:

  &prod-default-volume

  driver: "cloudstor:aws"

  driver: 'cloudstor:aws'

  driver_opts:

    backing: relocatable

    size: 1

    ebstype: gp2

    size: ${ZK_DEFAULT_VOL_SIZE:-1}

    ebstype: ${ZK_DEFAULT_VOL_EBS_TYPE:-gp2}



volumes:

  zk-data-vol:

deploy/docker-compose.zookeeper-1.tmpl.yml

+28 −20
Original line number Diff line number Diff line
@@ -2,21 +2,21 @@ version: '3.5' 


services:

  zookeeper-1:

    image: confluentinc/cp-zookeeper:${IMAGE_TAG:-latest}

    image: ${IMAGE_NAME}:${IMAGE_TAG}

    hostname: zk-1

    environment:

      - ZOOKEEPER_SERVER_ID=1

      - ZOOKEEPER_CLIENT_PORT=${ZK_PORT}

      - KAFKA_JMX_PORT=${JMX_PORT}

      - ZOOKEEPER_TICK_TIME=2000

      - ZOOKEEPER_INIT_LIMIT=5

      - ZOOKEEPER_SYNC_LIMIT=2

      - ZOOKEEPER_AUTOPURGE_SNAP_RETAIN_COUNT=3

      - ZOOKEEPER_AUTOPURGE_PURGE_INTERVAL=24

      - ZOOKEEPER_SERVERS=zk-1:2888:3888;zk-2:2888:3888;zk-3:2888:3888

      - KAFKA_JMX_HOSTNAME=zk-1

      - ZOOKEEPER_LOG4J_ROOT_LOGLEVEL=${LOG_LEVEL}

      - KAFKA_OPTS=-javaagent:/jmx_prometheus_javaagent.jar=${JMX_HTTP_PORT}:/config.yaml

      ZOOKEEPER_SERVER_ID: 1

      KAFKA_JMX_HOSTNAME: zk-1

      KAFKA_OPTS: -javaagent:${JMX_PROMETHEUS_JAVAAGENT_PATH}=${JMX_HTTP_PORT}:${JMX_PROMETHEUS_CONFIG_PATH}

      ZOOKEEPER_CLIENT_PORT:

      KAFKA_JMX_PORT:

      ZOOKEEPER_TICK_TIME:

      ZOOKEEPER_INIT_LIMIT:

      ZOOKEEPER_SYNC_LIMIT:

      ZOOKEEPER_AUTOPURGE_SNAP_RETAIN_COUNT:

      ZOOKEEPER_AUTOPURGE_PURGE_INTERVAL:

      ZOOKEEPER_SERVERS:

      ZOOKEEPER_LOG4J_ROOT_LOGLEVEL:

    networks:

      kafka-net:

        aliases:
@@ -24,28 +24,36 @@ services: 
      metric-net:

    configs:

      - source: jmx-prometheus-javaagent

        target: /jmx_prometheus_javaagent.jar

        target: ${JMX_PROMETHEUS_JAVAAGENT_PATH}

      - source: jmx-prometheus-config

        target: /config.yaml

        target: ${JMX_PROMETHEUS_CONFIG_PATH}

    volumes:

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

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

      - zk-secrets-vol:/etc/zookeeper/secrets

    healthcheck:

      test: echo ruok | nc localhost ${ZK_PORT}

      interval: 30s

      timeout: 5s

      retries: 3

      start_period: 2m

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:10s}

      retries: ${HEALTHCHECK_RETRIES:10}

      start_period: ${HEALTHCHECK_START_PERIOD:-2m}

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      restart_policy:

        delay: ${RESTART_DELAY:-30s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}



networks:

  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    driver: overlay

    driver: ${KAFKA_NET_DRIVER:-overlay}

    attachable: ${KAFKA_NET_ATTACHABLE:-true}



  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true



volumes:

deploy/docker-compose.zookeeper-2.dev.yml

+8 −9
Original line number Diff line number Diff line
@@ -3,19 +3,18 @@ version: '3.5' 
services:

  zookeeper-2:

    environment:

      - KAFKA_HEAP_OPTS=-Xmx128m -Xms128m

      KAFKA_HEAP_OPTS: -Xmx128m -Xms128m

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        delay: 30s

        window: 2m

      placement:

        constraints:

          - node.hostname == ${ZK_2_PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}

      resources:

        limits:

          cpus: '0.5'

          memory: 256M

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          memory: 205M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-205M}



volumes:

  zk-data-vol: