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

[filebeat][netflow]: fix template sharing #42079

Merged
merged 4 commits into from
Dec 19, 2024
Merged

[filebeat][netflow]: fix template sharing #42079

merged 4 commits into from
Dec 19, 2024

Conversation

simioa
Copy link
Contributor

@simioa simioa commented Dec 17, 2024 •
edited by andrewkroh
Loading

Proposed commit message

Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

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

@simioa simioa requested a review from a team as a code owner December 17, 2024 12:14
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 17, 2024
@mergify mergify bot assigned simioa Dec 17, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 17, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @simioa? 🙏.
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

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 17, 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 17, 2024
@simioa simioa mentioned this pull request Dec 17, 2024
Closed
@andrewkroh andrewkroh added the Team:Security-Deployment and Devices Deployment and Devices Team in Security Solution label Dec 17, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-deployment-and-devices (Team:Security-Deployment and Devices)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 17, 2024
@andrewkroh
Copy link
Member

/test

andrewkroh
andrewkroh reviewed Dec 17, 2024
View reviewed changes
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.

Thanks for the fix. It looks like this was missing a test case for the shared_templates. Can you please see if you can add a test case into v9_test.go that verifies shared_templates continues working?

And please add an entry to the CHANGELOG.next.asciidoc file under the bug -> filebeat section.

@simioa simioa force-pushed the fix/netflow-template-sharing branch from ec2b664 to a8ab197 Compare December 17, 2024 15:38
@simioa simioa requested a review from a team as a code owner December 17, 2024 15:38
@simioa
Copy link
Contributor Author

simioa commented Dec 17, 2024

@andrewkroh I added Tests and the Changelog entry

@simioa simioa force-pushed the fix/netflow-template-sharing branch from a8ab197 to 6eab4f0 Compare December 18, 2024 08:09
@simioa simioa marked this pull request as draft December 18, 2024 08:10
@simioa simioa force-pushed the fix/netflow-template-sharing branch from 6eab4f0 to a0a3839 Compare December 18, 2024 09:11
@simioa simioa marked this pull request as ready for review December 18, 2024 09:19
@simioa simioa requested a review from andrewkroh December 18, 2024 09:19
@andrewkroh andrewkroh requested a review from a team December 19, 2024 13:55
@andrewkroh
Copy link
Member

/test

@andrewkroh
Copy link
Member

run docs-build

@andrewkroh andrewkroh merged commit 323c69e into elastic:main Dec 19, 2024
22 checks passed
@andrewkroh
Copy link
Member

Thanks @simioa 👍

mergify bot pushed a commit that referenced this pull request Dec 19, 2024
@simioa @mergify
[filebeat][netflow]: fix template sharing (#42079)
884abb6 
Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

(cherry picked from commit 323c69e)
@mergify mergify bot mentioned this pull request Dec 19, 2024
Merged
6 tasks
andrewkroh pushed a commit that referenced this pull request Dec 19, 2024
@mergify @simioa
[8.x](backport #42079) [filebeat][netflow]: fix template sharing (#42124
3d2bda9 
)

Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

(cherry picked from commit 323c69e)

Co-authored-by: Ioannis Simeonidis <[email protected]>
@simioa
Copy link
Contributor Author

simioa commented Dec 20, 2024

Hi @andrewkroh
is it possible to make a backport into 8.16 and 8.17 as well?

@andrewkroh andrewkroh added backport-7.17 Automated backport to the 7.17 branch with mergify backport-8.16 Automated backport with mergify labels Dec 20, 2024
mergify bot pushed a commit that referenced this pull request Dec 20, 2024
@simioa @mergify
[filebeat][netflow]: fix template sharing (#42079)
5f173ba 
Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

(cherry picked from commit 323c69e)

# Conflicts:
#	x-pack/filebeat/input/netflow/decoder/v9/v9.go
mergify bot pushed a commit that referenced this pull request Dec 20, 2024
@simioa @mergify
[filebeat][netflow]: fix template sharing (#42079)
c6771d6 
Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

(cherry picked from commit 323c69e)
This was referenced Dec 20, 2024
Closed
Merged
@andrewkroh andrewkroh added backport-8.17 Automated backport with mergify and removed backport-7.17 Automated backport to the 7.17 branch with mergify labels Dec 20, 2024
mergify bot pushed a commit that referenced this pull request Dec 20, 2024
@simioa @mergify
[filebeat][netflow]: fix template sharing (#42079)
2a477fe 
Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

(cherry picked from commit 323c69e)
@mergify mergify bot mentioned this pull request Dec 20, 2024
Merged
6 tasks
mjwolf added a commit that referenced this pull request Dec 27, 2024
@mergify @simioa @mjwolf
[filebeat][netflow]: fix template sharing (#42079) (#42138)
e5169ec 
Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

(cherry picked from commit 323c69e)

Co-authored-by: Ioannis Simeonidis <[email protected]>
Co-authored-by: Michael Wolf <[email protected]>
mjwolf added a commit that referenced this pull request Dec 27, 2024
@mergify @simioa @mjwolf
[filebeat][netflow]: fix template sharing (#42079) (#42137)
3c9253f 
Pass the share_templates configuration option into the NetflowV9Protocol
struct. The parameter was not being set, and therefore was always false so
it was not possible to use this option.

Added a test case to prevent future regressions.

Closes #42080

(cherry picked from commit 323c69e)

Co-authored-by: Ioannis Simeonidis <[email protected]>
Co-authored-by: Michael Wolf <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees

@simioa simioa

Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify bugfix Team:Security-Deployment and Devices Deployment and Devices Team in Security Solution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Filebeat Netflow Template Sharing not working
3 participants
@simioa @elasticmachine @andrewkroh