From 619e23e5df8b4d9765c51740d893f0ac790aba2c Mon Sep 17 00:00:00 2001
From: Matthias Loibl <mail@matthiasloibl.com>
Date: Mon, 19 Nov 2018 16:00:48 +0100
Subject: [PATCH] node-mixin: Update rules to node_exporter v0.16

Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
---
 node-mixin/rules/rules.libsonnet | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/node-mixin/rules/rules.libsonnet b/node-mixin/rules/rules.libsonnet
index c3f74ba7..f836d0d0 100644
--- a/node-mixin/rules/rules.libsonnet
+++ b/node-mixin/rules/rules.libsonnet
@@ -10,7 +10,7 @@
             expr: |||
               count by (instance) (
                 sum by (instance, cpu) (
-                  node_cpu{%(nodeExporterSelector)s}
+                  node_cpu_seconds_total{%(nodeExporterSelector)s}
                 )
               )
             ||| % $._config,
@@ -20,7 +20,7 @@
             record: 'instance:node_cpu_utilisation:avg1m',
             expr: |||
               1 - avg by (instance) (
-                rate(node_cpu{%(nodeExporterSelector)s,mode="idle"}[1m])
+                rate(node_cpu_seconds_total{%(nodeExporterSelector)s,mode="idle"}[1m])
               )
             ||| % $._config,
           },
@@ -39,7 +39,7 @@
             record: 'instance:node_memory_bytes_total:sum',
             expr: |||
               sum by (instance) (
-                node_memory_MemTotal{%(nodeExporterSelector)s}
+                node_memory_MemTotal_bytes{%(nodeExporterSelector)s}
               )
             ||| % $._config,
           },
@@ -48,9 +48,9 @@
             record: 'instance:node_memory_utilisation:ratio',
             expr: |||
               1 - (
-                  node_memory_MemAvailable{%(nodeExporterSelector)s}
+                  node_memory_MemAvailable_bytes{%(nodeExporterSelector)s}
                 /
-                  node_memory_MemTotal{%(nodeExporterSelector)s}
+                  node_memory_MemTotal_bytes{%(nodeExporterSelector)s}
               )
             ||| % $._config,
           },
@@ -68,7 +68,7 @@
             record: 'instance:node_disk_utilisation:sum_irate',
             expr: |||
               sum by (instance) (
-                irate(node_disk_io_time_ms{%(nodeExporterSelector)s,device=~"(sd|xvd).+"}[1m]) / 1e3
+                irate(node_disk_io_time_seconds_total{%(nodeExporterSelector)s,device=~"(sd|xvd).+"}[1m])
               )
             ||| % $._config,
           },
@@ -77,7 +77,7 @@
             record: 'instance:node_disk_saturation:sum_irate',
             expr: |||
               sum by (instance) (
-                irate(node_disk_io_time_weighted{%(nodeExporterSelector)s,device=~"(sd|xvd).+"}[1m]) / 1e3
+                irate(node_disk_io_time_weighted_seconds_total{%(nodeExporterSelector)s,device=~"(sd|xvd).+"}[1m])
               )
             ||| % $._config,
           },
@@ -85,8 +85,8 @@
             record: 'instance:node_net_utilisation:sum_irate',
             expr: |||
               sum by (instance) (
-                (irate(node_network_receive_bytes{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]) +
-                 irate(node_network_transmit_bytes{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]))
+                (irate(node_network_receive_bytes_total{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]) +
+                 irate(node_network_transmit_bytes_total{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]))
               )
             ||| % $._config,
           },
@@ -94,8 +94,8 @@
             record: 'instance:node_net_saturation:sum_irate',
             expr: |||
               sum by (instance) (
-                (irate(node_network_receive_drop{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]) +
-                 irate(node_network_transmit_drop{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]))
+                (irate(node_network_receive_drop_total{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]) +
+                 irate(node_network_transmit_drop_total{%(nodeExporterSelector)s,device=~"eth[0-9]+"}[1m]))
               )
             ||| % $._config,
           },