Commit 669975e1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Retoca restricciones de despliegue

See merge request redmic-project/metric/prometheus!37
parents 2674199c 825d0983

deploy/compose.dev.yaml

+4 −1
Original line number Diff line number Diff line 
services:

  prometheus:

    deploy:

      placement:

        constraints:

          - ${PLACEMENT_CONSTRAINTS_NAME:-node.hostname} ${PLACEMENT_CONSTRAINTS_OPERATOR:-==} ${PLACEMENT_CONSTRAINTS_VALUE:-node}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'
@@ -12,7 +15,7 @@ services: 
volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: ${DEV_VOL_DRIVER:-local}

    driver: ${VOL_DRIVER:-local}



configs:

  node_rules:

deploy/compose.prod.yaml

+4 −1
Original line number Diff line number Diff line 
services:

  prometheus:

    deploy:

      placement:

        constraints:

          - ${PLACEMENT_CONSTRAINTS_NAME:-node.role} ${PLACEMENT_CONSTRAINTS_OPERATOR:-==} ${PLACEMENT_CONSTRAINTS_VALUE:-worker}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'
@@ -12,7 +15,7 @@ services: 
volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: ${PRO_VOL_DRIVER:-cloudstor:aws}

    driver: ${VOL_DRIVER:-cloudstor:aws}

    driver_opts:

      backing: ${VOL_BACKING:-relocatable}

      size: ${VOL_SIZE:-10}

deploy/compose.tmpl.yaml

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ services: 
    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      placement:

        constraints:

          - ${PLACEMENT_CONSTRAINTS_NAME:-node.hostname} ${PLACEMENT_CONSTRAINTS_OPERATOR:-==} ${PLACEMENT_CONSTRAINTS_VALUE:-node}

      restart_policy:

        delay: ${RESTART_DELAY:-3s}

      update_config: