RepoMirrors
/
node_exporter
mirror of https://github.com/prometheus/node_exporter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #653 from prometheus/mr/fix-629 

Use int64 throughout the ZFS collector.
This commit is contained in:
Tobias Schmidt 2017-08-21 22:28:37 +02:00 committed by GitHub
parent 8661bbbb42 5aa6819eb1
commit ba6897583b
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collector/zfs.go
View File

@ -75,7 +75,7 @@ func (s zfsSysctl) metricName() string {
return strings.Replace(parts[len(parts)-1], "-", "_", -1)
}
func (c *zfsCollector) constSysctlMetric(subsystem string, sysctl zfsSysctl, value int) prometheus.Metric {
func (c *zfsCollector) constSysctlMetric(subsystem string, sysctl zfsSysctl, value int64) prometheus.Metric {
metricName := sysctl.metricName()
return prometheus.MustNewConstMetric(
@ -90,7 +90,7 @@ func (c *zfsCollector) constSysctlMetric(subsystem string, sysctl zfsSysctl, val
)
}
func (c *zfsCollector) constPoolMetric(poolName string, sysctl zfsSysctl, value int) prometheus.Metric {
func (c *zfsCollector) constPoolMetric(poolName string, sysctl zfsSysctl, value int64) prometheus.Metric {
metricName := sysctl.metricName()
return prometheus.MustNewConstMetric(

12
collector/zfs_linux.go
View File

@ -42,7 +42,7 @@ func (c *zfsCollector) updateZfsStats(subsystem string, ch chan<- prometheus.Met
}
defer file.Close()
return c.parseProcfsFile(file, c.linuxPathMap[subsystem], func(s zfsSysctl, v int) {
return c.parseProcfsFile(file, c.linuxPathMap[subsystem], func(s zfsSysctl, v int64) {
ch <- c.constSysctlMetric(subsystem, s, v)
})
}
@ -64,7 +64,7 @@ func (c *zfsCollector) updatePoolStats(ch chan<- prometheus.Metric) error {
return errZFSNotAvailable
}
err = c.parsePoolProcfsFile(file, zpoolPath, func(poolName string, s zfsSysctl, v int) {
err = c.parsePoolProcfsFile(file, zpoolPath, func(poolName string, s zfsSysctl, v int64) {
ch <- c.constPoolMetric(poolName, s, v)
})
file.Close()
@ -76,7 +76,7 @@ func (c *zfsCollector) updatePoolStats(ch chan<- prometheus.Metric) error {
return nil
}
func (c *zfsCollector) parseProcfsFile(reader io.Reader, fmtExt string, handler func(zfsSysctl, int)) error {
func (c *zfsCollector) parseProcfsFile(reader io.Reader, fmtExt string, handler func(zfsSysctl, int64)) error {
scanner := bufio.NewScanner(reader)
parseLine := false
@ -95,7 +95,7 @@ func (c *zfsCollector) parseProcfsFile(reader io.Reader, fmtExt string, handler
key := fmt.Sprintf("kstat.zfs.misc.%s.%s", fmtExt, parts[0])
value, err := strconv.Atoi(parts[2])
value, err := strconv.ParseInt(parts[2], 10, 64)
if err != nil {
return fmt.Errorf("could not parse expected integer value for %q", key)
}
@ -109,7 +109,7 @@ func (c *zfsCollector) parseProcfsFile(reader io.Reader, fmtExt string, handler
return scanner.Err()
}
func (c *zfsCollector) parsePoolProcfsFile(reader io.Reader, zpoolPath string, handler func(string, zfsSysctl, int)) error {
func (c *zfsCollector) parsePoolProcfsFile(reader io.Reader, zpoolPath string, handler func(string, zfsSysctl, int64)) error {
scanner := bufio.NewScanner(reader)
parseLine := false
@ -139,7 +139,7 @@ func (c *zfsCollector) parsePoolProcfsFile(reader io.Reader, zpoolPath string, h
for i, field := range fields {
key := fmt.Sprintf("kstat.zfs.misc.%s.%s", zpoolFile, field)
value, err := strconv.Atoi(line[i])
value, err := strconv.ParseInt(line[i], 10, 64)
if err != nil {
return fmt.Errorf("could not parse expected integer value for %q: %v", key, err)
}

32
collector/zfs_linux_test.go
View File

@ -32,7 +32,7 @@ func TestArcstatsParsing(t *testing.T) {
}
handlerCalled := false
err = c.parseProcfsFile(arcstatsFile, "arcstats", func(s zfsSysctl, v int) {
err = c.parseProcfsFile(arcstatsFile, "arcstats", func(s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.arcstats.hits") {
return
@ -40,7 +40,7 @@ func TestArcstatsParsing(t *testing.T) {
handlerCalled = true
if v != int(8772612) {
if v != int64(8772612) {
t.Fatalf("Incorrect value parsed from procfs data")
}
@ -68,7 +68,7 @@ func TestZfetchstatsParsing(t *testing.T) {
}
handlerCalled := false
err = c.parseProcfsFile(zfetchstatsFile, "zfetchstats", func(s zfsSysctl, v int) {
err = c.parseProcfsFile(zfetchstatsFile, "zfetchstats", func(s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.zfetchstats.hits") {
return
@ -76,7 +76,7 @@ func TestZfetchstatsParsing(t *testing.T) {
handlerCalled = true
if v != int(7067992) {
if v != int64(7067992) {
t.Fatalf("Incorrect value parsed from procfs data")
}
@ -104,7 +104,7 @@ func TestZilParsing(t *testing.T) {
}
handlerCalled := false
err = c.parseProcfsFile(zilFile, "zil", func(s zfsSysctl, v int) {
err = c.parseProcfsFile(zilFile, "zil", func(s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.zil.zil_commit_count") {
return
@ -112,7 +112,7 @@ func TestZilParsing(t *testing.T) {
handlerCalled = true
if v != int(10) {
if v != int64(10) {
t.Fatalf("Incorrect value parsed from procfs data")
}
@ -140,7 +140,7 @@ func TestVdevCacheStatsParsing(t *testing.T) {
}
handlerCalled := false
err = c.parseProcfsFile(vdevCacheStatsFile, "vdev_cache_stats", func(s zfsSysctl, v int) {
err = c.parseProcfsFile(vdevCacheStatsFile, "vdev_cache_stats", func(s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.vdev_cache_stats.delegations") {
return
@ -148,7 +148,7 @@ func TestVdevCacheStatsParsing(t *testing.T) {
handlerCalled = true
if v != int(40) {
if v != int64(40) {
t.Fatalf("Incorrect value parsed from procfs data")
}
@ -176,7 +176,7 @@ func TestXuioStatsParsing(t *testing.T) {
}
handlerCalled := false
err = c.parseProcfsFile(xuioStatsFile, "xuio_stats", func(s zfsSysctl, v int) {
err = c.parseProcfsFile(xuioStatsFile, "xuio_stats", func(s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.xuio_stats.onloan_read_buf") {
return
@ -184,7 +184,7 @@ func TestXuioStatsParsing(t *testing.T) {
handlerCalled = true
if v != int(32) {
if v != int64(32) {
t.Fatalf("Incorrect value parsed from procfs data")
}
@ -212,7 +212,7 @@ func TestFmParsing(t *testing.T) {
}
handlerCalled := false
err = c.parseProcfsFile(fmFile, "fm", func(s zfsSysctl, v int) {
err = c.parseProcfsFile(fmFile, "fm", func(s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.fm.erpt-dropped") {
return
@ -220,7 +220,7 @@ func TestFmParsing(t *testing.T) {
handlerCalled = true
if v != int(18) {
if v != int64(18) {
t.Fatalf("Incorrect value parsed from procfs data")
}
@ -248,7 +248,7 @@ func TestDmuTxParsing(t *testing.T) {
}
handlerCalled := false
err = c.parseProcfsFile(dmuTxFile, "dmu_tx", func(s zfsSysctl, v int) {
err = c.parseProcfsFile(dmuTxFile, "dmu_tx", func(s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.dmu_tx.dmu_tx_assigned") {
return
@ -256,7 +256,7 @@ func TestDmuTxParsing(t *testing.T) {
handlerCalled = true
if v != int(3532844) {
if v != int64(3532844) {
t.Fatalf("Incorrect value parsed from procfs data")
}
@ -289,14 +289,14 @@ func TestZpoolParsing(t *testing.T) {
t.Fatal(err)
}
err = c.parsePoolProcfsFile(file, zpoolPath, func(poolName string, s zfsSysctl, v int) {
err = c.parsePoolProcfsFile(file, zpoolPath, func(poolName string, s zfsSysctl, v int64) {
if s != zfsSysctl("kstat.zfs.misc.io.nread") {
return
}
handlerCalled = true
if v != int(1884160) && v != int(2826240) {
if v != int64(1884160) && v != int64(2826240) {
t.Fatalf("Incorrect value parsed from procfs data %v", v)
}

3
node_exporter_test.go
View File

@ -16,6 +16,7 @@ import (
var (
binary = filepath.Join(os.Getenv("GOPATH"), "bin/node_exporter")
)
const (
address = "localhost:19100"
)
@ -118,7 +119,7 @@ func runCommandAndTests(cmd *exec.Cmd, address string, fn func(pid int) error) e
break
}
time.Sleep(500 * time.Millisecond)
if cmd.Process== nil || i == 9 {
if cmd.Process == nil || i == 9 {
return fmt.Errorf("can't start command")
}
}