From bf88b6ee0fd932324668197205daf2f63526dac3 Mon Sep 17 00:00:00 2001 From: Sharif Nassar Date: Fri, 13 May 2016 13:38:14 -0700 Subject: [PATCH] Fix typos, and initialisms from comments in #217 --- collector/filesystem_bsd.go | 4 ++-- collector/filesystem_common.go | 12 ++++++------ collector/filesystem_linux.go | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/collector/filesystem_bsd.go b/collector/filesystem_bsd.go index 24b92af6..f51f0eee 100644 --- a/collector/filesystem_bsd.go +++ b/collector/filesystem_bsd.go @@ -33,7 +33,7 @@ import "C" const ( defIgnoredMountPoints = "^/(dev)($|/)" - defIgnoredFsTypes = "^devfs$" + defIgnoredFSTypes = "^devfs$" MNT_RDONLY = 0x1 ) @@ -56,7 +56,7 @@ func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) { device := C.GoString(&mnt[i].f_mntfromname[0]) fstype := C.GoString(&mnt[i].f_fstypename[0]) - if c.ignoredFsTypesPattern.MatchString(fstype) { + if c.ignoredFSTypesPattern.MatchString(fstype) { log.Debugf("Ignoring fs type: %s", fstype) continue } diff --git a/collector/filesystem_common.go b/collector/filesystem_common.go index 9bf4d0a9..f12b9608 100644 --- a/collector/filesystem_common.go +++ b/collector/filesystem_common.go @@ -25,7 +25,7 @@ import ( // Arch-dependent implementation must define: // * defIgnoredMountPoints -// * defIgnoredFsTypes +// * defIgnoredFSTypes // * filesystemLabelNames // * filesystemCollector.GetStats @@ -35,9 +35,9 @@ var ( defIgnoredMountPoints, "Regexp of mount points to ignore for filesystem collector.") - ignoredFsTypes = flag.String( + ignoredFSTypes = flag.String( "collector.filesystem.ignored-fs-types", - defIgnoredFsTypes, + defIgnoredFSTypes, "Regexp of filesystem types to ignore for filesystem collector.") filesystemLabelNames = []string{"device", "mountpoint", "fstype"} @@ -45,7 +45,7 @@ var ( type filesystemCollector struct { ignoredMountPointsPattern *regexp.Regexp - ignoredFsTypesPattern *regexp.Regexp + ignoredFSTypesPattern *regexp.Regexp sizeDesc, freeDesc, availDesc, filesDesc, filesFreeDesc, roDesc *prometheus.Desc } @@ -64,7 +64,7 @@ func init() { func NewFilesystemCollector() (Collector, error) { subsystem := "filesystem" mountPointPattern := regexp.MustCompile(*ignoredMountPoints) - fsTypePatter := regexp.MustCompile(*ignoredFsTypes) + FSTypesPattern := regexp.MustCompile(*ignoredFSTypes) sizeDesc := prometheus.NewDesc( prometheus.BuildFQName(Namespace, subsystem, "size"), @@ -104,7 +104,7 @@ func NewFilesystemCollector() (Collector, error) { return &filesystemCollector{ ignoredMountPointsPattern: mountPointPattern, - ignoredFsTypesPattern: fsTypesPattern, + ignoredFSTypesPattern: FSTypesPattern, sizeDesc: sizeDesc, freeDesc: freeDesc, availDesc: availDesc, diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.go index 156f4b43..ceb99fa7 100644 --- a/collector/filesystem_linux.go +++ b/collector/filesystem_linux.go @@ -26,7 +26,7 @@ import ( const ( defIgnoredMountPoints = "^/(sys|proc|dev)($|/)" - defIgnoredFsTypes = "^(sys|proc)fs$" + defIgnoredFSTypes = "^(sys|proc)fs$" ST_RDONLY = 0x1 ) @@ -48,7 +48,7 @@ func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) { log.Debugf("Ignoring mount point: %s", mpd.mountPoint) continue } - if c.ignoredFsTypesPatter.MatchString(mpd.fsType) { + if c.ignoredFSTypesPattern.MatchString(mpd.fsType) { log.Debugf("Ignoring fs type: %s", mpd.fsType) continue }