From 5aca58ad2aef3f53088568fcf54b5515e244b4fe Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 15 Dec 2015 15:11:23 -0600
Subject: [PATCH] 0.3.0: zookeeper and zfs

---
 plugins/zfs/zfs.go             | 10 ++++++----
 plugins/zookeeper/zookeeper.go | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/plugins/zfs/zfs.go b/plugins/zfs/zfs.go
index f655c4abf..3594f670b 100644
--- a/plugins/zfs/zfs.go
+++ b/plugins/zfs/zfs.go
@@ -88,15 +88,15 @@ func gatherPoolStats(pool poolInfo, acc plugins.Accumulator) error {
 	}
 
 	tag := map[string]string{"pool": pool.name}
-
+	fields := make(map[string]interface{})
 	for i := 0; i < keyCount; i++ {
 		value, err := strconv.ParseInt(values[i], 10, 64)
 		if err != nil {
 			return err
 		}
-
-		acc.Add(keys[i], value, tag)
+		fields[keys[i]] = value
 	}
+	acc.AddFields("zfs_pool", fields, tag)
 
 	return nil
 }
@@ -124,6 +124,7 @@ func (z *Zfs) Gather(acc plugins.Accumulator) error {
 		}
 	}
 
+	fields := make(map[string]interface{})
 	for _, metric := range kstatMetrics {
 		lines, err := internal.ReadLines(kstatPath + "/" + metric)
 		if err != nil {
@@ -140,9 +141,10 @@ func (z *Zfs) Gather(acc plugins.Accumulator) error {
 			key := metric + "_" + rawData[0]
 			rawValue := rawData[len(rawData)-1]
 			value, _ := strconv.ParseInt(rawValue, 10, 64)
-			acc.Add(key, value, tags)
+			fields[key] = value
 		}
 	}
+	acc.AddFields("zfs", fields, tags)
 	return nil
 }
 
diff --git a/plugins/zookeeper/zookeeper.go b/plugins/zookeeper/zookeeper.go
index 395bd3fdd..342bace2c 100644
--- a/plugins/zookeeper/zookeeper.go
+++ b/plugins/zookeeper/zookeeper.go
@@ -67,35 +67,37 @@ func (z *Zookeeper) gatherServer(address string, acc plugins.Accumulator) error
 	defer c.Close()
 
 	fmt.Fprintf(c, "%s\n", "mntr")
-
 	rdr := bufio.NewReader(c)
-
 	scanner := bufio.NewScanner(rdr)
 
+	service := strings.Split(address, ":")
+	if len(service) != 2 {
+		return fmt.Errorf("Invalid service address: %s", address)
+	}
+	tags := map[string]string{"server": service[0], "port": service[1]}
+
+	fields := make(map[string]interface{})
 	for scanner.Scan() {
 		line := scanner.Text()
 
 		re := regexp.MustCompile(`^zk_(\w+)\s+([\w\.\-]+)`)
 		parts := re.FindStringSubmatch(string(line))
 
-		service := strings.Split(address, ":")
-
-		if len(parts) != 3 || len(service) != 2 {
+		if len(parts) != 3 {
 			return fmt.Errorf("unexpected line in mntr response: %q", line)
 		}
 
-		tags := map[string]string{"server": service[0], "port": service[1]}
-
 		measurement := strings.TrimPrefix(parts[1], "zk_")
 		sValue := string(parts[2])
 
 		iVal, err := strconv.ParseInt(sValue, 10, 64)
 		if err == nil {
-			acc.Add(measurement, iVal, tags)
+			fields[measurement] = iVal
 		} else {
-			acc.Add(measurement, sValue, tags)
+			fields[measurement] = sValue
 		}
 	}
+	acc.AddFields("zookeeper", fields, tags)
 
 	return nil
 }