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

Pone al día configuración y despliegue 

Utiliza nueva imagen Docker (la anterior se desmantuvo y se ha
rebautizado) en su última versión.

Corrige y actualiza configuración de despliegue.

Hace uso de plantillas CI para despliegue.
parent e4c19fd3

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

.gitlab-ci.yml

+7 −84
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'



stages:

  - deploy



image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}



services:

  - docker:dind



.deploy:

  variables:

  DOCKER_DRIVER: overlay2

    STACK: elastic
 
  IMAGE_TAG: 1.1.0rc1



deploy-supporting-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}

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

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} 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}

  environment:

    name: dev

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}

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

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} 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}

  environment:

    name: dev

  only:

    - master

  when: manual



deploy-supporting-branch-production:

  stage: deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}

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

  script:

     - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} 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}

  environment:

    name: pro

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-production:

  stage: deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}

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

  script:

     - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} 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}

  environment:

    name: pro

  only:

    - master

  when: manual

deploy/.env

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ ES_CLUSTER_SETTINGS=false 
ES_INDICES=true

ES_INDICES_SETTINGS=false

ES_SHARDS=false

ES_SHARDS_SETTINGS=false

ES_SNAPSHOTS=true

ES_TIMEOUT=10s

ES_CLUSTERINFO_INTERVAL=5m

ES_SSL-SKIP-VERIFY=true
 
ES_SSL_SKIP_VERIFY=true

deploy/docker-compose.prod.yml

+0 −7
Original line number Diff line number Diff line 
version: '3.5'
 


services:

  elasticsearch-exporter:

    deploy:

      placement:

        constraints:

          - node.role == worker

deploy/docker-compose.tmpl.yml

+28 −25
Original line number Diff line number Diff line
@@ -2,47 +2,50 @@ version: '3.5' 


services:

  elasticsearch-exporter:

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

    image: ${IMAGE_NAME:-quay.io/prometheuscommunity/elasticsearch-exporter}:${IMAGE_TAG:-latest}

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

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

      WEB_LISTEN_ADDRESS: ${UI_PORT}

      ES_ALL:

      ES_CLUSTER_SETTINGS:

      ES_INDICES:

      ES_INDICES_SETTINGS:

      ES_SHARDS:

      ES_SNAPSHOTS:

      ES_TIMEOUT:

      ES_CLUSTERINFO_INTERVAL:

      ES_SSL_SKIP_VERIFY:

    networks:

      - elastic-net

      - metric-net

      elastic-net:

      metric-net:

    healthcheck:

      test: wget --spider http://localhost:${UI_PORT}

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 1m

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-15s}

      retries: ${HEALTHCHECK_RETRIES:-10}

      start_period: ${HEALTHCHECK_START_PERIOD:-1m}

    deploy:

      mode: replicated

      replicas: 1

      replicas: ${REPLICAS:-1}

      restart_policy:

        delay: 30s

        window: 1m

        delay: ${RESTART_DELAY:-10s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '0.5'

          memory: 256M

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          memory: 205M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}



networks:

  elastic-net:

    name: ${ELASTIC_NET_NAME:-elastic-net}

    driver: ${ELASTIC_NET_DRIVER:-overlay}

    external: true



  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true

README.md

+1 −1

File changed.

Contains only whitespace changes.