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

Drop pkt_dstaddr and pkt_srcaddr when equals to "-" #22721

Merged
merged 5 commits into from
Nov 30, 2020
+90 −3
Merged

Drop pkt_dstaddr and pkt_srcaddr when equals to "-" #22721

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4aca334
drop aws.vpcflow.pkt_dstaddr and aws.vpcflow.pkt_srcaddr when equals …
kaiyan-sheng Nov 23, 2020
4daebbd
add changelog
kaiyan-sheng Nov 23, 2020
743891e
Add painless script to remove all empty fields
kaiyan-sheng Nov 26, 2020
bb35461
update expected.json files
kaiyan-sheng Nov 29, 2020
a1c222c
add ignore_failure: true
kaiyan-sheng Nov 29, 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 @@ -332,6 +332,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix handing missing eventtime and assignip field being set to N/A for fortinet module. {pull}22361[22361]
- Fix Zeek dashboard reference to `zeek.ssl.server.name` field. {pull}21696[21696]
- Fix for `field [source] not present as part of path [source.ip]` error in azure pipelines. {pull}22377[22377]
- Drop aws.vpcflow.pkt_srcaddr and aws.vpcflow.pkt_dstaddr when equal to "-". {pull}22721[22721] {issue}22716[22716]

*Heartbeat*

Expand Down
8 changes: 8 additions & 0 deletions x-pack/filebeat/module/aws/vpcflow/config/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ processors:
- drop_fields:
fields: ["aws.vpcflow.srcaddr", "aws.vpcflow.srcport", "aws.vpcflow.dstaddr", "aws.vpcflow.dstport", "aws.vpcflow.bytes", "aws.vpcflow.packets", "aws.vpcflow.protocol"]

- drop_fields:
when.equals.aws.vpcflow.pkt_srcaddr: "-"
fields: ["aws.vpcflow.pkt_srcaddr"]

- drop_fields:
when.equals.aws.vpcflow.pkt_dstaddr: "-"
fields: [ "aws.vpcflow.pkt_dstaddr" ]

- community_id: ~

# Use the aws.vpcflow.action value to set the event.outcome value to either "allow" or "deny".
Expand Down
5 changes: 5 additions & 0 deletions x-pack/filebeat/module/aws/vpcflow/test/tcp-flag-sequence-skip-data.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version vpc-id subnet-id instance-id interface-id account-id type srcaddr dstaddr srcport dstport pkt-srcaddr pkt-dstaddr protocol bytes packets start end action tcp-flags log-status
3 vpc-abcdefab012345678 subnet-aaaaaaaa012345678 i-01234567890123456 eni-1235b8ca123456789 123456789010 - - - - - - - - - - 1566848875 1566848933 - - SKIPDATA

version vpc-id subnet-id instance-id interface-id account-id type srcaddr dstaddr srcport dstport pkt-srcaddr pkt-dstaddr protocol bytes packets start end action tcp-flags log-status
3 vpc-abcdefab012345678 subnet-aaaaaaaa012345678 i-01234567890123456 eni-1235b8ca123456789 123456789010 - - - - - - - - - - 1566848875 1566848933 - - NODATA
64 changes: 64 additions & 0 deletions x-pack/filebeat/module/aws/vpcflow/test/tcp-flag-sequence-skip-data.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
[
{
"@timestamp": "2019-08-26T19:48:53.000Z",
"aws.vpcflow.account_id": "123456789010",
"aws.vpcflow.action": "-",
kaiyan-sheng marked this conversation as resolved.
Show resolved Hide resolved
"aws.vpcflow.instance_id": "i-01234567890123456",
"aws.vpcflow.interface_id": "eni-1235b8ca123456789",
"aws.vpcflow.log_status": "SKIPDATA",
"aws.vpcflow.subnet_id": "subnet-aaaaaaaa012345678",
"aws.vpcflow.tcp_flags": "-",
"aws.vpcflow.type": "-",
"aws.vpcflow.version": "3",
"aws.vpcflow.vpc_id": "vpc-abcdefab012345678",
"cloud.account.id": "123456789010",
"cloud.instance.id": "i-01234567890123456",
"cloud.provider": "aws",
"event.category": "network_traffic",
"event.dataset": "aws.vpcflow",
"event.end": "2019-08-26T19:48:53.000Z",
"event.kind": "event",
"event.module": "aws",
"event.original": "3 vpc-abcdefab012345678 subnet-aaaaaaaa012345678 i-01234567890123456 eni-1235b8ca123456789 123456789010 - - - - - - - - - - 1566848875 1566848933 - - SKIPDATA",
"event.start": "2019-08-26T19:47:55.000Z",
"event.type": "flow",
"fileset.name": "vpcflow",
"input.type": "log",
"log.offset": 183,
"service.type": "aws",
"tags": [
"forwarded"
]
},
{
"@timestamp": "2019-08-26T19:48:53.000Z",
"aws.vpcflow.account_id": "123456789010",
"aws.vpcflow.action": "-",
"aws.vpcflow.instance_id": "i-01234567890123456",
"aws.vpcflow.interface_id": "eni-1235b8ca123456789",
"aws.vpcflow.log_status": "NODATA",
"aws.vpcflow.subnet_id": "subnet-aaaaaaaa012345678",
"aws.vpcflow.tcp_flags": "-",
"aws.vpcflow.type": "-",
"aws.vpcflow.version": "3",
"aws.vpcflow.vpc_id": "vpc-abcdefab012345678",
"cloud.account.id": "123456789010",
"cloud.instance.id": "i-01234567890123456",
"cloud.provider": "aws",
"event.category": "network_traffic",
"event.dataset": "aws.vpcflow",
"event.end": "2019-08-26T19:48:53.000Z",
"event.kind": "event",
"event.module": "aws",
"event.original": "3 vpc-abcdefab012345678 subnet-aaaaaaaa012345678 i-01234567890123456 eni-1235b8ca123456789 123456789010 - - - - - - - - - - 1566848875 1566848933 - - NODATA",
"event.start": "2019-08-26T19:47:55.000Z",
"event.type": "flow",
"fileset.name": "vpcflow",
"input.type": "log",
"log.offset": 526,
"service.type": "aws",
"tags": [
"forwarded"
]
}
]