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.

Sign up for GitHub

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 #15906 to 7.x: Fix Filebeat Zeek Weird Ingest Pipeline #16037

Merged
merged 2 commits into from
Feb 4, 2020
Merged

Cherry-pick #15906 to 7.x: Fix Filebeat Zeek Weird Ingest Pipeline #16037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ca8685
Fix Filebeat Zeek Weird Ingest Pipeline (#15906)
0huey Feb 3, 2020
a58dc02
update changelog
kaiyan-sheng Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fixed dashboard for Cisco ASA Firewall. {issue}15420[15420] {pull}15553[15553]
- Add shared_credential_file to cloudtrail config {issue}15652[15652] {pull}15656[15656]
- Fix typos in zeek notice fileset config file. {issue}15764[15764] {pull}15765[15765]
- Fix mapping error when zeek weird logs do not contain IP addresses. {pull}15906[15906]

*Heartbeat*

Expand Down
6 changes: 4 additions & 2 deletions x-pack/filebeat/module/zeek/weird/ingest/pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@
{
"set": {
"field": "source.ip",
"value": "{{source.address}}"
"value": "{{source.address}}",
"if": "ctx?.source?.address != null"
}
},
{
"set": {
"field": "destination.ip",
"value": "{{destination.address}}"
"value": "{{destination.address}}",
"if": "ctx?.destination?.address != null"
}
}
],
Expand Down
1 change: 1 addition & 0 deletions x-pack/filebeat/module/zeek/weird/test/weird-json.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{"ts":1543877999.99354,"uid":"C1ralPp062bkwWt4e","id.orig_h":"192.168.1.1","id.orig_p":64521,"id.resp_h":"192.168.1.2","id.resp_p":53,"name":"dns_unmatched_reply","notice":false,"peer":"worker-6"}
{"ts":1580227259.342809,"name":"non_ip_packet_in_ethernet","notice":false,"peer":"ens3f1-4"}
15 changes: 15 additions & 0 deletions x-pack/filebeat/module/zeek/weird/test/weird-json.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,20 @@
"zeek.weird.name": "dns_unmatched_reply",
"zeek.weird.notice": false,
"zeek.weird.peer": "worker-6"
},
{
"@timestamp": "2020-01-28T16:00:59.342Z",
"event.dataset": "zeek.weird",
"event.module": "zeek",
"fileset.name": "weird",
"input.type": "log",
"log.offset": 197,
"service.type": "zeek",
"tags": [
"zeek.weird"
],
"zeek.weird.name": "non_ip_packet_in_ethernet",
"zeek.weird.notice": false,
"zeek.weird.peer": "ens3f1-4"
}
]