Loading .gitlab-ci.yml +2 −137 Original line number Diff line number Diff line include: - project: 'redmic-project/gitlab-ci-templates' ref: master file: '/_deployment.yml' file: '/deployment.yml' stages: - deploy Loading @@ -12,140 +12,5 @@ variables: .deploy: variables: STACK: ${PROJECT_PARENT_NAME} SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME} DD_AWS_REGION: ${AWS_REGION} .deploy-development: environment: name: dev/${SERVICE_NAME} .deploy-production: environment: name: pro/${SERVICE_NAME} .deploy-zk-1: variables: &deploy-zk-1-variables SERVICE_NAME: zk-1 SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-1 .deploy-zk-2: variables: &deploy-zk-2-variables SERVICE_NAME: zk-2 SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-2 .deploy-zk-3: variables: &deploy-zk-3-variables SERVICE_NAME: zk-3 SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-3 .deploy-zk-1-development: extends: .deploy-development variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-1.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-1.dev.yml <<: *deploy-zk-1-variables .deploy-zk-2-development: extends: .deploy-development variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-2.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-2.dev.yml <<: *deploy-zk-2-variables .deploy-zk-3-development: extends: .deploy-development variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-3.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-3.dev.yml <<: *deploy-zk-3-variables .deploy-zk-1-production: extends: .deploy-production variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-1.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-1.prod.yml <<: *deploy-zk-1-variables .deploy-zk-2-production: extends: .deploy-production variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-2.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-2.prod.yml <<: *deploy-zk-2-variables .deploy-zk-3-production: extends: .deploy-production variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-3.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-3.prod.yml <<: *deploy-zk-3-variables .deploy-support-branch: &deploy-support-branch only: - branches except: - master - schedules deploy-zk-1-support-branch-development: extends: .deploy-zk-1-development <<: *deploy-support-branch deploy-zk-2-support-branch-development: extends: .deploy-zk-2-development <<: *deploy-support-branch deploy-zk-3-support-branch-development: extends: .deploy-zk-3-development <<: *deploy-support-branch .deploy-stable-branch: &deploy-stable-branch only: - master except: - schedules deploy-zk-1-stable-branch-development: extends: .deploy-zk-1-development <<: *deploy-stable-branch deploy-zk-2-stable-branch-development: extends: .deploy-zk-2-development <<: *deploy-stable-branch deploy-zk-3-stable-branch-development: extends: .deploy-zk-3-development <<: *deploy-stable-branch deploy-zk-1-stable-branch-production: extends: .deploy-zk-1-production <<: *deploy-stable-branch deploy-zk-2-stable-branch-production: extends: .deploy-zk-2-production <<: *deploy-stable-branch deploy-zk-3-stable-branch-production: extends: .deploy-zk-3-production <<: *deploy-stable-branch .deploy-tag: &deploy-tag only: - tags deploy-zk-1-tag-development: extends: .deploy-zk-1-development <<: *deploy-tag deploy-zk-2-tag-development: extends: .deploy-zk-2-development <<: *deploy-tag deploy-zk-3-tag-development: extends: .deploy-zk-3-development <<: *deploy-tag deploy-zk-1-tag-production: extends: .deploy-zk-1-production <<: *deploy-tag deploy-zk-2-tag-production: extends: .deploy-zk-2-production <<: *deploy-tag deploy-zk-3-tag-production: extends: .deploy-zk-3-production <<: *deploy-tag deploy/.env +8 −4 Original line number Diff line number Diff line IMAGE_NAME=confluentinc/cp-zookeeper IMAGE_TAG=latest JMX_PROMETHEUS_JAVAAGENT_PATH=/jmx_prometheus_javaagent.jar JMX_HTTP_PORT=9998 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 Loading @@ -12,3 +9,10 @@ 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 JMX_PROMETHEUS_JAVAAGENT_PATH=/jmx_prometheus_javaagent.jar JMX_PROMETHEUS_CONFIG_PATH=/config.yaml ZK_SECRETS_VOL_NAME=zk-{{.Task.Slot}}-secrets-vol ZK_DATA_VOL_NAME=zk-{{.Task.Slot}}-data-vol ZK_LOG_VOL_NAME=zk-{{.Task.Slot}}-log-vol deploy/docker-compose.zookeeper-1.dev.yml→deploy/docker-compose.dev.yml +3 −6 Original line number Diff line number Diff line version: '3.5' services: zookeeper-1: zookeeper: environment: KAFKA_HEAP_OPTS: -Xmx128m -Xms128m deploy: placement: constraints: - node.hostname == ${ZK_1_PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname} resources: limits: cpus: '${RESOURCES_LIMITS_CPUS:-0.5}' Loading @@ -18,7 +15,7 @@ services: volumes: zk-data-vol: name: ${ZK_DATA_VOL_NAME:-zk-1-data-vol} name: ${ZK_DATA_VOL_NAME} zk-log-vol: name: ${ZK_LOG_VOL_NAME:-zk-1-log-vol} name: ${ZK_LOG_VOL_NAME} deploy/docker-compose.zookeeper-3.prod.yml→deploy/docker-compose.prod.yml +3 −4 Original line number Diff line number Diff line version: '3.5' services: zookeeper-3: zookeeper: environment: KAFKA_HEAP_OPTS: -Xmx256m -Xms256m deploy: placement: constraints: - node.role == worker - engine.labels.availability_zone == ${AWS_REGION}c resources: limits: cpus: '${RESOURCES_LIMITS_CPUS:-0.5}' Loading @@ -28,8 +27,8 @@ x-prod-default-volume: volumes: zk-data-vol: << : *prod-default-volume name: ${ZK_DATA_VOL_NAME:-zk-3-data-vol} name: ${ZK_DATA_VOL_NAME} zk-log-vol: << : *prod-default-volume name: ${ZK_LOG_VOL_NAME:-zk-3-log-vol} name: ${ZK_LOG_VOL_NAME} deploy/docker-compose.zookeeper-3.tmpl.yml→deploy/docker-compose.tmpl.yml +6 −8 Original line number Diff line number Diff line version: '3.5' services: zookeeper-3: image: ${IMAGE_NAME}:${IMAGE_TAG} hostname: zk-3 zookeeper: image: ${IMAGE_NAME:-confluentinc/cp-zookeeper}:${IMAGE_TAG:-latest} hostname: zk-{{.Task.Slot}} environment: ZOOKEEPER_SERVER_ID: 3 KAFKA_JMX_HOSTNAME: zk-3 ZOOKEEPER_SERVER_ID: '{{.Task.Slot}}' KAFKA_JMX_HOSTNAME: zk-{{.Task.Slot}} KAFKA_OPTS: -javaagent:${JMX_PROMETHEUS_JAVAAGENT_PATH}=${JMX_HTTP_PORT}:${JMX_PROMETHEUS_CONFIG_PATH} ZOOKEEPER_CLIENT_PORT: KAFKA_JMX_PORT: Loading @@ -19,8 +19,6 @@ services: ZOOKEEPER_LOG4J_ROOT_LOGLEVEL: networks: kafka-net: aliases: - zk-3 metric-net: configs: - source: jmx-prometheus-javaagent Loading Loading @@ -58,7 +56,7 @@ networks: volumes: zk-secrets-vol: name: ${ZK_SECRETS_VOL_NAME:-zk-3-secrets-vol} name: ${ZK_SECRETS_VOL_NAME} configs: jmx-prometheus-javaagent: Loading Loading
.gitlab-ci.yml +2 −137 Original line number Diff line number Diff line include: - project: 'redmic-project/gitlab-ci-templates' ref: master file: '/_deployment.yml' file: '/deployment.yml' stages: - deploy Loading @@ -12,140 +12,5 @@ variables: .deploy: variables: STACK: ${PROJECT_PARENT_NAME} SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME} DD_AWS_REGION: ${AWS_REGION} .deploy-development: environment: name: dev/${SERVICE_NAME} .deploy-production: environment: name: pro/${SERVICE_NAME} .deploy-zk-1: variables: &deploy-zk-1-variables SERVICE_NAME: zk-1 SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-1 .deploy-zk-2: variables: &deploy-zk-2-variables SERVICE_NAME: zk-2 SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-2 .deploy-zk-3: variables: &deploy-zk-3-variables SERVICE_NAME: zk-3 SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}-3 .deploy-zk-1-development: extends: .deploy-development variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-1.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-1.dev.yml <<: *deploy-zk-1-variables .deploy-zk-2-development: extends: .deploy-development variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-2.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-2.dev.yml <<: *deploy-zk-2-variables .deploy-zk-3-development: extends: .deploy-development variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-3.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-3.dev.yml <<: *deploy-zk-3-variables .deploy-zk-1-production: extends: .deploy-production variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-1.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-1.prod.yml <<: *deploy-zk-1-variables .deploy-zk-2-production: extends: .deploy-production variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-2.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-2.prod.yml <<: *deploy-zk-2-variables .deploy-zk-3-production: extends: .deploy-production variables: COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-3.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-3.prod.yml <<: *deploy-zk-3-variables .deploy-support-branch: &deploy-support-branch only: - branches except: - master - schedules deploy-zk-1-support-branch-development: extends: .deploy-zk-1-development <<: *deploy-support-branch deploy-zk-2-support-branch-development: extends: .deploy-zk-2-development <<: *deploy-support-branch deploy-zk-3-support-branch-development: extends: .deploy-zk-3-development <<: *deploy-support-branch .deploy-stable-branch: &deploy-stable-branch only: - master except: - schedules deploy-zk-1-stable-branch-development: extends: .deploy-zk-1-development <<: *deploy-stable-branch deploy-zk-2-stable-branch-development: extends: .deploy-zk-2-development <<: *deploy-stable-branch deploy-zk-3-stable-branch-development: extends: .deploy-zk-3-development <<: *deploy-stable-branch deploy-zk-1-stable-branch-production: extends: .deploy-zk-1-production <<: *deploy-stable-branch deploy-zk-2-stable-branch-production: extends: .deploy-zk-2-production <<: *deploy-stable-branch deploy-zk-3-stable-branch-production: extends: .deploy-zk-3-production <<: *deploy-stable-branch .deploy-tag: &deploy-tag only: - tags deploy-zk-1-tag-development: extends: .deploy-zk-1-development <<: *deploy-tag deploy-zk-2-tag-development: extends: .deploy-zk-2-development <<: *deploy-tag deploy-zk-3-tag-development: extends: .deploy-zk-3-development <<: *deploy-tag deploy-zk-1-tag-production: extends: .deploy-zk-1-production <<: *deploy-tag deploy-zk-2-tag-production: extends: .deploy-zk-2-production <<: *deploy-tag deploy-zk-3-tag-production: extends: .deploy-zk-3-production <<: *deploy-tag
deploy/.env +8 −4 Original line number Diff line number Diff line IMAGE_NAME=confluentinc/cp-zookeeper IMAGE_TAG=latest JMX_PROMETHEUS_JAVAAGENT_PATH=/jmx_prometheus_javaagent.jar JMX_HTTP_PORT=9998 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 Loading @@ -12,3 +9,10 @@ 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 JMX_PROMETHEUS_JAVAAGENT_PATH=/jmx_prometheus_javaagent.jar JMX_PROMETHEUS_CONFIG_PATH=/config.yaml ZK_SECRETS_VOL_NAME=zk-{{.Task.Slot}}-secrets-vol ZK_DATA_VOL_NAME=zk-{{.Task.Slot}}-data-vol ZK_LOG_VOL_NAME=zk-{{.Task.Slot}}-log-vol
deploy/docker-compose.zookeeper-1.dev.yml→deploy/docker-compose.dev.yml +3 −6 Original line number Diff line number Diff line version: '3.5' services: zookeeper-1: zookeeper: environment: KAFKA_HEAP_OPTS: -Xmx128m -Xms128m deploy: placement: constraints: - node.hostname == ${ZK_1_PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname} resources: limits: cpus: '${RESOURCES_LIMITS_CPUS:-0.5}' Loading @@ -18,7 +15,7 @@ services: volumes: zk-data-vol: name: ${ZK_DATA_VOL_NAME:-zk-1-data-vol} name: ${ZK_DATA_VOL_NAME} zk-log-vol: name: ${ZK_LOG_VOL_NAME:-zk-1-log-vol} name: ${ZK_LOG_VOL_NAME}
deploy/docker-compose.zookeeper-3.prod.yml→deploy/docker-compose.prod.yml +3 −4 Original line number Diff line number Diff line version: '3.5' services: zookeeper-3: zookeeper: environment: KAFKA_HEAP_OPTS: -Xmx256m -Xms256m deploy: placement: constraints: - node.role == worker - engine.labels.availability_zone == ${AWS_REGION}c resources: limits: cpus: '${RESOURCES_LIMITS_CPUS:-0.5}' Loading @@ -28,8 +27,8 @@ x-prod-default-volume: volumes: zk-data-vol: << : *prod-default-volume name: ${ZK_DATA_VOL_NAME:-zk-3-data-vol} name: ${ZK_DATA_VOL_NAME} zk-log-vol: << : *prod-default-volume name: ${ZK_LOG_VOL_NAME:-zk-3-log-vol} name: ${ZK_LOG_VOL_NAME}
deploy/docker-compose.zookeeper-3.tmpl.yml→deploy/docker-compose.tmpl.yml +6 −8 Original line number Diff line number Diff line version: '3.5' services: zookeeper-3: image: ${IMAGE_NAME}:${IMAGE_TAG} hostname: zk-3 zookeeper: image: ${IMAGE_NAME:-confluentinc/cp-zookeeper}:${IMAGE_TAG:-latest} hostname: zk-{{.Task.Slot}} environment: ZOOKEEPER_SERVER_ID: 3 KAFKA_JMX_HOSTNAME: zk-3 ZOOKEEPER_SERVER_ID: '{{.Task.Slot}}' KAFKA_JMX_HOSTNAME: zk-{{.Task.Slot}} KAFKA_OPTS: -javaagent:${JMX_PROMETHEUS_JAVAAGENT_PATH}=${JMX_HTTP_PORT}:${JMX_PROMETHEUS_CONFIG_PATH} ZOOKEEPER_CLIENT_PORT: KAFKA_JMX_PORT: Loading @@ -19,8 +19,6 @@ services: ZOOKEEPER_LOG4J_ROOT_LOGLEVEL: networks: kafka-net: aliases: - zk-3 metric-net: configs: - source: jmx-prometheus-javaagent Loading Loading @@ -58,7 +56,7 @@ networks: volumes: zk-secrets-vol: name: ${ZK_SECRETS_VOL_NAME:-zk-3-secrets-vol} name: ${ZK_SECRETS_VOL_NAME} configs: jmx-prometheus-javaagent: Loading