use util.SanitizeMetricKey

mackerelio · Oct 5, 2016 · f48ed39 · f48ed39
1 parent 4f2aed8
commit f48ed39
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/metrics/darwin/interface.go b/metrics/darwin/interface.go
@@ -79,7 +79,7 @@ func (g *InterfaceGenerator) collectIntarfacesValues() (metrics.Values, error) {
 	for lineScanner.Scan() {
 		line := lineScanner.Text()
 		fields := strings.Fields(line)
-		name := regexp.MustCompile(`[^A-Za-z0-9_-]`).ReplaceAllString(regexp.MustCompile(`\*`).ReplaceAllString(fields[0], ""), "_")
+		name := util.SanitizeMetricKey(regexp.MustCompile(`\*`).ReplaceAllString(fields[0], ""))
 		if match, _ := regexp.MatchString(`^lo\d+$`, name); match {
 			continue
 		}

diff --git a/metrics/filesystem.go b/metrics/filesystem.go
@@ -15,8 +15,6 @@ type FilesystemGenerator struct {
 	UseMountPoint bool
 }
 
-var sanitizerReg = regexp.MustCompile(`[^A-Za-z0-9_-]`)
-
 // Generate the metrics of filesystems
 func (g *FilesystemGenerator) Generate() (Values, error) {
 	filesystems, err := util.CollectDfValues()
@@ -32,9 +30,9 @@ func (g *FilesystemGenerator) Generate() (Values, error) {
 		if device := strings.TrimPrefix(name, "/dev/"); name != device {
 			var metricName string
 			if g.UseMountPoint {
-				metricName = sanitizerReg.ReplaceAllString(dfs.Mounted, "_")
+				metricName = util.SanitizeMetricKey(dfs.Mounted)
 			} else {
-				metricName = sanitizerReg.ReplaceAllString(device, "_")
+				metricName = util.SanitizeMetricKey(device)
 			}
 			// kilo bytes -> bytes
 			ret["filesystem."+metricName+".size"] = float64(dfs.Used+dfs.Available) * 1024

diff --git a/metrics/linux/disk.go b/metrics/linux/disk.go
@@ -112,7 +112,7 @@ func parseDiskStats(out []byte, mapping map[string]string) (metrics.Values, erro
 			diskLogger.Warningf("Failed to parse disk metrics: %s", text)
 			continue
 		}
-		device := regexp.MustCompile(`[^A-Za-z0-9_-]`).ReplaceAllString(cols[2], "_")
+		device := util.SanitizeMetricKey(cols[2])
 		values := cols[3:]
 
 		if len(values) != len(diskMetricsNames) {
@@ -150,8 +150,6 @@ func parseDiskStats(out []byte, mapping map[string]string) (metrics.Values, erro
 	return results, nil
 }
 
-var mountpointSanitizerReg = regexp.MustCompile(`[^A-Za-z0-9_-]`)
-
 // Generate the metrics of filesystems
 func getDeviceNameMapping() (map[string]string, error) {
 	filesystems, err := util.CollectDfValues()
@@ -162,8 +160,8 @@ func getDeviceNameMapping() (map[string]string, error) {
 	for _, dfs := range filesystems {
 		name := dfs.Name
 		if device := strings.TrimPrefix(name, "/dev/"); name != device {
-			mountpointLabel := mountpointSanitizerReg.ReplaceAllString(dfs.Mounted, "_")
-			deviceName := mountpointSanitizerReg.ReplaceAllString(device, "_")
+			mountpointLabel := util.SanitizeMetricKey(dfs.Mounted)
+			deviceName := util.SanitizeMetricKey(device)
 			ret[deviceName] = mountpointLabel
 		}
 	}

diff --git a/metrics/linux/interface.go b/metrics/linux/interface.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/mackerelio/mackerel-agent/logging"
 	"github.com/mackerelio/mackerel-agent/metrics"
+	"github.com/mackerelio/mackerel-agent/util"
 )
 
 /*
@@ -80,15 +81,13 @@ func (g *InterfaceGenerator) collectInterfacesValues() (metrics.Values, error) {
 	return parseNetdev(out)
 }
 
-var sanitizerReg = regexp.MustCompile(`[^A-Za-z0-9_-]`)
-
 func parseNetdev(out []byte) (metrics.Values, error) {
 	lineScanner := bufio.NewScanner(bytes.NewReader(out))
 	results := make(map[string]float64)
 	for lineScanner.Scan() {
 		line := lineScanner.Text()
 		if kv := strings.SplitN(line, ":", 2); len(kv) == 2 {
-			name := sanitizerReg.ReplaceAllString(strings.TrimSpace(kv[0]), "_")
+			name := util.SanitizeMetricKey(strings.TrimSpace(kv[0]))
 			if name == "lo" {
 				continue
 			}

diff --git a/metrics/windows/filesystem.go b/metrics/windows/filesystem.go
@@ -31,7 +31,7 @@ func (g *FilesystemGenerator) Generate() (metrics.Values, error) {
 	ret := make(map[string]float64)
 	for name, values := range filesystems {
 		if matches := regexp.MustCompile(`^(.*):`).FindStringSubmatch(name); matches != nil {
-			device := regexp.MustCompile(`[^A-Za-z0-9_-]`).ReplaceAllString(matches[1], "_")
+			device := util.SanitizeMetricKey(matches[1])
 
 			ret["filesystem."+device+".size"] = values.KbSize * 1024
 			ret["filesystem."+device+".used"] = values.KbUsed * 1024