ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

Unify CPU collector conventions (#806)

Browse source 
* Unify CPU collector conventions

Add a common CPU metric description.
* All collectors use the same `nodeCpuSecondsDesc`.
* All collectors drop the `cpu` prefix for `cpu` label values.

* Fix subsystem string in cpu_freebsd.

* Fix Linux CPU freq label names.
This commit is contained in:
Ben Kochie 2018-02-01 18:42:20 +01:00 • committed by GitHub
commit 14d60958d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 129 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

152
collector/fixtures/e2e-output.txt
View file

@ -201,24 +201,24 @@ node_buddyinfo_count{node="0",size="9",zone="Normal"} 0
node_context_switches_total 3.8014093e+07
# HELP node_cpu_core_throttles_total Number of times this cpu core has been throttled.
# TYPE node_cpu_core_throttles_total counter
node_cpu_core_throttles_total{cpu="cpu0"} 5
node_cpu_core_throttles_total{cpu="cpu1"} 0
node_cpu_core_throttles_total{cpu="cpu2"} 40
node_cpu_core_throttles_total{cpu="0"} 5
node_cpu_core_throttles_total{cpu="1"} 0
node_cpu_core_throttles_total{cpu="2"} 40
# HELP node_cpu_frequency_hertz Current cpu thread frequency in hertz.
# TYPE node_cpu_frequency_hertz gauge
node_cpu_frequency_hertz{cpu="cpu0"} 1.699981e+09
node_cpu_frequency_hertz{cpu="cpu1"} 1.699981e+09
node_cpu_frequency_hertz{cpu="cpu3"} 8e+06
node_cpu_frequency_hertz{cpu="0"} 1.699981e+09
node_cpu_frequency_hertz{cpu="1"} 1.699981e+09
node_cpu_frequency_hertz{cpu="3"} 8e+06
# HELP node_cpu_frequency_max_hertz Maximum cpu thread frequency in hertz.
# TYPE node_cpu_frequency_max_hertz gauge
node_cpu_frequency_max_hertz{cpu="cpu0"} 3.7e+09
node_cpu_frequency_max_hertz{cpu="cpu1"} 3.7e+09
node_cpu_frequency_max_hertz{cpu="cpu3"} 4.2e+09
node_cpu_frequency_max_hertz{cpu="0"} 3.7e+09
node_cpu_frequency_max_hertz{cpu="1"} 3.7e+09
node_cpu_frequency_max_hertz{cpu="3"} 4.2e+09
# HELP node_cpu_frequency_min_hertz Minimum cpu thread frequency in hertz.
# TYPE node_cpu_frequency_min_hertz gauge
node_cpu_frequency_min_hertz{cpu="cpu0"} 8e+08
node_cpu_frequency_min_hertz{cpu="cpu1"} 8e+08
node_cpu_frequency_min_hertz{cpu="cpu3"} 1e+06
node_cpu_frequency_min_hertz{cpu="0"} 8e+08
node_cpu_frequency_min_hertz{cpu="1"} 8e+08
node_cpu_frequency_min_hertz{cpu="3"} 1e+06
# HELP node_cpu_guest_seconds_total Seconds the cpus spent in guests (VMs) for each mode.
# TYPE node_cpu_guest_seconds_total counter
node_cpu_guest_seconds_total{cpu="0",mode="nice"} 0.01
@ -242,70 +242,70 @@ node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09
node_cpu_package_throttles_total{node="0"} 30
# HELP node_cpu_seconds_total Seconds the cpus spent in each mode.
# TYPE node_cpu_seconds_total counter
node_cpu_seconds_total{cpu="cpu0",mode="idle"} 10870.69
node_cpu_seconds_total{cpu="cpu0",mode="iowait"} 2.2
node_cpu_seconds_total{cpu="cpu0",mode="irq"} 0.01
node_cpu_seconds_total{cpu="cpu0",mode="nice"} 0.19
node_cpu_seconds_total{cpu="cpu0",mode="softirq"} 34.1
node_cpu_seconds_total{cpu="cpu0",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu0",mode="system"} 210.45
node_cpu_seconds_total{cpu="cpu0",mode="user"} 444.9
node_cpu_seconds_total{cpu="cpu1",mode="idle"} 11107.87
node_cpu_seconds_total{cpu="cpu1",mode="iowait"} 5.91
node_cpu_seconds_total{cpu="cpu1",mode="irq"} 0
node_cpu_seconds_total{cpu="cpu1",mode="nice"} 0.23
node_cpu_seconds_total{cpu="cpu1",mode="softirq"} 0.46
node_cpu_seconds_total{cpu="cpu1",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu1",mode="system"} 164.74
node_cpu_seconds_total{cpu="cpu1",mode="user"} 478.69
node_cpu_seconds_total{cpu="cpu2",mode="idle"} 11123.21
node_cpu_seconds_total{cpu="cpu2",mode="iowait"} 4.41
node_cpu_seconds_total{cpu="cpu2",mode="irq"} 0
node_cpu_seconds_total{cpu="cpu2",mode="nice"} 0.36
node_cpu_seconds_total{cpu="cpu2",mode="softirq"} 3.26
node_cpu_seconds_total{cpu="cpu2",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu2",mode="system"} 159.16
node_cpu_seconds_total{cpu="cpu2",mode="user"} 465.04
node_cpu_seconds_total{cpu="cpu3",mode="idle"} 11132.3
node_cpu_seconds_total{cpu="cpu3",mode="iowait"} 5.33
node_cpu_seconds_total{cpu="cpu3",mode="irq"} 0
node_cpu_seconds_total{cpu="cpu3",mode="nice"} 1.02
node_cpu_seconds_total{cpu="cpu3",mode="softirq"} 0.6
node_cpu_seconds_total{cpu="cpu3",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu3",mode="system"} 156.83
node_cpu_seconds_total{cpu="cpu3",mode="user"} 470.54
node_cpu_seconds_total{cpu="cpu4",mode="idle"} 11403.21
node_cpu_seconds_total{cpu="cpu4",mode="iowait"} 2.17
node_cpu_seconds_total{cpu="cpu4",mode="irq"} 0
node_cpu_seconds_total{cpu="cpu4",mode="nice"} 0.25
node_cpu_seconds_total{cpu="cpu4",mode="softirq"} 0.08
node_cpu_seconds_total{cpu="cpu4",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu4",mode="system"} 107.76
node_cpu_seconds_total{cpu="cpu4",mode="user"} 284.13
node_cpu_seconds_total{cpu="cpu5",mode="idle"} 11362.7
node_cpu_seconds_total{cpu="cpu5",mode="iowait"} 6.72
node_cpu_seconds_total{cpu="cpu5",mode="irq"} 0
node_cpu_seconds_total{cpu="cpu5",mode="nice"} 1.01
node_cpu_seconds_total{cpu="cpu5",mode="softirq"} 0.3
node_cpu_seconds_total{cpu="cpu5",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu5",mode="system"} 115.86
node_cpu_seconds_total{cpu="cpu5",mode="user"} 292.71
node_cpu_seconds_total{cpu="cpu6",mode="idle"} 11397.21
node_cpu_seconds_total{cpu="cpu6",mode="iowait"} 3.19
node_cpu_seconds_total{cpu="cpu6",mode="irq"} 0
node_cpu_seconds_total{cpu="cpu6",mode="nice"} 0.36
node_cpu_seconds_total{cpu="cpu6",mode="softirq"} 0.29
node_cpu_seconds_total{cpu="cpu6",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu6",mode="system"} 102.76
node_cpu_seconds_total{cpu="cpu6",mode="user"} 291.52
node_cpu_seconds_total{cpu="cpu7",mode="idle"} 11392.82
node_cpu_seconds_total{cpu="cpu7",mode="iowait"} 5.55
node_cpu_seconds_total{cpu="cpu7",mode="irq"} 0
node_cpu_seconds_total{cpu="cpu7",mode="nice"} 2.68
node_cpu_seconds_total{cpu="cpu7",mode="softirq"} 0.31
node_cpu_seconds_total{cpu="cpu7",mode="steal"} 0
node_cpu_seconds_total{cpu="cpu7",mode="system"} 101.64
node_cpu_seconds_total{cpu="cpu7",mode="user"} 290.98
node_cpu_seconds_total{cpu="0",mode="idle"} 10870.69
node_cpu_seconds_total{cpu="0",mode="iowait"} 2.2
node_cpu_seconds_total{cpu="0",mode="irq"} 0.01
node_cpu_seconds_total{cpu="0",mode="nice"} 0.19
node_cpu_seconds_total{cpu="0",mode="softirq"} 34.1
node_cpu_seconds_total{cpu="0",mode="steal"} 0
node_cpu_seconds_total{cpu="0",mode="system"} 210.45
node_cpu_seconds_total{cpu="0",mode="user"} 444.9
node_cpu_seconds_total{cpu="1",mode="idle"} 11107.87
node_cpu_seconds_total{cpu="1",mode="iowait"} 5.91
node_cpu_seconds_total{cpu="1",mode="irq"} 0
node_cpu_seconds_total{cpu="1",mode="nice"} 0.23
node_cpu_seconds_total{cpu="1",mode="softirq"} 0.46
node_cpu_seconds_total{cpu="1",mode="steal"} 0
node_cpu_seconds_total{cpu="1",mode="system"} 164.74
node_cpu_seconds_total{cpu="1",mode="user"} 478.69
node_cpu_seconds_total{cpu="2",mode="idle"} 11123.21
node_cpu_seconds_total{cpu="2",mode="iowait"} 4.41
node_cpu_seconds_total{cpu="2",mode="irq"} 0
node_cpu_seconds_total{cpu="2",mode="nice"} 0.36
node_cpu_seconds_total{cpu="2",mode="softirq"} 3.26
node_cpu_seconds_total{cpu="2",mode="steal"} 0
node_cpu_seconds_total{cpu="2",mode="system"} 159.16
node_cpu_seconds_total{cpu="2",mode="user"} 465.04
node_cpu_seconds_total{cpu="3",mode="idle"} 11132.3
node_cpu_seconds_total{cpu="3",mode="iowait"} 5.33
node_cpu_seconds_total{cpu="3",mode="irq"} 0
node_cpu_seconds_total{cpu="3",mode="nice"} 1.02
node_cpu_seconds_total{cpu="3",mode="softirq"} 0.6
node_cpu_seconds_total{cpu="3",mode="steal"} 0
node_cpu_seconds_total{cpu="3",mode="system"} 156.83
node_cpu_seconds_total{cpu="3",mode="user"} 470.54
node_cpu_seconds_total{cpu="4",mode="idle"} 11403.21
node_cpu_seconds_total{cpu="4",mode="iowait"} 2.17
node_cpu_seconds_total{cpu="4",mode="irq"} 0
node_cpu_seconds_total{cpu="4",mode="nice"} 0.25
node_cpu_seconds_total{cpu="4",mode="softirq"} 0.08
node_cpu_seconds_total{cpu="4",mode="steal"} 0
node_cpu_seconds_total{cpu="4",mode="system"} 107.76
node_cpu_seconds_total{cpu="4",mode="user"} 284.13
node_cpu_seconds_total{cpu="5",mode="idle"} 11362.7
node_cpu_seconds_total{cpu="5",mode="iowait"} 6.72
node_cpu_seconds_total{cpu="5",mode="irq"} 0
node_cpu_seconds_total{cpu="5",mode="nice"} 1.01
node_cpu_seconds_total{cpu="5",mode="softirq"} 0.3
node_cpu_seconds_total{cpu="5",mode="steal"} 0
node_cpu_seconds_total{cpu="5",mode="system"} 115.86
node_cpu_seconds_total{cpu="5",mode="user"} 292.71
node_cpu_seconds_total{cpu="6",mode="idle"} 11397.21
node_cpu_seconds_total{cpu="6",mode="iowait"} 3.19
node_cpu_seconds_total{cpu="6",mode="irq"} 0
node_cpu_seconds_total{cpu="6",mode="nice"} 0.36
node_cpu_seconds_total{cpu="6",mode="softirq"} 0.29
node_cpu_seconds_total{cpu="6",mode="steal"} 0
node_cpu_seconds_total{cpu="6",mode="system"} 102.76
node_cpu_seconds_total{cpu="6",mode="user"} 291.52
node_cpu_seconds_total{cpu="7",mode="idle"} 11392.82
node_cpu_seconds_total{cpu="7",mode="iowait"} 5.55
node_cpu_seconds_total{cpu="7",mode="irq"} 0
node_cpu_seconds_total{cpu="7",mode="nice"} 2.68
node_cpu_seconds_total{cpu="7",mode="softirq"} 0.31
node_cpu_seconds_total{cpu="7",mode="steal"} 0
node_cpu_seconds_total{cpu="7",mode="system"} 101.64
node_cpu_seconds_total{cpu="7",mode="user"} 290.98
# HELP node_disk_io_now The number of I/Os currently in progress.
# TYPE node_disk_io_now gauge
node_disk_io_now{device="dm-0"} 0