mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-11-09 23:24:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1515 from belm0/bugfix/hertz_typo

Browse source 
fix typo in cpufreq metric names (#1510)
This commit is contained in:
Ben Kochie 2019-10-10 21:03:21 +02:00 committed by GitHub
parent 7a30219ca4 15e36e2230
commit 9f49fff79e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -9,6 +9,7 @@
- `node_md_disks` now has a `state` label for "fail", "spare", "active" disks. - `node_md_disks` now has a `state` label for "fail", "spare", "active" disks.
- `node_md_is_active` is replaced by `node_md_state` with a state set of "active", "inactive", "recovering", "resync". - `node_md_is_active` is replaced by `node_md_state` with a state set of "active", "inactive", "recovering", "resync".
* Additional label `mountaddr` added to NFS device metrics to distinguish mounts from the same URL, but different IP addresses. #1417 * Additional label `mountaddr` added to NFS device metrics to distinguish mounts from the same URL, but different IP addresses. #1417
* Metrics node_cpu_scaling_frequency_min_hrts and node_cpu_scaling_frequency_max_hrts of the cpufreq collector were renamed to node_cpu_scaling_frequency_min_hertz and node_cpu_scaling_frequency_max_hertz. #1510
### Changes ### Changes
@ -28,6 +29,7 @@
* [BUGFIX] Fix netdev nil reference on Darwin #1414 * [BUGFIX] Fix netdev nil reference on Darwin #1414
* [BUGFIX] Strip path.rootfs from mountpoint labels #1421 * [BUGFIX] Strip path.rootfs from mountpoint labels #1421
* [BUGFIX] Fix empty string in path.rootfs #1464 * [BUGFIX] Fix empty string in path.rootfs #1464
* [BUGFIX] Fix typo in cpufreq metric names #1510
## 0.18.1 / 2019-06-04 ## 0.18.1 / 2019-06-04

4
collector/cpufreq_linux.go
View file

@ -66,12 +66,12 @@ func NewCPUFreqCollector() (Collector, error) {
[]string{"cpu"}, nil, []string{"cpu"}, nil,
), ),
scalingFreqMin: prometheus.NewDesc( scalingFreqMin: prometheus.NewDesc(
prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "scaling_frequency_min_hrts"), prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "scaling_frequency_min_hertz"),
"Minimum scaled cpu thread frequency in hertz.", "Minimum scaled cpu thread frequency in hertz.",
[]string{"cpu"}, nil, []string{"cpu"}, nil,
), ),
scalingFreqMax: prometheus.NewDesc( scalingFreqMax: prometheus.NewDesc(
prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "scaling_frequency_max_hrts"), prometheus.BuildFQName(namespace, cpuCollectorSubsystem, "scaling_frequency_max_hertz"),
"Maximum scaled cpu thread frequency in hertz.", "Maximum scaled cpu thread frequency in hertz.",
[]string{"cpu"}, nil, []string{"cpu"}, nil,
), ),

24
collector/fixtures/e2e-64k-page-output.txt
View file

@ -228,18 +228,18 @@ node_cpu_scaling_frequency_hertz{cpu="0"} 1.699981e+09
node_cpu_scaling_frequency_hertz{cpu="1"} 1.699981e+09 node_cpu_scaling_frequency_hertz{cpu="1"} 1.699981e+09
node_cpu_scaling_frequency_hertz{cpu="2"} 8e+06 node_cpu_scaling_frequency_hertz{cpu="2"} 8e+06
node_cpu_scaling_frequency_hertz{cpu="3"} 8e+06 node_cpu_scaling_frequency_hertz{cpu="3"} 8e+06
# HELP node_cpu_scaling_frequency_max_hrts Maximum scaled cpu thread frequency in hertz. # HELP node_cpu_scaling_frequency_max_hertz Maximum scaled cpu thread frequency in hertz.
# TYPE node_cpu_scaling_frequency_max_hrts gauge # TYPE node_cpu_scaling_frequency_max_hertz gauge
node_cpu_scaling_frequency_max_hrts{cpu="0"} 3.7e+09 node_cpu_scaling_frequency_max_hertz{cpu="0"} 3.7e+09
node_cpu_scaling_frequency_max_hrts{cpu="1"} 3.7e+09 node_cpu_scaling_frequency_max_hertz{cpu="1"} 3.7e+09
node_cpu_scaling_frequency_max_hrts{cpu="2"} 4.2e+09 node_cpu_scaling_frequency_max_hertz{cpu="2"} 4.2e+09
node_cpu_scaling_frequency_max_hrts{cpu="3"} 4.2e+09 node_cpu_scaling_frequency_max_hertz{cpu="3"} 4.2e+09
# HELP node_cpu_scaling_frequency_min_hrts Minimum scaled cpu thread frequency in hertz. # HELP node_cpu_scaling_frequency_min_hertz Minimum scaled cpu thread frequency in hertz.
# TYPE node_cpu_scaling_frequency_min_hrts gauge # TYPE node_cpu_scaling_frequency_min_hertz gauge
node_cpu_scaling_frequency_min_hrts{cpu="0"} 8e+08 node_cpu_scaling_frequency_min_hertz{cpu="0"} 8e+08
node_cpu_scaling_frequency_min_hrts{cpu="1"} 8e+08 node_cpu_scaling_frequency_min_hertz{cpu="1"} 8e+08
node_cpu_scaling_frequency_min_hrts{cpu="2"} 1e+06 node_cpu_scaling_frequency_min_hertz{cpu="2"} 1e+06
node_cpu_scaling_frequency_min_hrts{cpu="3"} 1e+06 node_cpu_scaling_frequency_min_hertz{cpu="3"} 1e+06
# HELP node_cpu_seconds_total Seconds the cpus spent in each mode. # HELP node_cpu_seconds_total Seconds the cpus spent in each mode.
# TYPE node_cpu_seconds_total counter # TYPE node_cpu_seconds_total counter
node_cpu_seconds_total{cpu="0",mode="idle"} 10870.69 node_cpu_seconds_total{cpu="0",mode="idle"} 10870.69

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

@ -228,18 +228,18 @@ node_cpu_scaling_frequency_hertz{cpu="0"} 1.699981e+09
node_cpu_scaling_frequency_hertz{cpu="1"} 1.699981e+09 node_cpu_scaling_frequency_hertz{cpu="1"} 1.699981e+09
node_cpu_scaling_frequency_hertz{cpu="2"} 8e+06 node_cpu_scaling_frequency_hertz{cpu="2"} 8e+06
node_cpu_scaling_frequency_hertz{cpu="3"} 8e+06 node_cpu_scaling_frequency_hertz{cpu="3"} 8e+06
# HELP node_cpu_scaling_frequency_max_hrts Maximum scaled cpu thread frequency in hertz. # HELP node_cpu_scaling_frequency_max_hertz Maximum scaled cpu thread frequency in hertz.
# TYPE node_cpu_scaling_frequency_max_hrts gauge # TYPE node_cpu_scaling_frequency_max_hertz gauge
node_cpu_scaling_frequency_max_hrts{cpu="0"} 3.7e+09 node_cpu_scaling_frequency_max_hertz{cpu="0"} 3.7e+09
node_cpu_scaling_frequency_max_hrts{cpu="1"} 3.7e+09 node_cpu_scaling_frequency_max_hertz{cpu="1"} 3.7e+09
node_cpu_scaling_frequency_max_hrts{cpu="2"} 4.2e+09 node_cpu_scaling_frequency_max_hertz{cpu="2"} 4.2e+09
node_cpu_scaling_frequency_max_hrts{cpu="3"} 4.2e+09 node_cpu_scaling_frequency_max_hertz{cpu="3"} 4.2e+09
# HELP node_cpu_scaling_frequency_min_hrts Minimum scaled cpu thread frequency in hertz. # HELP node_cpu_scaling_frequency_min_hertz Minimum scaled cpu thread frequency in hertz.
# TYPE node_cpu_scaling_frequency_min_hrts gauge # TYPE node_cpu_scaling_frequency_min_hertz gauge
node_cpu_scaling_frequency_min_hrts{cpu="0"} 8e+08 node_cpu_scaling_frequency_min_hertz{cpu="0"} 8e+08
node_cpu_scaling_frequency_min_hrts{cpu="1"} 8e+08 node_cpu_scaling_frequency_min_hertz{cpu="1"} 8e+08
node_cpu_scaling_frequency_min_hrts{cpu="2"} 1e+06 node_cpu_scaling_frequency_min_hertz{cpu="2"} 1e+06
node_cpu_scaling_frequency_min_hrts{cpu="3"} 1e+06 node_cpu_scaling_frequency_min_hertz{cpu="3"} 1e+06
# HELP node_cpu_seconds_total Seconds the cpus spent in each mode. # HELP node_cpu_seconds_total Seconds the cpus spent in each mode.
# TYPE node_cpu_seconds_total counter # TYPE node_cpu_seconds_total counter
node_cpu_seconds_total{cpu="0",mode="idle"} 10870.69 node_cpu_seconds_total{cpu="0",mode="idle"} 10870.69