ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

updates for zfsonlinux 0.7.5 (#779)

Browse source 
* updates for zfsonlinux 0.7.5

* add constants for KSTAT_DATA_* types

* added e2e test for negative values represented by uint64 that can result from ZFS bugs
This commit is contained in:
Richard Elling 2018-02-16 06:46:31 -08:00 • committed by Ben Kochie
commit d7348a5c78
9 changed files with 671 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
collector/zfs_linux.go
View file

@ -26,10 +26,26 @@ import (
"github.com/prometheus/common/log"
)
// constants from https://github.com/zfsonlinux/zfs/blob/master/lib/libspl/include/sys/kstat.h
// kept as strings for comparison thus avoiding conversion to int
const (
KSTAT_DATA_CHAR = "0"
KSTAT_DATA_INT32 = "1"
KSTAT_DATA_UINT32 = "2"
KSTAT_DATA_INT64 = "3"
KSTAT_DATA_UINT64 = "4"
KSTAT_DATA_LONG = "5"
KSTAT_DATA_ULONG = "6"
KSTAT_DATA_STRING = "7"
)
func (c *zfsCollector) openProcFile(path string) (*os.File, error) {
file, err := os.Open(procFilePath(path))
if err != nil {
log.Debugf("Cannot open %q for reading. Is the kernel module loaded?", procFilePath(path))
// file not found error can occur if:
// 1. zfs module is not loaded
// 2. zfs version does not have the feature with metrics -- ok to ignore
log.Debugf("Cannot open %q for reading", procFilePath(path))
return nil, errZFSNotAvailable
}
return file, nil
@ -60,7 +76,8 @@ func (c *zfsCollector) updatePoolStats(ch chan<- prometheus.Metric) error {
for _, zpoolPath := range zpoolPaths {
file, err := os.Open(zpoolPath)
if err != nil {
log.Debugf("Cannot open %q for reading. Is the kernel module loaded?", zpoolPath)
// this file should exist, but there is a race where an exporting pool can remove the files -- ok to ignore
log.Debugf("Cannot open %q for reading", zpoolPath)
return errZFSNotAvailable
}
@ -93,14 +110,16 @@ func (c *zfsCollector) parseProcfsFile(reader io.Reader, fmtExt string, handler
continue
}
key := fmt.Sprintf("kstat.zfs.misc.%s.%s", fmtExt, parts[0])
value, err := strconv.ParseUint(parts[2], 10, 64)
if err != nil {
return fmt.Errorf("could not parse expected integer value for %q", key)
// kstat data type (column 2) should be KSTAT_DATA_UINT64, otherwise ignore
// TODO: when other KSTAT_DATA_* types arrive, much of this will need to be restructured
if parts[1] == KSTAT_DATA_UINT64 {
key := fmt.Sprintf("kstat.zfs.misc.%s.%s", fmtExt, parts[0])
value, err := strconv.ParseUint(parts[2], 10, 64)
if err != nil {
return fmt.Errorf("could not parse expected integer value for %q", key)
}
handler(zfsSysctl(key), value)
}
handler(zfsSysctl(key), value)
}
if !parseLine {
return fmt.Errorf("did not parse a single %q metric", fmtExt)