aboutsummaryrefslogtreecommitdiff
path: root/collector
diff options
context:
space:
mode:
authorBenjamin Drung <benjamin.drung@cloud.ionos.com>2020-02-20 17:36:02 +0100
committerJohannes 'fish' Ziemke <github@freigeist.org>2020-03-20 17:27:11 +0100
commit34d50e15d56a5bc455687b6c535962f12505c7e1 (patch)
tree4d5a3c4cde261539090bcdefdae91edced7d0a53 /collector
parent47610d0d2b0e8bccc0595e413f232c24bdd56260 (diff)
downloadprometheus_node_collector-34d50e15d56a5bc455687b6c535962f12505c7e1.tar.bz2
prometheus_node_collector-34d50e15d56a5bc455687b6c535962f12505c7e1.tar.xz
prometheus_node_collector-34d50e15d56a5bc455687b6c535962f12505c7e1.zip
Add model_name and stepping to node_cpu_info metric
The `node_cpu_info` metric contains some information like the `model` (which is an integer), but not the human readable model name. Also the stepping of the processor might be interesting, since different stepping of a processor might behave differently. Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
Diffstat (limited to 'collector')
-rw-r--r--collector/cpu_linux.go4
-rw-r--r--collector/fixtures/e2e-64k-page-output.txt16
-rw-r--r--collector/fixtures/e2e-output.txt16
3 files changed, 19 insertions, 17 deletions
diff --git a/collector/cpu_linux.go b/collector/cpu_linux.go
index f5e9ce8..ae8ee53 100644
--- a/collector/cpu_linux.go
+++ b/collector/cpu_linux.go
@@ -57,7 +57,7 @@ func NewCPUCollector(logger log.Logger) (Collector, error) {
57 cpuInfo: prometheus.NewDesc( 57 cpuInfo: prometheus.NewDesc(
58 prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "info"), 58 prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "info"),
59 "CPU information from /proc/cpuinfo.", 59 "CPU information from /proc/cpuinfo.",
60 []string{"package", "core", "cpu", "vendor", "family", "model", "microcode", "cachesize"}, nil, 60 []string{"package", "core", "cpu", "vendor", "family", "model", "model_name", "microcode", "stepping", "cachesize"}, nil,
61 ), 61 ),
62 cpuGuest: prometheus.NewDesc( 62 cpuGuest: prometheus.NewDesc(
63 prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "guest_seconds_total"), 63 prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "guest_seconds_total"),
@@ -110,7 +110,9 @@ func (c *cpuCollector) updateInfo(ch chan<- prometheus.Metric) error {
110 cpu.VendorID, 110 cpu.VendorID,
111 cpu.CPUFamily, 111 cpu.CPUFamily,
112 cpu.Model, 112 cpu.Model,
113 cpu.ModelName,
113 cpu.Microcode, 114 cpu.Microcode,
115 cpu.Stepping,
114 cpu.CacheSize) 116 cpu.CacheSize)
115 } 117 }
116 return nil 118 return nil
diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt
index 257ddf1..0ea506b 100644
--- a/collector/fixtures/e2e-64k-page-output.txt
+++ b/collector/fixtures/e2e-64k-page-output.txt
@@ -210,14 +210,14 @@ node_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. 211# HELP node_cpu_info CPU information from /proc/cpuinfo.
212# TYPE node_cpu_info gauge 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 213node_cpu_info{cachesize="8192 KB",core="0",cpu="0",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
214node_cpu_info{cachesize="8192 KB",core="0",cpu="4",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",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
215node_cpu_info{cachesize="8192 KB",core="1",cpu="1",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",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
216node_cpu_info{cachesize="8192 KB",core="1",cpu="5",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",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
217node_cpu_info{cachesize="8192 KB",core="2",cpu="2",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",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
218node_cpu_info{cachesize="8192 KB",core="2",cpu="6",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",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
219node_cpu_info{cachesize="8192 KB",core="3",cpu="3",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",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
220node_cpu_info{cachesize="8192 KB",core="3",cpu="7",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",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
221# 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.
222# TYPE node_cpu_package_throttles_total counter 222# TYPE node_cpu_package_throttles_total counter
223node_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 ddc048f..907b420 100644
--- a/collector/fixtures/e2e-output.txt
+++ b/collector/fixtures/e2e-output.txt
@@ -258,14 +258,14 @@ node_cpu_guest_seconds_total{cpu="7",mode="nice"} 0.08
258node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09 258node_cpu_guest_seconds_total{cpu="7",mode="user"} 0.09
259# HELP node_cpu_info CPU information from /proc/cpuinfo. 259# HELP node_cpu_info CPU information from /proc/cpuinfo.
260# TYPE node_cpu_info gauge 260# TYPE node_cpu_info gauge
261node_cpu_info{cachesize="8192 KB",core="0",cpu="0",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 261node_cpu_info{cachesize="8192 KB",core="0",cpu="0",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
262node_cpu_info{cachesize="8192 KB",core="0",cpu="4",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 262node_cpu_info{cachesize="8192 KB",core="0",cpu="4",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
263node_cpu_info{cachesize="8192 KB",core="1",cpu="1",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 263node_cpu_info{cachesize="8192 KB",core="1",cpu="1",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
264node_cpu_info{cachesize="8192 KB",core="1",cpu="5",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 264node_cpu_info{cachesize="8192 KB",core="1",cpu="5",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
265node_cpu_info{cachesize="8192 KB",core="2",cpu="2",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 265node_cpu_info{cachesize="8192 KB",core="2",cpu="2",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
266node_cpu_info{cachesize="8192 KB",core="2",cpu="6",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 266node_cpu_info{cachesize="8192 KB",core="2",cpu="6",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
267node_cpu_info{cachesize="8192 KB",core="3",cpu="3",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 267node_cpu_info{cachesize="8192 KB",core="3",cpu="3",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
268node_cpu_info{cachesize="8192 KB",core="3",cpu="7",family="6",microcode="0xb4",model="142",package="0",vendor="GenuineIntel"} 1 268node_cpu_info{cachesize="8192 KB",core="3",cpu="7",family="6",microcode="0xb4",model="142",model_name="Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz",package="0",stepping="10",vendor="GenuineIntel"} 1
269# HELP node_cpu_package_throttles_total Number of times this cpu package has been throttled. 269# HELP node_cpu_package_throttles_total Number of times this cpu package has been throttled.
270# TYPE node_cpu_package_throttles_total counter 270# TYPE node_cpu_package_throttles_total counter
271node_cpu_package_throttles_total{package="0"} 30 271node_cpu_package_throttles_total{package="0"} 30
© 2015 Mike Crute