Merge pull request stefanprodan#81 from Kindratte/master

alert rules changed to work with node-exporter:v0.16.0

prometheus/rules/swarm_node.rules.yml

@@ -2,7 +2,7 @@ groups:
 - name: /1/store/projects/vagrant/docker-swarm-vagrant/apps/swarmprom/prometheus/rules/swarm_node.rules.yml
   rules:
   - alert: node_cpu_usage
-    expr: 100 - (avg(irate(node_cpu{mode="idle"}[1m]) * ON(instance) GROUP_LEFT(node_name)
+    expr: 100 - (avg(irate(node_cpu_seconds_total{mode="idle"}[1m]) * ON(instance) GROUP_LEFT(node_name)
       node_meta * 100) BY (node_name)) > 50
     for: 1m
     labels:
@@ -12,7 +12,7 @@ groups:
         $value}}%.
       summary: CPU alert for Swarm node '{{ $labels.node_name }}'
   - alert: node_memory_usage
-    expr: sum(((node_memory_MemTotal - node_memory_MemAvailable) / node_memory_MemTotal)
+    expr: sum(((node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) / node_memory_MemTotal_bytes)
       * ON(instance) GROUP_LEFT(node_name) node_meta * 100) BY (node_name) > 80
     for: 1m
     labels:
@@ -22,8 +22,8 @@ groups:
         $value}}%.
       summary: Memory alert for Swarm node '{{ $labels.node_name }}'
   - alert: node_disk_usage
-    expr: ((node_filesystem_size{mountpoint="/"} - node_filesystem_free{mountpoint="/"})
-      * 100 / node_filesystem_size{mountpoint="/"}) * ON(instance) GROUP_LEFT(node_name)
+    expr: ((node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_free_bytes{mountpoint="/"})
+      * 100 / node_filesystem_size_bytes{mountpoint="/"}) * ON(instance) GROUP_LEFT(node_name)
       node_meta > 85
     for: 1m
     labels:
@@ -33,7 +33,7 @@ groups:
         $value}}%.
       summary: Disk alert for Swarm node '{{ $labels.node_name }}'
   - alert: node_disk_fill_rate_6h
-    expr: predict_linear(node_filesystem_free{mountpoint="/"}[1h], 6 * 3600) * ON(instance)
+    expr: predict_linear(node_filesystem_free_bytes{mountpoint="/"}[1h], 6 * 3600) * ON(instance)
       GROUP_LEFT(node_name) node_meta < 0
     for: 1h
     labels: