-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
packetbeat/{beater,protos,sniffer}: allow assignment of protocols to interfaces #36852
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a10e1fd
to
09512c3
Compare
Collaborator
4ad779a
to
0c9d36d
Compare
…interfaces Previously the protocols association was held in a *protocols.ProtocolStruct in common for all interfaces. This prevented individual interfaces that were only associated with a subset of the protocols that were being captured from working specifically on that subset. The new code moves the construction of the protocols sets into setupSniffer where they are associated with the interface that will be capturing them. They are then assigned to child sniffers in sniffer.New based on the interface. This change has no effect on the behaviour of packetbeat as it stands as configs from packetbeat and from agent are only able to express the existence of a single interface. Changes to configuration format/shape will enable multiple interfaces to be enabled in packetbeat and within a single agent policy, making use of the change here.
0c9d36d
to
69e4e92
Compare
Pinging @elastic/security-external-integrations (Team:Security-External Integrations) |
andrewkroh
approved these changes
Nov 12, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. The non-pointer ProtocolStruct receivers surprised me until I went and saw that it was all maps.
Scholar-Li
pushed a commit
to Scholar-Li/beats
that referenced
this pull request
Feb 5, 2024
…interfaces (elastic#36852) Previously the protocols association was held in a *protocols.ProtocolStruct in common for all interfaces. This prevented individual interfaces that were only associated with a subset of the protocols that were being captured from working specifically on that subset. The new code moves the construction of the protocols sets into setupSniffer where they are associated with the interface that will be capturing them. They are then assigned to child sniffers in sniffer.New based on the interface. This change has no effect on the behaviour of packetbeat as it stands as configs from packetbeat and from agent are only able to express the existence of a single interface. Changes to configuration format/shape will enable multiple interfaces to be enabled in packetbeat and within a single agent policy, making use of the change here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
8.12-candidate
backport-skip
Skip notification from the automated backport with mergify
enhancement
Packetbeat
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed commit message
Previously the protocols association was held in a *protocols.ProtocolStruct in
common for all interfaces. This prevented individual interfaces that were only
associated with a subset of the protocols that were being captured from working
specifically on that subset. The new code moves the construction of the protocols
sets into setupSniffer where they are associated with the interface that will be
capturing them. They are then assigned to child sniffers in sniffer.New based on
the interface.
This change has no effect on the behaviour of packetbeat as it stands as configs
from packetbeat and from agent are only able to express the existence of a single
interface. Changes to configuration format/shape will enable multiple interfaces
to be enabled in packetbeat and within a single agent policy, making use of the
change here.
Checklist
CHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.Author's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs