Commit d26a020e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Limpia y actualiza variables de volumen

See merge request redmic-project/metric/prometheus!33
parents 1e2cb067 7f178c65

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -22,5 +22,3 @@ check-rules: 
  variables:

    STACK: metric

    STATUS_CHECK_DELAY: 200
 
  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

deploy/docker-compose.dev.yml

+3 −3
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  prometheus:
@@ -16,8 +16,8 @@ volumes: 
    name: ${DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${DATA_VOL_TYPE:-nfs4}

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

      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/}



configs:

deploy/docker-compose.prod.yml

+3 −3
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  prometheus:
@@ -20,8 +20,8 @@ volumes: 
    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: ${PROMETHEUS_VOL_SIZE:-10}

      ebstype: ${PROMETHEUS_VOL_EBS_TYPE:-gp2}

      size: ${DATA_VOL_SIZE:-10}

      ebstype: ${DATA_VOL_EBS_TYPE:-gp2}



configs:

  node_rules:

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  prometheus: