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

libbeat,packetbeat,x-pack/filebeat/input/netflow: unify gopacket dependencies #29167

Merged
merged 8 commits into from
Dec 6, 2021
Merged

libbeat,packetbeat,x-pack/filebeat/input/netflow: unify gopacket dependencies #29167

merged 8 commits into from
Dec 6, 2021

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Nov 29, 2021 •
edited
Loading

What does this PR do?

This unifies and updates the gopacket dependencies for network traffic analysis.

Why is it important?

Currently the project depends on three forks of the gopacket library. This complicates dependency management, and with many of the fixes now merged upstream it needlessly prevent us having access to new features of gopacket (though note the intention to make a canonical elastic/gopacket fork and elastic/gopacket#3 — hopefully in the long term merging changes back upstream.)

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.

Author's Checklist

No specific checks.

How to test this PR locally

standard testing.

Related issues

Use cases

N/A

Screenshots

N/A

Logs

N/A

@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 Nov 29, 2021
efd6
efd6 commented Nov 29, 2021
View reviewed changes
packetbeat/sniffer/sniffer.go Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 29, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-06T03:26:43.666+0000

  • Duration: 222 min 39 sec

  • Commit: fbd00a8

Test stats 🧪

Test Results
Failed 0
Passed 48640
Skipped 4286
Total 52926

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 force-pushed the gopacket branch 2 times, most recently from c1de28a to 593dd76 Compare November 29, 2021 02:49
@efd6
Copy link
Contributor Author

efd6 commented Nov 29, 2021

/test

1 similar comment
@efd6
Copy link
Contributor Author

efd6 commented Nov 29, 2021

/test

@efd6 efd6 marked this pull request as ready for review December 1, 2021 01:47
@efd6 efd6 requested a review from a team as a code owner December 1, 2021 01:47
@elasticmachine
Copy link
Collaborator

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

@efd6
Copy link
Contributor Author

efd6 commented Dec 1, 2021 •
edited
Loading

Not to be merged before elastic/gopacket#3 and with a replace directive added to build against that. Done.

@efd6
use elastic fork of gopacket
cd79b97 
This has fixes for use on older linux kernels and api for reloading WinPCAP.
@efd6 efd6 mentioned this pull request Dec 2, 2021
Merged
6 tasks
@efd6
Copy link
Contributor Author

efd6 commented Dec 2, 2021

E2E failure looks unrelated.

andrewkroh
andrewkroh approved these changes Dec 3, 2021
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.

LGTM

packetbeat/sniffer/sniffer.go Outdated Show resolved Hide resolved
@efd6 efd6 merged commit c3d31a4 into elastic:master Dec 6, 2021
@efd6 efd6 deleted the gopacket branch December 6, 2021 09:11
mergify bot pushed a commit that referenced this pull request Dec 6, 2021
@efd6
libbeat,packetbeat,x-pack/filebeat/input/netflow: unify gopacket depe…
a6a4b49 
…ndencies (#29167)

(cherry picked from commit c3d31a4)

# Conflicts:
#	go.sum
@mergify mergify bot mentioned this pull request Dec 6, 2021
Merged
efd6 added a commit that referenced this pull request Dec 6, 2021
@mergify @efd6
[8.0](backport #29167) libbeat,packetbeat,x-pack/filebeat/input/netfl…
274ccac 
…ow: unify gopacket dependencies (#29283)

* libbeat,packetbeat,x-pack/filebeat/input/netflow: unify gopacket dependencies (#29167)

(cherry picked from commit c3d31a4)

# Conflicts:
#	go.sum

* fix go.sum

Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
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
No one assigned
Labels
8.1-candidate backport-v8.0.0 Automated backport with mergify enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@efd6 @elasticmachine @andrewkroh