mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-12-31 16:37:31 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

filesystem_freebsd: Use bytesToString to get label values

Browse source 
Signed-off-by: David O'Rourke <david.orourke@gmail.com>
This commit is contained in:
David O'Rourke 2020-06-02 12:07:09 +01:00 committed by Johannes 'fish' Ziemke
parent d6fbce1529
commit 03450a4d7d
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
collector/filesystem_freebsd.go
View file

@ -16,8 +16,6 @@
package collector package collector
import ( import (
"bytes"
"github.com/go-kit/kit/log/level" "github.com/go-kit/kit/log/level"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@ -42,19 +40,14 @@ func (c *filesystemCollector) GetStats() ([]filesystemStats, error) {
} }
stats := []filesystemStats{} stats := []filesystemStats{}
for _, fs := range buf { for _, fs := range buf {
// We need to work out the lengths of the actual strings here, mountpoint := bytesToString(fs.Mntonname[:])
// otherwuse we will end up with null bytes in our label values.
mountpoint_len := bytes.Index(fs.Mntonname[:], []byte{0})
mountpoint := string(fs.Mntonname[:mountpoint_len])
if c.ignoredMountPointsPattern.MatchString(mountpoint) { if c.ignoredMountPointsPattern.MatchString(mountpoint) {
level.Debug(c.logger).Log("msg", "Ignoring mount point", "mountpoint", mountpoint) level.Debug(c.logger).Log("msg", "Ignoring mount point", "mountpoint", mountpoint)
continue continue
} }
device_len := bytes.Index(fs.Mntfromname[:], []byte{0}) device := bytesToString(fs.Mntfromname[:])
fstype_len := bytes.Index(fs.Fstypename[:], []byte{0}) fstype := bytesToString(fs.Fstypename[:])
device := string(fs.Mntfromname[:device_len])
fstype := string(fs.Fstypename[:fstype_len])
if c.ignoredFSTypesPattern.MatchString(fstype) { if c.ignoredFSTypesPattern.MatchString(fstype) {
level.Debug(c.logger).Log("msg", "Ignoring fs type", "type", fstype) level.Debug(c.logger).Log("msg", "Ignoring fs type", "type", fstype)
continue continue