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

Let network processor handle multiple IPs #41918

Merged

Conversation

fearful-symmetry
Copy link
Contributor

@fearful-symmetry fearful-symmetry commented Dec 5, 2024

Proposed commit message

This fixes a bug where the network processor would simply fail if it was given a document that had a list of IPs instead of a single IP. This uses "any match is a match" logic and instead traverses the list of IPs, if there is one.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • 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.

Issue

#41917

@fearful-symmetry fearful-symmetry added the Team:Security-Linux Platform Linux Platform Team in Security Solution label Dec 5, 2024
@fearful-symmetry fearful-symmetry self-assigned this Dec 5, 2024
@fearful-symmetry fearful-symmetry requested a review from a team as a code owner December 5, 2024 18:10
@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

@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 Dec 5, 2024
Copy link
Contributor

mergify bot commented Dec 5, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @fearful-symmetry? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Dec 5, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 5, 2024
Copy link
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.

LGTM, just the one change in the changelog from processor to condition

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

The documentation for the processor should be updated to indicate the behavior for arrays.

libbeat/conditions/network.go Outdated Show resolved Hide resolved
Copy link
Contributor

mergify bot commented Dec 6, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b network-processor-handle-ips upstream/network-processor-handle-ips
git merge upstream/main
git push upstream network-processor-handle-ips

libbeat/conditions/network.go Outdated Show resolved Hide resolved
libbeat/conditions/network.go Show resolved Hide resolved
libbeat/docs/processors-using.asciidoc Outdated Show resolved Hide resolved
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@fearful-symmetry fearful-symmetry merged commit 0827467 into elastic:main Dec 9, 2024
142 checks passed
mergify bot pushed a commit that referenced this pull request Dec 9, 2024
* let network processor handle multiple IPs

* add changelog

* linter...

* fix linter, logs, changelog

* linter...

* linter...

* linter...

* update docs

* whoops

* simplify logic

* docs, cleanup

(cherry picked from commit 0827467)
fearful-symmetry added a commit that referenced this pull request Dec 16, 2024
* let network processor handle multiple IPs

* add changelog

* linter...

* fix linter, logs, changelog

* linter...

* linter...

* linter...

* update docs

* whoops

* simplify logic

* docs, cleanup

(cherry picked from commit 0827467)

Co-authored-by: Alex K. <[email protected]>
Co-authored-by: fearful-symmetry <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify bugfix Team:Security-Linux Platform Linux Platform Team in Security Solution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants