-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-pick #10135 to 6.x: Elasticsearch/audit fileset should be more…
… lenient in parsing node name (#10174) Cherry-pick of PR #10135 to 6.x 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)
- Loading branch information
1 parent
107130a
commit bdd8c49
Showing
4 changed files
with
79 additions
and
51 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,56 @@ | ||
| { | ||
| "description": "Pipeline for parsing elasticsearch audit logs", | ||
| "processors": [ | ||
| { | ||
| "rename": { | ||
| "field": "@timestamp", | ||
| "target_field": "event.created" | ||
| } | ||
| }, | ||
| { | ||
| "grok": { | ||
| "field": "message", | ||
| "patterns": [ | ||
| "\\[%{TIMESTAMP_ISO8601:elasticsearch.audit.timestamp}\\]\\s*(\\[%{WORD:elasticsearch.node.name}\\])?\\s*\\[%{WORD:elasticsearch.audit.layer}\\]\\s*\\[%{WORD:elasticsearch.audit.event_type}\\]\\s*(origin_type\\=\\[%{WORD:elasticsearch.audit.origin_type}\\])?,?\\s*(origin_address\\=\\[%{IPORHOST:elasticsearch.audit.origin_address}\\])?,?\\s*(principal\\=\\[%{WORD:elasticsearch.audit.principal}\\])?,?\\s*(action\\=\\[%{DATA:elasticsearch.audit.action}\\])?,?\\s*?(uri=\\[%{DATA:elasticsearch.audit.uri}\\])?,?\\s*(request\\=\\[%{WORD:elasticsearch.audit.request}\\])?,?\\s*(request_body\\=\\[%{DATA:elasticsearch.audit.request_body}\\])?,?" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "date": { | ||
| "field": "elasticsearch.audit.timestamp", | ||
| "target_field": "@timestamp", | ||
| "formats": [ | ||
| "ISO8601" | ||
| ], | ||
| {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} | ||
| "ignore_failure": true | ||
| } | ||
| }, | ||
| { | ||
| "remove": { | ||
| "field": "elasticsearch.audit.timestamp" | ||
| } | ||
| } | ||
| "description": "Pipeline for parsing elasticsearch audit logs", | ||
| "processors": [ | ||
| { | ||
| "rename": { | ||
| "field": "@timestamp", | ||
| "target_field": "event.created" | ||
| } | ||
| }, | ||
| { | ||
| "grok": { | ||
| "field": "message", | ||
| "pattern_definitions": { | ||
| "ES_TIMESTAMP": "\\[%{TIMESTAMP_ISO8601:elasticsearch.audit.timestamp}\\]", | ||
| "ES_NODE_NAME": "(\\[%{DATA:elasticsearch.node.name}\\])?", | ||
| "ES_AUDIT_LAYER": "\\[%{WORD:elasticsearch.audit.layer}\\]", | ||
| "ES_AUDIT_EVENT_TYPE": "\\[%{WORD:event.type}\\]", | ||
| "ES_AUDIT_ORIGIN_TYPE": "(origin_type\\=\\[%{WORD:elasticsearch.audit.origin_type}\\])?", | ||
| "ES_AUDIT_ORIGIN_ADDRESS": "(origin_address\\=\\[%{IPORHOST:elasticsearch.audit.origin_address}\\])?", | ||
| "ES_AUDIT_PRINCIPAL": "(principal\\=\\[%{WORD:elasticsearch.audit.principal}\\])?", | ||
| "ES_AUDIT_ACTION": "(action\\=\\[%{DATA:elasticsearch.audit.action}\\])?", | ||
| "ES_AUDIT_URI": "(uri=\\[%{DATA:elasticsearch.audit.uri\\])?", | ||
| "ES_AUDIT_REQUEST": "(request\\=\\[%{WORD:elasticsearch.audit.request}\\])?", | ||
| "ES_AUDIT_REQUEST_BODY": "(request_body\\=\\[%{DATA:elasticsearch.audit.request_body}\\])?" | ||
| }, | ||
| "patterns": [ | ||
| "%{ES_TIMESTAMP}\\s*%{ES_NODE_NAME}\\s*%{ES_AUDIT_LAYER}\\s*%{ES_AUDIT_EVENT_TYPE}\\s*%{ES_AUDIT_ORIGIN_TYPE},?\\s*%{ES_AUDIT_ORIGIN_ADDRESS},?\\s*%{ES_AUDIT_PRINCIPAL},?\\s*%{ES_AUDIT_ACTION},?\\s*%{ES_AUDIT_URI},?\\s*%{ES_AUDIT_REQUEST},?\\s*%{ES_AUDIT_REQUEST_BODY},?" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "date": { | ||
| "field": "elasticsearch.audit.timestamp", | ||
| "target_field": "@timestamp", | ||
| "formats": [ | ||
| "ISO8601" | ||
| ], | ||
| {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} | ||
| "ignore_failure": true | ||
| } | ||
| }, | ||
| { | ||
| "remove": { | ||
| "field": "elasticsearch.audit.timestamp" | ||
| } | ||
| } | ||
| ], | ||
| "on_failure" : [{ | ||
| "set" : { | ||
| "field" : "error.message", | ||
| "value" : "{{ _ingest.on_failure_message }}" | ||
| } | ||
| }] | ||
| "on_failure": [ | ||
| { | ||
| "set": { | ||
| "field": "error.message", | ||
| "value": "{{ _ingest.on_failure_message }}" | ||
| } | ||
| } | ||
| ] | ||
| } |
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
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