Update procfs to v0.0.4-0.20190627154503-39e1aff1547e (#1409)

procfs v0.0.4-0.20190627154503-39e1aff1547e is a requirement for
https://github.com/prometheus/node_exporter/pull/1357 (because procfs
v0.0.3 contained bug https://github.com/prometheus/procfs/pull/187)

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
This commit is contained in:
Benjamin Drung 2019-07-01 12:23:50 +02:00 committed by Ben Kochie
parent 3f49b31101
commit cdd9a5fdef
8 changed files with 642 additions and 8 deletions

2
go.mod
View file

@ -15,7 +15,7 @@ require (
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
github.com/prometheus/common v0.4.1
github.com/prometheus/procfs v0.0.3
github.com/prometheus/procfs v0.0.4-0.20190627154503-39e1aff1547e
github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a

4
go.sum
View file

@ -68,8 +68,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/prometheus/procfs v0.0.4-0.20190627154503-39e1aff1547e h1:wHo3spLBVUEsk0etFRCYPI6CpKUZnxq0JwqXjaQhp/g=
github.com/prometheus/procfs v0.0.4-0.20190627154503-39e1aff1547e/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745 h1:IuH7WumZNax0D+rEqmy2TyhKCzrtMGqbZO0b8rO00JA=
github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745/go.mod h1:G81aIFAMS9ECrwBYR9YxhlPjWgrItd+Kje78O6+uqm8=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

View file

@ -47,6 +47,48 @@ SymlinkTo: ../../symlinktargets/ghi
Path: fixtures/proc/26231/fd/3
SymlinkTo: ../../symlinktargets/uvw
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Directory: fixtures/proc/26231/fdinfo
Mode: 755
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/26231/fdinfo/0
Lines: 6
pos: 0
flags: 02004000
mnt_id: 13
inotify wd:3 ino:1 sdev:34 mask:fce ignored_mask:0 fhandle-bytes:c fhandle-type:81 f_handle:000000000100000000000000
inotify wd:2 ino:1300016 sdev:fd00002 mask:fce ignored_mask:0 fhandle-bytes:8 fhandle-type:1 f_handle:16003001ed3f022a
inotify wd:1 ino:2e0001 sdev:fd00000 mask:fce ignored_mask:0 fhandle-bytes:8 fhandle-type:1 f_handle:01002e00138e7c65
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/26231/fdinfo/1
Lines: 4
pos: 0
flags: 02004002
mnt_id: 13
eventfd-count: 0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/26231/fdinfo/10
Lines: 3
pos: 0
flags: 02004002
mnt_id: 9
Mode: 400
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/26231/fdinfo/2
Lines: 3
pos: 0
flags: 02004002
mnt_id: 9
Mode: 400
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/26231/fdinfo/3
Lines: 3
pos: 0
flags: 02004002
mnt_id: 9
Mode: 400
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/26231/io
Lines: 7
rchar: 750339
@ -619,6 +661,227 @@ Path: fixtures/proc/symlinktargets/xyz
Lines: 0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Directory: fixtures/proc/sys
Mode: 775
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Directory: fixtures/proc/sys/vm
Mode: 775
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/admin_reserve_kbytes
Lines: 1
8192
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/block_dump
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/compact_unevictable_allowed
Lines: 1
1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/dirty_background_bytes
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/dirty_background_ratio
Lines: 1
10
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/dirty_bytes
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/dirty_expire_centisecs
Lines: 1
3000
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/dirty_ratio
Lines: 1
20
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/dirty_writeback_centisecs
Lines: 1
500
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/dirtytime_expire_seconds
Lines: 1
43200
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/drop_caches
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/extfrag_threshold
Lines: 1
500
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/hugetlb_shm_group
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/laptop_mode
Lines: 1
5
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/legacy_va_layout
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/lowmem_reserve_ratio
Lines: 1
256 256 32 0 0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/max_map_count
Lines: 1
65530
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/memory_failure_early_kill
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/memory_failure_recovery
Lines: 1
1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/min_free_kbytes
Lines: 1
67584
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/min_slab_ratio
Lines: 1
5
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/min_unmapped_ratio
Lines: 1
1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/mmap_min_addr
Lines: 1
65536
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/nr_hugepages
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/nr_hugepages_mempolicy
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/nr_overcommit_hugepages
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/numa_stat
Lines: 1
1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/numa_zonelist_order
Lines: 1
Node
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/oom_dump_tasks
Lines: 1
1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/oom_kill_allocating_task
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/overcommit_kbytes
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/overcommit_memory
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/overcommit_ratio
Lines: 1
50
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/page-cluster
Lines: 1
3
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/panic_on_oom
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/percpu_pagelist_fraction
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/stat_interval
Lines: 1
1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/swappiness
Lines: 1
60
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/user_reserve_kbytes
Lines: 1
131072
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/vfs_cache_pressure
Lines: 1
100
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/watermark_boost_factor
Lines: 1
15000
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/watermark_scale_factor
Lines: 1
10
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: fixtures/proc/sys/vm/zone_reclaim_mode
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Directory: fixtures/sys
Mode: 755
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View file

@ -279,3 +279,24 @@ func (p Proc) fileDescriptors() ([]string, error) {
func (p Proc) path(pa ...string) string {
return p.fs.Path(append([]string{strconv.Itoa(p.PID)}, pa...)...)
}
// FileDescriptorsInfo retrieves information about all file descriptors of
// the process.
func (p Proc) FileDescriptorsInfo() (ProcFDInfos, error) {
names, err := p.fileDescriptors()
if err != nil {
return nil, err
}
var fdinfos ProcFDInfos
for _, n := range names {
fdinfo, err := p.FDInfo(n)
if err != nil {
continue
}
fdinfos = append(fdinfos, *fdinfo)
}
return fdinfos, nil
}

132
vendor/github.com/prometheus/procfs/proc_fdinfo.go generated vendored Normal file
View file

@ -0,0 +1,132 @@
// Copyright 2019 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package procfs
import (
"bufio"
"fmt"
"io/ioutil"
"os"
"regexp"
"strings"
)
// Regexp variables
var (
rPos = regexp.MustCompile(`^pos:\s+(\d+)$`)
rFlags = regexp.MustCompile(`^flags:\s+(\d+)$`)
rMntID = regexp.MustCompile(`^mnt_id:\s+(\d+)$`)
rInotify = regexp.MustCompile(`^inotify`)
)
// ProcFDInfo contains represents file descriptor information.
type ProcFDInfo struct {
// File descriptor
FD string
// File offset
Pos string
// File access mode and status flags
Flags string
// Mount point ID
MntID string
// List of inotify lines (structed) in the fdinfo file (kernel 3.8+ only)
InotifyInfos []InotifyInfo
}
// FDInfo constructor. On kernels older than 3.8, InotifyInfos will always be empty.
func (p Proc) FDInfo(fd string) (*ProcFDInfo, error) {
f, err := os.Open(p.path("fdinfo", fd))
if err != nil {
return nil, err
}
defer f.Close()
fdinfo, err := ioutil.ReadAll(f)
if err != nil {
return nil, fmt.Errorf("could not read %s: %s", f.Name(), err)
}
var text, pos, flags, mntid string
var inotify []InotifyInfo
scanner := bufio.NewScanner(strings.NewReader(string(fdinfo)))
for scanner.Scan() {
text = scanner.Text()
if rPos.MatchString(text) {
pos = rPos.FindStringSubmatch(text)[1]
} else if rFlags.MatchString(text) {
flags = rFlags.FindStringSubmatch(text)[1]
} else if rMntID.MatchString(text) {
mntid = rMntID.FindStringSubmatch(text)[1]
} else if rInotify.MatchString(text) {
newInotify, err := parseInotifyInfo(text)
if err != nil {
return nil, err
}
inotify = append(inotify, *newInotify)
}
}
i := &ProcFDInfo{
FD: fd,
Pos: pos,
Flags: flags,
MntID: mntid,
InotifyInfos: inotify,
}
return i, nil
}
// InotifyInfo represents a single inotify line in the fdinfo file.
type InotifyInfo struct {
// Watch descriptor number
WD string
// Inode number
Ino string
// Device ID
Sdev string
// Mask of events being monitored
Mask string
}
// InotifyInfo constructor. Only available on kernel 3.8+.
func parseInotifyInfo(line string) (*InotifyInfo, error) {
r := regexp.MustCompile(`^inotify\s+wd:([0-9a-f]+)\s+ino:([0-9a-f]+)\s+sdev:([0-9a-f]+)\s+mask:([0-9a-f]+)`)
m := r.FindStringSubmatch(line)
i := &InotifyInfo{
WD: m[1],
Ino: m[2],
Sdev: m[3],
Mask: m[4],
}
return i, nil
}
// ProcFDInfos represents a list of ProcFDInfo structs.
type ProcFDInfos []ProcFDInfo
func (p ProcFDInfos) Len() int { return len(p) }
func (p ProcFDInfos) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
func (p ProcFDInfos) Less(i, j int) bool { return p[i].FD < p[j].FD }
// InotifyWatchLen returns the total number of inotify watches
func (p ProcFDInfos) InotifyWatchLen() (int, error) {
length := 0
for _, f := range p {
length += len(f.InotifyInfos)
}
return length, nil
}

View file

@ -275,7 +275,9 @@ func parseInfiniBandCounters(portPath string) (*InfiniBandCounters, error) {
counters.PortRcvConstraintErrors = vp.PUInt64()
case "port_rcv_data":
counters.PortRcvData = vp.PUInt64()
*counters.PortRcvData *= 4
if counters.PortRcvData != nil {
*counters.PortRcvData *= 4
}
case "port_rcv_discards":
counters.PortRcvDiscards = vp.PUInt64()
case "port_rcv_errors":
@ -286,7 +288,9 @@ func parseInfiniBandCounters(portPath string) (*InfiniBandCounters, error) {
counters.PortXmitConstraintErrors = vp.PUInt64()
case "port_xmit_data":
counters.PortXmitData = vp.PUInt64()
*counters.PortXmitData *= 4
if counters.PortXmitData != nil {
*counters.PortXmitData *= 4
}
case "port_xmit_discards":
counters.PortXmitDiscards = vp.PUInt64()
case "port_xmit_packets":
@ -339,7 +343,9 @@ func parseInfiniBandCounters(portPath string) (*InfiniBandCounters, error) {
counters.LegacyPortMulticastXmitPackets = vp.PUInt64()
case "port_rcv_data_64":
counters.LegacyPortRcvData64 = vp.PUInt64()
*counters.LegacyPortRcvData64 *= 4
if counters.LegacyPortRcvData64 != nil {
*counters.LegacyPortRcvData64 *= 4
}
case "port_rcv_packets_64":
counters.LegacyPortRcvPackets64 = vp.PUInt64()
case "port_unicast_rcv_packets":
@ -348,7 +354,9 @@ func parseInfiniBandCounters(portPath string) (*InfiniBandCounters, error) {
counters.LegacyPortUnicastXmitPackets = vp.PUInt64()
case "port_xmit_data_64":
counters.LegacyPortXmitData64 = vp.PUInt64()
*counters.LegacyPortXmitData64 *= 4
if counters.LegacyPortXmitData64 != nil {
*counters.LegacyPortXmitData64 *= 4
}
case "port_xmit_packets_64":
counters.LegacyPortXmitPackets64 = vp.PUInt64()
}

210
vendor/github.com/prometheus/procfs/vm.go generated vendored Normal file
View file

@ -0,0 +1,210 @@
// Copyright 2019 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// +build !windows
package procfs
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
"github.com/prometheus/procfs/internal/util"
)
// The VM interface is described at
// https://www.kernel.org/doc/Documentation/sysctl/vm.txt
// Each setting is exposed as a single file.
// Each file contains one line with a single numerical value, except lowmem_reserve_ratio which holds an array
// and numa_zonelist_order (deprecated) which is a string
type VM struct {
AdminReserveKbytes int64 // /proc/sys/vm/admin_reserve_kbytes
BlockDump int64 // /proc/sys/vm/block_dump
CompactUnevictableAllowed int64 // /proc/sys/vm/compact_unevictable_allowed
DirtyBackgroundBytes int64 // /proc/sys/vm/dirty_background_bytes
DirtyBackgroundRatio int64 // /proc/sys/vm/dirty_background_ratio
DirtyBytes int64 // /proc/sys/vm/dirty_bytes
DirtyExpireCentisecs int64 // /proc/sys/vm/dirty_expire_centisecs
DirtyRatio int64 // /proc/sys/vm/dirty_ratio
DirtytimeExpireSeconds int64 // /proc/sys/vm/dirtytime_expire_seconds
DirtyWritebackCentisecs int64 // /proc/sys/vm/dirty_writeback_centisecs
DropCaches int64 // /proc/sys/vm/drop_caches
ExtfragThreshold int64 // /proc/sys/vm/extfrag_threshold
HugetlbShmGroup int64 // /proc/sys/vm/hugetlb_shm_group
LaptopMode int64 // /proc/sys/vm/laptop_mode
LegacyVaLayout int64 // /proc/sys/vm/legacy_va_layout
LowmemReserveRatio []int64 // /proc/sys/vm/lowmem_reserve_ratio
MaxMapCount int64 // /proc/sys/vm/max_map_count
MemoryFailureEarlyKill int64 // /proc/sys/vm/memory_failure_early_kill
MemoryFailureRecovery int64 // /proc/sys/vm/memory_failure_recovery
MinFreeKbytes int64 // /proc/sys/vm/min_free_kbytes
MinSlabRatio int64 // /proc/sys/vm/min_slab_ratio
MinUnmappedRatio int64 // /proc/sys/vm/min_unmapped_ratio
MmapMinAddr int64 // /proc/sys/vm/mmap_min_addr
NrHugepages int64 // /proc/sys/vm/nr_hugepages
NrHugepagesMempolicy int64 // /proc/sys/vm/nr_hugepages_mempolicy
NrOvercommitHugepages int64 // /proc/sys/vm/nr_overcommit_hugepages
NumaStat int64 // /proc/sys/vm/numa_stat
NumaZonelistOrder string // /proc/sys/vm/numa_zonelist_order
OomDumpTasks int64 // /proc/sys/vm/oom_dump_tasks
OomKillAllocatingTask int64 // /proc/sys/vm/oom_kill_allocating_task
OvercommitKbytes int64 // /proc/sys/vm/overcommit_kbytes
OvercommitMemory int64 // /proc/sys/vm/overcommit_memory
OvercommitRatio int64 // /proc/sys/vm/overcommit_ratio
PageCluster int64 // /proc/sys/vm/page-cluster
PanicOnOom int64 // /proc/sys/vm/panic_on_oom
PercpuPagelistFraction int64 // /proc/sys/vm/percpu_pagelist_fraction
StatInterval int64 // /proc/sys/vm/stat_interval
Swappiness int64 // /proc/sys/vm/swappiness
UserReserveKbytes int64 // /proc/sys/vm/user_reserve_kbytes
VfsCachePressure int64 // /proc/sys/vm/vfs_cache_pressure
WatermarkBoostFactor int64 // /proc/sys/vm/watermark_boost_factor
WatermarkScaleFactor int64 // /proc/sys/vm/watermark_scale_factor
ZoneReclaimMode int64 // /proc/sys/vm/zone_reclaim_mode
}
// VM reads the VM statistics from the specified `proc` filesystem.
func (fs FS) VM() (*VM, error) {
path := fs.proc.Path("sys/vm")
file, err := os.Stat(path)
if err != nil {
return nil, err
}
if !file.Mode().IsDir() {
return nil, fmt.Errorf("%s is not a directory", path)
}
files, err := ioutil.ReadDir(path)
if err != nil {
return nil, err
}
var vm VM
for _, f := range files {
if f.IsDir() {
continue
}
name := filepath.Join(path, f.Name())
// ignore errors on read, as there are some write only
// in /proc/sys/vm
value, err := util.SysReadFile(name)
if err != nil {
continue
}
vp := util.NewValueParser(value)
switch f.Name() {
case "admin_reserve_kbytes":
vm.AdminReserveKbytes = *vp.PInt64()
case "block_dump":
vm.BlockDump = *vp.PInt64()
case "compact_unevictable_allowed":
vm.CompactUnevictableAllowed = *vp.PInt64()
case "dirty_background_bytes":
vm.DirtyBackgroundBytes = *vp.PInt64()
case "dirty_background_ratio":
vm.DirtyBackgroundRatio = *vp.PInt64()
case "dirty_bytes":
vm.DirtyBytes = *vp.PInt64()
case "dirty_expire_centisecs":
vm.DirtyExpireCentisecs = *vp.PInt64()
case "dirty_ratio":
vm.DirtyRatio = *vp.PInt64()
case "dirtytime_expire_seconds":
vm.DirtytimeExpireSeconds = *vp.PInt64()
case "dirty_writeback_centisecs":
vm.DirtyWritebackCentisecs = *vp.PInt64()
case "drop_caches":
vm.DropCaches = *vp.PInt64()
case "extfrag_threshold":
vm.ExtfragThreshold = *vp.PInt64()
case "hugetlb_shm_group":
vm.HugetlbShmGroup = *vp.PInt64()
case "laptop_mode":
vm.LaptopMode = *vp.PInt64()
case "legacy_va_layout":
vm.LegacyVaLayout = *vp.PInt64()
case "lowmem_reserve_ratio":
stringSlice := strings.Fields(value)
int64Slice := make([]int64, 0, len(stringSlice))
for _, value := range stringSlice {
vp := util.NewValueParser(value)
int64Slice = append(int64Slice, *vp.PInt64())
}
vm.LowmemReserveRatio = int64Slice
case "max_map_count":
vm.MaxMapCount = *vp.PInt64()
case "memory_failure_early_kill":
vm.MemoryFailureEarlyKill = *vp.PInt64()
case "memory_failure_recovery":
vm.MemoryFailureRecovery = *vp.PInt64()
case "min_free_kbytes":
vm.MinFreeKbytes = *vp.PInt64()
case "min_slab_ratio":
vm.MinSlabRatio = *vp.PInt64()
case "min_unmapped_ratio":
vm.MinUnmappedRatio = *vp.PInt64()
case "mmap_min_addr":
vm.MmapMinAddr = *vp.PInt64()
case "nr_hugepages":
vm.NrHugepages = *vp.PInt64()
case "nr_hugepages_mempolicy":
vm.NrHugepagesMempolicy = *vp.PInt64()
case "nr_overcommit_hugepages":
vm.NrOvercommitHugepages = *vp.PInt64()
case "numa_stat":
vm.NumaStat = *vp.PInt64()
case "numa_zonelist_order":
vm.NumaZonelistOrder = value
case "oom_dump_tasks":
vm.OomDumpTasks = *vp.PInt64()
case "oom_kill_allocating_task":
vm.OomKillAllocatingTask = *vp.PInt64()
case "overcommit_kbytes":
vm.OvercommitKbytes = *vp.PInt64()
case "overcommit_memory":
vm.OvercommitMemory = *vp.PInt64()
case "overcommit_ratio":
vm.OvercommitRatio = *vp.PInt64()
case "page-cluster":
vm.PageCluster = *vp.PInt64()
case "panic_on_oom":
vm.PanicOnOom = *vp.PInt64()
case "percpu_pagelist_fraction":
vm.PercpuPagelistFraction = *vp.PInt64()
case "stat_interval":
vm.StatInterval = *vp.PInt64()
case "swappiness":
vm.Swappiness = *vp.PInt64()
case "user_reserve_kbytes":
vm.UserReserveKbytes = *vp.PInt64()
case "vfs_cache_pressure":
vm.VfsCachePressure = *vp.PInt64()
case "watermark_boost_factor":
vm.WatermarkBoostFactor = *vp.PInt64()
case "watermark_scale_factor":
vm.WatermarkScaleFactor = *vp.PInt64()
case "zone_reclaim_mode":
vm.ZoneReclaimMode = *vp.PInt64()
}
if err := vp.Err(); err != nil {
return nil, err
}
}
return &vm, nil
}

2
vendor/modules.txt vendored
View file

@ -45,7 +45,7 @@ github.com/prometheus/common/version
github.com/prometheus/common/expfmt
github.com/prometheus/common/model
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
# github.com/prometheus/procfs v0.0.3
# github.com/prometheus/procfs v0.0.4-0.20190627154503-39e1aff1547e
github.com/prometheus/procfs
github.com/prometheus/procfs/bcache
github.com/prometheus/procfs/nfs