Skip to content

Cherry-pick #21979 to 7.x: [Packetbeat] Create x-pack magefile#22545

Merged
andrewstucki merged 2 commits intoelastic:7.xfrom
andrewstucki:backport_21979_7.x
Nov 11, 2020
Merged

Cherry-pick #21979 to 7.x: [Packetbeat] Create x-pack magefile#22545
andrewstucki merged 2 commits intoelastic:7.xfrom
andrewstucki:backport_21979_7.x

Conversation

@andrewstucki
Copy link
Copy Markdown

@andrewstucki andrewstucki commented Nov 11, 2020 •
edited by zube bot
Loading

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

What does this PR do?

This PR modifies the way that x-pack packetbeat builds in order to support the build process used in elastic-agent. I'm not entirely sure if there are any other places required for me to modify in order to have CI run mage package from the x-pack directory rather than OSS, but this should be all we need to get elastic-agent to know how to build packetbeat itself.

The elastic-agent change and packetbeat modifications for config files for elastic-agent configuration syntax are coming in subsequent PRs.

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.

[Packetbeat] Create x-pack magefile (elastic#21979)
32bc901 
* Create packetbeat x-pack magefile

* add changelog entry

* Fix up packetbeat magefile

* Add makefile for x-pack directory

* Uncomment packaging

* Add desired platforms to Jenkinsfile

* Add back in fields yml and kibana dashboards on package

* Add generated configs in x-pack/packetbeat

* Suggested changes

(cherry picked from commit 3e73c99)
@andrewstucki andrewstucki requested a review from a team as a code owner November 11, 2020 16:00
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 11, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 11, 2020

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 11, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 11, 2020 •
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

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22545 updated]

  • Start Time: 2020-11-11T16:05:10.604+0000

  • Duration: 27 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 1079
Skipped 10
Total 1089

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 11, 2020

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1079
Skipped 10
Total 1089

@andrewstucki andrewstucki merged commit bcbef06 into elastic:7.x Nov 11, 2020
@andrewstucki andrewstucki deleted the backport_21979_7.x branch November 11, 2020 22:16
@zube zube bot removed the [zube]: Done label Feb 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leehinman leehinman leehinman approved these changes

Assignees

No one assigned

Labels

backport Team:Automation Label for the Observability productivity team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@andrewstucki @elasticmachine @leehinman