Kiu/Node_Exporter
Kiu/Node_Exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-11-23 20:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #443 from joehandzik/wip-fix-zfs-fm-names

Browse Source 
ZFS Collector: Convert dashes to underscores for metrics
This commit is contained in:
Ben Kochie 2017-02-01 03:30:40 -05:00 committed by GitHub
commit 428bc92b1c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
collector/fixtures/e2e-output.txt
View File

@ -2383,18 +2383,18 @@ node_zfs_dmu_tx_dmu_tx_quota 0
# HELP node_zfs_dmu_tx_dmu_tx_suspended kstat.zfs.misc.dmu_tx.dmu_tx_suspended
# TYPE node_zfs_dmu_tx_dmu_tx_suspended untyped
node_zfs_dmu_tx_dmu_tx_suspended 0
# HELP node_zfs_fm_erpt-dropped kstat.zfs.misc.fm.erpt-dropped
# TYPE node_zfs_fm_erpt-dropped untyped
node_zfs_fm_erpt-dropped 18
# HELP node_zfs_fm_erpt-set-failed kstat.zfs.misc.fm.erpt-set-failed
# TYPE node_zfs_fm_erpt-set-failed untyped
node_zfs_fm_erpt-set-failed 0
# HELP node_zfs_fm_fmri-set-failed kstat.zfs.misc.fm.fmri-set-failed
# TYPE node_zfs_fm_fmri-set-failed untyped
node_zfs_fm_fmri-set-failed 0
# HELP node_zfs_fm_payload-set-failed kstat.zfs.misc.fm.payload-set-failed
# TYPE node_zfs_fm_payload-set-failed untyped
node_zfs_fm_payload-set-failed 0
# HELP node_zfs_fm_erpt_dropped kstat.zfs.misc.fm.erpt-dropped
# TYPE node_zfs_fm_erpt_dropped untyped
node_zfs_fm_erpt_dropped 18
# HELP node_zfs_fm_erpt_set_failed kstat.zfs.misc.fm.erpt-set-failed
# TYPE node_zfs_fm_erpt_set_failed untyped
node_zfs_fm_erpt_set_failed 0
# HELP node_zfs_fm_fmri_set_failed kstat.zfs.misc.fm.fmri-set-failed
# TYPE node_zfs_fm_fmri_set_failed untyped
node_zfs_fm_fmri_set_failed 0
# HELP node_zfs_fm_payload_set_failed kstat.zfs.misc.fm.payload-set-failed
# TYPE node_zfs_fm_payload_set_failed untyped
node_zfs_fm_payload_set_failed 0
# HELP node_zfs_vdev_cache_delegations kstat.zfs.misc.vdev_cache_stats.delegations
# TYPE node_zfs_vdev_cache_delegations untyped
node_zfs_vdev_cache_delegations 40

2
collector/zfs.go
View File

@ -81,7 +81,7 @@ func (c *zfsCollector) Update(ch chan<- prometheus.Metric) (err error) {
func (s zfsSysctl) metricName() string {
parts := strings.Split(string(s), ".")
return parts[len(parts)-1]
return strings.Replace(parts[len(parts)-1], "-", "_", -1)
}
func (c *zfsCollector) constSysctlMetric(subsystem string, sysctl zfsSysctl, value int) prometheus.Metric {