Skip to content

Commit 4200d7f

Browse files
SuperQSuperQ
authored
Merge pull request #2100 from prometheus/superq/integrate-1.2.1
Release 1.2.1
2 parents 1296894 + 8d144df commit 4200d7f

File tree

6 files changed

+51
-41
lines changed

6 files changed

+51
-41
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
* [ENHANCEMENT]
66
* [BUGFIX]
77

8+
## 1.2.1 / 2021-07-23
9+
10+
* [BUGFIX] Fix zoneinfo parsing prometheus/procfs#386
11+
* [BUGFIX] Fix nvme collector log noise #2091
12+
* [BUGFIX] Fix rapl collector log noise #2092
13+
814
## 1.2.0 / 2021-07-15
915

1016
NOTE: Ignoring invalid network speed will be the default in 2.x

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.0
1+
1.2.1

‎collector/fixtures/e2e-output.txt

+37-37
Original file line numberDiff line numberDiff line change
@@ -3988,171 +3988,171 @@ node_zfs_zpool_wupdate{zpool="pool1"} 7.9210489694949e+13
39883988
node_zfs_zpool_wupdate{zpool="poolz1"} 1.10734831833266e+14
39893989
# HELP node_zoneinfo_high_pages Zone watermark pages_high
39903990
# TYPE node_zoneinfo_high_pages gauge
3991-
node_zoneinfo_high_pages{node="0",zone=""} 14
3991+
node_zoneinfo_high_pages{node="0",zone="DMA"} 14
39923992
node_zoneinfo_high_pages{node="0",zone="DMA32"} 2122
39933993
node_zoneinfo_high_pages{node="0",zone="Device"} 0
39943994
node_zoneinfo_high_pages{node="0",zone="Movable"} 0
39953995
node_zoneinfo_high_pages{node="0",zone="Normal"} 31113
39963996
# HELP node_zoneinfo_low_pages Zone watermark pages_low
39973997
# TYPE node_zoneinfo_low_pages gauge
3998-
node_zoneinfo_low_pages{node="0",zone=""} 11
3998+
node_zoneinfo_low_pages{node="0",zone="DMA"} 11
39993999
node_zoneinfo_low_pages{node="0",zone="DMA32"} 1600
40004000
node_zoneinfo_low_pages{node="0",zone="Device"} 0
40014001
node_zoneinfo_low_pages{node="0",zone="Movable"} 0
40024002
node_zoneinfo_low_pages{node="0",zone="Normal"} 23461
40034003
# HELP node_zoneinfo_managed_pages Present pages managed by the buddy system
40044004
# TYPE node_zoneinfo_managed_pages gauge
4005-
node_zoneinfo_managed_pages{node="0",zone=""} 3973
4005+
node_zoneinfo_managed_pages{node="0",zone="DMA"} 3973
40064006
node_zoneinfo_managed_pages{node="0",zone="DMA32"} 530339
40074007
node_zoneinfo_managed_pages{node="0",zone="Device"} 0
40084008
node_zoneinfo_managed_pages{node="0",zone="Movable"} 0
40094009
node_zoneinfo_managed_pages{node="0",zone="Normal"} 7.654794e+06
40104010
# HELP node_zoneinfo_min_pages Zone watermark pages_min
40114011
# TYPE node_zoneinfo_min_pages gauge
4012-
node_zoneinfo_min_pages{node="0",zone=""} 8
4012+
node_zoneinfo_min_pages{node="0",zone="DMA"} 8
40134013
node_zoneinfo_min_pages{node="0",zone="DMA32"} 1078
40144014
node_zoneinfo_min_pages{node="0",zone="Device"} 0
40154015
node_zoneinfo_min_pages{node="0",zone="Movable"} 0
40164016
node_zoneinfo_min_pages{node="0",zone="Normal"} 15809
40174017
# HELP node_zoneinfo_nr_active_anon_pages Number of anonymous pages recently more used
40184018
# TYPE node_zoneinfo_nr_active_anon_pages gauge
4019-
node_zoneinfo_nr_active_anon_pages{node="0",zone=""} 1.175853e+06
4019+
node_zoneinfo_nr_active_anon_pages{node="0",zone="DMA"} 1.175853e+06
40204020
# HELP node_zoneinfo_nr_active_file_pages Number of active pages with file-backing
40214021
# TYPE node_zoneinfo_nr_active_file_pages gauge
4022-
node_zoneinfo_nr_active_file_pages{node="0",zone=""} 688810
4022+
node_zoneinfo_nr_active_file_pages{node="0",zone="DMA"} 688810
40234023
# HELP node_zoneinfo_nr_anon_pages Number of anonymous pages currently used by the system
40244024
# TYPE node_zoneinfo_nr_anon_pages gauge
4025-
node_zoneinfo_nr_anon_pages{node="0",zone=""} 1.156608e+06
4025+
node_zoneinfo_nr_anon_pages{node="0",zone="DMA"} 1.156608e+06
40264026
# HELP node_zoneinfo_nr_anon_transparent_hugepages Number of anonymous transparent huge pages currently used by the system
40274027
# TYPE node_zoneinfo_nr_anon_transparent_hugepages gauge
4028-
node_zoneinfo_nr_anon_transparent_hugepages{node="0",zone=""} 0
4028+
node_zoneinfo_nr_anon_transparent_hugepages{node="0",zone="DMA"} 0
40294029
# HELP node_zoneinfo_nr_dirtied_total Page dirtyings since bootup
40304030
# TYPE node_zoneinfo_nr_dirtied_total counter
4031-
node_zoneinfo_nr_dirtied_total{node="0",zone=""} 1.189097e+06
4031+
node_zoneinfo_nr_dirtied_total{node="0",zone="DMA"} 1.189097e+06
40324032
# HELP node_zoneinfo_nr_dirty_pages Number of dirty pages
40334033
# TYPE node_zoneinfo_nr_dirty_pages gauge
4034-
node_zoneinfo_nr_dirty_pages{node="0",zone=""} 103
4034+
node_zoneinfo_nr_dirty_pages{node="0",zone="DMA"} 103
40354035
# HELP node_zoneinfo_nr_file_pages Number of file pages
40364036
# TYPE node_zoneinfo_nr_file_pages gauge
4037-
node_zoneinfo_nr_file_pages{node="0",zone=""} 1.740118e+06
4037+
node_zoneinfo_nr_file_pages{node="0",zone="DMA"} 1.740118e+06
40384038
# HELP node_zoneinfo_nr_free_pages Total number of free pages in the zone
40394039
# TYPE node_zoneinfo_nr_free_pages gauge
4040-
node_zoneinfo_nr_free_pages{node="0",zone=""} 2949
4040+
node_zoneinfo_nr_free_pages{node="0",zone="DMA"} 2949
40414041
node_zoneinfo_nr_free_pages{node="0",zone="DMA32"} 528427
40424042
node_zoneinfo_nr_free_pages{node="0",zone="Normal"} 4.539739e+06
40434043
# HELP node_zoneinfo_nr_inactive_anon_pages Number of anonymous pages recently less used
40444044
# TYPE node_zoneinfo_nr_inactive_anon_pages gauge
4045-
node_zoneinfo_nr_inactive_anon_pages{node="0",zone=""} 95612
4045+
node_zoneinfo_nr_inactive_anon_pages{node="0",zone="DMA"} 95612
40464046
# HELP node_zoneinfo_nr_inactive_file_pages Number of inactive pages with file-backing
40474047
# TYPE node_zoneinfo_nr_inactive_file_pages gauge
4048-
node_zoneinfo_nr_inactive_file_pages{node="0",zone=""} 723339
4048+
node_zoneinfo_nr_inactive_file_pages{node="0",zone="DMA"} 723339
40494049
# HELP node_zoneinfo_nr_isolated_anon_pages Temporary isolated pages from anon lru
40504050
# TYPE node_zoneinfo_nr_isolated_anon_pages gauge
4051-
node_zoneinfo_nr_isolated_anon_pages{node="0",zone=""} 0
4051+
node_zoneinfo_nr_isolated_anon_pages{node="0",zone="DMA"} 0
40524052
# HELP node_zoneinfo_nr_isolated_file_pages Temporary isolated pages from file lru
40534053
# TYPE node_zoneinfo_nr_isolated_file_pages gauge
4054-
node_zoneinfo_nr_isolated_file_pages{node="0",zone=""} 0
4054+
node_zoneinfo_nr_isolated_file_pages{node="0",zone="DMA"} 0
40554055
# HELP node_zoneinfo_nr_kernel_stacks Number of kernel stacks
40564056
# TYPE node_zoneinfo_nr_kernel_stacks gauge
4057-
node_zoneinfo_nr_kernel_stacks{node="0",zone=""} 0
4057+
node_zoneinfo_nr_kernel_stacks{node="0",zone="DMA"} 0
40584058
node_zoneinfo_nr_kernel_stacks{node="0",zone="DMA32"} 0
40594059
node_zoneinfo_nr_kernel_stacks{node="0",zone="Normal"} 18864
40604060
# HELP node_zoneinfo_nr_mapped_pages Number of mapped pages
40614061
# TYPE node_zoneinfo_nr_mapped_pages gauge
4062-
node_zoneinfo_nr_mapped_pages{node="0",zone=""} 423143
4062+
node_zoneinfo_nr_mapped_pages{node="0",zone="DMA"} 423143
40634063
# HELP node_zoneinfo_nr_shmem_pages Number of shmem pages (included tmpfs/GEM pages)
40644064
# TYPE node_zoneinfo_nr_shmem_pages gauge
4065-
node_zoneinfo_nr_shmem_pages{node="0",zone=""} 330517
4065+
node_zoneinfo_nr_shmem_pages{node="0",zone="DMA"} 330517
40664066
# HELP node_zoneinfo_nr_slab_reclaimable_pages Number of reclaimable slab pages
40674067
# TYPE node_zoneinfo_nr_slab_reclaimable_pages gauge
4068-
node_zoneinfo_nr_slab_reclaimable_pages{node="0",zone=""} 121763
4068+
node_zoneinfo_nr_slab_reclaimable_pages{node="0",zone="DMA"} 121763
40694069
# HELP node_zoneinfo_nr_slab_unreclaimable_pages Number of unreclaimable slab pages
40704070
# TYPE node_zoneinfo_nr_slab_unreclaimable_pages gauge
4071-
node_zoneinfo_nr_slab_unreclaimable_pages{node="0",zone=""} 56182
4071+
node_zoneinfo_nr_slab_unreclaimable_pages{node="0",zone="DMA"} 56182
40724072
# HELP node_zoneinfo_nr_unevictable_pages Number of unevictable pages
40734073
# TYPE node_zoneinfo_nr_unevictable_pages gauge
4074-
node_zoneinfo_nr_unevictable_pages{node="0",zone=""} 213111
4074+
node_zoneinfo_nr_unevictable_pages{node="0",zone="DMA"} 213111
40754075
# HELP node_zoneinfo_nr_writeback_pages Number of writeback pages
40764076
# TYPE node_zoneinfo_nr_writeback_pages gauge
4077-
node_zoneinfo_nr_writeback_pages{node="0",zone=""} 0
4077+
node_zoneinfo_nr_writeback_pages{node="0",zone="DMA"} 0
40784078
# HELP node_zoneinfo_nr_written_total Page writings since bootup
40794079
# TYPE node_zoneinfo_nr_written_total counter
4080-
node_zoneinfo_nr_written_total{node="0",zone=""} 1.181554e+06
4080+
node_zoneinfo_nr_written_total{node="0",zone="DMA"} 1.181554e+06
40814081
# HELP node_zoneinfo_numa_foreign_total Was intended here, hit elsewhere
40824082
# TYPE node_zoneinfo_numa_foreign_total counter
4083-
node_zoneinfo_numa_foreign_total{node="0",zone=""} 0
4083+
node_zoneinfo_numa_foreign_total{node="0",zone="DMA"} 0
40844084
node_zoneinfo_numa_foreign_total{node="0",zone="DMA32"} 0
40854085
node_zoneinfo_numa_foreign_total{node="0",zone="Normal"} 0
40864086
# HELP node_zoneinfo_numa_hit_total Allocated in intended node
40874087
# TYPE node_zoneinfo_numa_hit_total counter
4088-
node_zoneinfo_numa_hit_total{node="0",zone=""} 1
4088+
node_zoneinfo_numa_hit_total{node="0",zone="DMA"} 1
40894089
node_zoneinfo_numa_hit_total{node="0",zone="DMA32"} 13
40904090
node_zoneinfo_numa_hit_total{node="0",zone="Normal"} 6.2836441e+07
40914091
# HELP node_zoneinfo_numa_interleave_total Interleaver preferred this zone
40924092
# TYPE node_zoneinfo_numa_interleave_total counter
4093-
node_zoneinfo_numa_interleave_total{node="0",zone=""} 1
4093+
node_zoneinfo_numa_interleave_total{node="0",zone="DMA"} 1
40944094
node_zoneinfo_numa_interleave_total{node="0",zone="DMA32"} 1
40954095
node_zoneinfo_numa_interleave_total{node="0",zone="Normal"} 23174
40964096
# HELP node_zoneinfo_numa_local_total Allocation from local node
40974097
# TYPE node_zoneinfo_numa_local_total counter
4098-
node_zoneinfo_numa_local_total{node="0",zone=""} 1
4098+
node_zoneinfo_numa_local_total{node="0",zone="DMA"} 1
40994099
node_zoneinfo_numa_local_total{node="0",zone="DMA32"} 13
41004100
node_zoneinfo_numa_local_total{node="0",zone="Normal"} 6.2836441e+07
41014101
# HELP node_zoneinfo_numa_miss_total Allocated in non intended node
41024102
# TYPE node_zoneinfo_numa_miss_total counter
4103-
node_zoneinfo_numa_miss_total{node="0",zone=""} 0
4103+
node_zoneinfo_numa_miss_total{node="0",zone="DMA"} 0
41044104
node_zoneinfo_numa_miss_total{node="0",zone="DMA32"} 0
41054105
node_zoneinfo_numa_miss_total{node="0",zone="Normal"} 0
41064106
# HELP node_zoneinfo_numa_other_total Allocation from other node
41074107
# TYPE node_zoneinfo_numa_other_total counter
4108-
node_zoneinfo_numa_other_total{node="0",zone=""} 0
4108+
node_zoneinfo_numa_other_total{node="0",zone="DMA"} 0
41094109
node_zoneinfo_numa_other_total{node="0",zone="DMA32"} 0
41104110
node_zoneinfo_numa_other_total{node="0",zone="Normal"} 0
41114111
# HELP node_zoneinfo_present_pages Physical pages existing within the zone
41124112
# TYPE node_zoneinfo_present_pages gauge
4113-
node_zoneinfo_present_pages{node="0",zone=""} 3997
4113+
node_zoneinfo_present_pages{node="0",zone="DMA"} 3997
41144114
node_zoneinfo_present_pages{node="0",zone="DMA32"} 546847
41154115
node_zoneinfo_present_pages{node="0",zone="Device"} 0
41164116
node_zoneinfo_present_pages{node="0",zone="Movable"} 0
41174117
node_zoneinfo_present_pages{node="0",zone="Normal"} 7.806976e+06
41184118
# HELP node_zoneinfo_protection_0 Protection array 0. field
41194119
# TYPE node_zoneinfo_protection_0 gauge
4120-
node_zoneinfo_protection_0{node="0",zone=""} 0
4120+
node_zoneinfo_protection_0{node="0",zone="DMA"} 0
41214121
node_zoneinfo_protection_0{node="0",zone="DMA32"} 0
41224122
node_zoneinfo_protection_0{node="0",zone="Device"} 0
41234123
node_zoneinfo_protection_0{node="0",zone="Movable"} 0
41244124
node_zoneinfo_protection_0{node="0",zone="Normal"} 0
41254125
# HELP node_zoneinfo_protection_1 Protection array 1. field
41264126
# TYPE node_zoneinfo_protection_1 gauge
4127-
node_zoneinfo_protection_1{node="0",zone=""} 2039
4127+
node_zoneinfo_protection_1{node="0",zone="DMA"} 2039
41284128
node_zoneinfo_protection_1{node="0",zone="DMA32"} 0
41294129
node_zoneinfo_protection_1{node="0",zone="Device"} 0
41304130
node_zoneinfo_protection_1{node="0",zone="Movable"} 0
41314131
node_zoneinfo_protection_1{node="0",zone="Normal"} 0
41324132
# HELP node_zoneinfo_protection_2 Protection array 2. field
41334133
# TYPE node_zoneinfo_protection_2 gauge
4134-
node_zoneinfo_protection_2{node="0",zone=""} 31932
4134+
node_zoneinfo_protection_2{node="0",zone="DMA"} 31932
41354135
node_zoneinfo_protection_2{node="0",zone="DMA32"} 29893
41364136
node_zoneinfo_protection_2{node="0",zone="Device"} 0
41374137
node_zoneinfo_protection_2{node="0",zone="Movable"} 0
41384138
node_zoneinfo_protection_2{node="0",zone="Normal"} 0
41394139
# HELP node_zoneinfo_protection_3 Protection array 3. field
41404140
# TYPE node_zoneinfo_protection_3 gauge
4141-
node_zoneinfo_protection_3{node="0",zone=""} 31932
4141+
node_zoneinfo_protection_3{node="0",zone="DMA"} 31932
41424142
node_zoneinfo_protection_3{node="0",zone="DMA32"} 29893
41434143
node_zoneinfo_protection_3{node="0",zone="Device"} 0
41444144
node_zoneinfo_protection_3{node="0",zone="Movable"} 0
41454145
node_zoneinfo_protection_3{node="0",zone="Normal"} 0
41464146
# HELP node_zoneinfo_protection_4 Protection array 4. field
41474147
# TYPE node_zoneinfo_protection_4 gauge
4148-
node_zoneinfo_protection_4{node="0",zone=""} 31932
4148+
node_zoneinfo_protection_4{node="0",zone="DMA"} 31932
41494149
node_zoneinfo_protection_4{node="0",zone="DMA32"} 29893
41504150
node_zoneinfo_protection_4{node="0",zone="Device"} 0
41514151
node_zoneinfo_protection_4{node="0",zone="Movable"} 0
41524152
node_zoneinfo_protection_4{node="0",zone="Normal"} 0
41534153
# HELP node_zoneinfo_spanned_pages Total pages spanned by the zone, including holes
41544154
# TYPE node_zoneinfo_spanned_pages gauge
4155-
node_zoneinfo_spanned_pages{node="0",zone=""} 4095
4155+
node_zoneinfo_spanned_pages{node="0",zone="DMA"} 4095
41564156
node_zoneinfo_spanned_pages{node="0",zone="DMA32"} 1.04448e+06
41574157
node_zoneinfo_spanned_pages{node="0",zone="Device"} 0
41584158
node_zoneinfo_spanned_pages{node="0",zone="Movable"} 0

‎collector/rapl_linux.go

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ func (c *raplCollector) Update(ch chan<- prometheus.Metric) error {
7070
for _, rz := range zones {
7171
newMicrojoules, err := rz.GetEnergyMicrojoules()
7272
if err != nil {
73+
if errors.Is(err, os.ErrPermission) {
74+
level.Debug(c.logger).Log("msg", "Can't access energy_uj file", "zone", rz, "err", err)
75+
return ErrNoData
76+
}
7377
return err
7478
}
7579
index := strconv.Itoa(rz.Index)

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/prometheus/client_model v0.2.0
1717
github.com/prometheus/common v0.29.0
1818
github.com/prometheus/exporter-toolkit v0.6.0
19-
github.com/prometheus/procfs v0.7.0
19+
github.com/prometheus/procfs v0.7.1
2020
github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0
2121
github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect
2222
github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
238238
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
239239
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
240240
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
241-
github.com/prometheus/procfs v0.7.0 h1:OQZ41sZU9XkRpzrz8/TD0EldH/Rwbddkdu5wDyUwzfE=
242-
github.com/prometheus/procfs v0.7.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
241+
github.com/prometheus/procfs v0.7.1 h1:TlEtJq5GvGqMykEwWzbZWjjztF86swFhsPix1i0bkgA=
242+
github.com/prometheus/procfs v0.7.1/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
243243
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
244244
github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0 h1:eskphjc5kRCykOJyX7HHVbJCs25/8knprttvrVvEd8o=
245245
github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=

0 commit comments

Comments
 (0)