Commit 271c6818 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Revert "Permite deshabilitar healthcheck por variable"

See merge request redmic-project/metric/pushgateway!4
parents 64484155 491a4d3f

.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:

  - deploy

deploy/.env

+3 −0
Original line number Diff line number Diff line
@@ -3,4 +3,7 @@ METRICS_PATH=/metrics 
DATA_PATH=/pushgateway

PERSISTENCE_INTERVAL=5m

LOG_LEVEL=info



DATA_VOL_NAME=pushgateway-vol



TRAEFIK_AUTH=user:$apr1$md5password

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+1 −3
Original line number Diff line number Diff line 
version: '3.9'



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: local

    driver: ${VOL_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}

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

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



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+12 −6
Original line number Diff line number Diff line 
version: '3.9'



services:

  pushgateway:

    image: ${IMAGE_NAME:-prom/pushgateway}:${IMAGE_TAG:-latest}
@@ -14,6 +12,12 @@ services: 
      traefik-net:

    volumes:

      - data-vol:${DATA_PATH}

    healthcheck:

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

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-15s}

      retries: ${HEALTHCHECK_RETRIES:-5}

      start_period: ${HEALTHCHECK_START_PERIOD:-1m}

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}
@@ -22,10 +26,12 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:${TRAEFIK_SUBDOMAIN:-pushgateway}.${PUBLIC_HOSTNAME}

        traefik.backend: pushgateway

        traefik.port: '${PORT}'

        traefik.enable: ${TRAEFIK_ENABLE:-true}

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

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

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

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

        traefik.http.services.pushgateway.loadbalancer.server.port: ${PORT}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'