implement for other unix

mackerelio · Jan 29, 2016 · 1a843bd · 1a843bd
1 parent d11264b
commit 1a843bd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/command/command_darwin.go b/command/command_darwin.go
@@ -27,7 +27,7 @@ func metricsGenerators(conf *config.Config) []metrics.Generator {
 		&metricsDarwin.CPUUsageGenerator{},
 		&metricsDarwin.MemoryGenerator{},
 		&metricsDarwin.SwapGenerator{},
-		&metricsDarwin.FilesystemGenerator{},
+		&metricsDarwin.FilesystemGenerator{Ignore: conf.Filesystems.Ignore},
 		&metricsDarwin.InterfaceGenerator{Interval: metricsInterval},
 	}
 

diff --git a/command/command_freebsd.go b/command/command_freebsd.go
@@ -25,7 +25,7 @@ func metricsGenerators(conf *config.Config) []metrics.Generator {
 	generators := []metrics.Generator{
 		&metricsFreebsd.Loadavg5Generator{},
 		&metricsFreebsd.CPUUsageGenerator{},
-		&metricsFreebsd.FilesystemGenerator{},
+		&metricsFreebsd.FilesystemGenerator{Ignore: conf.Filesystems.Ignore},
 		&metricsFreebsd.MemoryGenerator{},
 	}
 

diff --git a/command/command_netbsd.go b/command/command_netbsd.go
@@ -25,7 +25,7 @@ func metricsGenerators(conf *config.Config) []metrics.Generator {
 	generators := []metrics.Generator{
 		&metricsNetbsd.Loadavg5Generator{},
 		&metricsNetbsd.CPUUsageGenerator{},
-		&metricsNetbsd.FilesystemGenerator{},
+		&metricsNetbsd.FilesystemGenerator{Ignore: conf.Filesystems.Ignore},
 		&metricsNetbsd.MemoryGenerator{},
 	}
 

diff --git a/metrics/darwin/filesystem.go b/metrics/darwin/filesystem.go
@@ -12,6 +12,7 @@ import (
 
 // FilesystemGenerator XXX
 type FilesystemGenerator struct {
+	Ignore string
 }
 
 var logger = logging.GetLogger("metrics.filesystem")
@@ -30,6 +31,9 @@ func (g *FilesystemGenerator) Generate() (metrics.Values, error) {
 
 	ret := make(map[string]float64)
 	for name, values := range filesystems {
+		if g.Ignore != "" && regexp.MustCompile(g.Ignore).FindStringSubmatch(name) != nil {
+			continue
+		}
 		if matches := regexp.MustCompile(`^/dev/(.*)$`).FindStringSubmatch(name); matches != nil {
 			device := regexp.MustCompile(`[^A-Za-z0-9_-]`).ReplaceAllString(matches[1], "_")
 			for key, value := range values {

diff --git a/metrics/freebsd/filesystem.go b/metrics/freebsd/filesystem.go
@@ -12,6 +12,7 @@ import (
 
 // FilesystemGenerator XXX
 type FilesystemGenerator struct {
+	Ignore string
 }
 
 var logger = logging.GetLogger("metrics.filesystem")
@@ -30,6 +31,9 @@ func (g *FilesystemGenerator) Generate() (metrics.Values, error) {
 
 	ret := make(map[string]float64)
 	for name, values := range filesystems {
+		if g.Ignore != "" && regexp.MustCompile(g.Ignore).FindStringSubmatch(name) != nil {
+			continue
+		}
 		if matches := regexp.MustCompile(`^/dev/(.*)$`).FindStringSubmatch(name); matches != nil {
 			device := regexp.MustCompile(`[^A-Za-z0-9_-]`).ReplaceAllString(matches[1], "_")
 			for key, value := range values {

diff --git a/metrics/netbsd/filesystem.go b/metrics/netbsd/filesystem.go
@@ -12,6 +12,7 @@ import (
 
 // FilesystemGenerator XXX
 type FilesystemGenerator struct {
+	Ignore string
 }
 
 var logger = logging.GetLogger("metrics.filesystem")
@@ -30,6 +31,9 @@ func (g *FilesystemGenerator) Generate() (metrics.Values, error) {
 
 	ret := make(map[string]float64)
 	for name, values := range filesystems {
+		if g.Ignore != "" && regexp.MustCompile(g.Ignore).FindStringSubmatch(name) != nil {
+			continue
+		}
 		if matches := regexp.MustCompile(`^/dev/(.*)$`).FindStringSubmatch(name); matches != nil {
 			device := regexp.MustCompile(`[^A-Za-z0-9_-]`).ReplaceAllString(matches[1], "_")
 			for key, value := range values {