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

Actualiza dependencias y limpia restos

parent bcade907

docker-compose.tmpl.yml

+3 −6
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ services: 
          memory: 64M



  grafana:

    image: stefanprodan/swarmprom-grafana:5.0.1

    image: stefanprodan/swarmprom-grafana:5.3.4

    environment:

      - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin}

      - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin}
@@ -155,15 +155,12 @@ services: 
          memory: 64M



  node-exporter:

    image: stefanprodan/swarmprom-node-exporter:v0.15.2

    image: stefanprodan/swarmprom-node-exporter:v0.16.0

    command:

      - '--path.sysfs=/host/sys'

      - '--path.procfs=/host/proc'

      - '--collector.textfile.directory=/etc/node-exporter/'

      - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)'

      # no collectors are explicitely enabled here, because the defaults are just fine,

      # see https://github.com/prometheus/node_exporter

      # disable ipvs collector because it barfs the node-exporter logs full with errors on my centos 7 vm's

      - '--no-collector.ipvs'

    environment:

      - NODE_ID={{.Node.ID}}
@@ -201,7 +198,7 @@ services: 
      labels:

        traefik.port: "9091"

        traefik.docker.network: traefik-net

        traefik.frontend.auth.basic: ${UI_AUTH}

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:pushgateway.${PUBLIC_HOSTNAME}

        traefik.backend: pushgateway

      restart_policy:

prometheus/rules/swarm_task.rules.yml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
groups:

- name: /1/store/projects/vagrant/docker-swarm-vagrant/apps/swarmprom/prometheus/rules/swarm_task.rules.yml

  rules:

  - alert: task_high_cpu_usage_50

    expr: sum(rate(container_cpu_usage_seconds_total{container_label_com_docker_swarm_task_name=~".+"}[1m]))

      BY (container_label_com_docker_swarm_task_name, container_label_com_docker_swarm_node_id)

      * 100 > 50

    for: 1m

    annotations:

      description: '{{ $labels.container_label_com_docker_swarm_task_name }} on ''{{

        $labels.container_label_com_docker_swarm_node_id }}'' CPU usage is at {{ humanize

        $value}}%.'

      summary: CPU alert for Swarm task '{{ $labels.container_label_com_docker_swarm_task_name

        }}' on '{{ $labels.container_label_com_docker_swarm_node_id }}'

  - alert: task_high_memory_usage_1g

    expr: sum(container_memory_rss{container_label_com_docker_swarm_task_name=~".+"})

      BY (container_label_com_docker_swarm_task_name, container_label_com_docker_swarm_node_id) > 1e+09

    for: 1m

    annotations:

      description: '{{ $labels.container_label_com_docker_swarm_task_name }} on ''{{

        $labels.container_label_com_docker_swarm_node_id }}'' memory usage is {{ humanize

        $value}}.'

      summary: Memory alert for Swarm task '{{ $labels.container_label_com_docker_swarm_task_name

        }}' on '{{ $labels.container_label_com_docker_swarm_node_id }}'



  - alert: backup_db_not_created

    expr: time() - backup_created_date_seconds{} > 86400

    labels:

      severity: warning

    annotations:

      description: Error creating backup for '{{ $labels.label }}' database.

      summary: Error creating backup for '{{ $labels.label }}' database.
 
 No newline at end of file

swarmprom @ bfc3cf7d

Compare 0f4d40ee to bfc3cf7d
Original line number Diff line number Diff line 
Subproject commit 0f4d40ee90f672b17aa24d5c6e119eed69aa9302
 
Subproject commit bfc3cf7dcc4814a828d651e499e6199b8f22d3f3