easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update remaining node-exporter rules

Browse Source 
Regenerate kube-prometheus
This commit is contained in:
Laurent Godet
2019-01-11 14:04:38 +00:00
committed by Matthias Loibl
parent 89acb2359c
commit 5ba6285ede
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jsonnet/kube-prometheus/rules/node-rules.libsonnet
View File

@@ -5,31 +5,31 @@
name: 'kube-prometheus-node-recording.rules', name: 'kube-prometheus-node-recording.rules',
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', 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', 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', 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', 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', 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', 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', record: 'cluster:node_cpu:ratio',
}, },
], ],

6
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
} }
}, },
"version": "0905fc6d7d74f1c89a88e966ef7d29c55bcf1f35" "version": "53c89042b8b22d160040e8322358cbcdeb74ab0c"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "2e358ff68f00bd0dead547beaddc6ce7526864e8" "version": "4c23c06fff9ef50744f5ed306c9ab0c4bd78a144"
}, },
{ {
"name": "grafonnet", "name": "grafonnet",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "a00bff7848db1dcead692e2bea1d7c87e8a2c157" "version": "fae6e92407e004894f5e0d71baab212732ddd8c2"
} }
] ]
} }

19
manifests/prometheus-rules.yaml
View File

@@ -288,21 +288,24 @@ spec:
record: 'node:node_inodes_free:' record: 'node:node_inodes_free:'
- name: kube-prometheus-node-recording.rules - name: kube-prometheus-node-recording.rules
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 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) BY (instance)
record: instance:node_filesystem_usage:sum 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 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 record: instance:node_network_transmit_bytes:rate:sum
- expr: sum(rate(node_cpu{mode!="idle",mode!="iowait"}[5m])) WITHOUT (cpu, mode) - expr: sum(rate(node_cpu_seconds_total{mode!="idle",mode!="iowait"}[5m])) WITHOUT
/ ON(instance) GROUP_LEFT() count(sum(node_cpu) BY (instance, cpu)) BY (instance) (cpu, mode) / ON(instance) GROUP_LEFT() count(sum(node_cpu_seconds_total)
BY (instance, cpu)) BY (instance)
record: instance:node_cpu:ratio 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 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 record: cluster:node_cpu:ratio
- name: kubernetes-absent - name: kubernetes-absent
rules: rules: