Skip to content

Cherry-pick #23072 to 7.x: [Filebeat] Add fortinet/firewall network direction override based on interface#23085

Merged
andrewstucki merged 4 commits intoelastic:7.xfrom
andrewstucki:backport_23072_7.x
Dec 11, 2020
Merged

Cherry-pick #23072 to 7.x: [Filebeat] Add fortinet/firewall network direction override based on interface#23085
andrewstucki merged 4 commits intoelastic:7.xfrom
andrewstucki:backport_23072_7.x

Conversation

@andrewstucki
Copy link
Copy Markdown

@andrewstucki andrewstucki commented Dec 10, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #23072 to 7.x branch. Original message:

What does this PR do?

This is pretty similar to the other PRs that allow override based off zone, such as #23066. However, since fortinet doesn't ship zone information, this uses the interface instead.

Additionally, I found some values in the utm source that were setting network.direction to "outgoing"/"incoming", so I normalized those.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

[Filebeat] Add fortinet/firewall network direction override based on …
75bc21f 
…interface (elastic#23072)

* [Filebeat] Add fortinet/firewall network direction override based on interface

* Add changelog entry

* Don't override categorization if no interface name is set

(cherry picked from commit 5a03647)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 10, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 10, 2020

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 10, 2020
@andrewstucki andrewstucki requested a review from a team December 10, 2020 21:59
leehinman
leehinman approved these changes Dec 10, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couple extra lines in CHANGELOG

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 10, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #23085 updated

  • Start Time: 2020-12-10T23:25:11.535+0000

  • Duration: 62 min 44 sec

Test stats 🧪

Test Results
Failed 0
Passed 2413
Skipped 261
Total 2674

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 2413
Skipped 261
Total 2674

@andrewstucki andrewstucki merged commit a3f90fc into elastic:7.x Dec 11, 2020
@andrewstucki andrewstucki deleted the backport_23072_7.x branch December 11, 2020 00:37
@zube zube bot removed the [zube]: Done label Mar 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leehinman leehinman leehinman approved these changes

Assignees

No one assigned

Labels

backport

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@andrewstucki @elasticmachine @leehinman