Feature/3484 - set metric name with 'measurement' modifier for grok parser #4433
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
docs/DATA_FORMATS_INPUT.md
Outdated
| Each pattern should only have one 'measurement' modifier applied to it. The modifier should only apply to fields | ||
| of a single value type, not to another grok pattern. The name of the field with the measurement modifier applied | ||
| will be ignored, so these formats are the same: `custom_patterns = {"TEST %{WORD:ignored_name:measurement}"}` | ||
| `custom_patterns = {"TEST %{WORD::measurement}"}` |
There was a problem hiding this comment.
I think the patterns should behave the same regardless of if it is in the pattern or custom_pattern. Can we just say %{WORD::measurement} will use the matched text and %{TEST:test_name:measurement} will use the static value test_name?
There was a problem hiding this comment.
Yea I think that should be made clear. The issue with that would be if people use the dynamic name on an entire pattern, ie not a single field, it would add the text of the whole pattern as a metric name.
danielnelson
suggested changes
Aug 17, 2018
plugins/parsers/grok/parser.go
Outdated
| @@ -57,7 +58,7 @@ var ( | |||
| // %{IPORHOST:clientip:tag} | |||
| // %{HTTPDATE:ts1:ts-http} | |||
| // %{HTTPDATE:ts2:ts-"02 Jan 06 15:04"} | |||
| modifierRe = regexp.MustCompile(`%{\w+:(\w+):(ts-".+"|t?s?-?\w+)}`) | |||
| modifierRe = regexp.MustCompile(`%{\w+:(\w+|):(ts-".+"|t?s?-?\w+)}`) | |||
There was a problem hiding this comment.
Let's just require a name that isn't used, similar to how timestamp works. This will make the code even simpler and we won't need to explain the new form.
docs/DATA_FORMATS_INPUT.md
Outdated
| apply the 'measurement' modifier to a specific field in a pattern. | ||
| The configuration: `custom_patterns = {"TEST %{WORD::measurement}"}` is treated the same as `custom_patterns = {"TEST %{WORD:ignored_name:measurement}"}`, as semantic names are ignored. If the pattern is matched, the measurement name will be set to the value of the field it was applied to. Each pattern should only have one 'measurement' modifier applied to it. The modifier should only apply to fields of a single value type, not to another grok pattern. | ||
|
|
||
| The best way to get acquainted with grok patterns is to read the logstash docs, |
There was a problem hiding this comment.
There are some merge issues here, most of this is already in master.
| Patterns []string | ||
| NamedPatterns []string | ||
| CustomPatterns string | ||
| CustomPatternFiles []string | ||
| TimeZone string | ||
| MeasurementName string `toml:"measurement"` |
There was a problem hiding this comment.
Revert change so there is less churn in the git history and to keep the real changes clear.
| Patterns: []string{"%{TEST_LOG_A}", "%{TEST_LOG_B}"}, | ||
| CustomPatternFiles: []string{thisdir + "grok/testdata/test-patterns"}, | ||
| MeasurementName: "logparser_grok", |
plugins/parsers/grok/parser.go
Outdated
| @@ -214,7 +215,8 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) { | |||
|
|
|||
| timestamp := time.Now() | |||
| for k, v := range values { | |||
| if k == "" || v == "" { | |||
| if (k == "" || v == "") && p.typeMap[patternName][k] != "measurement" { | |||
plugins/parsers/grok/parser.go
Outdated
| @@ -456,6 +460,12 @@ func (p *Parser) parseTypedCaptures(name, pattern string) (string, error) { | |||
| } | |||
| hasTimestamp = true | |||
| } else { | |||
| //for handling measurement tag with no name | |||
plugins/parsers/grok/parser.go
Outdated
| @@ -214,10 +215,6 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) { | |||
|
|
|||
| timestamp := time.Now() | |||
| for k, v := range values { | |||
| if k == "" || v == "" { | |||
danielnelson
approved these changes
Aug 17, 2018
danielnelson
added
feat
rgitzel
pushed a commit
to rgitzel/telegraf
that referenced
this pull request
Oct 17, 2018
otherpirate
pushed a commit
to otherpirate/telegraf
that referenced
this pull request
Mar 15, 2019
otherpirate
pushed a commit
to otherpirate/telegraf
that referenced
this pull request
Mar 15, 2019
dupondje
pushed a commit
to dupondje/telegraf
that referenced
this pull request
Apr 22, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes: #3484
Required for all PRs: