Add missing bracket

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)
@@ -206,69 +205,6 @@ exec_mycollector,my_tag_1=foo,my_tag_2=baz a=5,b_c=6
 exec_mycollector,my_tag_1=bar,my_tag_2=baz a=7,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

@@ -1338,71 +1338,6 @@ 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")
@@ -1418,11 +1353,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)
 }

plugins/inputs/logparser/grok/grok.go

@@ -340,6 +340,9 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 
 			ts, err := time.ParseInLocation(t, v, p.loc)
 			if err == nil {
+				if ts.Year() == 0 {
+					ts = ts.AddDate(timestamp.Year(), 0, 0)
+				}
 				timestamp = ts
 			} else {
 				log.Printf("E! Error parsing %s to time layout [%s]: %s", v, t, err)
@@ -469,7 +472,6 @@ func (t *tsModder) tsMod(ts time.Time) time.Time {
 		t.rollover = 0
 		return ts
 	}
-
 	if ts.Equal(t.last) {
 		t.dupe = ts
 	}

plugins/inputs/logparser/grok/grok_test.go

@@ -1000,3 +1000,20 @@ func TestReplaceTimestampComma(t *testing.T) {
 	//Convert Nanosecond to milisecond for compare
 	require.Equal(t, 555, m.Time().Nanosecond()/1000000)
 }
+
+func TestEmptyYearInTimestamp(t *testing.T) {
+	p := &Parser{
+		Patterns: []string{`%{APPLE_SYSLOG_TIME_SHORT:timestamp:ts-"Jan 2 15:04:05"} %{HOSTNAME} %{APP_NAME:app_name}\[%{NUMBER:pid:int}\]%{GREEDYDATA:message}`},
+		CustomPatterns: `
+		APPLE_SYSLOG_TIME_SHORT %{MONTH} +%{MONTHDAY} %{TIME}
+		APP_NAME [a-zA-Z0-9\.]+
+		`,
+	}
+	require.NoError(t, p.Compile())
+	p.ParseLine("Nov  6 13:57:03 generic iTunes[6504]: info> Scale factor of main display = 2.0")
+	m, err := p.ParseLine("Nov  6 13:57:03 generic iTunes[6504]: objc[6504]: Object descriptor was null.")
+	require.NoError(t, err)
+	require.NotNil(t, m)
+	require.Equal(t, 2018, m.Time().Year())
+
+}

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/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"
@@ -88,13 +87,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.
@@ -128,37 +120,12 @@ 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,
-	tagPaths map[string]string,
-	strPaths map[string]string,
-	boolPaths map[string]string,
-	floatPaths map[string]string,
-	intPaths map[string]string) (Parser, error) {
-	parser := &gjson.JSONPath{
-		MetricName: metricName,
-		TagPath:    tagPaths,
-		StrPath:    strPaths,
-		BoolPath:   boolPaths,
-		FloatPath:  floatPaths,
-		IntPath:    intPaths,
-	}
-	return parser, nil
-}
-
 func NewJSONParser(
 	metricName string,
 	tagKeys []string,