Merge pull request #157 from mischief/filesystem-sync-labels

collector: sync bsd filesystem collector labels with linux

collector/filesystem_bsd.go

@@ -35,10 +35,6 @@ const (
 	defIgnoredMountPoints = "^/(dev)($|/)"
 )
 
-var (
-	filesystemLabelNames = []string{"filesystem"}
-)
-
 // Expose filesystem fullness.
 func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) {
 	var mntbuf *C.struct_statfs
@@ -50,13 +46,16 @@ func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) {
 	mnt := (*[1 << 30]C.struct_statfs)(unsafe.Pointer(mntbuf))
 	stats = []filesystemStats{}
 	for i := 0; i < int(count); i++ {
-		name := C.GoString(&mnt[i].f_mntonname[0])
-		if c.ignoredMountPointsPattern.MatchString(name) {
-			log.Debugf("Ignoring mount point: %s", name)
+		mountpoint := C.GoString(&mnt[i].f_mntonname[0])
+		if c.ignoredMountPointsPattern.MatchString(mountpoint) {
+			log.Debugf("Ignoring mount point: %s", mountpoint)
 			continue
 		}
 
-		labelValues := []string{name}
+		device := C.GoString(&mnt[i].f_mntfromname[0])
+		fstype := C.GoString(&mnt[i].f_fstypename[0])
+
+		labelValues := []string{device, mountpoint, fstype}
 		stats = append(stats, filesystemStats{
 			labelValues: labelValues,
 			size:        float64(mnt[i].f_blocks) * float64(mnt[i].f_bsize),

collector/filesystem_common.go

@@ -33,6 +33,8 @@ var (
 		"collector.filesystem.ignored-mount-points",
 		defIgnoredMountPoints,
 		"Regexp of mount points to ignore for filesystem collector.")
+
+	filesystemLabelNames = []string{"device", "mountpoint", "fstype"}
 )
 
 type filesystemCollector struct {

collector/filesystem_linux.go

@@ -28,10 +28,6 @@ const (
 	defIgnoredMountPoints = "^/(sys|proc|dev)($|/)"
 )
 
-var (
-	filesystemLabelNames = []string{"device", "mountpoint", "fstype"}
-)
-
 type filesystemDetails struct {
 	device     string
 	mountPoint string