From 97a66b73cfa54f04f508d1da43257ea83e55f13c Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 14 Dec 2015 13:10:55 -0600
Subject: [PATCH] Updating aerospike & apache plugins for 0.3.0

---
 plugins/aerospike/aerospike.go | 28 +++++++++++++++----------
 plugins/apache/apache.go       | 38 +++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/plugins/aerospike/aerospike.go b/plugins/aerospike/aerospike.go
index cf372aeb4..9d920646d 100644
--- a/plugins/aerospike/aerospike.go
+++ b/plugins/aerospike/aerospike.go
@@ -247,26 +247,32 @@ func get(key []byte, host string) (map[string]string, error) {
 	return data, err
 }
 
-func readAerospikeStats(stats map[string]string, acc plugins.Accumulator, host, namespace string) {
+func readAerospikeStats(
+	stats map[string]string,
+	acc plugins.Accumulator,
+	host string,
+	namespace string,
+) {
+	fields := make(map[string]interface{})
+	tags := map[string]string{
+		"aerospike_host": host,
+		"namespace":      "_service",
+	}
+
+	if namespace != "" {
+		tags["namespace"] = namespace
+	}
 	for key, value := range stats {
-		tags := map[string]string{
-			"aerospike_host": host,
-			"namespace":      "_service",
-		}
-
-		if namespace != "" {
-			tags["namespace"] = namespace
-		}
-
 		// We are going to ignore all string based keys
 		val, err := strconv.ParseInt(value, 10, 64)
 		if err == nil {
 			if strings.Contains(key, "-") {
 				key = strings.Replace(key, "-", "_", -1)
 			}
-			acc.Add(key, val, tags)
+			fields[key] = val
 		}
 	}
+	acc.AddFields("aerospike", fields, tags)
 }
 
 func unmarshalMapInfo(infoMap map[string]string, key string) (map[string]string, error) {
diff --git a/plugins/apache/apache.go b/plugins/apache/apache.go
index 3cebecb22..958a0296e 100644
--- a/plugins/apache/apache.go
+++ b/plugins/apache/apache.go
@@ -72,32 +72,33 @@ func (n *Apache) gatherUrl(addr *url.URL, acc plugins.Accumulator) error {
 	tags := getTags(addr)
 
 	sc := bufio.NewScanner(resp.Body)
+	fields := make(map[string]interface{})
 	for sc.Scan() {
 		line := sc.Text()
 		if strings.Contains(line, ":") {
-
 			parts := strings.SplitN(line, ":", 2)
 			key, part := strings.Replace(parts[0], " ", "", -1), strings.TrimSpace(parts[1])
 
 			switch key {
-
 			case "Scoreboard":
-				n.gatherScores(part, acc, tags)
+				for field, value := range n.gatherScores(part) {
+					fields[field] = value
+				}
 			default:
 				value, err := strconv.ParseFloat(part, 64)
 				if err != nil {
 					continue
 				}
-				acc.Add(key, value, tags)
+				fields[key] = value
 			}
 		}
 	}
+	acc.AddFields("apache", fields, tags)
 
 	return nil
 }
 
-func (n *Apache) gatherScores(data string, acc plugins.Accumulator, tags map[string]string) {
-
+func (n *Apache) gatherScores(data string) map[string]interface{} {
 	var waiting, open int = 0, 0
 	var S, R, W, K, D, C, L, G, I int = 0, 0, 0, 0, 0, 0, 0, 0, 0
 
@@ -129,17 +130,20 @@ func (n *Apache) gatherScores(data string, acc plugins.Accumulator, tags map[str
 		}
 	}
 
-	acc.Add("scboard_waiting", float64(waiting), tags)
-	acc.Add("scboard_starting", float64(S), tags)
-	acc.Add("scboard_reading", float64(R), tags)
-	acc.Add("scboard_sending", float64(W), tags)
-	acc.Add("scboard_keepalive", float64(K), tags)
-	acc.Add("scboard_dnslookup", float64(D), tags)
-	acc.Add("scboard_closing", float64(C), tags)
-	acc.Add("scboard_logging", float64(L), tags)
-	acc.Add("scboard_finishing", float64(G), tags)
-	acc.Add("scboard_idle_cleanup", float64(I), tags)
-	acc.Add("scboard_open", float64(open), tags)
+	fields := map[string]interface{}{
+		"scboard_waiting":      float64(waiting),
+		"scboard_starting":     float64(S),
+		"scboard_reading":      float64(R),
+		"scboard_sending":      float64(W),
+		"scboard_keepalive":    float64(K),
+		"scboard_dnslookup":    float64(D),
+		"scboard_closing":      float64(C),
+		"scboard_logging":      float64(L),
+		"scboard_finishing":    float64(G),
+		"scboard_idle_cleanup": float64(I),
+		"scboard_open":         float64(open),
+	}
+	return fields
 }
 
 // Get tag(s) for the apache plugin