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

Merge branch 'dev' into 'master' 

Borra parámetro de pila obsoleto, reduce recursos

See merge request redmic-project/metric/swarmprom-ci!14
parents 7e7f17c9 c0dc01b2

docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ services: 
      resources:

        limits:

          cpus: '0.5'

          memory: 1G

          memory: 512M

        reservations:

          memory: 128M

docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ services: 
      resources:

        limits:

          cpus: '0.5'

          memory: 1G

          memory: 512M

        reservations:

          memory: 128M

docker-compose.tmpl.yml

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ services: 
      - '--web.console.templates=/etc/prometheus/consoles'

      - '--storage.tsdb.path=/prometheus'

      - '--storage.tsdb.retention=30d'

      - '--storage.local.target-heap-size=536870912'

    networks:

      - metric-net

      - traefik-net