Commit 50a8c0c0 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Cambia a red de elastic v6 y omite credenciales

parent f3a6e6b4

.gitlab-ci.yml

+4 −20
Original line number Diff line number Diff line
@@ -83,12 +83,8 @@ deploy-supporting-branch-develop: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    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} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

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

  environment:

    name: dev

  only:
@@ -107,12 +103,8 @@ deploy-stable-branch-develop: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    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} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

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

  environment:

    name: dev

  only:
@@ -129,12 +121,8 @@ deploy-supporting-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    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} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

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

  environment:

    name: pro

  only:
@@ -153,12 +141,8 @@ deploy-stable-branch-production: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    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} ES_USER=${ES_USER}

      ES_PASS=${ES_PASS}

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

  environment:

    name: pro

  only:

deploy/.env

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

ES_PASS=changeme

deploy/conf/fluent.conf

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
	<store>

		@type elasticsearch

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

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

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

		index_name fluentd

		type_name fluentd

		logstash_format true

		logstash_prefix fluentd

deploy/docker-compose.yml

+2 −4
Original line number Diff line number Diff line
@@ -5,13 +5,11 @@ services: 
    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - ES_HOSTS

      - ES_USER

      - ES_PASS

    networks:

      log-net:

        aliases:

          - fluentd

      elastic-net:

      elastic6-net:

    configs:

      - source: fluent-conf

        target: /fluentd/etc/fluent.conf
@@ -36,7 +34,7 @@ networks: 
    driver: overlay

    attachable: true



  elastic-net:

  elastic6-net:

    external: true



configs: