From 59787a65325c66938c541cdd31e2e6cd5efb05f9 Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Tue, 14 Apr 2020 13:08:31 +0000 Subject: [PATCH] update parsing for Zeek files --- salt/elasticsearch/files/ingest/zeek.common | 14 +++++++------- salt/elasticsearch/files/ingest/zeek.files | 11 ++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/salt/elasticsearch/files/ingest/zeek.common b/salt/elasticsearch/files/ingest/zeek.common index fe1e50fe1..480359335 100644 --- a/salt/elasticsearch/files/ingest/zeek.common +++ b/salt/elasticsearch/files/ingest/zeek.common @@ -4,17 +4,17 @@ { "rename": { "field": "@timestamp", "target_field": "ingest.timestamp", "ignore_missing": true } }, { "rename": { "field": "message2.uid", "target_field": "log.id.uid", "ignore_missing": true } }, { "dot_expander": { "field": "id.orig_h", "path": "message2", "ignore_failure": true } }, - { "rename": { "field": "message2.id.orig_h", "target_field": "source.ip", "ignore_missing": true } }, - { "set": { "field": "client.ip", "value": "{{source.ip}}" } }, { "dot_expander": { "field": "id.orig_p", "path": "message2", "ignore_failure": true } }, - { "rename": { "field": "message2.id.orig_p", "target_field": "source.port", "ignore_missing": true } }, - { "set": { "field": "client.port", "value": "{{source.port}}" } }, { "dot_expander": { "field": "id.resp_h", "path": "message2", "ignore_failure": true } }, - { "rename": { "field": "message2.id.resp_h", "target_field": "destination.ip", "ignore_missing": true } }, - { "set": { "field": "server.ip", "value": "{{destination.ip}}" } }, { "dot_expander": { "field": "id.resp_p", "path": "message2", "ignore_failure": true } }, + { "rename": { "field": "message2.id.orig_h", "target_field": "source.ip", "ignore_missing": true } }, + { "rename": { "field": "message2.id.orig_p", "target_field": "source.port", "ignore_missing": true } }, + { "rename": { "field": "message2.id.resp_h", "target_field": "destination.ip", "ignore_missing": true } }, { "rename": { "field": "message2.id.resp_p", "target_field": "destination.port", "ignore_missing": true } }, - { "set": { "field": "server.port", "value": "{{destination.port}}" } }, + { "set": { "field": "client.ip", "value": "{{source.ip}}" } }, + { "set": { "if": "ctx.source.port != null", "field": "client.port", "value": "{{source.port}}" } }, + { "set": { "field": "server.ip", "value": "{{destination.ip}}" } }, + { "set": { "if": "ctx.destination.port != null", "field": "server.port", "value": "{{destination.port}}" } }, { "set": { "field": "observer.name", "value": "{{agent.name}}" } }, { "date": { "field": "message2.ts", "target_field": "@timestamp", "formats": ["ISO8601", "UNIX"], "ignore_failure": true } }, { "remove": { "field": ["agent"], "ignore_failure": true } }, diff --git a/salt/elasticsearch/files/ingest/zeek.files b/salt/elasticsearch/files/ingest/zeek.files index 693405953..f72bde097 100644 --- a/salt/elasticsearch/files/ingest/zeek.files +++ b/salt/elasticsearch/files/ingest/zeek.files @@ -4,12 +4,13 @@ { "remove": { "field": ["host"], "ignore_failure": true } }, { "json": { "field": "message", "target_field": "message2", "ignore_failure": true } }, { "rename": { "field": "message2.fuid", "target_field": "log.id.fuid", "ignore_missing": true } }, - { "rename": { "field": "message2.rx_hosts", "target_field": "destination.ip", "ignore_missing": true } }, - { "rename": { "field": "message2.tx_hosts", "target_field": "source.ip", "ignore_missing": true } }, - { "set": { "field": "server.ip", "value": "{{source.ip}}", "ignore_failure": true } }, - { "set": { "field": "client.ip", "value": "{{destination.ip}}", "ignore_failure": true } }, + { "rename": { "field": "message2.conn_uids", "target_field": "log.id.uids", "ignore_missing": true } }, + { "remove": { "field": "source", "ignore_missing": true } }, + { "rename": { "field": "message2.rx_hosts.0", "target_field": "destination.ip", "ignore_missing": true } }, + { "rename": { "field": "message2.tx_hosts.0", "target_field": "source.ip", "ignore_missing": true } }, + { "remove": { "field": "message2.rx_hosts", "ignore_missing": true } }, + { "remove": { "field": "message2.tx_hosts", "ignore_missing": true } }, { "rename": { "field": "message2.conn_uids", "target_field": "log.id.uids", "ignore_missing": true } }, - { "remove": { "field": "source", "ignore_missing": true } }, { "rename": { "field": "message2.source", "target_field": "file.source", "ignore_missing": true } }, { "rename": { "field": "message2.depth", "target_field": "file.depth", "ignore_missing": true } }, { "rename": { "field": "message2.analyzers", "target_field": "file.analyzer", "ignore_missing": true } },