Cherry-pick #10135 to 6.x: Elasticsearch/audit fileset should be more lenient in parsing node name#10174
Merged
ycombinator merged 1 commit intoelastic:6.xfrom Jan 21, 2019
ycombinator:backport_10135_6.x
Merged
Cherry-pick #10135 to 6.x: Elasticsearch/audit fileset should be more lenient in parsing node name#10174ycombinator merged 1 commit intoelastic:6.xfrom ycombinator:backport_10135_6.x
ycombinator merged 1 commit intoelastic:6.xfrom
ycombinator:backport_10135_6.x
Conversation
…me (#10135) Resolves #10035. This PR: * Uses `DATA` instead of `WORD` in the grok pattern for parsing out `elasticsearch.node.name`, * Breaks out the grok pattern into pattern definitions to increase readability * Removes a redundant `?` after a `*` in the grok pattern (between `elasticsearch.audit.action` and `elasticsearch.audit.uri`), and * Properly reindents the pipeline JSON (so you might want to view the diff with `?w=1` appended to the URL) (cherry picked from commit 93851c2)
Contributor
Author
|
jenkins, test this |
ruflin
approved these changes
Jan 21, 2019
Contributor
Author
|
This PR broke the parsing of a couple fields, so I'm following it up with another PR to fix said breakage: #10340 |
ycombinator
added a commit
that referenced
this pull request
Jan 25, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-pick of PR #10135 to 6.x branch. Original message:
Resolves #10035.
This PR:
DATAinstead ofWORDin the grok pattern for parsing outelasticsearch.node.name,?after a*in the grok pattern (betweenelasticsearch.audit.actionandelasticsearch.audit.uri), and?w=1appended to the URL)