Merge branch 'master' of github.com:influxdata/telegraf into plugin/reader

plugins/parsers/registry.go

@@ -88,6 +88,7 @@ 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
+<<<<<<< HEAD
 
 	//grok patterns
 	Patterns           []string
@@ -95,6 +96,8 @@ type Config struct {
 	CustomPatterns     string
 	CustomPatternFiles []string
 	TimeZone           string
+=======
+>>>>>>> 23523ffd10bac33b0e40bad98bee4213049109ff
 }
 
 // NewParser returns a Parser interface based on the given config.
@@ -128,6 +131,7 @@ func NewParser(config *Config) (Parser, error) {
 			config.DefaultTags,
 			config.Separator,
 			config.Templates)
+<<<<<<< HEAD
 	case "grok":
 		parser, err = NewGrokParser(
 			config.MetricName,
@@ -136,6 +140,8 @@ func NewParser(config *Config) (Parser, error) {
 			config.CustomPatterns,
 			config.CustomPatternFiles,
 			config.TimeZone)
+=======
+>>>>>>> 23523ffd10bac33b0e40bad98bee4213049109ff
 	default:
 		err = fmt.Errorf("Invalid data format: %s", config.DataFormat)
 	}