Commit 6972f201 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Intercambia restricción de despliegue por vol nfs

See merge request redmic-project/metric/prometheus!26
parents 7af471cd 3671db71

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ stages: 
  - test

  - deploy



variables:

  PROJECT_PARENT_NAME: metric



check-rules:

  stage: test

  image: ${DOCKER_IMAGE}
@@ -23,8 +20,7 @@ check-rules: 


.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: metric

    STATUS_CHECK_DELAY: 200

  environment:

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

deploy/docker-compose.dev.yml

+5 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ version: '3.5' 
services:

  prometheus:

    deploy:

      placement:

        constraints:

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

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'
@@ -17,6 +14,11 @@ services: 
volumes:

  data-vol:

    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}

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



configs:

  node_rules: