diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 7e03cb01a7da..bcdde1dafe06 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -167,6 +167,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix event.kind for system/syslog pipeline {issue}20365[20365] {pull}20390[20390] - Fix event.type for zeek/ssl and duplicate event.category for zeek/connection {pull}20696[20696] - Fix Okta default date formatting. {issue}24018[24018] {pull}24025[24025] +- Fix aws/vpcflow generating errors for empty logs or unidentified formats. {pull}24167[24167] *Heartbeat* diff --git a/x-pack/filebeat/module/aws/vpcflow/ingest/pipeline.yml b/x-pack/filebeat/module/aws/vpcflow/ingest/pipeline.yml index a8a6e5ae7262..2982140d51ba 100644 --- a/x-pack/filebeat/module/aws/vpcflow/ingest/pipeline.yml +++ b/x-pack/filebeat/module/aws/vpcflow/ingest/pipeline.yml @@ -119,7 +119,7 @@ processors: ignore_empty_value: true - set: - if: "ctx.aws.vpcflow.instance_id != '-'" + if: "ctx.aws?.vpcflow?.instance_id != null && ctx.aws.vpcflow.instance_id != '-'" field: cloud.instance.id value: "{{aws.vpcflow.instance_id}}" ignore_empty_value: true diff --git a/x-pack/filebeat/module/aws/vpcflow/test/bad.log b/x-pack/filebeat/module/aws/vpcflow/test/bad.log new file mode 100644 index 000000000000..6ac4ad6fc476 --- /dev/null +++ b/x-pack/filebeat/module/aws/vpcflow/test/bad.log @@ -0,0 +1 @@ +Phony unsupported log format. diff --git a/x-pack/filebeat/module/aws/vpcflow/test/bad.log-expected.json b/x-pack/filebeat/module/aws/vpcflow/test/bad.log-expected.json new file mode 100644 index 000000000000..534c05beba51 --- /dev/null +++ b/x-pack/filebeat/module/aws/vpcflow/test/bad.log-expected.json @@ -0,0 +1,18 @@ +[ + { + "cloud.provider": "aws", + "event.category": "network_traffic", + "event.dataset": "aws.vpcflow", + "event.kind": "event", + "event.module": "aws", + "event.original": "Phony unsupported log format.", + "event.type": "flow", + "fileset.name": "vpcflow", + "input.type": "log", + "log.offset": 0, + "service.type": "aws", + "tags": [ + "forwarded" + ] + } +] \ No newline at end of file