Commit 3c6b95e0 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Cambia parámetros de command por variables de env.

parent 92b22528

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ deploy-supporting-branch-develop: 
  script:

    - >

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

      UI_AUTH=${UI_AUTH} ES_AUTH=${ES_AUTH} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}

      ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}

      ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
@@ -43,7 +43,7 @@ deploy-stable-branch-develop: 
  script:

    - >

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

      UI_AUTH=${UI_AUTH} ES_AUTH=${ES_AUTH} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}

      ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}

      ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
@@ -63,7 +63,7 @@ deploy-supporting-branch-production: 
  script:

     - >

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

      UI_AUTH=${UI_AUTH} ES_AUTH=${ES_AUTH} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}

      ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}

      ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
@@ -85,7 +85,7 @@ deploy-stable-branch-production: 
  script:

     - >

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

      UI_AUTH=${UI_AUTH} ES_AUTH=${ES_AUTH} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}

      ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}

      ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}

      ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}

deploy/.env

+4 −3
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ UI_AUTH=user:$apr1$md5password 
UI_SUBDOMAIN=esexporter

UI_PORT=9114

ES_PROTOCOL=http

ES_AUTH=user:pass

ES_USER=user

ES_PASS=pass

ES_HOST=es-1

ES_PORT=9200

ES_ALL=true
@@ -14,5 +15,5 @@ ES_SHARDS_SETTINGS=false 
ES_SNAPSHOTS=true

ES_TIMEOUT=10s

ES_CLUSTERINFO_INTERVAL=5m

ES_SSL_SKIP_VERIFY=true

WEB_LISTEN_ADDRESS=9114
 
ES_SSL-SKIP-VERIFY=true

WEB_LISTEN-ADDRESS=9114

deploy/docker-compose.tmpl.yml

+15 −15
Original line number Diff line number Diff line
@@ -3,25 +3,25 @@ version: '3.5' 
services:

  elasticsearch-exporter:

    image: ${IMAGE_NAME:-justwatch/elasticsearch_exporter}:${IMAGE_TAG:-1.1.0rc1}

    command:

      - '--es.uri=${ES_PROTOCOL}://${ES_AUTH}@${ES_HOST}:${ES_PORT}'

      - '--es.all=${ES_ALL}'

      - '--es.cluster_settings=${ES_CLUSTER_SETTINGS}'

      - '--es.indices=${ES_INDICES}'

      - '--es.indices_settings=${ES_INDICES_SETTINGS}'

      - '--es.shards=${ES_SHARDS}'

      - '--es.shards_settings=${ES_SHARDS_SETTINGS}'

      - '--es.snapshots=${ES_SNAPSHOTS}'

      - '--es.timeout=${ES_TIMEOUT}'

      - '--es.clusterinfo.interval=${ES_CLUSTERINFO_INTERVAL}'

      - '--es.ssl-skip-verify=${ES_SSL_SKIP_VERIFY}'

      - '--web.listen-address=${WEB_LISTEN_ADDRESS}'

    environment:

      - ES_URI='${ES_PROTOCOL}://${ES_USER}:${ES_PASS}@${ES_HOST}:${ES_PORT}'

      - ES_ALL

      - ES_CLUSTER_SETTINGS

      - ES_INDICES

      - ES_INDICES_SETTINGS

      - ES_SHARDS

      - ES_SHARDS_SETTINGS

      - ES_SNAPSHOTS

      - ES_TIMEOUT

      - ES_CLUSTERINFO_INTERVAL

      - ES_SSL-SKIP-VERIFY

      - WEB_LISTEN-ADDRESS

    networks:

      - elastic-net

      - metric-net

      - traefik-net

    healthcheck:

      test: curl --silent --output /dev/null http://localhost:${WEB_LISTEN_ADDRESS}

      test: curl --silent --output /dev/null http://localhost:${WEB_LISTEN-ADDRESS}

      interval: 30s

      timeout: 10s

      retries: 3
@@ -33,7 +33,7 @@ services: 
        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:${UI_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.backend: elasticsearch-exporter

        traefik.port: '${WEB_LISTEN_ADDRESS}'

        traefik.port: '${WEB_LISTEN-ADDRESS}'

      restart_policy:

        delay: 30s

        window: 1m