From 5ba6285ede463aec803600b6860c19e12d0bebe8 Mon Sep 17 00:00:00 2001
From: Laurent Godet <mevoyasf@gmail.com>
Date: Fri, 11 Jan 2019 14:04:38 +0000
Subject: [PATCH] Update remaining node-exporter rules
Regenerate kube-prometheus
---
.../rules/node-rules.libsonnet | 14 +++++++-------
jsonnetfile.lock.json | 6 +++---
manifests/prometheus-rules.yaml | 19 +++++++++++--------
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/jsonnet/kube-prometheus/rules/node-rules.libsonnet b/jsonnet/kube-prometheus/rules/node-rules.libsonnet
index ec3a331e..e3396b08 100644
--- a/jsonnet/kube-prometheus/rules/node-rules.libsonnet
+++ b/jsonnet/kube-prometheus/rules/node-rules.libsonnet
@@ -5,31 +5,31 @@
name: 'kube-prometheus-node-recording.rules',
rules: [
{
- expr: 'sum(rate(node_cpu{mode!="idle",mode!="iowait"}[3m])) BY (instance)',
+ expr: 'sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[3m])) BY (instance)',
record: 'instance:node_cpu:rate:sum',
},
{
- expr: 'sum((node_filesystem_size{mountpoint="/"} - node_filesystem_free{mountpoint="/"})) BY (instance)',
+ expr: 'sum((node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_free_bytes{mountpoint="/"})) BY (instance)',
record: 'instance:node_filesystem_usage:sum',
},
{
- expr: 'sum(rate(node_network_receive_bytes[3m])) BY (instance)',
+ expr: 'sum(rate(node_network_receive_bytes_total[3m])) BY (instance)',
record: 'instance:node_network_receive_bytes:rate:sum',
},
{
- expr: 'sum(rate(node_network_transmit_bytes[3m])) BY (instance)',
+ expr: 'sum(rate(node_network_transmit_bytes_total[3m])) BY (instance)',
record: 'instance:node_network_transmit_bytes:rate:sum',
},
{
- expr: 'sum(rate(node_cpu{mode!="idle",mode!="iowait"}[5m])) WITHOUT (cpu, mode) / ON(instance) GROUP_LEFT() count(sum(node_cpu) BY (instance, cpu)) BY (instance)',
+ expr: 'sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[5m])) WITHOUT (cpu, mode) / ON(instance) GROUP_LEFT() count(sum(node_cpu_seconds_total) BY (instance, cpu)) BY (instance)',
record: 'instance:node_cpu:ratio',
},
{
- expr: 'sum(rate(node_cpu{mode!="idle",mode!="iowait"}[5m]))',
+ expr: 'sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[5m]))',
record: 'cluster:node_cpu:sum_rate5m',
},
{
- expr: 'cluster:node_cpu:rate5m / count(sum(node_cpu) BY (instance, cpu))',
+ expr: 'cluster:node_cpu_seconds_total:rate5m / count(sum(node_cpu_seconds_total) BY (instance, cpu))',
record: 'cluster:node_cpu:ratio',
},
],
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 86630edb..f1ebbce6 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "0905fc6d7d74f1c89a88e966ef7d29c55bcf1f35"
+ "version": "53c89042b8b22d160040e8322358cbcdeb74ab0c"
},
{
"name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": ""
}
},
- "version": "2e358ff68f00bd0dead547beaddc6ce7526864e8"
+ "version": "4c23c06fff9ef50744f5ed306c9ab0c4bd78a144"
},
{
"name": "grafonnet",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "a00bff7848db1dcead692e2bea1d7c87e8a2c157"
+ "version": "fae6e92407e004894f5e0d71baab212732ddd8c2"
}
]
}
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index e578dad0..04905a34 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -288,21 +288,24 @@ spec:
record: 'node:node_inodes_free:'
- name: kube-prometheus-node-recording.rules
rules:
- - expr: sum(rate(node_cpu{mode!="idle",mode!="iowait"}[3m])) BY (instance)
+ - expr: sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[3m])) BY
+ (instance)
record: instance:node_cpu:rate:sum
- - expr: sum((node_filesystem_size{mountpoint="/"} - node_filesystem_free{mountpoint="/"}))
+ - expr: sum((node_filesystem_size_bytes{mountpoint="/"} - node_filesystem_free_bytes{mountpoint="/"}))
BY (instance)
record: instance:node_filesystem_usage:sum
- - expr: sum(rate(node_network_receive_bytes[3m])) BY (instance)
+ - expr: sum(rate(node_network_receive_bytes_total[3m])) BY (instance)
record: instance:node_network_receive_bytes:rate:sum
- - expr: sum(rate(node_network_transmit_bytes[3m])) BY (instance)
+ - expr: sum(rate(node_network_transmit_bytes_total[3m])) BY (instance)
record: instance:node_network_transmit_bytes:rate:sum
- - expr: sum(rate(node_cpu{mode!="idle",mode!="iowait"}[5m])) WITHOUT (cpu, mode)
- / ON(instance) GROUP_LEFT() count(sum(node_cpu) BY (instance, cpu)) BY (instance)
+ - expr: sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[5m])) WITHOUT
+ (cpu, mode) / ON(instance) GROUP_LEFT() count(sum(node_cpu_seconds_total)
+ BY (instance, cpu)) BY (instance)
record: instance:node_cpu:ratio
- - expr: sum(rate(node_cpu{mode!="idle",mode!="iowait"}[5m]))
+ - expr: sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[5m]))
record: cluster:node_cpu:sum_rate5m
- - expr: cluster:node_cpu:rate5m / count(sum(node_cpu) BY (instance, cpu))
+ - expr: cluster:node_cpu_seconds_total:rate5m / count(sum(node_cpu_seconds_total)
+ BY (instance, cpu))
record: cluster:node_cpu:ratio
- name: kubernetes-absent
rules:
--
GitLab