diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index a4ce4fabec0d..323876182ea3 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -9,6 +9,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] ==== Breaking changes *Affecting all Beats* +- Elastic-agent-autodiscover library updated to version 0.6.4, disabling metadata for deployment and cronjob. Pods that will be created from deployments or cronjobs will not have the extra metadata field for kubernetes.deployment or kubernetes.cronjob, respectively. {pull}36880[36880] *Auditbeat* @@ -144,6 +145,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] *Packetbeat* +- Improve efficiency of sniffers by deduplicating interface configurations. {issue}36574[36574] {pull}36576[36576] +- Bump Windows Npcap version to v1.76. {issue}36539[36539] {pull}36549[36549] *Winlogbeat* diff --git a/NOTICE.txt b/NOTICE.txt index beab6f347d18..a33a7f65ba70 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -12268,11 +12268,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-autodiscover -Version: v0.6.2 +Version: v0.6.4 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.6.2/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-autodiscover@v0.6.4/LICENSE: Apache License Version 2.0, January 2004 @@ -34014,11 +34014,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/cyphar/filepath-securejoin -Version: v0.2.3 +Version: v0.2.4 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/cyphar/filepath-securejoin@v0.2.3/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/cyphar/filepath-securejoin@v0.2.4/LICENSE: Copyright (C) 2014-2015 Docker Inc & Go Authors. All rights reserved. Copyright (C) 2017 SUSE LLC. All rights reserved. diff --git a/deploy/kubernetes/auditbeat-kubernetes.yaml b/deploy/kubernetes/auditbeat-kubernetes.yaml index 70982dbe7725..3c41aafe40a7 100644 --- a/deploy/kubernetes/auditbeat-kubernetes.yaml +++ b/deploy/kubernetes/auditbeat-kubernetes.yaml @@ -205,7 +205,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: auditbeat - image: docker.elastic.co/beats/auditbeat:8.10.3 + image: docker.elastic.co/beats/auditbeat:8.10.4 args: [ "-c", "/etc/auditbeat.yml", "-e", diff --git a/deploy/kubernetes/filebeat-kubernetes.yaml b/deploy/kubernetes/filebeat-kubernetes.yaml index e07bdb859954..5203ef315ee7 100644 --- a/deploy/kubernetes/filebeat-kubernetes.yaml +++ b/deploy/kubernetes/filebeat-kubernetes.yaml @@ -167,7 +167,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: filebeat - image: docker.elastic.co/beats/filebeat:8.10.3 + image: docker.elastic.co/beats/filebeat:8.10.4 args: [ "-c", "/etc/filebeat.yml", "-e", diff --git a/deploy/kubernetes/heartbeat-kubernetes.yaml b/deploy/kubernetes/heartbeat-kubernetes.yaml index a6acfc574da8..85b4d85bab6b 100644 --- a/deploy/kubernetes/heartbeat-kubernetes.yaml +++ b/deploy/kubernetes/heartbeat-kubernetes.yaml @@ -171,7 +171,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: heartbeat - image: docker.elastic.co/beats/heartbeat:8.10.3 + image: docker.elastic.co/beats/heartbeat:8.10.4 args: [ "-c", "/etc/heartbeat.yml", "-e", diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml index fbc64d62e6b1..937fcf3a7c94 100644 --- a/deploy/kubernetes/metricbeat-kubernetes.yaml +++ b/deploy/kubernetes/metricbeat-kubernetes.yaml @@ -290,7 +290,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: metricbeat - image: docker.elastic.co/beats/metricbeat:8.10.3 + image: docker.elastic.co/beats/metricbeat:8.10.4 args: [ "-c", "/etc/metricbeat.yml", "-e", diff --git a/go.mod b/go.mod index fbfc4467500b..26f8f114c6ef 100644 --- a/go.mod +++ b/go.mod @@ -201,7 +201,7 @@ require ( github.com/aws/smithy-go v1.13.5 github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20220623125934-28468a6701b5 github.com/elastic/bayeux v1.0.5 - github.com/elastic/elastic-agent-autodiscover v0.6.2 + github.com/elastic/elastic-agent-autodiscover v0.6.4 github.com/elastic/elastic-agent-libs v0.3.13 github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 github.com/elastic/elastic-agent-system-metrics v0.6.1 @@ -259,7 +259,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.11.10 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dgraph-io/ristretto v0.1.0 // indirect diff --git a/go.sum b/go.sum index 65f9584102a5..5b0657f719b2 100644 --- a/go.sum +++ b/go.sum @@ -420,8 +420,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -500,8 +500,8 @@ github.com/elastic/bayeux v1.0.5 h1:UceFq01ipmT3S8DzFK+uVAkbCdiPR0Bqei8qIGmUeY0= github.com/elastic/bayeux v1.0.5/go.mod h1:CSI4iP7qeo5MMlkznGvYKftp8M7qqP/3nzmVZoXHY68= github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 h1:lnDkqiRFKm0rxdljqrj3lotWinO9+jFmeDXIC4gvIQs= github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod h1:aPqzac6AYkipvp4hufTyMj5PDIphF3+At8zr7r51xjY= -github.com/elastic/elastic-agent-autodiscover v0.6.2 h1:7P3cbMBWXjbzA80rxitQjc+PiWyZ4I4F4LqrCYgYlNc= -github.com/elastic/elastic-agent-autodiscover v0.6.2/go.mod h1:yXYKFAG+Py+TcE4CCR8EAbJiYb+6Dz9sCDoWgOveqtU= +github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= +github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.3.0 h1:LugKtBXK7bp4SFL/uQqGU/f4Ppx12Jk5a36voGabLa0= github.com/elastic/elastic-agent-client/v7 v7.3.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0= github.com/elastic/elastic-agent-libs v0.3.13 h1:qFiBWeBfjsBId+i31rggyW2ZjzA9qBRz7wIiy+rkcvc= diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 15116afebb17..46597e9a57a2 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,4 +1,4 @@ -:stack-version: 8.10.3 +:stack-version: 8.10.4 :doc-branch: 8.10 :go-version: 1.20.10 :release-state: unreleased diff --git a/libbeat/version/version.go b/libbeat/version/version.go index ce877ea779a9..77510bcf5c59 100644 --- a/libbeat/version/version.go +++ b/libbeat/version/version.go @@ -18,4 +18,4 @@ // Code generated by dev-tools/set_version package version -const defaultBeatVersion = "8.10.4" +const defaultBeatVersion = "8.10.5" diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml index 6335b22bf8fe..bf419e390a8e 100644 --- a/metricbeat/docker-compose.yml +++ b/metricbeat/docker-compose.yml @@ -17,11 +17,11 @@ services: # Used by base tests elasticsearch: - image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.10.3}-1 + image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-8.10.4}-1 build: context: ./module/elasticsearch/_meta args: - ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.10.3} + ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-8.10.4} environment: - "ES_JAVA_OPTS=-Xms256m -Xmx256m" - "transport.host=127.0.0.1" @@ -38,11 +38,11 @@ services: # Used by base tests kibana: - image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.10.3}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.10.4}-1 build: context: ./module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-8.10.3} + KIBANA_VERSION: ${KIBANA_VERSION:-8.10.4} healthcheck: test: ["CMD-SHELL", "curl -u beats:testing -s http://localhost:5601/api/status?v8format=true | grep -q '\"overall\":{\"level\":\"available\"'"] retries: 600 @@ -53,11 +53,11 @@ services: # Used by base tests metricbeat: - image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.10.3}-1 + image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-8.10.4}-1 build: context: ./module/beat/_meta args: - BEAT_VERSION: ${BEAT_VERSION:-8.10.3} + BEAT_VERSION: ${BEAT_VERSION:-8.10.4} command: '-e' ports: - 5066:5066 diff --git a/testing/environments/latest.yml b/testing/environments/latest.yml index 942d66b15b7e..559dc1ce8b63 100644 --- a/testing/environments/latest.yml +++ b/testing/environments/latest.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.10.3 + image: docker.elastic.co/elasticsearch/elasticsearch:8.10.4 healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"] retries: 300 @@ -19,7 +19,7 @@ services: - "script.context.template.cache_max_size=2000" logstash: - image: docker.elastic.co/logstash/logstash:8.10.3 + image: docker.elastic.co/logstash/logstash:8.10.4 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 300 @@ -29,7 +29,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:8.10.3 + image: docker.elastic.co/kibana/kibana:8.10.4 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:5601"] retries: 300 diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml index 6dc3e71dd249..907d49993728 100644 --- a/testing/environments/snapshot.yml +++ b/testing/environments/snapshot.yml @@ -3,7 +3,7 @@ version: '2.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.10.4-df8d75ce-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.10.4-ba5798e3-SNAPSHOT # When extend is used it merges healthcheck.tests, see: # https://github.com/docker/compose/issues/8962 # healthcheck: @@ -31,7 +31,7 @@ services: - "./docker/elasticsearch/users_roles:/usr/share/elasticsearch/config/users_roles" logstash: - image: docker.elastic.co/logstash/logstash:8.10.4-df8d75ce-SNAPSHOT + image: docker.elastic.co/logstash/logstash:8.10.4-ba5798e3-SNAPSHOT healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 600 @@ -44,7 +44,7 @@ services: - 5055:5055 kibana: - image: docker.elastic.co/kibana/kibana:8.10.4-df8d75ce-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.10.4-ba5798e3-SNAPSHOT environment: - "ELASTICSEARCH_USERNAME=kibana_system_user" - "ELASTICSEARCH_PASSWORD=testing" diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml index 4dd4c85911b3..c56e4b627638 100644 --- a/x-pack/metricbeat/docker-compose.yml +++ b/x-pack/metricbeat/docker-compose.yml @@ -24,11 +24,11 @@ services: kibana: # Copied configuration from OSS metricbeat because services with depends_on # cannot be extended with extends - image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.10.3}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-8.10.4}-1 build: context: ../../metricbeat/module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-8.10.3} + KIBANA_VERSION: ${KIBANA_VERSION:-8.10.4} depends_on: - elasticsearch ports: diff --git a/x-pack/packetbeat/LICENSE-Npcap.txt b/x-pack/packetbeat/LICENSE-Npcap.txt index 893b6ff218a5..bb51b2fbd6f7 100644 --- a/x-pack/packetbeat/LICENSE-Npcap.txt +++ b/x-pack/packetbeat/LICENSE-Npcap.txt @@ -1,228 +1,237 @@ - -NPCAP COPYRIGHT / END USER LICENSE AGREEMENT - -Npcap is a Windows packet sniffing driver and library and is copyright -(c) 2013-2022 by Insecure.Com LLC ("The Nmap Project"). All rights -reserved. - -Even though Npcap source code is publicly available for review, it is -not open source software and may not be redistributed without special -permission from the Nmap Project. The standard version is also -limited to installation on five systems. We fund the Npcap project by -selling two types of commercial licenses to a special Npcap OEM -edition: - -1) Npcap OEM Redistribution License allows companies to redistribute -Npcap with their products. - -2) Npcap OEM Internal Use License allows companies to use Npcap OEM -internally in excess of the free/demo version's normal 5-system -limitation. - -Both of these licenses include updates and support as well as a -warranty. Npcap OEM also includes a silent installer for unattended -installation. Further details about Npcap OEM are available from -https://nmap.org/npcap/oem/, and you are also welcome to contact us at -sales@nmap.com to ask any questions or set up a license for your -organization. - -Free and open source software producers are also welcome to contact us -for redistribution requests. However, we normally recommend that such -authors instead ask your users to download and install Npcap themselves. - -If the Nmap Project (directly or through one of our commercial -licensing customers) has granted you additional rights to Npcap or -Npcap OEM, those additional rights take precedence where they conflict -with the terms of this license agreement. - -Since the Npcap source code is available for download and review, -users sometimes contribute code patches to fix bugs or add new -features. By sending these changes to the Nmap Project (including -through direct email or our mailing lists or submitting pull requests -through our source code repository), it is understood unless you -specify otherwise that you are offering the Nmap Project the -unlimited, non-exclusive right to reuse, modify, and relicence your -code contribution so that we may (but are not obligated to) -incorporate it into Npcap. If you wish to specify special license -conditions or restrictions on your contributions, just say so when you -send them. - -This copy of Npcap (the "Software") and accompanying documentation is -licensed and not sold. This Software is protected by copyright laws -and treaties, as well as laws and treaties related to other forms of -intellectual property. The Nmap Project owns intellectual property -rights in the Software. The Licensee's ("you" or "your") license to -download, use, copy, or change the Software is subject to these rights -and to all the terms and conditions of this End User License Agreement -("Agreement"). - -ACCEPTANCE - -By accepting this agreement or by downloading, installing, using, or -copying the Software, or by clicking "I Agree", you agree to be bound -by the terms of this EULA. If you do not agree to the terms of this -EULA, do not install, use, or copy the Software. - -LICENSE GRANT - -This Agreement entitles you to install and use five (5) copies of the -Software. In addition, you may make archival copies of the Software -which may only be used for the reinstallation of the Software. This -Agreement does not permit the installation or use of more than 5 -copies of the Software, or the installation of the Software on more -than five computer at any given time, on a system that allows shared -used of applications by more than five users, or on any configuration -or system of computers that allows more than five users. A user may -only have one instance of this Agreement active at once. For example, -downloading the software multiple times, downloading multiple versions -of the software, and/or executing the software installer multiple -times do not grant any additional rights such as using the software on -more machines. - -The terms "computer" and "machine" in this license include any -computing device, including software computing instances such as -virtual machines and Docker containers. - -Copies of Npcap do not count toward the five copy, five computer, or -five user limitations imposed by this section if they are installed -and used solely in conjunction with any of the following software: - -o The Nmap Security Scanner, as distributed from https://nmap.org - -o The Wireshark network protocol analyzer, as distributed from - https://www.wireshark.org/ - -o Microsoft Defender for Identity, as distributed from - https://www.microsoft.com/en-us/microsoft-365/security/identity-defender - -Users wishing to redistribute Npcap or exceed the usage limits imposed -by this free license or benefit from commercial support and features -such as a silent installer should contact sales@nmap.com to obtain an -appropriate commercial license agreement. More details on our OEM -edition is also available from https://nmap.org/npcap/oem/. - -DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -RESTRICTIONS ON TRANSFER - -Without first obtaining the express written consent of the Nmap -Project, you may not assign your rights and obligations under this -Agreement, or redistribute, encumber, sell, rent, lease, sublicense, -or otherwise transfer your rights to the Software Product. - -RESTRICTIONS ON USE - -You may not use, copy, or install the Software Product on more than -five computers, or permit the use, copying, or installation of the -Software Product by more than five users or on more than five -computers. - -RESTRICTIONS ON COPYING - -You may not copy any part of the Software except to the extent that -licensed use inherently demands the creation of a temporary copy -stored in computer memory and not permanently affixed on storage -medium. You may make archival copies as well. - -DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY - -UNLESS OTHERWISE EXPLICITLY AGREED TO IN WRITING BY THE NMAP PROJECT, -THE NMAP PROJECT MAKES NO OTHER WARRANTIES, EXPRESS OR IMPLIED, IN -FACT OR IN LAW, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES -OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OTHER THAN AS -SET FORTH IN THIS AGREEMENT OR IN THE LIMITED WARRANTY DOCUMENTS -PROVIDED WITH THE SOFTWARE. - -The Nmap Project makes no warranty that the Software will meet your -requirements or operate under your specific conditions of use. The -Nmap Project makes no warranty that operation of the Software Product -will be secure, error free, or free from interruption. YOU MUST -DETERMINE WHETHER THE SOFTWARE SUFFICIENTLY MEETS YOUR REQUIREMENTS -FOR SECURITY AND UNINTERRUPTABILITY. YOU BEAR SOLE RESPONSIBILITY AND -ALL LIABILITY FOR ANY LOSS INCURRED DUE TO FAILURE OF THE SOFTWARE TO -MEET YOUR REQUIREMENTS. THE NMAP PROJECT WILL NOT, UNDER ANY -CIRCUMSTANCES, BE RESPONSIBLE OR LIABLE FOR THE LOSS OF DATA ON ANY -COMPUTER OR INFORMATION STORAGE DEVICE. - -UNDER NO CIRCUMSTANCES SHALL THE NMAP PROJECT, ITS DIRECTORS, -OFFICERS, EMPLOYEES OR AGENTS BE LIABLE TO YOU OR ANY OTHER PARTY FOR -INDIRECT, CONSEQUENTIAL, SPECIAL, INCIDENTAL, PUNITIVE, OR EXEMPLARY -DAMAGES OF ANY KIND (INCLUDING LOST REVENUES OR PROFITS OR LOSS OF -BUSINESS) RESULTING FROM THIS AGREEMENT, OR FROM THE FURNISHING, -PERFORMANCE, INSTALLATION, OR USE OF THE SOFTWARE, WHETHER DUE TO A -BREACH OF CONTRACT, BREACH OF WARRANTY, OR THE NEGLIGENCE OF THE NMAP -PROJECT OR ANY OTHER PARTY, EVEN IF THE NMAP PROJECT IS ADVISED -BEFOREHAND OF THE POSSIBILITY OF SUCH DAMAGES. TO THE EXTENT THAT THE -APPLICABLE JURISDICTION LIMITS THE NMAP PROJECT'S ABILITY TO DISCLAIM -ANY IMPLIED WARRANTIES, THIS DISCLAIMER SHALL BE EFFECTIVE TO THE -MAXIMUM EXTENT PERMITTED. - -LIMITATIONS OF REMEDIES AND DAMAGES - -Your remedy for a breach of this Agreement or of any warranty included -in this Agreement is the correction or replacement of the Software or -a refund of the purchase price of the Software, exclusive of any costs -for shipping and handling. Selection of whether to correct or replace -or refund shall be solely at the discretion of the Nmap Project. The -Nmap Project reserves the right to substitute a functionally -equivalent copy of the Software Product as a replacement. - -Any claim must be made within the applicable warranty period. All -warranties cover only defects arising under normal use and do not -include malfunctions or failure resulting from misuse, abuse, neglect, -alteration, problems with electrical power, acts of nature, unusual -temperatures or humidity, improper installation, or damage determined -by the Nmap Project to have been caused by you. All limited warranties -on the Software Product are granted only to you and are -non-transferable. - -You agree to indemnify and hold the Nmap Project harmless from all -claims, judgments, liabilities, expenses, or costs arising from your -breach of this Agreement and/or acts or omissions. - -GOVERNING LAW, JURISDICTION AND COSTS - -This Agreement is governed by the laws the United States of America -and Washington State, without regard to Washington's conflict or -choice of law provisions. - -SEVERABILITY - -If any provision of this Agreement shall be held to be invalid or -unenforceable, the remainder of this Agreement shall remain in full -force and effect. To the extent any express or implied restrictions -are not permitted by applicable laws, these express or implied -restrictions shall remain in force and effect to the maximum extent -permitted by such applicable laws. - -THIRD PARTY SOFTWARE ATTRIBUTION - -Npcap uses several 3rd party open source software libraries: - -* The libpcap portable packet capturing library from https://tcpdump.org -* The Winpcap packet capturing library. It has been abandoned, but is - currently still available from https://www.winpcap.org/. -* The ieee80211_radiotap.h header file from David Young - -All of these are open source with BSD-style licenses that allow for -unlimited use and royalty-free redistribution within other software -(including commercial/proprietary software). Some include a warranty -disclaimer (relating to the original authors) and require a small -amount of acknowledgment text be added somewhere in the documentation -of any software which includes them (including indirect inclusion -through Npcap). - -The required acknowledgement text as well as full license text and -source details for these libraries is available from: -https://npcap.org/src/docs/Npcap-Third-Party-Open-Source.pdf . - -Since Insecure.Com LLC is not the author of this 3rd party code, we -can not waive or modify it’s software copyright or license. Npcap -users and redistributors must comply with the relevant Npcap license -(either the free/demo license or a commercial Npcap OEM license they -may have purchased) as well as the minimal requirements of this 3rd -party open source software. + +NPCAP COPYRIGHT / END USER LICENSE AGREEMENT + +Npcap (https://npcap.com) is a Windows packet sniffing driver and +library and is copyright (c) 2013-2023 by Nmap Software LLC ("The Nmap +Project"). All rights reserved. + +Even though Npcap source code is publicly available for review, it is +not open source software and may not be redistributed or used in other +software without special permission from the Nmap Project. The +standard (free) version is usually limited to installation on five +systems. We fund the Npcap project by selling two types of commercial +licenses to a special Npcap OEM edition: + +1) The Npcap OEM Redistribution License allows companies distribute +Npcap OEM within their products. Licensees generally use the Npcap OEM +silent installer, ensuring a seamless experience for end +users. Licensees may choose between a perpetual unlimited license or +a quarterly term license, along with options for commercial support and +updates. Prices and details: https://npcap.com/oem/redist.html + +2) The Npcap OEM Internal-Use License is for organizations that wish +to use Npcap OEM internally, without redistribution outside their +organization. This allows them to bypass the 5-system usage cap of the +Npcap free edition. It includes commercial support and update options, +and provides the extra Npcap OEM features such as the silent installer +for automated deployment. Prices and details: +https://npcap.com/oem/internal.html + +Both of these licenses include updates and support as well as a +warranty. Npcap OEM also includes a silent installer for unattended +installation. Further details about Npcap OEM are available from +https://npcap.com/oem/, and you are also welcome to contact us at +sales@nmap.com to ask any questions or set up a license for your +organization. + +Free and open source software producers are also welcome to contact us +for redistribution requests. However, we normally recommend that such +authors instead ask your users to download and install Npcap +themselves. It will be free for them if they need 5 or fewer copies. + +If the Nmap Project (directly or through one of our commercial +licensing customers) has granted you additional rights to Npcap or +Npcap OEM, those additional rights take precedence where they conflict +with the terms of this license agreement. + +Since the Npcap source code is available for download and review, +users sometimes contribute code patches to fix bugs or add new +features. By sending these changes to the Nmap Project (including +through direct email or our mailing lists or submitting pull requests +through our source code repository), it is understood unless you +specify otherwise that you are offering the Nmap Project the +unlimited, non-exclusive right to reuse, modify, and relicense your +code contribution so that we may (but are not obligated to) +incorporate it into Npcap. If you wish to specify special license +conditions or restrictions on your contributions, just say so when you +send them. + +This copy of Npcap (the "Software") and accompanying documentation is +licensed and not sold. This Software is protected by copyright laws +and treaties, as well as laws and treaties related to other forms of +intellectual property. The Nmap Project owns intellectual property +rights in the Software. The Licensee's ("you" or "your") license to +download, use, copy, or change the Software is subject to these rights +and to all the terms and conditions of this End User License Agreement +("Agreement"). + +ACCEPTANCE + +By accepting this agreement or by downloading, installing, using, or +copying the Software, or by clicking "I Agree", you agree to be bound +by the terms of this EULA. If you do not agree to the terms of this +EULA, do not install, use, or copy the Software. + +LICENSE GRANT + +This Agreement entitles you to install and use five (5) copies of the +Software. In addition, you may make archival copies of the Software +which may only be used for the reinstallation of the Software. This +Agreement does not permit the installation or use of more than 5 +copies of the Software, or the installation of the Software on more +than five computer at any given time, on a system that allows shared +used of applications by more than five users, or on any configuration +or system of computers that allows more than five users. A user may +only have one instance of this Agreement active at once. For example, +downloading the software multiple times, downloading multiple versions +of the software, and/or executing the software installer multiple +times do not grant any additional rights such as using the software on +more machines. + +The terms "computer" and "machine" in this license include any +computing device, including software computing instances such as +virtual machines and Docker containers. + +Copies of Npcap do not count toward the five copy, five computer, or +five user limitations imposed by this section if they are installed +and used solely in conjunction with any of the following software: + +o The Nmap Security Scanner, as distributed from https://nmap.org + +o The Wireshark network protocol analyzer, as distributed from + https://www.wireshark.org/ + +o Microsoft Defender for Identity, as distributed from + https://www.microsoft.com/en-us/microsoft-365/security/identity-defender + +Users wishing to redistribute Npcap or exceed the usage limits imposed +by this free license or benefit from commercial support and features +such as a silent installer should contact sales@nmap.com to obtain an +appropriate commercial license agreement. More details on our OEM +edition is also available from https://npcap.com/oem/. + +DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +RESTRICTIONS ON TRANSFER + +Without first obtaining the express written consent of the Nmap +Project, you may not assign your rights and obligations under this +Agreement, or redistribute, encumber, sell, rent, lease, sublicense, +or otherwise transfer your rights to the Software Product. + +RESTRICTIONS ON USE + +You may not use, copy, or install the Software Product on more than +five computers, or permit the use, copying, or installation of the +Software Product by more than five users or on more than five +computers. + +RESTRICTIONS ON COPYING + +You may not copy any part of the Software except to the extent that +licensed use inherently demands the creation of a temporary copy +stored in computer memory and not permanently affixed on storage +medium. You may make archival copies as well. + +DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY + +UNLESS OTHERWISE EXPLICITLY AGREED TO IN WRITING BY THE NMAP PROJECT, +THE NMAP PROJECT MAKES NO OTHER WARRANTIES, EXPRESS OR IMPLIED, IN +FACT OR IN LAW, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES +OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OTHER THAN AS +SET FORTH IN THIS AGREEMENT OR IN THE LIMITED WARRANTY DOCUMENTS +PROVIDED WITH THE SOFTWARE. + +The Nmap Project makes no warranty that the Software will meet your +requirements or operate under your specific conditions of use. The +Nmap Project makes no warranty that operation of the Software Product +will be secure, error free, or free from interruption. YOU MUST +DETERMINE WHETHER THE SOFTWARE SUFFICIENTLY MEETS YOUR REQUIREMENTS +FOR SECURITY AND UNINTERRUPTABILITY. YOU BEAR SOLE RESPONSIBILITY AND +ALL LIABILITY FOR ANY LOSS INCURRED DUE TO FAILURE OF THE SOFTWARE TO +MEET YOUR REQUIREMENTS. THE NMAP PROJECT WILL NOT, UNDER ANY +CIRCUMSTANCES, BE RESPONSIBLE OR LIABLE FOR THE LOSS OF DATA ON ANY +COMPUTER OR INFORMATION STORAGE DEVICE. + +UNDER NO CIRCUMSTANCES SHALL THE NMAP PROJECT, ITS DIRECTORS, +OFFICERS, EMPLOYEES OR AGENTS BE LIABLE TO YOU OR ANY OTHER PARTY FOR +INDIRECT, CONSEQUENTIAL, SPECIAL, INCIDENTAL, PUNITIVE, OR EXEMPLARY +DAMAGES OF ANY KIND (INCLUDING LOST REVENUES OR PROFITS OR LOSS OF +BUSINESS) RESULTING FROM THIS AGREEMENT, OR FROM THE FURNISHING, +PERFORMANCE, INSTALLATION, OR USE OF THE SOFTWARE, WHETHER DUE TO A +BREACH OF CONTRACT, BREACH OF WARRANTY, OR THE NEGLIGENCE OF THE NMAP +PROJECT OR ANY OTHER PARTY, EVEN IF THE NMAP PROJECT IS ADVISED +BEFOREHAND OF THE POSSIBILITY OF SUCH DAMAGES. TO THE EXTENT THAT THE +APPLICABLE JURISDICTION LIMITS THE NMAP PROJECT'S ABILITY TO DISCLAIM +ANY IMPLIED WARRANTIES, THIS DISCLAIMER SHALL BE EFFECTIVE TO THE +MAXIMUM EXTENT PERMITTED. + +LIMITATIONS OF REMEDIES AND DAMAGES + +Your remedy for a breach of this Agreement or of any warranty included +in this Agreement is the correction or replacement of the Software or +a refund of the purchase price of the Software, exclusive of any costs +for shipping and handling. Selection of whether to correct or replace +or refund shall be solely at the discretion of the Nmap Project. The +Nmap Project reserves the right to substitute a functionally +equivalent copy of the Software Product as a replacement. + +Any claim must be made within the applicable warranty period. All +warranties cover only defects arising under normal use and do not +include malfunctions or failure resulting from misuse, abuse, neglect, +alteration, problems with electrical power, acts of nature, unusual +temperatures or humidity, improper installation, or damage determined +by the Nmap Project to have been caused by you. All limited warranties +on the Software Product are granted only to you and are +non-transferable. + +You agree to indemnify and hold the Nmap Project harmless from all +claims, judgments, liabilities, expenses, or costs arising from your +breach of this Agreement and/or acts or omissions. + +GOVERNING LAW, JURISDICTION AND COSTS + +This Agreement is governed by the laws of the United States of America +and Deleware State, without regard to Delaware's conflict or choice of +law provisions. + +SEVERABILITY + +If any provision of this Agreement shall be held to be invalid or +unenforceable, the remainder of this Agreement shall remain in full +force and effect. To the extent any express or implied restrictions +are not permitted by applicable laws, these express or implied +restrictions shall remain in force and effect to the maximum extent +permitted by such applicable laws. + +THIRD PARTY SOFTWARE ATTRIBUTION + +Npcap uses several 3rd party open source software libraries: + +* The libpcap portable packet capturing library from https://tcpdump.org +* The Winpcap packet capturing library. It has been abandoned, but is + currently still available from https://www.winpcap.org/. +* The ieee80211_radiotap.h header file from David Young + +All of these are open source with BSD-style licenses that allow for +unlimited use and royalty-free redistribution within other software +(including commercial/proprietary software). Some include a warranty +disclaimer (relating to the original authors) and require a small +amount of acknowledgment text be added somewhere in the documentation +of any software which includes them (including indirect inclusion +through Npcap). + +The required acknowledgement text as well as full license text and +source details for these libraries is available from: +https://npcap.com/src/docs/Npcap-Third-Party-Open-Source.pdf . + +Since Nmap Software LLC is not the author of this 3rd party code, we +can not waive or modify its software copyright or license. Npcap +users and redistributors must comply with the relevant Npcap license +(either the free/demo license or a commercial Npcap OEM license they +may have purchased) as well as the minimal requirements of this 3rd +party open source software. diff --git a/x-pack/packetbeat/magefile.go b/x-pack/packetbeat/magefile.go index daee711156a8..2d0d367a4600 100644 --- a/x-pack/packetbeat/magefile.go +++ b/x-pack/packetbeat/magefile.go @@ -36,7 +36,7 @@ import ( // the packetbeat executable. It is used to specify which npcap builder crossbuild // image to use and the installer to obtain from the cloud store for testing. const ( - NpcapVersion = "1.71" + NpcapVersion = "1.76" installer = "npcap-" + NpcapVersion + "-oem.exe" ) diff --git a/x-pack/packetbeat/npcap/installer/LICENSE b/x-pack/packetbeat/npcap/installer/LICENSE index 0bf8aa4d9b6a..61173d3226af 100644 --- a/x-pack/packetbeat/npcap/installer/LICENSE +++ b/x-pack/packetbeat/npcap/installer/LICENSE @@ -1,10 +1,10 @@ -------------------------------------------------------------------------------- Dependency : Npcap (https://nmap.org/npcap/) -Version: 1.71 +Version: 1.76 Licence type: Commercial -------------------------------------------------------------------------------- -Npcap is Copyright (c) 2013-2021 Insecure.Com LLC. All rights reserved. +Npcap is Copyright (c) 2013-2023 Insecure.Com LLC. All rights reserved. See https://npcap.org for details. Portions of Npcap are Copyright (c) 1999 - 2005 NetGroup, Politecnico di diff --git a/x-pack/packetbeat/tests/system/app_test.go b/x-pack/packetbeat/tests/system/app_test.go index f6db2aa29772..b7566e7450bb 100644 --- a/x-pack/packetbeat/tests/system/app_test.go +++ b/x-pack/packetbeat/tests/system/app_test.go @@ -29,7 +29,7 @@ import ( ) // Keep in sync with NpcapVersion in magefile.go. -const NpcapVersion = "1.71" +const NpcapVersion = "1.76" func TestWindowsNpcapInstaller(t *testing.T) { if runtime.GOOS != "windows" {