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/input/{tcp,udp}: use correct address list in udp #35996

Merged
merged 1 commit into from Jul 10, 2023
Merged

filebeat/input/{tcp,udp}: use correct address list in udp #35996

merged 1 commit into from Jul 10, 2023

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Jul 5, 2023 •
edited

What does this PR do?

Use correct address list in udp input metric collection.

Also add a check in the common path to check that the addr slice is the same length as the undefined addr slice, returning an error on mismatch rather than allowing the panic.

Why is it important?

Prevents a panic.

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

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 added bug Filebeat Filebeat Team:Security-External Integrations backport-skip Skip notification from the automated backport with mergify 8.10-candidate labels Jul 5, 2023
@efd6 efd6 self-assigned this Jul 5, 2023
@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 Jul 5, 2023
@efd6
filebeat/input/{tcp,udp}: use correct address list in udp
e1720d5 
Also add a check in the common path to check that the addr slice is the
same length as the undefined addr slice, returning an error on mismatch
rather than allowing the panic.
@efd6 efd6 changed the title filebeat/{tcp,udp}: use correct address list in udp filebeat/input/{tcp,udp}: use correct address list in udp Jul 5, 2023
@efd6 efd6 added backport-v8.9.0 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Jul 5, 2023
efd6
efd6 commented Jul 5, 2023
View reviewed changes
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 5, 2023 •
edited by jenkins-beats-ci bot

💚 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: 2023-07-05T12:49:34.678+0000

  • Duration: 70 min 5 sec

Test stats 🧪

Test Results
Failed 0
Passed 7996
Skipped 757
Total 8753

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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 marked this pull request as ready for review July 5, 2023 07:19
@efd6 efd6 requested a review from a team as a code owner July 5, 2023 07:19
@efd6 efd6 requested review from rdner and leehinman July 5, 2023 07:19
@elasticmachine
Copy link
Collaborator

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

@efd6 efd6 requested a review from andrewkroh July 10, 2023 04:06
@efd6 efd6 merged commit e741a6d into elastic:main Jul 10, 2023
26 checks passed
mergify bot pushed a commit that referenced this pull request Jul 10, 2023
@efd6 @mergify
filebeat/input/{tcp,udp}: use correct address list in udp (#35996)
64658e0 
Also add a check in the common path to check that the addr slice is the
same length as the undefined addr slice, returning an error on mismatch
rather than allowing the panic.

(cherry picked from commit e741a6d)
@mergify mergify bot mentioned this pull request Jul 10, 2023
Merged
efd6 added a commit that referenced this pull request Jul 11, 2023
@mergify @efd6
filebeat/input/{tcp,udp}: use correct address list in udp (#35996) (#…
787a0d0 
…36033)

Also add a check in the common path to check that the addr slice is the
same length as the undefined addr slice, returning an error on mismatch
rather than allowing the panic.

(cherry picked from commit e741a6d)

Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
@efd6 @Scholar-Li
filebeat/input/{tcp,udp}: use correct address list in udp (elastic#35996
592e355 
)

Also add a check in the common path to check that the addr slice is the
same length as the undefined addr slice, returning an error on mismatch
rather than allowing the panic.
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

@leehinman leehinman leehinman approved these changes

@rdner rdner Awaiting requested review from rdner rdner is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@efd6 efd6

Labels
8.10-candidate backport-v8.9.0 Automated backport with mergify bug Filebeat Filebeat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@efd6 @elasticmachine @andrewkroh @leehinman