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

[netflow] Ensure custom fields configuration is applied #40730

Merged
merged 4 commits into from
Sep 10, 2024
Merged

[netflow] Ensure custom fields configuration is applied #40730

merged 4 commits into from
Sep 10, 2024

Conversation

taylor-swanson
Copy link
Contributor

@taylor-swanson taylor-swanson commented Sep 10, 2024 •
edited
Loading

Proposed commit message

  • Fix custom fields not being applied when provided through configuration

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.

How to test this PR locally

Run unit tests for netlow

Related issues

@taylor-swanson
[netflow] Ensure custom fields configuration is applied
c4568e5 
- Fix custom fields not being applied when provided through configuration
@taylor-swanson taylor-swanson added Filebeat Filebeat bugfix Team:Security-Deployment and Devices Deployment and Devices Team in Security Solution labels Sep 10, 2024
@taylor-swanson taylor-swanson self-assigned this Sep 10, 2024
@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 Sep 10, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 10, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @taylor-swanson? 🙏.
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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

NOTE: backport-v8.x has been added to help with the transition to the new branch 8.x.

@taylor-swanson taylor-swanson added the backport-8.15 Automated backport to the 8.15 branch with mergify label Sep 10, 2024
@taylor-swanson taylor-swanson linked an issue Sep 10, 2024 that may be closed by this pull request
[netflow] Custom definitions are not applied when provided in configuration #40735
Closed
pkoutsovasilis
pkoutsovasilis approved these changes Sep 10, 2024
View reviewed changes
Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

LGTM! ty for this

@taylor-swanson taylor-swanson marked this pull request as ready for review September 10, 2024 15:02
@taylor-swanson taylor-swanson requested a review from a team as a code owner September 10, 2024 15:02
@elasticmachine
Copy link
Collaborator

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

pkoutsovasilis
pkoutsovasilis approved these changes Sep 10, 2024
View reviewed changes
Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

double approval! 🎉

@taylor-swanson taylor-swanson merged commit f9b41f2 into elastic:main Sep 10, 2024
20 checks passed
@taylor-swanson taylor-swanson deleted the bugfix/netflow-custom-fields-cfg branch September 10, 2024 16:57
mergify bot pushed a commit that referenced this pull request Sep 10, 2024
@taylor-swanson @mergify
[netflow] Ensure custom fields configuration is applied (#40730)
30f809b 
- Fix custom fields not being applied when provided through configuration
- Add regression test

(cherry picked from commit f9b41f2)
@mergify mergify bot mentioned this pull request Sep 10, 2024
Merged
3 tasks
mergify bot pushed a commit that referenced this pull request Sep 10, 2024
@taylor-swanson @mergify
[netflow] Ensure custom fields configuration is applied (#40730)
3432e54 
- Fix custom fields not being applied when provided through configuration
- Add regression test

(cherry picked from commit f9b41f2)
@mergify mergify bot mentioned this pull request Sep 10, 2024
Merged
3 tasks
taylor-swanson added a commit that referenced this pull request Sep 10, 2024
@mergify @taylor-swanson
[netflow] Ensure custom fields configuration is applied (#40730) (#40740
267467e 
)

- Fix custom fields not being applied when provided through configuration
- Add regression test

(cherry picked from commit f9b41f2)

Co-authored-by: Taylor Swanson <[email protected]>
taylor-swanson added a commit that referenced this pull request Sep 10, 2024
@mergify @taylor-swanson
[netflow] Ensure custom fields configuration is applied (#40730) (#40739
8704468 
)

- Fix custom fields not being applied when provided through configuration
- Add regression test

(cherry picked from commit f9b41f2)

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

@dwhyrock dwhyrock dwhyrock approved these changes

@pkoutsovasilis pkoutsovasilis pkoutsovasilis approved these changes

Assignees

@taylor-swanson taylor-swanson

Labels
backport-8.15 Automated backport to the 8.15 branch with mergify bugfix Filebeat Filebeat 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.

[netflow] Custom definitions are not applied when provided in configuration
4 participants
@taylor-swanson @elasticmachine @pkoutsovasilis @dwhyrock