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

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/metric/pushgateway!3
parents 4531116b 3ddbe150

.gitlab-ci.yml

+1 −7
Original line number Diff line number Diff line
@@ -6,12 +6,6 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: metric



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

  environment:

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

deploy/docker-compose.dev.yml

+6 −8
Original line number Diff line number Diff line 
version: '3.5'



services:

  pushgateway:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}

version: '3.9'



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:-:/pushgateway-vol/}

deploy/docker-compose.prod.yml

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

version: '3.9'



volumes:

  data-vol:

deploy/docker-compose.tmpl.yml

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

version: '3.9'



services:

  pushgateway: