From 64a832467e7da590e53026fc22c888534babc526 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 18 Dec 2015 17:09:01 -0700
Subject: [PATCH] 0.3.0: postgresql and phpfpm

---
 plugins/haproxy/haproxy.go       | 13 ++++++-------
 plugins/phpfpm/phpfpm.go         |  4 +++-
 plugins/postgresql/postgresql.go |  6 ++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/plugins/haproxy/haproxy.go b/plugins/haproxy/haproxy.go
index 93d3f6c6c..2069af249 100644
--- a/plugins/haproxy/haproxy.go
+++ b/plugins/haproxy/haproxy.go
@@ -162,14 +162,13 @@ func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) error {
 	now := time.Now()
 
 	for _, row := range result {
-
+		fields := make(map[string]interface{})
+		tags := map[string]string{
+			"server": host,
+			"proxy":  row[HF_PXNAME],
+			"sv":     row[HF_SVNAME],
+		}
 		for field, v := range row {
-			fields := make(map[string]interface{})
-			tags := map[string]string{
-				"server": host,
-				"proxy":  row[HF_PXNAME],
-				"sv":     row[HF_SVNAME],
-			}
 			switch field {
 			case HF_QCUR:
 				ival, err := strconv.ParseUint(v, 10, 64)
diff --git a/plugins/phpfpm/phpfpm.go b/plugins/phpfpm/phpfpm.go
index 8408c86f7..2f2164913 100644
--- a/plugins/phpfpm/phpfpm.go
+++ b/plugins/phpfpm/phpfpm.go
@@ -198,9 +198,11 @@ func importMetric(r io.Reader, acc plugins.Accumulator, host string) (poolStat,
 			"url":  host,
 			"pool": pool,
 		}
+		fields := make(map[string]interface{})
 		for k, v := range stats[pool] {
-			acc.Add(strings.Replace(k, " ", "_", -1), v, tags)
+			fields[strings.Replace(k, " ", "_", -1)] = v
 		}
+		acc.AddFields("phpfpm", fields, tags)
 	}
 
 	return stats, nil
diff --git a/plugins/postgresql/postgresql.go b/plugins/postgresql/postgresql.go
index a31a9b4d2..5da776cbd 100644
--- a/plugins/postgresql/postgresql.go
+++ b/plugins/postgresql/postgresql.go
@@ -42,7 +42,7 @@ var sampleConfig = `
   # to grab metrics for.
   #
 
-  address = "sslmode=disable"
+  address = "host=localhost user=postgres sslmode=disable"
 
   # A list of databases to pull metrics about. If not specified, metrics for all
   # databases are gathered.
@@ -161,12 +161,14 @@ func (p *Postgresql) accRow(row scanner, acc plugins.Accumulator, serv *Server)
 
 	tags := map[string]string{"server": serv.Address, "db": dbname.String()}
 
+	fields := make(map[string]interface{})
 	for col, val := range columnMap {
 		_, ignore := ignoredColumns[col]
 		if !ignore {
-			acc.Add(col, *val, tags)
+			fields[col] = *val
 		}
 	}
+	acc.AddFields("postgresql", fields, tags)
 
 	return nil
 }