From 628b2db5bcb6c4db9e46116ca4187e26d7989129 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Thu, 17 May 2018 17:44:39 +0200 Subject: [PATCH 1/4] Update example rules * Remove Prometheus 1.x example file. * Update CPU rules for 0.16.0. Signed-off-by: Ben Kochie --- example-rules.yml | 12 ++++++------ example.rules | 8 -------- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 example.rules diff --git a/example-rules.yml b/example-rules.yml index 5985287d..bf222d49 100644 --- a/example-rules.yml +++ b/example-rules.yml @@ -2,13 +2,13 @@ groups: - name: example-node-exporter-rules rules: # The count of CPUs per node, useful for getting CPU time as a percent of total. - - record: instance:node_cpus:count - expr: count(node_cpu{mode="idle"}) without (cpu,mode) + - record: instance:node_cpu_seconds_total:count + expr: count(node_cpu_seconds_total{mode="idle"}) without (cpu,mode) # CPU in use by CPU. - - record: instance_cpu:node_cpu_not_idle:rate5m - expr: sum(rate(node_cpu{mode!="idle"}[5m])) without (mode) + - record: instance_cpu:node_cpu_seconds_total:rate5m + expr: sum(rate(node_cpu_seconds_total{mode!="idle"}[5m])) without (mode) # CPU in use by mode. - - record: instance_mode:node_cpu:rate5m - expr: sum(rate(node_cpu[5m])) without (cpu) + - record: instance_mode:node_cpu_seconds_total:rate5m + expr: sum(rate(node_cpu_seconds_total[5m])) without (cpu) diff --git a/example.rules b/example.rules deleted file mode 100644 index a44fecf4..00000000 --- a/example.rules +++ /dev/null @@ -1,8 +0,0 @@ -# The count of CPUs per node, useful for getting CPU time as a percent of total. -instance:node_cpus:count = count(node_cpu{mode="idle"}) without (cpu,mode) - -# CPU in use by CPU. -instance_cpu:node_cpu_not_idle:rate5m = sum(rate(node_cpu{mode!="idle"}[5m])) without (mode) - -# CPU in use by mode. -instance_mode:node_cpu:rate5m = sum(rate(node_cpu[5m])) without (cpu) From f00f3db08b61b9d43e4b2a1f5097616d4a20218e Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Thu, 17 May 2018 17:49:07 +0200 Subject: [PATCH 2/4] Add a CPU in-use recording example. Signed-off-by: Ben Kochie --- example-rules.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/example-rules.yml b/example-rules.yml index bf222d49..20a75bbc 100644 --- a/example-rules.yml +++ b/example-rules.yml @@ -12,3 +12,7 @@ groups: # CPU in use by mode. - record: instance_mode:node_cpu_seconds_total:rate5m expr: sum(rate(node_cpu_seconds_total[5m])) without (cpu) + + # CPU in use ratio. + - record: instance:node_cpu_seconds_total_in_use:ratio + expr: sum(instance_mode:node_cpu_seconds_total:rate5m{mode!="idle"}) / instance:node_cpu_seconds_total:count From eb3f922c50ba7c91c800f86da5b8faab2a790070 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Thu, 17 May 2018 17:52:07 +0200 Subject: [PATCH 3/4] Update naming. Signed-off-by: Ben Kochie --- example-rules.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/example-rules.yml b/example-rules.yml index 20a75bbc..3fd87b9c 100644 --- a/example-rules.yml +++ b/example-rules.yml @@ -2,17 +2,17 @@ groups: - name: example-node-exporter-rules rules: # The count of CPUs per node, useful for getting CPU time as a percent of total. - - record: instance:node_cpu_seconds_total:count + - record: instance:node_cpus:count expr: count(node_cpu_seconds_total{mode="idle"}) without (cpu,mode) # CPU in use by CPU. - - record: instance_cpu:node_cpu_seconds_total:rate5m + - record: instance_cpu:node_cpu_seconds_not_idle:rate5m expr: sum(rate(node_cpu_seconds_total{mode!="idle"}[5m])) without (mode) # CPU in use by mode. - - record: instance_mode:node_cpu_seconds_total:rate5m + - record: instance_mode:node_cpu_seconds:rate5m expr: sum(rate(node_cpu_seconds_total[5m])) without (cpu) # CPU in use ratio. - record: instance:node_cpu_seconds_total_in_use:ratio - expr: sum(instance_mode:node_cpu_seconds_total:rate5m{mode!="idle"}) / instance:node_cpu_seconds_total:count + expr: sum(instance_mode:node_cpu_seconds:rate5m{mode!="idle"}) / instance:node_cpus:count From ec28a8e9d4865ea69428f7b3aed2936654fb457c Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Thu, 17 May 2018 18:15:07 +0200 Subject: [PATCH 4/4] Fix cpu utilization rule. Signed-off-by: Ben Kochie --- example-rules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example-rules.yml b/example-rules.yml index 3fd87b9c..5ca5c4cb 100644 --- a/example-rules.yml +++ b/example-rules.yml @@ -14,5 +14,5 @@ groups: expr: sum(rate(node_cpu_seconds_total[5m])) without (cpu) # CPU in use ratio. - - record: instance:node_cpu_seconds_total_in_use:ratio - expr: sum(instance_mode:node_cpu_seconds:rate5m{mode!="idle"}) / instance:node_cpus:count + - record: instance:node_cpu_utilization:ratio + expr: sum(instance_mode:node_cpu_seconds:rate5m{mode!="idle"}) without (mode) / instance:node_cpus:count