Commit 9b51c301 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Unifica deploy, protege config, añade credenciales 

No es necesario mantener configs por entorno, se pueden leer valores
desde las variables de entorno.
Además, como ahora recogen las credenciales para conectar a
elasticsearch, dejan de ser configs para convertirse en secrets.
parent de4707aa

.gitlab-ci.yml

+24 −8
Original line number Diff line number Diff line
@@ -82,9 +82,13 @@ deploy-supporting-branch-develop: 
    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

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

    - >

      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:
@@ -102,9 +106,13 @@ deploy-stable-branch-develop: 
    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

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

    - >

      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:
@@ -120,9 +128,13 @@ deploy-supporting-branch-production: 
    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

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

    - >

      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:
@@ -140,9 +152,13 @@ deploy-stable-branch-production: 
    SERVICES_TO_CHECK: log_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

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

    - >

      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

0 → 100644
+3 −0
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-prod.conf

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<source>

	@type forward

	port 24224

	bind 0.0.0.0

</source>

<match *.**>

	@type copy

	<store>

		@type elasticsearch

		hosts es-1,es-2,es-3

		port 9200

		index_name fluentd

		type_name fluentd

		logstash_format true

		logstash_prefix fluentd

		logstash_dateformat %Y%m%d

		include_tag_key true

		tag_key @log_name

		flush_interval 1s

	</store>

	<store>

		@type stdout

	</store>

</match>

deploy/conf/fluent-dev.conf→deploy/conf/fluent.conf

+3 −2
Original line number Diff line number Diff line
@@ -7,8 +7,9 @@ 
	@type copy

	<store>

		@type elasticsearch

		host es-1

		port 9200

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

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

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

		index_name fluentd

		type_name fluentd

		logstash_format true

deploy/docker-compose.dev.yml

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
version: '3.5'



configs:

  fluent-conf:

    file: ./conf/fluent-dev.conf