-
Notifications
You must be signed in to change notification settings - Fork 5k
x-pack/packetbeat: install Npcap at start-up when required #29112
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
Merged
Merged
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
1a9dc95
packetbeat: add npcap installer hooks
efd6 5c4a632
packetbeat: use a remote registry
efd6 b1cbe24
packetbeat: allow specification of Npcap install location
efd6 55731c0
packetbeat: fix error handling and make failure an option
efd6 c6017af
add changelog line
efd6 b8aac75
improve error reporting
efd6 a335ebc
restrict oem npcap installation to elastic licensed use
efd6 4a9daa2
add logic for installing from embedded byte artifact
efd6 4195197
make npcap installer code visible from x-pack
efd6 d7dffe0
allow installation of npcap from embedded npcap installer
efd6 b0620ae
reload npcap dll on install
efd6 639664a
make compilation succeed and handle un-bundled case
efd6 0a8979b
update docs for new approach and note limiting use to x-pack
efd6 b168922
remove option to retain downloaded installer file
efd6 becaf5e
only include Npcap config options on Windows when Elastic Licensed
efd6 70635df
back out remote provisioning of installer
efd6 f3d8867
be explicit about included files in installer
efd6 3be42f6
allow the tree to remain clean during packaging
efd6 fe57072
use config struct and allow user to block install
efd6 7ff30e5
test config file contents
efd6 f3d26e6
log pcap version for windows platforms
efd6 7d5778a
add logic to select crossbuilder image for npcap installer artifact
efd6 ec83ab2
hard code npcap version to build with and provide non-CI build option
efd6 4f89991
copy installer asset into source tree before starting crossbuild
efd6 8e370b0
use hostname to determine whether we are on a beats-ci builder
efd6 64decc8
x-pack/packetbeat: add license notices
efd6 ba59bf9
experiment DO NOT MERGE
efd6 1e7c68e
test: print the CI env variable
v1v c0df4fc
include CI in mage var dump
efd6 e47956b
use correct call
efd6 8846b90
move image selection logic into x-pack
efd6 460a80a
Revert "test: print the CI env variable"
efd6 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16728,6 +16728,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/mod | ||
| Version: v0.5.1 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE: | ||
|
|
||
| Copyright (c) 2009 The Go Authors. All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are | ||
| met: | ||
|
|
||
| * Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above | ||
| copyright notice, this list of conditions and the following disclaimer | ||
| in the documentation and/or other materials provided with the | ||
| distribution. | ||
| * Neither the name of Google Inc. nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/net | ||
| Version: v0.0.0-20211020060615-d418f374d309 | ||
|
|
@@ -34519,43 +34556,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
| THE SOFTWARE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/mod | ||
| Version: v0.5.1 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]/LICENSE: | ||
|
|
||
| Copyright (c) 2009 The Go Authors. All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are | ||
| met: | ||
|
|
||
| * Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above | ||
| copyright notice, this list of conditions and the following disclaimer | ||
| in the documentation and/or other materials provided with the | ||
| distribution. | ||
| * Neither the name of Google Inc. nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/term | ||
| Version: v0.0.0-20210615171337-6886f2dfbf5b | ||
|
|
@@ -37624,4 +37624,3 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| {{if and (eq .BeatLicense "Elastic License") (eq .GOOS "windows")}} | ||
|
|
||
| {{header "Windows Npcap installation settings"}} | ||
|
|
||
| # Windows Npcap installation options. These options specify how the Npcap packet | ||
| # capture library for Windows should be obtained and installed. | ||
| # Npcap installation is only available in the default distribution of Packetbeat | ||
| # for Windows and is not available in the OSS-only distribution of Packetbeat. | ||
| # | ||
| # LICENSE NOTICE | ||
| # | ||
| # Restrictions on Distribution | ||
| # | ||
| # Insecure.Com LLC (“The Nmap Project”) has granted Elasticsearch BV and its | ||
| # affiliates the right to include Npcap with this distribution of Packetbeat. | ||
| # You may not distribute this version of Packetbeat or any other package from | ||
| # Elastic that includes Npcap. If you wish to distribute Npcap, or any package | ||
| # that includes Npcap, you should reach out to The Nmap Project to obtain a | ||
| # distribution license. See https://nmap.org/npcap/ for more details. | ||
| # | ||
| #npcap: | ||
| # # install_destination allows configuration of the location that the Npcap will | ||
| # # place the Npcap library and associated files. See https://nmap.org/npcap/guide/npcap-users-guide.html#npcap-installation-uninstall-options. | ||
| # install_destination: "" | ||
| # install_timeout: 120s | ||
| # # ignore_missing_registry specifies that failure to query the registry server | ||
| # # will be ignored with a logged warning. | ||
| # ignore_missing_registry: false | ||
| # # By default Npcap will be installed only when a newer version of Npcap is available. | ||
| # # force_reinstall forces a new installation of Npcap in all cases. | ||
| # force_reinstall: false | ||
| # # If a specific local version of Npcap is required installation by packetbeat | ||
| # # can be blocked by setting never_install to true. No action is taken if this | ||
| # # option is set to true. | ||
| # never_install: false | ||
| {{- end -}} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.