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.

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 #18392 to 7.x: Cisco asa/ftd: Remove _temp_ fields on failure #18474

Merged
merged 1 commit into from
May 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fixing `ingress_controller.` fields to be of type keyword instead of text. {issue}17834[17834]
- Fixed typo in log message. {pull}17897[17897]
- Unescape file name from SQS message. {pull}18370[18370]
- Improve cisco asa and ftd pipelines' failure handler to avoid mapping temporary fields. {issue}18391[18391] {pull}18392[18392]

*Heartbeat*

Expand Down
10 changes: 10 additions & 0 deletions x-pack/filebeat/module/cisco/shared/ingest/asa-ftd-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1275,6 +1275,16 @@ processors:
ignore_missing: true
on_failure:
# Copy any fields under _temp_.cisco to its final destination. Those can help
# with diagnosing the failure.
- rename:
field: _temp_.cisco
target_field: "cisco.{< .internal_prefix >}"
ignore_failure: true
# Remove _temp_ to avoid adding a lot of unnecessary fields to the index.
- remove:
field: _temp_
ignore_missing: true
- append:
field: "error.message"
value: "{{ _ingest.on_failure_message }}"