ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

ZFS Collector: Refactor to use maps/slices and fewer globals

Browse source 
Removed all global types that were unnecessary, and refactored to use constructor-created values and inline values instead of globals.

Signed-Off-By: Joe Handzik <joseph.t.handzik@hpe.com>
This commit is contained in:
Joe Handzik 2017-01-25 21:47:48 -06:00
commit e213ccbc57
3 changed files with 48 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

94
collector/zfs.go
View file

@ -24,32 +24,16 @@ import (
"github.com/prometheus/common/log"
)
type zfsMetricValue int
const zfsErrorValue = zfsMetricValue(-1)
var zfsNotAvailableError = errors.New("ZFS / ZFS statistics are not available")
type zfsSysctl string
type zfsSubsystemName string
const (
arc = zfsSubsystemName("zfsArc")
dmuTx = zfsSubsystemName("zfsDmuTx")
fm = zfsSubsystemName("zfsFm")
vdevCache = zfsSubsystemName("zfsVdevCache")
xuio = zfsSubsystemName("zfsXuio")
zfetch = zfsSubsystemName("zfsFetch")
zil = zfsSubsystemName("zfsZil")
zpoolSubsystem = zfsSubsystemName("zfsPool")
)
// Metrics
type zfsMetric struct {
subsystem zfsSubsystemName // The Prometheus subsystem name.
name string // The Prometheus name of the metric.
sysctl zfsSysctl // The sysctl of the ZFS metric.
subsystem string // The Prometheus subsystem name.
name string // The Prometheus name of the metric.
sysctl zfsSysctl // The sysctl of the ZFS metric.
}
// Collector
@ -59,58 +43,36 @@ func init() {
}
type zfsCollector struct {
zfsMetrics []zfsMetric
zfsMetrics []zfsMetric
linuxProcpathBase string
linuxPathMap map[string]string
}
func NewZFSCollector() (Collector, error) {
return &zfsCollector{}, nil
var z zfsCollector
z.linuxProcpathBase = "spl/kstat/zfs"
z.linuxPathMap = map[string]string{
"zfsArc": "arcstats",
"zfsDmuTx": "dmu_tx",
"zfsFm": "fm",
"zfsFetch": "zfetchstats",
"zfsVdevCache": "vdev_cache_stats",
"zfsXuio": "xuio_stats",
"zfsZil": "zil",
}
return &z, nil
}
func (c *zfsCollector) Update(ch chan<- prometheus.Metric) (err error) {
// Arcstats
err = c.updateArcstats(ch)
switch {
case err == zfsNotAvailableError:
log.Debug(err)
return nil
case err != nil:
return err
}
// Zfetchstats
err = c.updateZfetchstats(ch)
if err != nil {
return err
}
// Zil
err = c.updateZil(ch)
if err != nil {
return err
}
// VdevCacheStats
err = c.updateVdevCacheStats(ch)
if err != nil {
return err
}
// XuioStats
err = c.updateXuioStats(ch)
if err != nil {
return err
}
// Fm
err = c.updateFm(ch)
if err != nil {
return err
}
// DmuTx
err = c.updateDmuTx(ch)
if err != nil {
return err
for subsystem := range c.linuxPathMap {
err = c.updateZfsStats(subsystem, ch)
switch {
case err == zfsNotAvailableError:
log.Debug(err)
return nil
case err != nil:
return err
}
}
// Pool stats
@ -122,7 +84,7 @@ func (s zfsSysctl) metricName() string {
return parts[len(parts)-1]
}
func (c *zfsCollector) constSysctlMetric(subsystem zfsSubsystemName, sysctl zfsSysctl, value zfsMetricValue) prometheus.Metric {
func (c *zfsCollector) constSysctlMetric(subsystem string, sysctl zfsSysctl, value int) prometheus.Metric {
metricName := sysctl.metricName()
return prometheus.MustNewConstMetric(