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.

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

Cherry-pick #22145 to 7.x: [Packetbeat] Split out elastic-agent config changes #22600

Merged
merged 1 commit into from
Nov 17, 2020

Conversation

andrewstucki
Copy link

Cherry-pick of PR #22145 to 7.x branch. Original message:

What does this PR do?

This PR splits out the elastic-agent changes from #22134, it:

  1. Adds a minimal(ish) agent configuration file to filter out the proper input types and inject agent configuration/indices for packetbeat
  2. Packages packetbeat with the default elastic-agent build

This should be merged after the x-pack/packetbeat magefile changes (#21979) in order for elastic-agent to build properly and #22134 in order for packetbeat to actually work with agent

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

* Split out elastic-agent config changes

* update test fixtures

* Remove bundled packetbeat

* unnest inputs

* Change input to type packet

* Revert "Remove bundled packetbeat"

This reverts commit a89fe1a.

* Revert "Revert "Remove bundled packetbeat""

This reverts commit 48d5f0e.

(cherry picked from commit af4007e)
@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 16, 2020
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 16, 2020
@leehinman
Copy link
Contributor

jenkins run tests

@elasticmachine
Copy link
Collaborator

💚 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

Expand to view the summary

Build stats

  • Build Cause: [leehinman commented: jenkins run tests]

  • Start Time: 2020-11-16T22:46:13.981+0000

  • Duration: 23 min 54 sec

Test stats 🧪

Test Results
Failed 0
Passed 1384
Skipped 6
Total 1390

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1384
Skipped 6
Total 1390

@leehinman leehinman merged commit d051760 into elastic:7.x Nov 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants