Move stat_linux to cpu_linux and add cpufreq stats (#548)

2017-06-13 11:21:53 +02:00 · 2017-06-13 11:21:53 +02:00 · 2e9f1913b8
commit 2e9f1913b8
parent 798950d25b
15 changed files with 210 additions and 81 deletions
--- a/collector/fixtures/e2e-output.txt
+++ b/collector/fixtures/e2e-output.txt
@ -208,6 +208,26 @@ node_cpu{cpu="cpu7",mode="softirq"} 0.31
 node_cpu{cpu="cpu7",mode="steal"} 0
 node_cpu{cpu="cpu7",mode="system"} 101.64
 node_cpu{cpu="cpu7",mode="user"} 290.98
+# 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
+# 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+06
+node_cpu_frequency_hertz{cpu="cpu1"} 1.699981e+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+06
+node_cpu_frequency_max_hertz{cpu="cpu1"} 3.7e+06
+# 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"} 800000
+node_cpu_frequency_min_hertz{cpu="cpu1"} 800000
+# HELP node_cpu_package_throttles_total Number of times this cpu package has been throttled.
+# TYPE node_cpu_package_throttles_total counter
+node_cpu_package_throttles_total{cpu="cpu0"} 30
+node_cpu_package_throttles_total{cpu="cpu1"} 30
 # HELP node_disk_bytes_read The total number of bytes read successfully.
 # TYPE node_disk_bytes_read counter
 node_disk_bytes_read{device="dm-0"} 5.13708655616e+11
@ -2142,6 +2162,7 @@ node_scrape_collector_success{collector="arp"} 1
 node_scrape_collector_success{collector="bonding"} 1
 node_scrape_collector_success{collector="buddyinfo"} 1
 node_scrape_collector_success{collector="conntrack"} 1
+node_scrape_collector_success{collector="cpu"} 1
 node_scrape_collector_success{collector="diskstats"} 1
 node_scrape_collector_success{collector="drbd"} 1
 node_scrape_collector_success{collector="edac"} 1
--- a/collector/fixtures/sys/bus/cpu/devices/cpu0/cpufreq/scaling_cur_freq
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu0/cpufreq/scaling_cur_freq
@ -0,0 +1 @@
+1699981
--- a/collector/fixtures/sys/bus/cpu/devices/cpu0/cpufreq/scaling_max_freq
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu0/cpufreq/scaling_max_freq
@ -0,0 +1 @@
+3700000
--- a/collector/fixtures/sys/bus/cpu/devices/cpu0/cpufreq/scaling_min_freq
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu0/cpufreq/scaling_min_freq
@ -0,0 +1 @@
+800000
--- a/collector/fixtures/sys/bus/cpu/devices/cpu0/thermal_throttle/core_throttle_count
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu0/thermal_throttle/core_throttle_count
@ -0,0 +1 @@
+5
--- a/collector/fixtures/sys/bus/cpu/devices/cpu0/thermal_throttle/package_throttle_count
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu0/thermal_throttle/package_throttle_count
@ -0,0 +1 @@
+30
--- a/collector/fixtures/sys/bus/cpu/devices/cpu1/cpufreq/scaling_cur_freq
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu1/cpufreq/scaling_cur_freq
@ -0,0 +1 @@
+1699981
--- a/collector/fixtures/sys/bus/cpu/devices/cpu1/cpufreq/scaling_max_freq
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu1/cpufreq/scaling_max_freq
@ -0,0 +1 @@
+3700000
--- a/collector/fixtures/sys/bus/cpu/devices/cpu1/cpufreq/scaling_min_freq
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu1/cpufreq/scaling_min_freq
@ -0,0 +1 @@
+800000
--- a/collector/fixtures/sys/bus/cpu/devices/cpu1/thermal_throttle/core_throttle_count
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu1/thermal_throttle/core_throttle_count
@ -0,0 +1 @@
+0
--- a/collector/fixtures/sys/bus/cpu/devices/cpu1/thermal_throttle/package_throttle_count
+++ b/collector/fixtures/sys/bus/cpu/devices/cpu1/thermal_throttle/package_throttle_count
@ -0,0 +1 @@
+30