Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #10135 to 6.6: Elasticsearch/audit fileset should be more lenient in parsing node name #10465

Merged
merged 3 commits into from
Feb 1, 2019

Conversation

ycombinator
Copy link
Contributor

Cherry-pick of PR #10135 to 6.6 branch. Original message:

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)

…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)
@ycombinator ycombinator merged commit 148c283 into elastic:6.6 Feb 1, 2019
@ycombinator ycombinator deleted the backport_10135_6.6 branch February 1, 2019 10:35
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…be more lenient in parsing node name (elastic#10465)

Cherry-pick of PR elastic#10135 to 6.6 branch. Original message: 

Resolves elastic#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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants