Skip to content

Commit

Permalink
Merge pull request prometheus#2100 from prometheus/superq/integrate-1…
Browse files Browse the repository at this point in the history 
….2.1

Release 1.2.1
  • Loading branch information
@SuperQ
SuperQ committed Aug 5, 2021
2 parents 1296894 + 8d144df commit 4200d7f
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 41 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
* [ENHANCEMENT]
* [BUGFIX]

## 1.2.1 / 2021-07-23

* [BUGFIX] Fix zoneinfo parsing prometheus/procfs#386
* [BUGFIX] Fix nvme collector log noise #2091
* [BUGFIX] Fix rapl collector log noise #2092

## 1.2.0 / 2021-07-15

NOTE: Ignoring invalid network speed will be the default in 2.x
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.2.1
74 changes: 37 additions & 37 deletions collector/fixtures/e2e-output.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3988,171 +3988,171 @@ node_zfs_zpool_wupdate{zpool="pool1"} 7.9210489694949e+13
node_zfs_zpool_wupdate{zpool="poolz1"} 1.10734831833266e+14
# HELP node_zoneinfo_high_pages Zone watermark pages_high
# TYPE node_zoneinfo_high_pages gauge
node_zoneinfo_high_pages{node="0",zone=""} 14
node_zoneinfo_high_pages{node="0",zone="DMA"} 14
node_zoneinfo_high_pages{node="0",zone="DMA32"} 2122
node_zoneinfo_high_pages{node="0",zone="Device"} 0
node_zoneinfo_high_pages{node="0",zone="Movable"} 0
node_zoneinfo_high_pages{node="0",zone="Normal"} 31113
# HELP node_zoneinfo_low_pages Zone watermark pages_low
# TYPE node_zoneinfo_low_pages gauge
node_zoneinfo_low_pages{node="0",zone=""} 11
node_zoneinfo_low_pages{node="0",zone="DMA"} 11
node_zoneinfo_low_pages{node="0",zone="DMA32"} 1600
node_zoneinfo_low_pages{node="0",zone="Device"} 0
node_zoneinfo_low_pages{node="0",zone="Movable"} 0
node_zoneinfo_low_pages{node="0",zone="Normal"} 23461
# HELP node_zoneinfo_managed_pages Present pages managed by the buddy system
# TYPE node_zoneinfo_managed_pages gauge
node_zoneinfo_managed_pages{node="0",zone=""} 3973
node_zoneinfo_managed_pages{node="0",zone="DMA"} 3973
node_zoneinfo_managed_pages{node="0",zone="DMA32"} 530339
node_zoneinfo_managed_pages{node="0",zone="Device"} 0
node_zoneinfo_managed_pages{node="0",zone="Movable"} 0
node_zoneinfo_managed_pages{node="0",zone="Normal"} 7.654794e+06
# HELP node_zoneinfo_min_pages Zone watermark pages_min
# TYPE node_zoneinfo_min_pages gauge
node_zoneinfo_min_pages{node="0",zone=""} 8
node_zoneinfo_min_pages{node="0",zone="DMA"} 8
node_zoneinfo_min_pages{node="0",zone="DMA32"} 1078
node_zoneinfo_min_pages{node="0",zone="Device"} 0
node_zoneinfo_min_pages{node="0",zone="Movable"} 0
node_zoneinfo_min_pages{node="0",zone="Normal"} 15809
# HELP node_zoneinfo_nr_active_anon_pages Number of anonymous pages recently more used
# TYPE node_zoneinfo_nr_active_anon_pages gauge
node_zoneinfo_nr_active_anon_pages{node="0",zone=""} 1.175853e+06
node_zoneinfo_nr_active_anon_pages{node="0",zone="DMA"} 1.175853e+06
# HELP node_zoneinfo_nr_active_file_pages Number of active pages with file-backing
# TYPE node_zoneinfo_nr_active_file_pages gauge
node_zoneinfo_nr_active_file_pages{node="0",zone=""} 688810
node_zoneinfo_nr_active_file_pages{node="0",zone="DMA"} 688810
# HELP node_zoneinfo_nr_anon_pages Number of anonymous pages currently used by the system
# TYPE node_zoneinfo_nr_anon_pages gauge
node_zoneinfo_nr_anon_pages{node="0",zone=""} 1.156608e+06
node_zoneinfo_nr_anon_pages{node="0",zone="DMA"} 1.156608e+06
# HELP node_zoneinfo_nr_anon_transparent_hugepages Number of anonymous transparent huge pages currently used by the system
# TYPE node_zoneinfo_nr_anon_transparent_hugepages gauge
node_zoneinfo_nr_anon_transparent_hugepages{node="0",zone=""} 0
node_zoneinfo_nr_anon_transparent_hugepages{node="0",zone="DMA"} 0
# HELP node_zoneinfo_nr_dirtied_total Page dirtyings since bootup
# TYPE node_zoneinfo_nr_dirtied_total counter
node_zoneinfo_nr_dirtied_total{node="0",zone=""} 1.189097e+06
node_zoneinfo_nr_dirtied_total{node="0",zone="DMA"} 1.189097e+06
# HELP node_zoneinfo_nr_dirty_pages Number of dirty pages
# TYPE node_zoneinfo_nr_dirty_pages gauge
node_zoneinfo_nr_dirty_pages{node="0",zone=""} 103
node_zoneinfo_nr_dirty_pages{node="0",zone="DMA"} 103
# HELP node_zoneinfo_nr_file_pages Number of file pages
# TYPE node_zoneinfo_nr_file_pages gauge
node_zoneinfo_nr_file_pages{node="0",zone=""} 1.740118e+06
node_zoneinfo_nr_file_pages{node="0",zone="DMA"} 1.740118e+06
# HELP node_zoneinfo_nr_free_pages Total number of free pages in the zone
# TYPE node_zoneinfo_nr_free_pages gauge
node_zoneinfo_nr_free_pages{node="0",zone=""} 2949
node_zoneinfo_nr_free_pages{node="0",zone="DMA"} 2949
node_zoneinfo_nr_free_pages{node="0",zone="DMA32"} 528427
node_zoneinfo_nr_free_pages{node="0",zone="Normal"} 4.539739e+06
# HELP node_zoneinfo_nr_inactive_anon_pages Number of anonymous pages recently less used
# TYPE node_zoneinfo_nr_inactive_anon_pages gauge
node_zoneinfo_nr_inactive_anon_pages{node="0",zone=""} 95612
node_zoneinfo_nr_inactive_anon_pages{node="0",zone="DMA"} 95612
# HELP node_zoneinfo_nr_inactive_file_pages Number of inactive pages with file-backing
# TYPE node_zoneinfo_nr_inactive_file_pages gauge
node_zoneinfo_nr_inactive_file_pages{node="0",zone=""} 723339
node_zoneinfo_nr_inactive_file_pages{node="0",zone="DMA"} 723339
# HELP node_zoneinfo_nr_isolated_anon_pages Temporary isolated pages from anon lru
# TYPE node_zoneinfo_nr_isolated_anon_pages gauge
node_zoneinfo_nr_isolated_anon_pages{node="0",zone=""} 0
node_zoneinfo_nr_isolated_anon_pages{node="0",zone="DMA"} 0
# HELP node_zoneinfo_nr_isolated_file_pages Temporary isolated pages from file lru
# TYPE node_zoneinfo_nr_isolated_file_pages gauge
node_zoneinfo_nr_isolated_file_pages{node="0",zone=""} 0
node_zoneinfo_nr_isolated_file_pages{node="0",zone="DMA"} 0
# HELP node_zoneinfo_nr_kernel_stacks Number of kernel stacks
# TYPE node_zoneinfo_nr_kernel_stacks gauge
node_zoneinfo_nr_kernel_stacks{node="0",zone=""} 0
node_zoneinfo_nr_kernel_stacks{node="0",zone="DMA"} 0
node_zoneinfo_nr_kernel_stacks{node="0",zone="DMA32"} 0
node_zoneinfo_nr_kernel_stacks{node="0",zone="Normal"} 18864
# HELP node_zoneinfo_nr_mapped_pages Number of mapped pages
# TYPE node_zoneinfo_nr_mapped_pages gauge
node_zoneinfo_nr_mapped_pages{node="0",zone=""} 423143
node_zoneinfo_nr_mapped_pages{node="0",zone="DMA"} 423143
# HELP node_zoneinfo_nr_shmem_pages Number of shmem pages (included tmpfs/GEM pages)
# TYPE node_zoneinfo_nr_shmem_pages gauge
node_zoneinfo_nr_shmem_pages{node="0",zone=""} 330517
node_zoneinfo_nr_shmem_pages{node="0",zone="DMA"} 330517
# HELP node_zoneinfo_nr_slab_reclaimable_pages Number of reclaimable slab pages
# TYPE node_zoneinfo_nr_slab_reclaimable_pages gauge
node_zoneinfo_nr_slab_reclaimable_pages{node="0",zone=""} 121763
node_zoneinfo_nr_slab_reclaimable_pages{node="0",zone="DMA"} 121763
# HELP node_zoneinfo_nr_slab_unreclaimable_pages Number of unreclaimable slab pages
# TYPE node_zoneinfo_nr_slab_unreclaimable_pages gauge
node_zoneinfo_nr_slab_unreclaimable_pages{node="0",zone=""} 56182
node_zoneinfo_nr_slab_unreclaimable_pages{node="0",zone="DMA"} 56182
# HELP node_zoneinfo_nr_unevictable_pages Number of unevictable pages
# TYPE node_zoneinfo_nr_unevictable_pages gauge
node_zoneinfo_nr_unevictable_pages{node="0",zone=""} 213111
node_zoneinfo_nr_unevictable_pages{node="0",zone="DMA"} 213111
# HELP node_zoneinfo_nr_writeback_pages Number of writeback pages
# TYPE node_zoneinfo_nr_writeback_pages gauge
node_zoneinfo_nr_writeback_pages{node="0",zone=""} 0
node_zoneinfo_nr_writeback_pages{node="0",zone="DMA"} 0
# HELP node_zoneinfo_nr_written_total Page writings since bootup
# TYPE node_zoneinfo_nr_written_total counter
node_zoneinfo_nr_written_total{node="0",zone=""} 1.181554e+06
node_zoneinfo_nr_written_total{node="0",zone="DMA"} 1.181554e+06
# HELP node_zoneinfo_numa_foreign_total Was intended here, hit elsewhere
# TYPE node_zoneinfo_numa_foreign_total counter
node_zoneinfo_numa_foreign_total{node="0",zone=""} 0
node_zoneinfo_numa_foreign_total{node="0",zone="DMA"} 0
node_zoneinfo_numa_foreign_total{node="0",zone="DMA32"} 0
node_zoneinfo_numa_foreign_total{node="0",zone="Normal"} 0
# HELP node_zoneinfo_numa_hit_total Allocated in intended node
# TYPE node_zoneinfo_numa_hit_total counter
node_zoneinfo_numa_hit_total{node="0",zone=""} 1
node_zoneinfo_numa_hit_total{node="0",zone="DMA"} 1
node_zoneinfo_numa_hit_total{node="0",zone="DMA32"} 13
node_zoneinfo_numa_hit_total{node="0",zone="Normal"} 6.2836441e+07
# HELP node_zoneinfo_numa_interleave_total Interleaver preferred this zone
# TYPE node_zoneinfo_numa_interleave_total counter
node_zoneinfo_numa_interleave_total{node="0",zone=""} 1
node_zoneinfo_numa_interleave_total{node="0",zone="DMA"} 1
node_zoneinfo_numa_interleave_total{node="0",zone="DMA32"} 1
node_zoneinfo_numa_interleave_total{node="0",zone="Normal"} 23174
# HELP node_zoneinfo_numa_local_total Allocation from local node
# TYPE node_zoneinfo_numa_local_total counter
node_zoneinfo_numa_local_total{node="0",zone=""} 1
node_zoneinfo_numa_local_total{node="0",zone="DMA"} 1
node_zoneinfo_numa_local_total{node="0",zone="DMA32"} 13
node_zoneinfo_numa_local_total{node="0",zone="Normal"} 6.2836441e+07
# HELP node_zoneinfo_numa_miss_total Allocated in non intended node
# TYPE node_zoneinfo_numa_miss_total counter
node_zoneinfo_numa_miss_total{node="0",zone=""} 0
node_zoneinfo_numa_miss_total{node="0",zone="DMA"} 0
node_zoneinfo_numa_miss_total{node="0",zone="DMA32"} 0
node_zoneinfo_numa_miss_total{node="0",zone="Normal"} 0
# HELP node_zoneinfo_numa_other_total Allocation from other node
# TYPE node_zoneinfo_numa_other_total counter
node_zoneinfo_numa_other_total{node="0",zone=""} 0
node_zoneinfo_numa_other_total{node="0",zone="DMA"} 0
node_zoneinfo_numa_other_total{node="0",zone="DMA32"} 0
node_zoneinfo_numa_other_total{node="0",zone="Normal"} 0
# HELP node_zoneinfo_present_pages Physical pages existing within the zone
# TYPE node_zoneinfo_present_pages gauge
node_zoneinfo_present_pages{node="0",zone=""} 3997
node_zoneinfo_present_pages{node="0",zone="DMA"} 3997
node_zoneinfo_present_pages{node="0",zone="DMA32"} 546847
node_zoneinfo_present_pages{node="0",zone="Device"} 0
node_zoneinfo_present_pages{node="0",zone="Movable"} 0
node_zoneinfo_present_pages{node="0",zone="Normal"} 7.806976e+06
# HELP node_zoneinfo_protection_0 Protection array 0. field
# TYPE node_zoneinfo_protection_0 gauge
node_zoneinfo_protection_0{node="0",zone=""} 0
node_zoneinfo_protection_0{node="0",zone="DMA"} 0
node_zoneinfo_protection_0{node="0",zone="DMA32"} 0
node_zoneinfo_protection_0{node="0",zone="Device"} 0
node_zoneinfo_protection_0{node="0",zone="Movable"} 0
node_zoneinfo_protection_0{node="0",zone="Normal"} 0
# HELP node_zoneinfo_protection_1 Protection array 1. field
# TYPE node_zoneinfo_protection_1 gauge
node_zoneinfo_protection_1{node="0",zone=""} 2039
node_zoneinfo_protection_1{node="0",zone="DMA"} 2039
node_zoneinfo_protection_1{node="0",zone="DMA32"} 0
node_zoneinfo_protection_1{node="0",zone="Device"} 0
node_zoneinfo_protection_1{node="0",zone="Movable"} 0
node_zoneinfo_protection_1{node="0",zone="Normal"} 0
# HELP node_zoneinfo_protection_2 Protection array 2. field
# TYPE node_zoneinfo_protection_2 gauge
node_zoneinfo_protection_2{node="0",zone=""} 31932
node_zoneinfo_protection_2{node="0",zone="DMA"} 31932
node_zoneinfo_protection_2{node="0",zone="DMA32"} 29893
node_zoneinfo_protection_2{node="0",zone="Device"} 0
node_zoneinfo_protection_2{node="0",zone="Movable"} 0
node_zoneinfo_protection_2{node="0",zone="Normal"} 0
# HELP node_zoneinfo_protection_3 Protection array 3. field
# TYPE node_zoneinfo_protection_3 gauge
node_zoneinfo_protection_3{node="0",zone=""} 31932
node_zoneinfo_protection_3{node="0",zone="DMA"} 31932
node_zoneinfo_protection_3{node="0",zone="DMA32"} 29893
node_zoneinfo_protection_3{node="0",zone="Device"} 0
node_zoneinfo_protection_3{node="0",zone="Movable"} 0
node_zoneinfo_protection_3{node="0",zone="Normal"} 0
# HELP node_zoneinfo_protection_4 Protection array 4. field
# TYPE node_zoneinfo_protection_4 gauge
node_zoneinfo_protection_4{node="0",zone=""} 31932
node_zoneinfo_protection_4{node="0",zone="DMA"} 31932
node_zoneinfo_protection_4{node="0",zone="DMA32"} 29893
node_zoneinfo_protection_4{node="0",zone="Device"} 0
node_zoneinfo_protection_4{node="0",zone="Movable"} 0
node_zoneinfo_protection_4{node="0",zone="Normal"} 0
# HELP node_zoneinfo_spanned_pages Total pages spanned by the zone, including holes
# TYPE node_zoneinfo_spanned_pages gauge
node_zoneinfo_spanned_pages{node="0",zone=""} 4095
node_zoneinfo_spanned_pages{node="0",zone="DMA"} 4095
node_zoneinfo_spanned_pages{node="0",zone="DMA32"} 1.04448e+06
node_zoneinfo_spanned_pages{node="0",zone="Device"} 0
node_zoneinfo_spanned_pages{node="0",zone="Movable"} 0
Expand Down
4 changes: 4 additions & 0 deletions collector/rapl_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ func (c *raplCollector) Update(ch chan<- prometheus.Metric) error {
for _, rz := range zones {
newMicrojoules, err := rz.GetEnergyMicrojoules()
if err != nil {
if errors.Is(err, os.ErrPermission) {
level.Debug(c.logger).Log("msg", "Can't access energy_uj file", "zone", rz, "err", err)
return ErrNoData
}
return err
}
index := strconv.Itoa(rz.Index)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.29.0
github.com/prometheus/exporter-toolkit v0.6.0
github.com/prometheus/procfs v0.7.0
github.com/prometheus/procfs v0.7.1
github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0
github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect
github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.7.0 h1:OQZ41sZU9XkRpzrz8/TD0EldH/Rwbddkdu5wDyUwzfE=
github.com/prometheus/procfs v0.7.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.7.1 h1:TlEtJq5GvGqMykEwWzbZWjjztF86swFhsPix1i0bkgA=
github.com/prometheus/procfs v0.7.1/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0 h1:eskphjc5kRCykOJyX7HHVbJCs25/8knprttvrVvEd8o=
github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
Expand Down

0 comments on commit 4200d7f

Please sign in to comment.