Commit 7e7f17c9 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige parámetros de Prometheus, persiste datos

See merge request redmic-project/metric/swarmprom-ci!13
parents dc4494f6 5921c41e

docker-compose.dev.yml

+3 −1
Original line number Diff line number Diff line
@@ -140,14 +140,16 @@ services: 
      resources:

        limits:

          cpus: '0.5'

          memory: 512M

          memory: 1G

        reservations:

          memory: 128M



volumes:

  prometheus:

    name: prometheus-vol



  grafana:

    name: grafana-vol



  alertmanager:

    name: alertmanager-vol

docker-compose.prod.yml

+13 −1
Original line number Diff line number Diff line
@@ -124,14 +124,26 @@ services: 
      resources:

        limits:

          cpus: '0.5'

          memory: 512M

          memory: 1G

        reservations:

          memory: 128M



volumes:

  prometheus:

    name: prometheus-vol

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 5

      ebstype: gp2



  grafana:

    name: grafana-vol

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2



  alertmanager:

    name: alertmanager-vol

docker-compose.tmpl.yml

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ services: 
      - '--web.console.libraries=/etc/prometheus/console_libraries'

      - '--web.console.templates=/etc/prometheus/consoles'

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

      - '--storage.tsdb.retention=24h'

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

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

    networks:

      - metric-net

      - traefik-net
@@ -108,13 +109,16 @@ services: 
networks:

  metric-net:

    external: true



  traefik-net:

    external: true



configs:

  dockerd_config:

    file: ./swarmprom/dockerd-exporter/Caddyfile



  node_rules:

    file: ./swarmprom/prometheus/rules/swarm_node.rules.yml



  task_rules:

    file: ./swarmprom/prometheus/rules/swarm_task.rules.yml