Skip to content

Cherry-pick #24110 to 7.11: [Filebeat] Document netflow internal_networks and set default#24279

Merged
andrewkroh merged 2 commits intoelastic:7.11from
andrewkroh:backport_24110_7.11
Mar 17, 2021
Merged

Cherry-pick #24110 to 7.11: [Filebeat] Document netflow internal_networks and set default#24279
andrewkroh merged 2 commits intoelastic:7.11from
andrewkroh:backport_24110_7.11

Conversation

@andrewkroh
Copy link
Copy Markdown
Member

@andrewkroh andrewkroh commented Mar 1, 2021

Cherry-pick of PR #24110 to 7.11 branch. Original message:

What does this PR do?

Documentation for the internal_networks option of the Netflow input and module was missing.
Also the module's manifest did not declare the option so if it was not set in the module config
it would cause an error.

I did not see where a default was set for the netflow input's internal_networks option so I set that
to private to keep the old behavior before this was configurable.

Fixes #24094

Why is it important?

Existing users of the netflow module are broken after upgrade unless they change their config.

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

@elasticmachine
Copy link
Copy Markdown
Contributor

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

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Mar 1, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Mar 1, 2021

💚 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 #24279 updated

  • Start Time: 2021-03-16T18:39:11.667+0000

  • Duration: 45 min 1 sec

  • Commit: 288b8b8

Test stats 🧪

Test Results
Failed 0
Passed 12837
Skipped 2047
Total 14884

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 12837
Skipped 2047
Total 14884

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems some extra lines got in

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I fixed it once, but more crept in while merging in master repeatedly to satisfy the branch merge requirement. 😞

…c#24110)

Documentation for the `internal_networks` option of the Netflow input and module was missing.
Also the module's manifest did not declare the option so if it was not set in the module config
it would cause an error.

I did not see where a default was set for the netflow input's internal_networks option so I set that
to `private` to keep the old behavior before this was configurable.

Fixes elastic#24094

(cherry picked from commit 3ca53aa)
@andrewkroh andrewkroh force-pushed the backport_24110_7.11 branch from ab0fb75 to 7a3354a Compare March 4, 2021 13:38
@andrewkroh andrewkroh merged commit f312136 into elastic:7.11 Mar 17, 2021
@zube zube bot removed the [zube]: Done label Jun 15, 2021
@andrewkroh andrewkroh deleted the backport_24110_7.11 branch January 14, 2022 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants