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

[8.0](backport #29112) x-pack/packetbeat: install Npcap at start-up when required #30049

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2022

This is an automatic backport of pull request #29112 done by Mergify.
Cherry-pick of 72a43be has failed:

On branch mergify/bp/8.0/pr-29112
Your branch is up to date with 'origin/8.0'.

You are currently cherry-picking commit 72a43be9e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   NOTICE.txt
	modified:   dev-tools/mage/config.go
	modified:   dev-tools/mage/crossbuild.go
	modified:   dev-tools/mage/settings.go
	modified:   dev-tools/notice/NOTICE.txt.tmpl
	modified:   dev-tools/packaging/package_test.go
	modified:   packetbeat/README.md
	modified:   packetbeat/_meta/config/beat.reference.yml.tmpl
	modified:   packetbeat/_meta/config/beat.yml.tmpl
	new file:   packetbeat/_meta/config/windows_npcap.yml.tmpl
	new file:   packetbeat/beater/install_npcap.go
	modified:   packetbeat/beater/packetbeat.go
	new file:   packetbeat/npcap/npcap.go
	new file:   packetbeat/npcap/npcap_other.go
	new file:   packetbeat/npcap/npcap_test.go
	new file:   packetbeat/npcap/npcap_windows.go
	new file:   packetbeat/npcap/testdata/mock_installer.go
	new file:   packetbeat/npcap/testdata/mock_uninstaller.go
	modified:   packetbeat/scripts/mage/package.go
	new file:   x-pack/packetbeat/LICENSE-Npcap.txt
	modified:   x-pack/packetbeat/cmd/root.go
	modified:   x-pack/packetbeat/magefile.go
	new file:   x-pack/packetbeat/npcap/installer/.gitignore
	new file:   x-pack/packetbeat/npcap/installer/LICENSE
	new file:   x-pack/packetbeat/npcap/installer/README
	new file:   x-pack/packetbeat/npcap/installer/npcap-0.00.exe
	new file:   x-pack/packetbeat/npcap/npcap_other.go
	new file:   x-pack/packetbeat/npcap/npcap_windows.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

This add automated installation of an OEM Npcap provided by embedding in the
packetbeat executable. The installation is configurable to allow users to retain
their own version of Npcap if they have one and to specify the location of the
install. To simplify support this configurablity will not be included in the
next release, but is comitted here to allow it to be reverted back out to make it
easier to add if the decision is made to do that later.

(cherry picked from commit 72a43be)

# Conflicts:
#	go.mod
@mergify mergify bot requested review from a team as code owners January 27, 2022 05:36
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 27, 2022
@mergify mergify bot assigned efd6 Jan 27, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 27, 2022
@botelastic
Copy link

botelastic bot commented Jan 27, 2022

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💔 Build Failed

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: 2022-01-27T05:37:11.257+0000

  • Duration: 8 min 37 sec

  • Commit: e1f4e41

Steps errors 2

Expand to view the steps failures

Dump mage variables
  • Took 0 min 0 sec . View more details here
  • Description: mage dumpVariables
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'hudson.AbortException: script returned exit code 1'

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

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.

This should be going into 8.1 rather than 8.0, right?

@efd6
Copy link
Contributor

efd6 commented Jan 27, 2022

Yes. At the start of the addition it was to be added to 8.0, but I think we missed that boat. It's merged into master, so it will be in 8.1.

@efd6 efd6 closed this Jan 27, 2022
@mergify mergify bot deleted the mergify/bp/8.0/pr-29112 branch January 27, 2022 06:33
@elasticmachine
Copy link
Collaborator

💚 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!)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants