Commit 7a6532f6 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Pone al día el proyecto 

Actualiza algunos nombres de variables y valores por defecto.
Aplica restricción de despliegue y abandona volumen NFS para dev.
Usa IP local para healthcheck en lugar de localhost.
Actualiza nombre y sintaxis de ficheros compose.
Actualiza plantillas CI utilizadas.
parent a560e491

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
include:

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

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - test

deploy/.env

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ ENTRYPOINT_FILENAME=entrypoint.sh 
DATA_VOL_NAME=prometheus-vol

NODE_RULES_NAME=node_rules



TRAEFIK_ENTRYPOINT=http

TRAEFIK_SUBDOMAIN=prometheus

PUBLIC_HOSTNAME=change.me

TRAEFIK_AUTH=user:$apr1$md5password

deploy/docker-compose.dev.yml

+2 −8
Original line number Diff line number Diff line 
version: '3.9'



services:

  prometheus:

    deploy:
@@ -9,16 +7,12 @@ services: 
          memory: ${RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-256M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-512M}



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

      o: addr=${VOL_ADDR:-127.0.0.1},${VOL_OPTS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${DATA_VOL_DEVICE:-:/prometheus-vol/}

    driver: ${DEV_VOL_DRIVER:-local}



configs:

  node_rules:

deploy/docker-compose.prod.yml

+4 −9
Original line number Diff line number Diff line 
version: '3.9'



services:

  prometheus:

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'
@@ -17,11 +12,11 @@ services: 
volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: 'cloudstor:aws'

    driver: ${PRO_VOL_DRIVER:-cloudstor:aws}

    driver_opts:

      backing: relocatable

      size: ${DATA_VOL_SIZE:-10}

      ebstype: ${DATA_VOL_EBS_TYPE:-gp2}

      backing: ${VOL_BACKING:-relocatable}

      size: ${VOL_SIZE:-10}

      ebstype: ${VOL_EBSTYPE:-gp2}



configs:

  node_rules:

deploy/docker-compose.tmpl.yml

+5 −4
Original line number Diff line number Diff line 
version: '3.9'



services:

  prometheus:

    image: ${IMAGE_NAME:-prom/prometheus}:${IMAGE_TAG:-latest}
@@ -40,7 +38,7 @@ services: 
      - source: kafka_rules

        target: /etc/prometheus/kafka.rules.yml

    healthcheck:

      test: wget --spider -q http://localhost:${PORT}

      test: wget --spider -q http://127.0.0.1:${PORT}

      interval: ${HEALTHCHECK_INTERVAL:-1m}

      timeout: ${HEALTHCHECK_TIMEOUT:-30s}

      retries: ${HEALTHCHECK_RETRIES:-10}
@@ -48,13 +46,16 @@ services: 
    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      placement:

        constraints:

          - ${PLACEMENT_CONSTRAINTS_NAME:-node.hostname} ${PLACEMENT_CONSTRAINTS_OPERATOR:-==} ${PLACEMENT_CONSTRAINTS_VALUE:-node}

      restart_policy:

        delay: ${RESTART_DELAY:-3s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

        traefik.enable: ${TRAEFIK_ENABLE:-true}

        traefik.http.routers.prometheus.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.prometheus.entrypoints: ${TRAEFIK_ENTRYPOINT:-http}

        traefik.http.routers.prometheus.rule: Host(`${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)

        traefik.http.middlewares.prometheus-auth.basicauth.users: ${TRAEFIK_AUTH}

        traefik.http.routers.prometheus.middlewares: prometheus-auth