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

Jump to bottom

Cherry-pick #24270 to 7.x: Fix detect_sequence_reset flag in netflow module #24458

Merged
merged 3 commits into from
Mar 22, 2021
Merged

Cherry-pick #24270 to 7.x: Fix detect_sequence_reset flag in netflow module #24458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0daec98
Fix detect_sequence_reset flag in netflow module (#24270)
adriansr Mar 10, 2021
4a4c42f
Merge branch '7.x' into backport_24270_7.x
adriansr Mar 22, 2021
77dc16d
Merge branch '7.x' into backport_24270_7.x
adriansr Mar 22, 2021
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 @@ -257,6 +257,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix default `scope` in `add_nomad_metadata`. {issue}24559[24559]
- Fix Cisco ASA parser for message 722051. {pull}24410[24410]
- Fix `google_workspace` pagination. {pull}24668[24668]
- Fix netflow module ignoring detect_sequence_reset flag. {issue}24268[24268] {pull}24270[24270]

*Heartbeat*

Expand Down
2 changes: 0 additions & 2 deletions x-pack/filebeat/module/netflow/log/config/netflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ custom_definitions:
{{end}}
{{end}}

{{ if .detect_sequence_reset}}
detect_sequence_reset: {{.detect_sequence_reset}}
{{end}}

tags: {{.tags | tojson}}
publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}
Expand Down
1 change: 1 addition & 0 deletions x-pack/filebeat/module/netflow/log/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var:
- name: timeout
- name: custom_definitions
- name: detect_sequence_reset
default: true
- name: tags
default: [forwarded]
- name: internal_networks
Expand Down