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

Merge branch 'dev' into 'master' 

Define variables olvidadas para otros deploys

See merge request redmic-project/log/fluentd!3
parents 5c7dba7e 0b730c9c

.gitlab-ci.yml

+20 −4
Original line number Diff line number Diff line
@@ -80,8 +80,12 @@ deploy-supporting-branch-develop: 
  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    ES_HOSTS: ${DEV_ES_HOSTS}

    ES_USER: ${DEV_ES_USER}

    ES_PASS: ${DEV_ES_PASS}

  script:

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS}

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

  environment:

    name: dev

  only:
@@ -96,8 +100,12 @@ deploy-stable-branch-develop: 
  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    ES_HOSTS: ${DEV_ES_HOSTS}

    ES_USER: ${DEV_ES_USER}

    ES_PASS: ${DEV_ES_PASS}

  script:

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS}

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

  environment:

    name: dev

  only:
@@ -110,8 +118,12 @@ deploy-supporting-branch-production: 
  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    ES_HOSTS: ${PRO_ES_HOSTS}

    ES_USER: ${PRO_ES_USER}

    ES_PASS: ${PRO_ES_PASS}

  script:

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS}

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

  environment:

    name: pro

  only:
@@ -126,8 +138,12 @@ deploy-stable-branch-production: 
  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    ES_HOSTS: ${PRO_ES_HOSTS}

    ES_USER: ${PRO_ES_USER}

    ES_PASS: ${PRO_ES_PASS}

  script:

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS}

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} ES_HOSTS=${ES_HOSTS} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

  environment:

    name: pro

  only:

deploy/.env

+2 −0
Original line number Diff line number Diff line 
ES_HOSTS=es-1:9200,es-2:9200

ES_USER=user

ES_PASS=pass

deploy/conf/fluent.conf

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
		@id elasticsearch-output

		@log_level debug

		hosts "#{ENV['ES_HOSTS']}"

		user "#{ENV['ES_USER']}"

		password "#{ENV['ES_PASS']}"

		type_name fluentd

		logstash_format true

		logstash_prefix fluentd-${tag_parts[0]}

deploy/docker-compose.yml

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ services: 
    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - ES_HOSTS

      - ES_USER

      - ES_PASS

    networks:

      log-net:

        aliases: