ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

Add flag to change the location of the procfs.

Browse source 
Remove all hardcoded references to `/proc`. For all collectors that do
not use `github.com/prometheus/procfs` yet, provide a wrapper to
generate the full paths.

Reformulate help strings, errors and comments to remove absolute
references to `/proc`.

This is a breaking change: the `-collector.ipvs.procfs` flag is removed
in favor of the general flag. Since it only affected that collector it
was only useful for development, so this should not cause many issues.
This commit is contained in:
Matthias Rampke 2015-09-26 14:53:46 +02:00
commit 20b551ab2b
15 changed files with 57 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
collector/diskstats_linux.go
View file

@ -17,7 +17,6 @@ import (
)
const (
procDiskStats = "/proc/diskstats"
diskSubsystem = "disk"
)
@ -147,6 +146,7 @@ func NewDiskstatsCollector() (Collector, error) {
}
func (c *diskstatsCollector) Update(ch chan<- prometheus.Metric) (err error) {
procDiskStats := procFilePath("diskstats")
diskStats, err := getDiskStats()
if err != nil {
return fmt.Errorf("couldn't get diskstats: %s", err)
@ -184,7 +184,7 @@ func (c *diskstatsCollector) Update(ch chan<- prometheus.Metric) (err error) {
}
func getDiskStats() (map[string]map[int]string, error) {
file, err := os.Open(procDiskStats)
file, err := os.Open(procFilePath("diskstats"))
if err != nil {
return nil, err
}
@ -202,7 +202,7 @@ func parseDiskStats(r io.Reader) (map[string]map[int]string, error) {
for scanner.Scan() {
parts := strings.Fields(string(scanner.Text()))
if len(parts) < 4 { // we strip major, minor and dev
return nil, fmt.Errorf("invalid line in %s: %s", procDiskStats, scanner.Text())
return nil, fmt.Errorf("invalid line in %s: %s", procFilePath("diskstats"), scanner.Text())
}
dev := parts[2]
diskStats[dev] = map[int]string{}