aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gier <pgier@redhat.com>2019-09-11 16:06:36 -0500
committerPaul Gier <pgier@redhat.com>2019-09-25 14:38:57 -0500
commit4d72cb80593ef829d9aa4d918aa957a8828eb740 (patch)
tree9d129786659b7e9e3f7ce7a756f1714ed1680865
parent27b8c93a5afc21632239890c4558c7300cca17d2 (diff)
downloadprometheus_node_collector-4d72cb80593ef829d9aa4d918aa957a8828eb740.tar.bz2
prometheus_node_collector-4d72cb80593ef829d9aa4d918aa957a8828eb740.tar.xz
prometheus_node_collector-4d72cb80593ef829d9aa4d918aa957a8828eb740.zip
add node_cpu_info metric
Contains information gathered from /proc/cpuinfo Signed-off-by: Paul Gier <pgier@redhat.com>
-rw-r--r--CHANGELOG.md1
-rw-r--r--collector/cpu_linux.go38
-rw-r--r--collector/fixtures/e2e-64k-page-output.txt10
-rw-r--r--collector/fixtures/e2e-output.txt10
-rw-r--r--collector/fixtures/proc/cpuinfo216
-rwxr-xr-xend-to-end-test.sh1
6 files changed, 276 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b60da3c..3299dbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
17* [CHANGE] Add `mountaddr` label to NFS metrics. #1417 17* [CHANGE] Add `mountaddr` label to NFS metrics. #1417
18* [FEATURE] Add new schedstat collector #1389 18* [FEATURE] Add new schedstat collector #1389
19* [FEATURE] Add uname support for Darwin and OpenBSD #1433 19* [FEATURE] Add uname support for Darwin and OpenBSD #1433
20* [FEATURE] Add new metric node_cpu_info #1489
20* [ENHANCEMENT] Include additional XFS runtime statistics. #1423 21* [ENHANCEMENT] Include additional XFS runtime statistics. #1423
21* [ENHANCEMENT] Report non-fatal collection errors in the exporter metric. #1439 22* [ENHANCEMENT] Report non-fatal collection errors in the exporter metric. #1439
22* [ENHANCEMENT] Expose IPVS firewall mark as a label #1455 23* [ENHANCEMENT] Expose IPVS firewall mark as a label #1455
diff --git a/collector/cpu_linux.go b/collector/cpu_linux.go
index f915d62..c6404c3 100644
--- a/collector/cpu_linux.go
+++ b/collector/cpu_linux.go
@@ -23,16 +23,22 @@ import (
23 "github.com/prometheus/client_golang/prometheus" 23 "github.com/prometheus/client_golang/prometheus"
24 "github.com/prometheus/common/log" 24 "github.com/prometheus/common/log"
25 "github.com/prometheus/procfs" 25 "github.com/prometheus/procfs"
26 kingpin "gopkg.in/alecthomas/kingpin.v2"
26) 27)
27 28
28type cpuCollector struct { 29type cpuCollector struct {
29 fs procfs.FS 30 fs procfs.FS
30 cpu *prometheus.Desc 31 cpu *prometheus.Desc
32 cpuInfo *prometheus.Desc
31 cpuGuest *prometheus.Desc 33 cpuGuest *prometheus.Desc
32 cpuCoreThrottle *prometheus.Desc 34 cpuCoreThrottle *prometheus.Desc
33 cpuPackageThrottle *prometheus.Desc 35 cpuPackageThrottle *prometheus.Desc
34} 36}
35 37
38var (
39 enableCPUInfo = kingpin.Flag("collector.cpu.info", "Enables metric cpu_info").Bool()
40)
41
36func init() { 42func init() {
37 registerCollector("cpu", defaultEnabled, NewCPUCollector) 43 registerCollector("cpu", defaultEnabled, NewCPUCollector)
38} 44}
@@ -46,6 +52,11 @@ func NewCPUCollector() (Collector, error) {
46 return &cpuCollector{ 52 return &cpuCollector{
47 fs: fs, 53 fs: fs,
48 cpu: nodeCPUSecondsDesc, 54 cpu: nodeCPUSecondsDesc,
55 cpuInfo: prometheus.NewDesc(
56 prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "info"),
57 "CPU information from /proc/cpuinfo.",
58 []string{"package", "core", "cpu", "vendor", "family", "model", "microcode", "cachesize"}, nil,
59 ),
49 cpuGuest: prometheus.NewDesc( 60 cpuGuest: prometheus.NewDesc(
50 prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "guest_seconds_total"), 61 prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "guest_seconds_total"),
51 "Seconds the cpus spent in guests (VMs) for each mode.", 62 "Seconds the cpus spent in guests (VMs) for each mode.",
@@ -66,6 +77,11 @@ func NewCPUCollector() (Collector, error) {
66 77
67// Update implements Collector and exposes cpu related metrics from /proc/stat and /sys/.../cpu/. 78// Update implements Collector and exposes cpu related metrics from /proc/stat and /sys/.../cpu/.
68func (c *cpuCollector) Update(ch chan<- prometheus.Metric) error { 79func (c *cpuCollector) Update(ch chan<- prometheus.Metric) error {
80 if *enableCPUInfo {
81 if err := c.updateInfo(ch); err != nil {
82 return err
83 }
84 }
69 if err := c.updateStat(ch); err != nil { 85 if err := c.updateStat(ch); err != nil {
70 return err 86 return err
71 } 87 }
@@ -75,6 +91,28 @@ func (c *cpuCollector) Update(ch chan<- prometheus.Metric) error {
75 return nil 91 return nil
76} 92}
77 93
94// updateInfo reads /proc/cpuinfo
95func (c *cpuCollector) updateInfo(ch chan<- prometheus.Metric) error {
96 info, err := c.fs.CPUInfo()
97 if err != nil {
98 return err
99 }
100 for _, cpu := range info {
101 ch <- prometheus.MustNewConstMetric(c.cpuInfo,
102 prometheus.GaugeValue,
103 1,
104 cpu.PhysicalID,
105 cpu.CoreID,
106 fmt.Sprintf("%d", cpu.Processor),
107 cpu.VendorID,
108 cpu.CPUFamily,
109 cpu.Model,
110 cpu.Microcode,
111 cpu.CacheSize)
112 }
113 return nil
114}
115
78// updateThermalThrottle reads /sys/devices/system/cpu/cpu* and expose thermal throttle statistics. 116// updateThermalThrottle reads /sys/devices/system/cpu/cpu* and expose thermal throttle statistics.
79func (c *cpuCollector) updateThermalThrottle(ch chan<- prometheus.Metric) error { 117func (c *cpuCollector) updateThermalThrottle(ch chan<- prometheus.Metric) error {
80 cpus, err := filepath.Glob(sysFilePath("devices/system/cpu/cpu[0-9]*")) 118 cpus, err := filepath.Glob(sysFilePath("devices/system/cpu/cpu[0-9]*"))
diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt
index 4ac50a1..5751d39 100644
--- a/collector/fixtures/e2e-64k-page-output.txt
+++ b/collector/fixtures/e2e-64k-page-output.txt
@@ -208,6 +208,16 @@ node_cpu_guest_seconds_total{cpu="6",mode="nice"} 0.07
208node_cpu_guest_seconds_total{cpu="6",mode="user"} 0.08 208node_cpu_guest_seconds_total{cpu="6",mode="user"} 0.08
209node_cpu_guest_seconds_total{cpu="7",mode="nice"} 0.08 209node_cpu_guest_seconds_total{cpu="7",mode="nice"} 0.08
210node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09 210node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09
211# HELP node_cpu_info CPU information from /proc/cpuinfo.
212# TYPE node_cpu_info gauge
213node_cpu_info{cachesize="8192 KB",core="0",cpu="0",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
214node_cpu_info{cachesize="8192 KB",core="0",cpu="4",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
215node_cpu_info{cachesize="8192 KB",core="1",cpu="1",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
216node_cpu_info{cachesize="8192 KB",core="1",cpu="5",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
217node_cpu_info{cachesize="8192 KB",core="2",cpu="2",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
218node_cpu_info{cachesize="8192 KB",core="2",cpu="6",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
219node_cpu_info{cachesize="8192 KB",core="3",cpu="3",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
220node_cpu_info{cachesize="8192 KB",core="3",cpu="7",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
211# HELP node_cpu_package_throttles_total Number of times this cpu package has been throttled. 221# HELP node_cpu_package_throttles_total Number of times this cpu package has been throttled.
212# TYPE node_cpu_package_throttles_total counter 222# TYPE node_cpu_package_throttles_total counter
213node_cpu_package_throttles_total{package="0"} 30 223node_cpu_package_throttles_total{package="0"} 30
diff --git a/collector/fixtures/e2e-output.txt b/collector/fixtures/e2e-output.txt
index 607d250..0b76eeb 100644
--- a/collector/fixtures/e2e-output.txt
+++ b/collector/fixtures/e2e-output.txt
@@ -208,6 +208,16 @@ node_cpu_guest_seconds_total{cpu="6",mode="nice"} 0.07
208node_cpu_guest_seconds_total{cpu="6",mode="user"} 0.08 208node_cpu_guest_seconds_total{cpu="6",mode="user"} 0.08
209node_cpu_guest_seconds_total{cpu="7",mode="nice"} 0.08 209node_cpu_guest_seconds_total{cpu="7",mode="nice"} 0.08
210node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09 210node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09
211# HELP node_cpu_info CPU information from /proc/cpuinfo.
212# TYPE node_cpu_info gauge
213node_cpu_info{cachesize="8192 KB",core="0",cpu="0",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
214node_cpu_info{cachesize="8192 KB",core="0",cpu="4",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
215node_cpu_info{cachesize="8192 KB",core="1",cpu="1",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
216node_cpu_info{cachesize="8192 KB",core="1",cpu="5",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
217node_cpu_info{cachesize="8192 KB",core="2",cpu="2",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
218node_cpu_info{cachesize="8192 KB",core="2",cpu="6",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
219node_cpu_info{cachesize="8192 KB",core="3",cpu="3",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
220node_cpu_info{cachesize="8192 KB",core="3",cpu="7",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1
211# HELP node_cpu_package_throttles_total Number of times this cpu package has been throttled. 221# HELP node_cpu_package_throttles_total Number of times this cpu package has been throttled.
212# TYPE node_cpu_package_throttles_total counter 222# TYPE node_cpu_package_throttles_total counter
213node_cpu_package_throttles_total{package="0"} 30 223node_cpu_package_throttles_total{package="0"} 30
diff --git a/collector/fixtures/proc/cpuinfo b/collector/fixtures/proc/cpuinfo
new file mode 100644
index 0000000..f297405
--- /dev/null
+++ b/collector/fixtures/proc/cpuinfo
@@ -0,0 +1,216 @@
1processor : 0
2vendor_id : GenuineIntel
3cpu family : 6
4model : 142
5model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
6stepping : 10
7microcode : 0xb4
8cpu MHz : 799.998
9cache size : 8192 KB
10physical id : 0
11siblings : 8
12core id : 0
13cpu cores : 4
14apicid : 0
15initial apicid : 0
16fpu : yes
17fpu_exception : yes
18cpuid level : 22
19wp : yes
20flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
21bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
22bogomips : 4224.00
23clflush size : 64
24cache_alignment : 64
25address sizes : 39 bits physical, 48 bits virtual
26power management:
27
28processor : 1
29vendor_id : GenuineIntel
30cpu family : 6
31model : 142
32model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
33stepping : 10
34microcode : 0xb4
35cpu MHz : 800.037
36cache size : 8192 KB
37physical id : 0
38siblings : 8
39core id : 1
40cpu cores : 4
41apicid : 2
42initial apicid : 2
43fpu : yes
44fpu_exception : yes
45cpuid level : 22
46wp : yes
47flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
48bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
49bogomips : 4224.00
50clflush size : 64
51cache_alignment : 64
52address sizes : 39 bits physical, 48 bits virtual
53power management:
54
55processor : 2
56vendor_id : GenuineIntel
57cpu family : 6
58model : 142
59model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
60stepping : 10
61microcode : 0xb4
62cpu MHz : 800.010
63cache size : 8192 KB
64physical id : 0
65siblings : 8
66core id : 2
67cpu cores : 4
68apicid : 4
69initial apicid : 4
70fpu : yes
71fpu_exception : yes
72cpuid level : 22
73wp : yes
74flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
75bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
76bogomips : 4224.00
77clflush size : 64
78cache_alignment : 64
79address sizes : 39 bits physical, 48 bits virtual
80power management:
81
82processor : 3
83vendor_id : GenuineIntel
84cpu family : 6
85model : 142
86model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
87stepping : 10
88microcode : 0xb4
89cpu MHz : 800.028
90cache size : 8192 KB
91physical id : 0
92siblings : 8
93core id : 3
94cpu cores : 4
95apicid : 6
96initial apicid : 6
97fpu : yes
98fpu_exception : yes
99cpuid level : 22
100wp : yes
101flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
102bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
103bogomips : 4224.00
104clflush size : 64
105cache_alignment : 64
106address sizes : 39 bits physical, 48 bits virtual
107power management:
108
109processor : 4
110vendor_id : GenuineIntel
111cpu family : 6
112model : 142
113model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
114stepping : 10
115microcode : 0xb4
116cpu MHz : 799.989
117cache size : 8192 KB
118physical id : 0
119siblings : 8
120core id : 0
121cpu cores : 4
122apicid : 1
123initial apicid : 1
124fpu : yes
125fpu_exception : yes
126cpuid level : 22
127wp : yes
128flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
129bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
130bogomips : 4224.00
131clflush size : 64
132cache_alignment : 64
133address sizes : 39 bits physical, 48 bits virtual
134power management:
135
136processor : 5
137vendor_id : GenuineIntel
138cpu family : 6
139model : 142
140model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
141stepping : 10
142microcode : 0xb4
143cpu MHz : 800.083
144cache size : 8192 KB
145physical id : 0
146siblings : 8
147core id : 1
148cpu cores : 4
149apicid : 3
150initial apicid : 3
151fpu : yes
152fpu_exception : yes
153cpuid level : 22
154wp : yes
155flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
156bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
157bogomips : 4224.00
158clflush size : 64
159cache_alignment : 64
160address sizes : 39 bits physical, 48 bits virtual
161power management:
162
163processor : 6
164vendor_id : GenuineIntel
165cpu family : 6
166model : 142
167model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
168stepping : 10
169microcode : 0xb4
170cpu MHz : 800.017
171cache size : 8192 KB
172physical id : 0
173siblings : 8
174core id : 2
175cpu cores : 4
176apicid : 5
177initial apicid : 5
178fpu : yes
179fpu_exception : yes
180cpuid level : 22
181wp : yes
182flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
183bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
184bogomips : 4224.00
185clflush size : 64
186cache_alignment : 64
187address sizes : 39 bits physical, 48 bits virtual
188power management:
189
190processor : 7
191vendor_id : GenuineIntel
192cpu family : 6
193model : 142
194model name : Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz
195stepping : 10
196microcode : 0xb4
197cpu MHz : 800.030
198cache size : 8192 KB
199physical id : 0
200siblings : 8
201core id : 3
202cpu cores : 4
203apicid : 7
204initial apicid : 7
205fpu : yes
206fpu_exception : yes
207cpuid level : 22
208wp : yes
209flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp md_clear flush_l1d
210bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
211bogomips : 4224.00
212clflush size : 64
213cache_alignment : 64
214address sizes : 39 bits physical, 48 bits virtual
215power management:
216
diff --git a/end-to-end-test.sh b/end-to-end-test.sh
index 469b811..7372940 100755
--- a/end-to-end-test.sh
+++ b/end-to-end-test.sh
@@ -103,6 +103,7 @@ fi
103 --collector.wifi.fixtures="collector/fixtures/wifi" \ 103 --collector.wifi.fixtures="collector/fixtures/wifi" \
104 --collector.qdisc.fixtures="collector/fixtures/qdisc/" \ 104 --collector.qdisc.fixtures="collector/fixtures/qdisc/" \
105 --collector.netclass.ignored-devices="(bond0|dmz|int)" \ 105 --collector.netclass.ignored-devices="(bond0|dmz|int)" \
106 --collector.cpu.info \
106 --web.listen-address "127.0.0.1:${port}" \ 107 --web.listen-address "127.0.0.1:${port}" \
107 --log.level="debug" > "${tmpdir}/node_exporter.log" 2>&1 & 108 --log.level="debug" > "${tmpdir}/node_exporter.log" 2>&1 &
108 109