Commit a516218f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige publicación de métricas, reorganiza deploy 

Actualiza el check de salud para que no interfiera con la publicación de
métricas, sino que las aproveche para evaluar su estado.
parent f439b677

kafka/.env

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ ZK_PORT=2181 
KF_PORT=9092

KF_PORT_EXT=9093

JMX_PORT=9999

JMX_HTTP_PORT=9998

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

KAFKA_LOG_CLEANER_ENABLE=false

KAFKA_LOG_CLEANUP_POLICY=compact

kafka/config/config.yaml

+1 −3
Original line number Diff line number Diff line 
---

startDelaySeconds: 0

hostPort: 127.0.0.1:9999

startDelaySeconds: 10

ssl: false

kafka/docker-compose.dev.yml

+1 −32
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ x-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: '-Xmx1g -Xms1g -javaagent:/jmx_prometheus_javaagent.jar=9998:/config.yaml'

  KAFKA_HEAP_OPTS: '-Xmx1g -Xms1g'



x-dev-deploy:

  &dev-deploy
@@ -30,11 +30,6 @@ services: 
      - target: ${KF_PORT_EXT}

        published: 1${KF_PORT}

        mode: host

    configs:

      - source: jmx-prometheus-javaagent

        target: /jmx_prometheus_javaagent.jar

      - source: jmx-prometheus-config

        target: /config.yaml

    deploy: *dev-deploy



  kf-2:
@@ -45,11 +40,6 @@ services: 
      - target: ${KF_PORT_EXT}

        published: 2${KF_PORT}

        mode: host

    configs:

      - source: jmx-prometheus-javaagent

        target: /jmx_prometheus_javaagent.jar

      - source: jmx-prometheus-config

        target: /config.yaml

    deploy: *dev-deploy



  kf-3:
@@ -60,35 +50,14 @@ services: 
      - target: ${KF_PORT_EXT}

        published: 3${KF_PORT}

        mode: host

    configs:

      - source: jmx-prometheus-javaagent

        target: /jmx_prometheus_javaagent.jar

      - source: jmx-prometheus-config

        target: /config.yaml

    deploy: *dev-deploy



volumes:

  kf-1-data-vol:

    name: kf-1-data-vol



  kf-1-secrets-vol:

    name: kf-1-secrets-vol



  kf-2-data-vol:

    name: kf-2-data-vol



  kf-2-secrets-vol:

    name: kf-2-secrets-vol



  kf-3-data-vol:

    name: kf-3-data-vol
 


  kf-3-secrets-vol:

    name: kf-3-secrets-vol



configs:

  jmx-prometheus-javaagent:

    file: ./config/jmx_prometheus_javaagent-0.3.1.jar



  jmx-prometheus-config:

    file: ./config/config.yaml

kafka/docker-compose.prod.yml

+0 −9
Original line number Diff line number Diff line
@@ -61,19 +61,10 @@ volumes: 
    << : *prod-default-volume

    name: kf-1-data-vol



  kf-1-secrets-vol:

    name: kf-1-secrets-vol



  kf-2-data-vol:

    << : *prod-default-volume

    name: kf-2-data-vol



  kf-2-secrets-vol:

    name: kf-2-secrets-vol



  kf-3-data-vol:

    << : *prod-default-volume

    name: kf-3-data-vol
 


  kf-3-secrets-vol:

    name: kf-3-secrets-vol

kafka/docker-compose.tmpl.yml

+35 −2
Original line number Diff line number Diff line
@@ -17,12 +17,13 @@ x-tmpl-environment: 
  KAFKA_OFFSETS_RETENTION_MINUTES: ${KAFKA_OFFSETS_RETENTION_MINUTES}

  KAFKA_SOCKET_RECEIVE_BUFFER_BYTES: ${KAFKA_SOCKET_RECEIVE_BUFFER_BYTES}

  KAFKA_MESSAGE_MAX_BYTES: ${KAFKA_MESSAGE_MAX_BYTES}

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



x-tmpl-healthcheck:

  &tmpl-healthcheck

  test: kafka-topics --list -zookeeper $${KAFKA_ZOOKEEPER_CONNECT}

  test: wget --spider -S -t 3 http://localhost:${JMX_HTTP_PORT}

  interval: 30s

  timeout: 30s

  timeout: 10s

  retries: 3

  start_period: 2m
@@ -39,6 +40,11 @@ services: 
    volumes:

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

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

    configs:

      - source: jmx-prometheus-javaagent

        target: /jmx_prometheus_javaagent.jar

      - source: jmx-prometheus-config

        target: /config.yaml

    healthcheck: *tmpl-healthcheck



  kf-2:
@@ -53,6 +59,11 @@ services: 
    volumes:

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

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

    configs:

      - source: jmx-prometheus-javaagent

        target: /jmx_prometheus_javaagent.jar

      - source: jmx-prometheus-config

        target: /config.yaml

    healthcheck: *tmpl-healthcheck



  kf-3:
@@ -67,8 +78,30 @@ services: 
    volumes:

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

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

    configs:

      - source: jmx-prometheus-javaagent

        target: /jmx_prometheus_javaagent.jar

      - source: jmx-prometheus-config

        target: /config.yaml

    healthcheck: *tmpl-healthcheck



networks:

  kafka-net:

    external: true



volumes:

  kf-1-secrets-vol:

    name: kf-1-secrets-vol



  kf-2-secrets-vol:

    name: kf-2-secrets-vol



  kf-3-secrets-vol:

    name: kf-3-secrets-vol



configs:

  jmx-prometheus-javaagent:

    file: ./config/jmx_prometheus_javaagent-0.3.1.jar



  jmx-prometheus-config:

    file: ./config/config.yaml