comments reflect deprecated NewJsonParser

docs/DATA_FORMATS_INPUT.md

@@ -4,7 +4,6 @@ Telegraf is able to parse the following input data formats into metrics:
 
 1. [InfluxDB Line Protocol](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#influx)
 1. [JSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#json)
-1. [GJSON](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#gjson)
 1. [Graphite](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite)
 1. [Value](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#value), ie: 45 or "booyah"
 1. [Nagios](https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#nagios) (exec input only)
@@ -105,9 +104,10 @@ but can be overridden using the `name_override` config option.
 
 #### JSON Configuration:
 
-The JSON data format supports specifying "tag keys". If specified, keys
+The JSON data format supports specifying "tag keys" and "field keys". If specified, keys
-will be searched for in the root-level of the JSON blob. If the key(s) exist,
+will be searched for in the root-level and any nested lists of the JSON blob. If the key(s) exist,
-they will be applied as tags to the Telegraf metrics.
+they will be applied as tags or fields to the Telegraf metrics.  If "field_keys" is not specified,
+all int and float values will be set as fields by default.
 
 For example, if you had this configuration:
 
@@ -174,6 +174,7 @@ For example, if the following configuration:
     "my_tag_1",
     "my_tag_2"
   ]
+  field_keys = ["b_c"]
 ```
 
 with this JSON output from a command:
@@ -199,76 +200,13 @@ with this JSON output from a command:
 ]
 ```
 
-Your Telegraf metrics would get tagged with "my_tag_1" and "my_tag_2"
+Your Telegraf metrics would get tagged with "my_tag_1" and "my_tag_2" and fielded with "b_c"
 
 ```
-exec_mycollector,my_tag_1=foo,my_tag_2=baz a=5,b_c=6
+exec_mycollector,my_tag_1=foo,my_tag_2=baz b_c=6
-exec_mycollector,my_tag_1=bar,my_tag_2=baz a=7,b_c=8
+exec_mycollector,my_tag_1=bar,my_tag_2=baz b_c=8
 ```
 
-# GJSON:
-GJSON also parses JSON data, but uses paths to name and identify fields of your choosing.
-
-The GJSON parser supports 5 different configuration fields for json objects:
-
-1.'gjson_tag_paths'
-2.'gjson_string_paths'
-3.'gjson_int_paths'
-4.'gjson_float_paths'
-5.'gjson_bool_paths'
-
-Each field is a map type that will map a field_name to a field_path.  Path syntax is described below.
-Path maps should be configured as:
-`toml gjson_tag_paths = {"field_name" = "field.path", "field_name2" = "field.path2"}`
-
-Any paths specified in gjson_tag_paths will be converted to strings and stored as tags.
-Any paths otherwise specified will be their marked type and stored as fields.
-
-#### GJSON Configuration:
-Paths are a series of keys seperated by a dot, ie "obj.sub_obj".
-Paths should not lead to an JSON array, but a single object.  
-An error message will be thrown if a path describes an array.
-Further reading for path syntax can be found here: https://github.com/tidwall/gjson
-
-As an example, if you had the json:
-
-```json
-{
-  "name": {"first": "Tom", "last": "Anderson"},
-  "age":37,
-  "children": ["Sara","Alex","Jack"],
-  "fav.movie": "Deer Hunter",
-  "friends": [
-    {"first": "Dale", "last": "Murphy", "age": 44},
-    {"first": "Roger", "last": "Craig", "age": 68},
-    {"first": "Jane", "last": "Murphy", "age": 47}
-  ]
-}
-```
-with the config:
-
-```toml
-[[inputs.exec]]
-  ## Commands array
-  commands = ["/usr/bin/mycollector --foo=bar"]
-
-  ## Data format to consume.
-  ## Each data format has its own unique set of configuration options, read
-  ## more about them here:
-  ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
-  data_format = "gjson"
-
-  name_override = "gjson_sample"
-
-  gjson_tag_paths = {"first_name_tag" = "name.first"}
-  gjson_string_paths = {"last_name" = "name.last"}
-  gjson_int_paths = {"age" = "age", "Janes_age" = "friends.2.age"}
-```
-
-would output the metric:
-`gjson_sample, first_name_tag=Tom last_name=Anderson,age=37,Janes_age=47`
-
-
 # Value:
 
 The "value" data format translates single values into Telegraf metrics. This

internal/config/config.go

@@ -1261,6 +1261,18 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
+	if node, ok := tbl.Fields["field_keys"]; ok {
+		if kv, ok := node.(*ast.KeyValue); ok {
+			if ary, ok := kv.Value.(*ast.Array); ok {
+				for _, elem := range ary.Value {
+					if str, ok := elem.(*ast.String); ok {
+						c.FieldKeys = append(c.FieldKeys, str.Value)
+					}
+				}
+			}
+		}
+	}
+
 	if node, ok := tbl.Fields["data_type"]; ok {
 		if kv, ok := node.(*ast.KeyValue); ok {
 			if str, ok := kv.Value.(*ast.String); ok {
@@ -1338,77 +1350,13 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 		}
 	}
 
-	c.GJSONTagPaths = make(map[string]string)
-	if node, ok := tbl.Fields["gjson_tag_paths"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					if str, ok := kv.Value.(*ast.String); ok {
-						c.GJSONTagPaths[name] = str.Value
-					}
-				}
-			}
-		}
-	}
-
-	c.GJSONBoolPaths = make(map[string]string)
-	if node, ok := tbl.Fields["gjson_bool_paths"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					if str, ok := kv.Value.(*ast.String); ok {
-						c.GJSONBoolPaths[name] = str.Value
-					}
-				}
-			}
-		}
-	}
-
-	c.GJSONFloatPaths = make(map[string]string)
-	if node, ok := tbl.Fields["gjson_float_paths"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					if str, ok := kv.Value.(*ast.String); ok {
-						c.GJSONFloatPaths[name] = str.Value
-					}
-				}
-			}
-		}
-	}
-
-	c.GJSONStringPaths = make(map[string]string)
-	if node, ok := tbl.Fields["gjson_string_paths"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					if str, ok := kv.Value.(*ast.String); ok {
-						c.GJSONStringPaths[name] = str.Value
-					}
-				}
-			}
-		}
-	}
-
-	c.GJSONIntPaths = make(map[string]string)
-	if node, ok := tbl.Fields["gjson_int_paths"]; ok {
-		if subtbl, ok := node.(*ast.Table); ok {
-			for name, val := range subtbl.Fields {
-				if kv, ok := val.(*ast.KeyValue); ok {
-					if str, ok := kv.Value.(*ast.String); ok {
-						c.GJSONIntPaths[name] = str.Value
-					}
-				}
-			}
-		}
-	}
-
 	c.MetricName = name
 
 	delete(tbl.Fields, "data_format")
 	delete(tbl.Fields, "separator")
 	delete(tbl.Fields, "templates")
 	delete(tbl.Fields, "tag_keys")
+	delete(tbl.Fields, "field_keys")
 	delete(tbl.Fields, "data_type")
 	delete(tbl.Fields, "collectd_auth_file")
 	delete(tbl.Fields, "collectd_security_level")
@@ -1418,11 +1366,6 @@ func buildParser(name string, tbl *ast.Table) (parsers.Parser, error) {
 	delete(tbl.Fields, "dropwizard_time_format")
 	delete(tbl.Fields, "dropwizard_tags_path")
 	delete(tbl.Fields, "dropwizard_tag_paths")
-	delete(tbl.Fields, "gjson_tag_paths")
-	delete(tbl.Fields, "gjson_bool_paths")
-	delete(tbl.Fields, "gjson_float_paths")
-	delete(tbl.Fields, "gjson_string_paths")
-	delete(tbl.Fields, "gjson_int_paths")
 
 	return parsers.NewParser(c)
 }

internal/config/config_test.go

@@ -143,7 +143,10 @@ func TestConfig_LoadDirectory(t *testing.T) {
 		"Testdata did not produce correct memcached metadata.")
 
 	ex := inputs.Inputs["exec"]().(*exec.Exec)
-	p, err := parsers.NewJSONParser("exec", nil, nil)
+	p, err := parsers.NewParser(&parsers.Config{
+		MetricName: "exec",
+		DataFormat: "json",
+	})
 	assert.NoError(t, err)
 	ex.SetParser(p)
 	ex.Command = "/usr/bin/myothercollector --foo=bar"

plugins/inputs/exec/exec_test.go

@@ -93,7 +93,10 @@ func (r runnerMock) Run(e *Exec, command string, acc telegraf.Accumulator) ([]by
 }
 
 func TestExec(t *testing.T) {
-	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	parser, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "exec",
+	})
 	e := &Exec{
 		runner:   newRunnerMock([]byte(validJson), nil),
 		Commands: []string{"testcommand arg1"},
@@ -119,7 +122,10 @@ func TestExec(t *testing.T) {
 }
 
 func TestExecMalformed(t *testing.T) {
-	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	parser, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "exec",
+	})
 	e := &Exec{
 		runner:   newRunnerMock([]byte(malformedJson), nil),
 		Commands: []string{"badcommand arg1"},
@@ -132,7 +138,10 @@ func TestExecMalformed(t *testing.T) {
 }
 
 func TestCommandError(t *testing.T) {
-	parser, _ := parsers.NewJSONParser("exec", []string{}, nil)
+	parser, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "exec",
+	})
 	e := &Exec{
 		runner:   newRunnerMock(nil, fmt.Errorf("exit status code 1")),
 		Commands: []string{"badcommand"},

plugins/inputs/http/http_test.go

@@ -26,7 +26,11 @@ func TestHTTPwithJSONFormat(t *testing.T) {
 		URLs: []string{url},
 	}
 	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+
+	p, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "metricName",
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator
@@ -63,8 +67,11 @@ func TestHTTPHeaders(t *testing.T) {
 		URLs:    []string{url},
 		Headers: map[string]string{header: headerValue},
 	}
-	metricName := "metricName"
+
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	p, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "metricName",
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator
@@ -83,7 +90,10 @@ func TestInvalidStatusCode(t *testing.T) {
 	}
 
 	metricName := "metricName"
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+	p, _ := parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: metricName,
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator
@@ -105,8 +115,10 @@ func TestMethod(t *testing.T) {
 		Method: "POST",
 	}
 
-	metricName := "metricName"
+	p, _ := parsers.NewParser(&parsers.Config{
-	p, _ := parsers.NewJSONParser(metricName, nil, nil)
+		DataFormat: "json",
+		MetricName: "metricName",
+	})
 	plugin.SetParser(p)
 
 	var acc testutil.Accumulator

plugins/inputs/httpjson/httpjson.go

@@ -181,7 +181,12 @@ func (h *HttpJson) gatherServer(
 		"server": serverURL,
 	}
 
-	parser, err := parsers.NewJSONParser(msrmnt_name, h.TagKeys, tags)
+	parser, err := parsers.NewParser(&parsers.Config{
+		DataFormat:  "json",
+		MetricName:  msrmnt_name,
+		TagKeys:     h.TagKeys,
+		DefaultTags: tags,
+	})
 	if err != nil {
 		return err
 	}

plugins/inputs/kafka_consumer/kafka_consumer_test.go

@@ -125,7 +125,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	k.acc = &acc
 	defer close(k.done)
 
-	k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil)
+	k.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "kafka_json_test",
+	})
 	go k.receiver()
 	in <- saramaMsg(testMsgJSON)
 	acc.Wait(1)

plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go

@@ -125,7 +125,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	k.acc = &acc
 	defer close(k.done)
 
-	k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil)
+	k.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "kafka_json_test",
+	})
 	go k.receiver()
 	in <- saramaMsg(testMsgJSON)
 	acc.Wait(1)

plugins/inputs/mqtt_consumer/mqtt_consumer_test.go

@@ -172,7 +172,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	n.acc = &acc
 	defer close(n.done)
 
-	n.parser, _ = parsers.NewJSONParser("nats_json_test", []string{}, nil)
+	n.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "nats_json_test",
+	})
 	go n.receiver()
 	in <- mqttMsg(testMsgJSON)
 

plugins/inputs/nats_consumer/nats_consumer_test.go

@@ -108,7 +108,10 @@ func TestRunParserAndGatherJSON(t *testing.T) {
 	n.acc = &acc
 	defer close(n.done)
 
-	n.parser, _ = parsers.NewJSONParser("nats_json_test", []string{}, nil)
+	n.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "nats_json_test",
+	})
 	n.wg.Add(1)
 	go n.receiver()
 	in <- natsMsg(testMsgJSON)

plugins/inputs/tcp_listener/tcp_listener_test.go

@@ -300,7 +300,10 @@ func TestRunParserJSONMsg(t *testing.T) {
 	listener.acc = &acc
 	defer close(listener.done)
 
-	listener.parser, _ = parsers.NewJSONParser("udp_json_test", []string{}, nil)
+	listener.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "udp_json_test",
+	})
 	listener.wg.Add(1)
 	go listener.tcpParser()
 

plugins/inputs/udp_listener/udp_listener_test.go

@@ -193,7 +193,10 @@ func TestRunParserJSONMsg(t *testing.T) {
 	listener.acc = &acc
 	defer close(listener.done)
 
-	listener.parser, _ = parsers.NewJSONParser("udp_json_test", []string{}, nil)
+	listener.parser, _ = parsers.NewParser(&parsers.Config{
+		DataFormat: "json",
+		MetricName: "udp_json_test",
+	})
 	listener.wg.Add(1)
 	go listener.udpParser()
 

plugins/parsers/gjson/parser.go

@@ -1,96 +0,0 @@
-package gjson
-
-import (
-	"log"
-	"time"
-
-	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/metric"
-	"github.com/tidwall/gjson"
-)
-
-type JSONPath struct {
-	MetricName  string
-	TagPath     map[string]string
-	FloatPath   map[string]string
-	IntPath     map[string]string
-	StrPath     map[string]string
-	BoolPath    map[string]string
-	DefaultTags map[string]string
-}
-
-func (j *JSONPath) Parse(buf []byte) ([]telegraf.Metric, error) {
-	tags := make(map[string]string)
-	for k, v := range j.DefaultTags {
-		tags[k] = v
-	}
-	fields := make(map[string]interface{})
-	metrics := make([]telegraf.Metric, 0)
-
-	for k, v := range j.TagPath {
-		c := gjson.GetBytes(buf, v)
-		if c.IsArray() {
-			log.Printf("E! GJSON cannot assign array to field on path: %v", v)
-			continue
-		}
-		tags[k] = c.String()
-	}
-
-	for k, v := range j.FloatPath {
-		c := gjson.GetBytes(buf, v)
-		if c.IsArray() {
-			log.Printf("E! GJSON cannot assign array to field on path: %v", v)
-			continue
-		}
-		fields[k] = c.Float()
-	}
-
-	for k, v := range j.IntPath {
-		c := gjson.GetBytes(buf, v)
-		if c.IsArray() {
-			log.Printf("E! GJSON cannot assign array to field on path: %v", v)
-			continue
-		}
-		fields[k] = c.Int()
-	}
-
-	for k, v := range j.BoolPath {
-		c := gjson.GetBytes(buf, v)
-		if c.IsArray() {
-			log.Printf("E! GJSON cannot assign array to field on path: %v", v)
-			continue
-		}
-		if c.String() == "true" {
-			fields[k] = true
-		} else if c.String() == "false" {
-			fields[k] = false
-		} else {
-			log.Printf("E! Cannot decode: %v as bool", c.String())
-		}
-	}
-
-	for k, v := range j.StrPath {
-		c := gjson.GetBytes(buf, v)
-		if c.IsArray() {
-			log.Printf("E! GJSON cannot assign array to field on path: %v", v)
-			continue
-		}
-		fields[k] = c.String()
-	}
-
-	m, err := metric.New(j.MetricName, tags, fields, time.Now())
-	if err != nil {
-		return nil, err
-	}
-	metrics = append(metrics, m)
-	return metrics, nil
-}
-
-func (j *JSONPath) ParseLine(str string) (telegraf.Metric, error) {
-	m, err := j.Parse([]byte(str))
-	return m[0], err
-}
-
-func (j *JSONPath) SetDefaultTags(tags map[string]string) {
-	j.DefaultTags = tags
-}

plugins/parsers/gjson/parser_test.go

@@ -1,72 +0,0 @@
-package gjson
-
-import (
-	"log"
-	"reflect"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestParseJsonPath(t *testing.T) {
-	testString := `{
-		"total_devices": 5,
-		"total_threads": 10,
-		"shares": {
-			"total": 5,
-			"accepted": 5,
-			"rejected": 0,
-			"avg_find_time": 4,
-			"tester": "work",
-			"tester2": true,
-			"tester3": {
-				"hello":"sup",
-				"fun":"money",
-				"break":9
-			}
-		}
-	}`
-
-	jsonParser := JSONPath{
-		MetricName: "jsonpather",
-		TagPath:    map[string]string{"hello": "shares.tester3.hello"},
-		BoolPath:   map[string]string{"bool": "shares.tester2"},
-	}
-
-	metrics, err := jsonParser.Parse([]byte(testString))
-	assert.NoError(t, err)
-	log.Printf("m[0] name: %v, tags: %v, fields: %v", metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields())
-
-}
-
-func TestTagTypes(t *testing.T) {
-	testString := `{
-		"total_devices": 5,
-		"total_threads": 10,
-		"shares": {
-			"total": 5,
-			"accepted": 5,
-			"rejected": 0,
-			"my_bool": true,
-			"tester": "work",
-			"tester2": {
-				"hello":"sup",
-				"fun":true,
-				"break":9.97
-			}
-		}
-	}`
-
-	r := JSONPath{
-		TagPath:   map[string]string{"int1": "total_devices", "my_bool": "shares.my_bool"},
-		FloatPath: map[string]string{"total": "shares.total"},
-		BoolPath:  map[string]string{"fun": "shares.tester2.fun"},
-		StrPath:   map[string]string{"hello": "shares.tester2.hello"},
-		IntPath:   map[string]string{"accepted": "shares.accepted"},
-	}
-
-	metrics, err := r.Parse([]byte(testString))
-	log.Printf("m[0] name: %v, tags: %v, fields: %v", metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields())
-	assert.NoError(t, err)
-	assert.Equal(t, true, reflect.DeepEqual(map[string]interface{}{"total": 5.0, "fun": true, "hello": "sup", "accepted": int64(5)}, metrics[0].Fields()))
-}

plugins/parsers/json/parser.go

@@ -20,6 +20,7 @@ var (
 type JSONParser struct {
 	MetricName  string
 	TagKeys     []string
+	FieldKeys   []string
 	DefaultTags map[string]string
 }
 
@@ -86,6 +87,17 @@ func (p *JSONParser) switchFieldToTag(tags map[string]string, fields map[string]
 		}
 	}
 
+	//if field_keys is specified, only those values should be reported as fields
+	if len(p.FieldKeys) > 0 {
+		nFields := make(map[string]interface{})
+		for _, name := range p.FieldKeys {
+			if fields[name] != nil {
+				nFields[name] = fields[name]
+			}
+		}
+		return tags, nFields
+	}
+
 	//remove any additional string/bool values from fields
 	for k := range fields {
 		switch fields[k].(type) {

plugins/parsers/json/parser_test.go

@@ -1,6 +1,7 @@
 package json
 
 import (
+	"log"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -454,16 +455,22 @@ func TestJSONParseNestedArray(t *testing.T) {
 		"avg_find_time": 4,
 		"tester": "work",
 		"tester2": "don't want this",
-	"tester3": 7.93
+		"tester3": {
+			"hello":"sup",
+			"fun":"money",
+			"break":9
+		}
 	}
 	}`
 
 	parser := JSONParser{
 		MetricName: "json_test",
-		TagKeys:    []string{"total_devices", "total_threads", "shares_tester", "shares_tester3"},
+		TagKeys:    []string{"total_devices", "total_threads", "shares_tester3_fun"},
+		FieldKeys:  []string{"shares_tester", "shares_tester3_break"},
 	}
 
 	metrics, err := parser.Parse([]byte(testString))
+	log.Printf("m[0] name: %v, tags: %v, fields: %v", metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields())
 	require.NoError(t, err)
 	require.Equal(t, len(parser.TagKeys), len(metrics[0].Tags()))
 }

plugins/parsers/registry.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/influxdata/telegraf/plugins/parsers/collectd"
 	"github.com/influxdata/telegraf/plugins/parsers/dropwizard"
-	"github.com/influxdata/telegraf/plugins/parsers/gjson"
 	"github.com/influxdata/telegraf/plugins/parsers/graphite"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/plugins/parsers/json"
@@ -57,6 +56,8 @@ type Config struct {
 
 	// TagKeys only apply to JSON data
 	TagKeys []string
+	// FieldKeys only apply to JSON
+	FieldKeys []string
 	// MetricName applies to JSON & value. This will be the name of the measurement.
 	MetricName string
 
@@ -88,13 +89,6 @@ type Config struct {
 	// an optional map containing tag names as keys and json paths to retrieve the tag values from as values
 	// used if TagsPath is empty or doesn't return any tags
 	DropwizardTagPathsMap map[string]string
-
-	//for gjson format
-	GJSONTagPaths    map[string]string
-	GJSONBoolPaths   map[string]string
-	GJSONFloatPaths  map[string]string
-	GJSONStringPaths map[string]string
-	GJSONIntPaths    map[string]string
 }
 
 // NewParser returns a Parser interface based on the given config.
@@ -103,8 +97,8 @@ func NewParser(config *Config) (Parser, error) {
 	var parser Parser
 	switch config.DataFormat {
 	case "json":
-		parser, err = NewJSONParser(config.MetricName,
+		parser, err = newJSONParser(config.MetricName,
-			config.TagKeys, config.DefaultTags)
+			config.TagKeys, config.FieldKeys, config.DefaultTags)
 	case "value":
 		parser, err = NewValueParser(config.MetricName,
 			config.DataType, config.DefaultTags)
@@ -128,37 +122,28 @@ func NewParser(config *Config) (Parser, error) {
 			config.DefaultTags,
 			config.Separator,
 			config.Templates)
-
-	case "gjson":
-		parser, err = newGJSONParser(config.MetricName,
-			config.GJSONTagPaths,
-			config.GJSONStringPaths,
-			config.GJSONBoolPaths,
-			config.GJSONFloatPaths,
-			config.GJSONIntPaths)
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}
 	return parser, err
 }
 
-func newGJSONParser(metricName string,
+func newJSONParser(
-	tagPaths map[string]string,
+	metricName string,
-	strPaths map[string]string,
+	tagKeys []string,
-	boolPaths map[string]string,
+	fieldKeys []string,
-	floatPaths map[string]string,
+	defaultTags map[string]string,
-	intPaths map[string]string) (Parser, error) {
+) (Parser, error) {
-	parser := &gjson.JSONPath{
+	parser := &json.JSONParser{
 		MetricName:  metricName,
-		TagPath:    tagPaths,
+		TagKeys:     tagKeys,
-		StrPath:    strPaths,
+		FieldKeys:   fieldKeys,
-		BoolPath:   boolPaths,
+		DefaultTags: defaultTags,
-		FloatPath:  floatPaths,
-		IntPath:    intPaths,
 	}
 	return parser, nil
 }
 
+//Deprecated: Use NewParser to get a JSONParser object
 func NewJSONParser(
 	metricName string,
 	tagKeys []string,