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

Merge branch 'dev' into 'master' 

Renombra a configs actualizadas de agente jmx

See merge request redmic-project/confluent/kafka!1
parents eff7e2a5 9d1bf03c

.gitlab-ci.yml

+13 −13
Original line number Diff line number Diff line 
stages:

  - deploy



image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}



services:

  - docker:dind
@@ -22,7 +22,7 @@ deploy-kf-1-supporting-branch-develop: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    name: dev/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - branches

  except:
@@ -41,7 +41,7 @@ deploy-kf-2-supporting-branch-develop: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    name: dev/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - branches

  except:
@@ -60,7 +60,7 @@ deploy-kf-3-supporting-branch-develop: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    name: dev/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - branches

  except:
@@ -79,7 +79,7 @@ deploy-kf-1-stable-branch-develop: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    name: dev/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - master

  when: manual
@@ -96,7 +96,7 @@ deploy-kf-2-stable-branch-develop: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    name: dev/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - master

  when: manual
@@ -113,7 +113,7 @@ deploy-kf-3-stable-branch-develop: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    name: dev/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - master

  when: manual
@@ -130,7 +130,7 @@ deploy-kf-1-supporting-branch-production: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro

    name: pro/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - branches

  except:
@@ -149,7 +149,7 @@ deploy-kf-2-supporting-branch-production: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro

    name: pro/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - branches

  except:
@@ -168,7 +168,7 @@ deploy-kf-3-supporting-branch-production: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro

    name: pro/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - branches

  except:
@@ -187,7 +187,7 @@ deploy-kf-1-stable-branch-production: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro

    name: pro/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - master

  when: manual
@@ -204,7 +204,7 @@ deploy-kf-2-stable-branch-production: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro

    name: pro/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - master

  when: manual
@@ -221,7 +221,7 @@ deploy-kf-3-stable-branch-production: 
  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro

    name: pro/${CI_PROJECT_NAME}-${INSTANCE_ID}

  only:

    - master

  when: manual

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

+2 −2
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ volumes: 


configs:

  jmx-prometheus-javaagent:

    name: ${JMX_PROMETHEUS_JAVA_AGENT_NAME:-jmx-prometheus-javaagent}

    name: ${JMX_PROMETHEUS_JAVA_AGENT_NAME:-jmx-prometheus-javaagent-0.11.0}

    external: true



  jmx-prometheus-config:

    name: ${JMX_PROMETHEUS_CONFIG_NAME:-jmx-prometheus-config}

    name: ${JMX_PROMETHEUS_CONFIG_NAME:-jmx-prometheus-config-0.11.0}

    external: true

deploy/docker-compose.kafka-2.tmpl.yml

+2 −2
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ volumes: 


configs:

  jmx-prometheus-javaagent:

    name: ${JMX_PROMETHEUS_JAVA_AGENT_NAME:-jmx-prometheus-javaagent}

    name: ${JMX_PROMETHEUS_JAVA_AGENT_NAME:-jmx-prometheus-javaagent-0.11.0}

    external: true



  jmx-prometheus-config:

    name: ${JMX_PROMETHEUS_CONFIG_NAME:-jmx-prometheus-config}

    name: ${JMX_PROMETHEUS_CONFIG_NAME:-jmx-prometheus-config-0.11.0}

    external: true

deploy/docker-compose.kafka-3.tmpl.yml

+2 −2
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ volumes: 


configs:

  jmx-prometheus-javaagent:

    name: ${JMX_PROMETHEUS_JAVA_AGENT_NAME:-jmx-prometheus-javaagent}

    name: ${JMX_PROMETHEUS_JAVA_AGENT_NAME:-jmx-prometheus-javaagent-0.11.0}

    external: true



  jmx-prometheus-config:

    name: ${JMX_PROMETHEUS_CONFIG_NAME:-jmx-prometheus-config}

    name: ${JMX_PROMETHEUS_CONFIG_NAME:-jmx-prometheus-config-0.11.0}

    external: true