Commit 7914a0f4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza variables y valores por defecto

See merge request redmic-project/metric/pushgateway!5
parents 271c6818 4f3d9226

deploy/.env

+6 −1
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ DATA_PATH=/pushgateway 
PERSISTENCE_INTERVAL=5m

LOG_LEVEL=info



TRAEFIK_AUTH=user:$apr1$md5password



DATA_VOL_NAME=pushgateway-vol



TRAEFIK_AUTH=user:$apr1$md5password
 
VOL_TYPE=nfs

VOL_ADDR=127.0.0.1

VOL_VERS=4.2

VOL_OPTS=nolock,noacl,noatime,nodiratime

deploy/compose.dev.yaml

+3 −3
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ volumes: 
    name: ${DATA_VOL_NAME}

    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}

      device: ${DATA_VOL_DEVICE:-:/pushgateway-vol/}
 
      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},vers=${VOL_VERS},${VOL_OPTS}

      device: :${VOL_DEVICE_PREFIX}${DATA_VOL_DEVICE:-/pushgateway-vol/}

deploy/compose.prod.yaml

+2 −2
Original line number Diff line number Diff line 
volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: 'cloudstor:aws'

    driver: ${VOL_DRIVER:-cloudstor:aws}

    driver_opts:

      backing: shared
 
      backing: ${VOL_BACKING:-shared}

deploy/compose.tmpl.yaml

+3 −3
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ services: 
        traefik.http.services.pushgateway.loadbalancer.server.port: ${PORT}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-64M}

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-128M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-16M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-32M}



networks:

  metric-net: