From 4798bd9d339aa60a9ea5a10f92fe1b16561782cf Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Mon, 14 Dec 2015 16:57:17 -0600
Subject: [PATCH] 0.3.0 httpjson

---
 plugins/httpjson/httpjson.go | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/plugins/httpjson/httpjson.go b/plugins/httpjson/httpjson.go
index f1d2ef927..e2b44b7a9 100644
--- a/plugins/httpjson/httpjson.go
+++ b/plugins/httpjson/httpjson.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/influxdb/telegraf/internal"
 	"github.com/influxdb/telegraf/plugins"
 )
 
@@ -154,7 +155,19 @@ func (h *HttpJson) gatherServer(
 		delete(jsonOut, tag)
 	}
 
-	processResponse(acc, service.Name, tags, jsonOut)
+	f := internal.JSONFlattener{}
+	err = f.FlattenJSON("", jsonOut)
+	if err != nil {
+		return err
+	}
+
+	var msrmnt_name string
+	if service.Name == "" {
+		msrmnt_name = "httpjson"
+	} else {
+		msrmnt_name = "httpjson_" + service.Name
+	}
+	acc.AddFields(msrmnt_name, f.Fields, nil)
 	return nil
 }
 
@@ -209,23 +222,6 @@ func (h *HttpJson) sendRequest(service Service, serverURL string) (string, error
 	return string(body), err
 }
 
-// Flattens the map generated from the JSON object and stores its float values using a
-// plugins.Accumulator. It ignores any non-float values.
-// Parameters:
-//     acc: the Accumulator to use
-//     prefix: What the name of the measurement name should be prefixed by.
-//     tags: telegraf tags to
-func processResponse(acc plugins.Accumulator, prefix string, tags map[string]string, v interface{}) {
-	switch t := v.(type) {
-	case map[string]interface{}:
-		for k, v := range t {
-			processResponse(acc, prefix+"_"+k, tags, v)
-		}
-	case float64:
-		acc.Add(prefix, v, tags)
-	}
-}
-
 func init() {
 	plugins.Add("httpjson", func() plugins.Plugin {
 		return &HttpJson{client: RealHTTPClient{client: &http.Client{}}}