diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh old mode 100644 new mode 100755 index 3ee1ad9b087..e4248118fae --- a/.ci/packer_cache.sh +++ b/.ci/packer_cache.sh @@ -9,73 +9,23 @@ source /usr/local/bin/bash_standard_lib.sh # shellcheck disable=SC1091 source ./dev-tools/common.bash -# Docker images used on Dockerfiles 2019-07-12 -# aerospike:3.9.0 -# alpine:edge -# apache/couchdb:1.7 -# busybox:latest -# ceph/daemon:master-6373c6a-jewel-centos-7-x86_64 -# cockroachdb/cockroach:v19.1.1 -# consul:1.4.2 -# coredns/coredns:1.5.0 -# couchbase:4.5.1 -# debian:latest -# debian:stretch -# docker.elastic.co/beats-dev/fpm:1.11.0 -# docker.elastic.co/beats/metricbeat:6.5.4 -# docker.elastic.co/beats/metricbeat:7.2.0 -# docker.elastic.co/elasticsearch/elasticsearch:7.2.0 -# docker.elastic.co/kibana/kibana:7.2.0 -# docker.elastic.co/logstash/logstash:7.2.0 -# docker.elastic.co/observability-ci/database-instantclient:12.2.0.1 -# envoyproxy/envoy:v1.7.0 -# exekias/localkube-image -# haproxy:1.8 -# httpd:2.4.20 -# java:8-jdk-alpine -# jplock/zookeeper:3.4.8 -# maven:3.3-jdk-8 -# memcached:1.4.35-alpine -# microsoft/mssql-server-linux:2017-GA -# mongo:3.4 -# mysql:5.7.12 -# nats:1.3.0 -# nginx:1.9 -# oraclelinux:7 -# postgres:9.5.3 -# prom/prometheus:v2.6.0 -# python:3.6-alpine -# quay.io/coreos/etcd:v3.3.10 -# rabbitmq:3.7.4-management -# redis:3.2.12-alpine -# redis:3.2.4-alpine -# store/oracle/database-enterprise:12.2.0.1 -# traefik:1.6-alpine -# tsouza/nginx-php-fpm:php-7.1 -# ubuntu:16.04 -# ubuntu:trusty +###################### +############ FUNCTIONS +###################### +function getBeatsVersion() { + grep 'defaultBeatVersion' libbeat/version/version.go | cut -d= -f2 | sed 's#"##g' | tr -d " " +} -get_go_version - -DOCKER_IMAGES="docker.elastic.co/observability-ci/database-instantclient:12.2.0.1 -docker.elastic.co/observability-ci/database-enterprise:12.2.0.1 -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-arm -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-darwin -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main-debian7 -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main-debian8 -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main-debian9 -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-mips -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-ppc -docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-s390x -golang:${GO_VERSION} -" -if [ -x "$(command -v docker)" ]; then - for image in ${DOCKER_IMAGES} - do - (retry 2 docker pull ${image}) || echo "Error pulling ${image} Docker image, we continue" +function dockerPullCommonImages() { + DOCKER_IMAGES="docker.elastic.co/observability-ci/database-instantclient:12.2.0.1 + docker.elastic.co/observability-ci/database-enterprise:12.2.0.1 + docker.elastic.co/beats-dev/fpm:1.11.0 + golang:1.14.12-stretch + centos:7 + " + for image in ${DOCKER_IMAGES} ; do + (retry 2 docker pull ${image}) || echo "Error pulling ${image} Docker image. Continuing." done - docker tag \ docker.elastic.co/observability-ci/database-instantclient:12.2.0.1 \ store/oracle/database-instantclient:12.2.0.1 \ @@ -83,5 +33,54 @@ if [ -x "$(command -v docker)" ]; then docker tag \ docker.elastic.co/observability-ci/database-enterprise:12.2.0.1 \ store/oracle/database-enterprise:12.2.0.1 \ - || echo "Error setting the Oracle Dtabase tag" + || echo "Error setting the Oracle Database tag" +} + +function dockerPullImages() { + SNAPSHOT=$1 + get_go_version + + DOCKER_IMAGES=" + docker.elastic.co/elasticsearch/elasticsearch:${SNAPSHOT} + docker.elastic.co/kibana/kibana:${SNAPSHOT} + docker.elastic.co/logstash/logstash:${SNAPSHOT} + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-arm + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-base-arm-debian9 + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-darwin + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main-debian7 + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main-debian8 + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-main-debian9 + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-mips + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-ppc + docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-s390x + golang:${GO_VERSION} + " + for image in ${DOCKER_IMAGES} + do + (retry 2 docker pull ${image}) || echo "Error pulling ${image} Docker image. Continuing." + done +} + +################# +############ MAIN +################# +if [ -x "$(command -v docker)" ]; then + set -x + echo "Docker pull common docker images" + dockerPullCommonImages + + ## GitHub api returns up to 100 entries. + ## Probably we need a different approach to search the latest minor. + latestMinor=$(curl -s https://github.com/gitapi/repos/elastic/beats/branches\?per_page=100 | jq -r '.[].name' | grep "^7." | tail -1) + + for branch in master 7.x $latestMinor ; do + if [ "$branch" != "master" ] ; then + echo "Checkout the branch $branch" + git checkout "$branch" + fi + + VERSION=$(getBeatsVersion) + dockerPullImages "${VERSION}-SNAPSHOT" + done fi diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index 8dbeb193b79..5a11985ab24 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -53,6 +53,7 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Remove global ACK handler support via `SetACKHandler` from publisher pipeline. {pull}19632[19632] - Make implementing `Close` required for `reader.Reader` interfaces. {pull}20455[20455] - Remove `NumCPU` as clients should update the CPU count on the fly in case of config changes in a VM. {pull}23154[23154] +- Remove Metricbeat EventFetcher and EventsFetcher interface. Use the reporter interface instead. {pull}25093[25093] ==== Bugfixes diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 5166b62ba38..4c2d1a4e048 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -105,6 +105,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Rename `network.direction` values in crowdstrike/falcon to `ingress`/`egress`. {pull}23041[23041] - Possible values for Netflow's locality fields (source.locality, destination.locality and flow.locality) are now `internal` and `external`, instead of `private` and `public`. {issue}24272[24272] {pull}24295[24295] - Add User Agent Parser for Azure Sign In Logs Ingest Pipeline {pull}23201[23201] +- Changes filebeat httpjson input's append transform to create a list even with only a single value{pull}25074[25074] *Heartbeat* @@ -160,6 +161,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Affecting all Beats* +- Fix events being dropped if they contain a floating point value of NaN or Inf. {pull}25051[25051] - Fix templates being overwritten if there was an error when check for the template existance. {pull}24332[24332] - Fix Kubernetes autodiscovery provider to correctly handle pod states and avoid missing event data {pull}17223[17223] - Fix `add_cloud_metadata` to better support modifying sub-fields with other processors. {pull}13808[13808] @@ -279,6 +281,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix a connection error in httpjson input. {pull}16123[16123] - Fix integer overflow in S3 offsets when collecting very large files. {pull}22523[22523] - Fix CredentialsJSON unpacking for `gcp-pubsub` and `httpjson` inputs. {pull}23277[23277] +- Strip Azure Eventhub connection string in debug logs. {pulll}25066[25066] *Filebeat* @@ -392,11 +395,13 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix S3 input validation for non amazonaws.com domains. {issue}24420[24420] {pull}24861[24861] - Fix google_workspace and okta modules pagination when next page template is empty. {pull}24967[24967] - Fix IPtables Pipeline and Ubiquiti dashboard. {issue}24878[24878] {pull}24928[24928] +- Fix gcp module field names to use gcp instead of googlecloud. {pull}25038[25038] *Heartbeat* - Fixed excessive memory usage introduced in 7.5 due to over-allocating memory for HTTP checks. {pull}15639[15639] - Fixed TCP TLS checks to properly validate hostnames, this broke in 7.x and only worked for IP SANs. {pull}17549[17549] +- Fix panic when initialization of ICMP monitors fail twice. {pull}25073[25073] *Journalbeat* diff --git a/NOTICE.txt b/NOTICE.txt index 96cd4f82374..78056a21acd 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -7454,11 +7454,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-seccomp-bpf@ -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-structform -Version: v0.0.7 +Version: v0.0.8 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-structform@v0.0.7/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-structform@v0.0.8/LICENSE: Apache License Version 2.0, January 2004 @@ -11050,12 +11050,12 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice -------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/nomad/api -Version: v0.0.0-20201203164818-6318a8ac7bf8 +Dependency : github.com/hashicorp/golang-lru +Version: v0.5.4 Licence type (autodetected): MPL-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/nomad/api@v0.0.0-20201203164818-6318a8ac7bf8/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/golang-lru@v0.5.4/LICENSE: Mozilla Public License, version 2.0 @@ -11421,209 +11421,581 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice the Mozilla Public License, v. 2.0. - -------------------------------------------------------------------------------- -Dependency : github.com/hectane/go-acl -Version: v0.0.0-20190604041725-da78bae5fc95 -Licence type (autodetected): MIT +Dependency : github.com/hashicorp/nomad/api +Version: v0.0.0-20201203164818-6318a8ac7bf8 +Licence type (autodetected): MPL-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hectane/go-acl@v0.0.0-20190604041725-da78bae5fc95/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/nomad/api@v0.0.0-20201203164818-6318a8ac7bf8/LICENSE: -The MIT License (MIT) +Mozilla Public License, version 2.0 -Copyright (c) 2015 Nathan Osman +1. Definitions -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +1.1. "Contributor" -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + means each individual or legal entity that creates, contributes to the + creation of, or owns Covered Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used by a + Contributor and that particular Contributor's Contribution. --------------------------------------------------------------------------------- -Dependency : github.com/elastic/dhcp -Version: v0.0.0-20200227161230-57ec251c7eb3 -Licence type (autodetected): BSD-3-Clause --------------------------------------------------------------------------------- +1.3. "Contribution" -Contents of probable licence file $GOMODCACHE/github.com/elastic/dhcp@v0.0.0-20200227161230-57ec251c7eb3/LICENSE: + means Covered Software of a particular Contributor. -BSD 3-Clause License +1.4. "Covered Software" -Copyright (c) 2018, Andrea Barberio -All rights reserved. + means Source Code Form to which the initial Contributor has attached the + notice in Exhibit A, the Executable Form of such Source Code Form, and + Modifications of such Source Code Form, in each case including portions + thereof. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +1.5. "Incompatible With Secondary Licenses" + means -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. + a. that the initial Contributor has attached the notice described in + Exhibit B to the Covered Software; or -* 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. + b. that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the terms of + a Secondary License. -* Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +1.6. "Executable Form" -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 HOLDER 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. + means any form of the work other than Source Code Form. +1.7. "Larger Work" --------------------------------------------------------------------------------- -Dependency : github.com/jarcoal/httpmock -Version: v1.0.4 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- + means a work that combines Covered Software with other material, in a + separate file or files, that is not Covered Software. -Contents of probable licence file $GOMODCACHE/github.com/jarcoal/httpmock@v1.0.4/LICENSE: +1.8. "License" -The MIT License (MIT) + means this document. -Copyright (c) 2014 Jared Morse +1.9. "Licensable" -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: + means having the right to grant, to the maximum extent possible, whether + at the time of the initial grant or subsequently, any and all of the + rights conveyed by this License. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +1.10. "Modifications" -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + means any of the following: + a. any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered Software; or --------------------------------------------------------------------------------- -Dependency : github.com/jmoiron/sqlx -Version: v1.2.1-0.20190826204134-d7d95172beb5 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- + b. any new file in Source Code Form that contains any Covered Software. -Contents of probable licence file $GOMODCACHE/github.com/jmoiron/sqlx@v1.2.1-0.20190826204134-d7d95172beb5/LICENSE: +1.11. "Patent Claims" of a Contributor - Copyright (c) 2013, Jason Moiron + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the License, + by the making, using, selling, offering for sale, having made, import, + or transfer of either its Contributions or its Contributor Version. - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: +1.12. "Secondary License" - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. + means either the GNU General Public License, Version 2.0, the GNU Lesser + General Public License, Version 2.1, the GNU Affero General Public + License, Version 3.0, or any later versions of those licenses. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. +1.13. "Source Code Form" + means the form of the work preferred for making modifications. +1.14. "You" (or "Your") --------------------------------------------------------------------------------- -Dependency : github.com/joeshaw/multierror -Version: v0.0.0-20140124173710-69b34d4ec901 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that controls, is + controlled by, or is under common control with You. For purposes of this + definition, "control" means (a) the power, direct or indirect, to cause + the direction or management of such entity, whether by contract or + otherwise, or (b) ownership of more than fifty percent (50%) of the + outstanding shares or beneficial ownership of such entity. -Contents of probable licence file $GOMODCACHE/github.com/joeshaw/multierror@v0.0.0-20140124173710-69b34d4ec901/LICENSE: -The MIT License (MIT) +2. License Grants and Conditions -Copyright (c) 2014 Joe Shaw +2.1. Grants -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. + a. under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. + b. under Patent Claims of such Contributor to make, use, sell, offer for + sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. +2.2. Effective Date --------------------------------------------------------------------------------- -Dependency : github.com/jonboulle/clockwork -Version: v0.2.2 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- + The licenses granted in Section 2.1 with respect to any Contribution + become effective for each Contribution on the date the Contributor first + distributes such Contribution. -Contents of probable licence file $GOMODCACHE/github.com/jonboulle/clockwork@v0.2.2/LICENSE: +2.3. Limitations on Grant Scope -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ + The licenses granted in this Section 2 are the only rights granted under + this License. No additional rights or licenses will be implied from the + distribution or licensing of Covered Software under this License. + Notwithstanding Section 2.1(b) above, no patent license is granted by a + Contributor: - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + a. for any code that a Contributor has removed from Covered Software; or - 1. Definitions. + b. for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. + c. under Patent Claims infringed by Covered Software in the absence of + its Contributions. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. + This License does not grant any rights in the trademarks, service marks, + or logos of any Contributor (except as may be necessary to comply with + the notice requirements in Section 3.4). - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. +2.4. Subsequent Licenses - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. + No Contributor makes additional grants as a result of Your choice to + distribute the Covered Software under a subsequent version of this + License (see Section 10.2) or under the terms of a Secondary License (if + permitted under the terms of Section 3.3). - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +2.5. Representation - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. + Each Contributor represents that the Contributor believes its + Contributions are its original creation(s) or it has sufficient rights to + grant the rights to its Contributions conveyed by this License. - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). +2.6. Fair Use - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications + This License is not intended to limit any rights You have under + applicable copyright doctrines of fair use, fair dealing, or other + equivalents. + +2.7. Conditions + + Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in + Section 2.1. + + +3. Responsibilities + +3.1. Distribution of Source Form + + All distribution of Covered Software in Source Code Form, including any + Modifications that You create or to which You contribute, must be under + the terms of this License. You must inform recipients that the Source + Code Form of the Covered Software is governed by the terms of this + License, and how they can obtain a copy of this License. You may not + attempt to alter or restrict the recipients' rights in the Source Code + Form. + +3.2. Distribution of Executable Form + + If You distribute Covered Software in Executable Form then: + + a. such Covered Software must also be made available in Source Code Form, + as described in Section 3.1, and You must inform recipients of the + Executable Form how they can obtain a copy of such Source Code Form by + reasonable means in a timely manner, at a charge no more than the cost + of distribution to the recipient; and + + b. You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter the + recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + + You may create and distribute a Larger Work under terms of Your choice, + provided that You also comply with the requirements of this License for + the Covered Software. If the Larger Work is a combination of Covered + Software with a work governed by one or more Secondary Licenses, and the + Covered Software is not Incompatible With Secondary Licenses, this + License permits You to additionally distribute such Covered Software + under the terms of such Secondary License(s), so that the recipient of + the Larger Work may, at their option, further distribute the Covered + Software under the terms of either this License or such Secondary + License(s). + +3.4. Notices + + You may not remove or alter the substance of any license notices + (including copyright notices, patent notices, disclaimers of warranty, or + limitations of liability) contained within the Source Code Form of the + Covered Software, except that You may alter any license notices to the + extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + + You may choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of Covered + Software. However, You may do so only on Your own behalf, and not on + behalf of any Contributor. You must make it absolutely clear that any + such warranty, support, indemnity, or liability obligation is offered by + You alone, and You hereby agree to indemnify every Contributor for any + liability incurred by such Contributor as a result of warranty, support, + indemnity or liability terms You offer. You may include additional + disclaimers of warranty and limitations of liability specific to any + jurisdiction. + +4. Inability to Comply Due to Statute or Regulation + + If it is impossible for You to comply with any of the terms of this License + with respect to some or all of the Covered Software due to statute, + judicial order, or regulation then You must: (a) comply with the terms of + this License to the maximum extent possible; and (b) describe the + limitations and the code they affect. Such description must be placed in a + text file included with all distributions of the Covered Software under + this License. Except to the extent prohibited by statute or regulation, + such description must be sufficiently detailed for a recipient of ordinary + skill to be able to understand it. + +5. Termination + +5.1. The rights granted under this License will terminate automatically if You + fail to comply with any of its terms. However, if You become compliant, + then the rights granted under this License from a particular Contributor + are reinstated (a) provisionally, unless and until such Contributor + explicitly and finally terminates Your grants, and (b) on an ongoing + basis, if such Contributor fails to notify You of the non-compliance by + some reasonable means prior to 60 days after You have come back into + compliance. Moreover, Your grants from a particular Contributor are + reinstated on an ongoing basis if such Contributor notifies You of the + non-compliance by some reasonable means, this is the first time You have + received notice of non-compliance with this License from such + Contributor, and You become compliant prior to 30 days after Your receipt + of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent + infringement claim (excluding declaratory judgment actions, + counter-claims, and cross-claims) alleging that a Contributor Version + directly or indirectly infringes any patent, then the rights granted to + You by any and all Contributors for the Covered Software under Section + 2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user + license agreements (excluding distributors and resellers) which have been + validly granted by You or Your distributors under this License prior to + termination shall survive termination. + +6. Disclaimer of Warranty + + Covered Software is provided under this License on an "as is" basis, + without warranty of any kind, either expressed, implied, or statutory, + including, without limitation, warranties that the Covered Software is free + of defects, merchantable, fit for a particular purpose or non-infringing. + The entire risk as to the quality and performance of the Covered Software + is with You. Should any Covered Software prove defective in any respect, + You (not any Contributor) assume the cost of any necessary servicing, + repair, or correction. This disclaimer of warranty constitutes an essential + part of this License. No use of any Covered Software is authorized under + this License except under this disclaimer. + +7. Limitation of Liability + + Under no circumstances and under no legal theory, whether tort (including + negligence), contract, or otherwise, shall any Contributor, or anyone who + distributes Covered Software as permitted above, be liable to You for any + direct, indirect, special, incidental, or consequential damages of any + character including, without limitation, damages for lost profits, loss of + goodwill, work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses, even if such party shall have been + informed of the possibility of such damages. This limitation of liability + shall not apply to liability for death or personal injury resulting from + such party's negligence to the extent applicable law prohibits such + limitation. Some jurisdictions do not allow the exclusion or limitation of + incidental or consequential damages, so this exclusion and limitation may + not apply to You. + +8. Litigation + + Any litigation relating to this License may be brought only in the courts + of a jurisdiction where the defendant maintains its principal place of + business and such litigation shall be governed by laws of that + jurisdiction, without reference to its conflict-of-law provisions. Nothing + in this Section shall prevent a party's ability to bring cross-claims or + counter-claims. + +9. Miscellaneous + + This License represents the complete agreement concerning the subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. Any law or regulation which provides that + the language of a contract shall be construed against the drafter shall not + be used to construe this License against a Contributor. + + +10. Versions of the License + +10.1. New Versions + + Mozilla Foundation is the license steward. Except as provided in Section + 10.3, no one other than the license steward has the right to modify or + publish new versions of this License. Each version will be given a + distinguishing version number. + +10.2. Effect of New Versions + + You may distribute the Covered Software under the terms of the version + of the License under which You originally received the Covered Software, + or under the terms of any subsequent version published by the license + steward. + +10.3. Modified Versions + + If you create software not governed by this License, and you want to + create a new license for such software, you may create and use a + modified version of this License if you rename the license and remove + any references to the name of the license steward (except to note that + such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary + Licenses If You choose to distribute Source Code Form that is + Incompatible With Secondary Licenses under the terms of this version of + the License, the notice described in Exhibit B of this License must be + attached. + +Exhibit A - Source Code Form License Notice + + This Source Code Form is subject to the + terms of the Mozilla Public License, v. + 2.0. If a copy of the MPL was not + distributed with this file, You can + obtain one at + http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular file, +then You may include the notice in a location (such as a LICENSE file in a +relevant directory) where a recipient would be likely to look for such a +notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice + + This Source Code Form is "Incompatible + With Secondary Licenses", as defined by + the Mozilla Public License, v. 2.0. + + + +-------------------------------------------------------------------------------- +Dependency : github.com/hectane/go-acl +Version: v0.0.0-20190604041725-da78bae5fc95 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/hectane/go-acl@v0.0.0-20190604041725-da78bae5fc95/LICENSE.txt: + +The MIT License (MIT) + +Copyright (c) 2015 Nathan Osman + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +-------------------------------------------------------------------------------- +Dependency : github.com/elastic/dhcp +Version: v0.0.0-20200227161230-57ec251c7eb3 +Licence type (autodetected): BSD-3-Clause +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/dhcp@v0.0.0-20200227161230-57ec251c7eb3/LICENSE: + +BSD 3-Clause License + +Copyright (c) 2018, Andrea Barberio +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 the copyright holder 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 HOLDER 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 : github.com/jarcoal/httpmock +Version: v1.0.4 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/jarcoal/httpmock@v1.0.4/LICENSE: + +The MIT License (MIT) + +Copyright (c) 2014 Jared Morse + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +-------------------------------------------------------------------------------- +Dependency : github.com/jmoiron/sqlx +Version: v1.2.1-0.20190826204134-d7d95172beb5 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/jmoiron/sqlx@v1.2.1-0.20190826204134-d7d95172beb5/LICENSE: + + Copyright (c) 2013, Jason Moiron + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + + +-------------------------------------------------------------------------------- +Dependency : github.com/joeshaw/multierror +Version: v0.0.0-20140124173710-69b34d4ec901 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/joeshaw/multierror@v0.0.0-20140124173710-69b34d4ec901/LICENSE: + +The MIT License (MIT) + +Copyright (c) 2014 Joe Shaw + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + +-------------------------------------------------------------------------------- +Dependency : github.com/jonboulle/clockwork +Version: v0.2.2 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/jonboulle/clockwork@v0.2.2/LICENSE: + +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, @@ -14184,11 +14556,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : github.com/stretchr/testify -Version: v1.6.1 +Version: v1.7.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/stretchr/testify@v1.6.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/stretchr/testify@v1.7.0/LICENSE: MIT License @@ -30777,273 +31149,24 @@ Contents of probable licence file $GOMODCACHE/github.com/google/renameio@v0.1.0/ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - --------------------------------------------------------------------------------- -Dependency : github.com/google/shlex -Version: v0.0.0-20191202100458-e7afc7fbc510 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/google/shlex@v0.0.0-20191202100458-e7afc7fbc510/COPYING: - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - --------------------------------------------------------------------------------- -Dependency : github.com/googleapis/gax-go/v2 -Version: v2.0.5 -Licence type (autodetected): BSD-3-Clause --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/googleapis/gax-go/v2@v2.0.5/LICENSE: - -Copyright 2016, Google Inc. -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. + You may obtain a copy of the License at -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. + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -------------------------------------------------------------------------------- -Dependency : github.com/googleapis/gnostic -Version: v0.4.1 +Dependency : github.com/google/shlex +Version: v0.0.0-20191202100458-e7afc7fbc510 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/googleapis/gnostic@v0.4.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/google/shlex@v0.0.0-20191202100458-e7afc7fbc510/COPYING: Apache License @@ -31249,17 +31372,16 @@ Contents of probable licence file $GOMODCACHE/github.com/googleapis/gnostic@v0.4 limitations under the License. - -------------------------------------------------------------------------------- -Dependency : github.com/gopherjs/gopherjs -Version: v0.0.0-20181017120253-0766667cb4d1 -Licence type (autodetected): BSD-2-Clause +Dependency : github.com/googleapis/gax-go/v2 +Version: v2.0.5 +Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/gopherjs/gopherjs@v0.0.0-20181017120253-0766667cb4d1/LICENSE: - -Copyright (c) 2013 Richard Musiol. All rights reserved. +Contents of probable licence file $GOMODCACHE/github.com/googleapis/gax-go/v2@v2.0.5/LICENSE: +Copyright 2016, Google Inc. +All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -31270,6 +31392,9 @@ notice, this list of conditions and the following disclaimer. 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 @@ -31285,97 +31410,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -Dependency : github.com/gorilla/websocket -Version: v1.4.1 -Licence type (autodetected): BSD-2-Clause --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/gorilla/websocket@v1.4.1/LICENSE: - -Copyright (c) 2013 The Gorilla WebSocket 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. - -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 HOLDER 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 : github.com/gregjones/httpcache -Version: v0.0.0-20180305231024-9cad4c3443a7 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/gregjones/httpcache@v0.0.0-20180305231024-9cad4c3443a7/LICENSE.txt: - -Copyright © 2012 Greg Jones (greg.jones@gmail.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------------------- -Dependency : github.com/grpc-ecosystem/grpc-gateway -Version: v1.13.0 -Licence type (autodetected): BSD-3-Clause --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/grpc-ecosystem/grpc-gateway@v1.13.0/LICENSE.txt: - -Copyright (c) 2015, Gengo, Inc. -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 Gengo, 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 : github.com/hashicorp/cronexpr -Version: v1.1.0 +Dependency : github.com/googleapis/gnostic +Version: v0.4.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/cronexpr@v1.1.0/APLv2: +Contents of probable licence file $GOMODCACHE/github.com/googleapis/gnostic@v0.4.1/LICENSE: Apache License @@ -31518,528 +31558,496 @@ Contents of probable licence file $GOMODCACHE/github.com/hashicorp/cronexpr@v1.1 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - --------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/errwrap -Version: v1.0.0 -Licence type (autodetected): MPL-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/errwrap@v1.0.0/LICENSE: - -Mozilla Public License, version 2.0 - -1. Definitions - -1.1. “Contributor” - - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. - -1.2. “Contributor Version” - - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor’s Contribution. - -1.3. “Contribution” - - means Covered Software of a particular Contributor. - -1.4. “Covered Software” - - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. - -1.5. “Incompatible With Secondary Licenses” - means - - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or - - b. that the Covered Software was made available under the terms of version - 1.1 or earlier of the License, but not also under the terms of a - Secondary License. - -1.6. “Executable Form” - - means any form of the work other than Source Code Form. - -1.7. “Larger Work” - - means a work that combines Covered Software with other material, in a separate - file or files, that is not Covered Software. - -1.8. “License” - - means this document. - -1.9. “Licensable” - - means having the right to grant, to the maximum extent possible, whether at the - time of the initial grant or subsequently, any and all of the rights conveyed by - this License. + origin of the Work and reproducing the content of the NOTICE file. -1.10. “Modifications” + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. - means any of the following: + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. - a. any file in Source Code Form that results from an addition to, deletion - from, or modification of the contents of Covered Software; or + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. - b. any new file in Source Code Form that contains any Covered Software. + END OF TERMS AND CONDITIONS -1.11. “Patent Claims” of a Contributor + APPENDIX: How to apply the Apache License to your work. - means any patent claim(s), including without limitation, method, process, - and apparatus claims, in any patent Licensable by such Contributor that - would be infringed, but for the grant of the License, by the making, - using, selling, offering for sale, having made, import, or transfer of - either its Contributions or its Contributor Version. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -1.12. “Secondary License” + Copyright [yyyy] [name of copyright owner] - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at -1.13. “Source Code Form” + http://www.apache.org/licenses/LICENSE-2.0 - means the form of the work preferred for making modifications. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -1.14. “You” (or “Your”) - means an individual or a legal entity exercising rights under this - License. For legal entities, “You” includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, “control” means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. +-------------------------------------------------------------------------------- +Dependency : github.com/gopherjs/gopherjs +Version: v0.0.0-20181017120253-0766667cb4d1 +Licence type (autodetected): BSD-2-Clause +-------------------------------------------------------------------------------- -2. License Grants and Conditions +Contents of probable licence file $GOMODCACHE/github.com/gopherjs/gopherjs@v0.0.0-20181017120253-0766667cb4d1/LICENSE: -2.1. Grants +Copyright (c) 2013 Richard Musiol. All rights reserved. - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or as - part of a Larger Work; and + * 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. - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its Contributions - or its Contributor Version. +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. -2.2. Effective Date - The licenses granted in Section 2.1 with respect to any Contribution become - effective for each Contribution on the date the Contributor first distributes - such Contribution. +-------------------------------------------------------------------------------- +Dependency : github.com/gorilla/websocket +Version: v1.4.1 +Licence type (autodetected): BSD-2-Clause +-------------------------------------------------------------------------------- -2.3. Limitations on Grant Scope +Contents of probable licence file $GOMODCACHE/github.com/gorilla/websocket@v1.4.1/LICENSE: - The licenses granted in this Section 2 are the only rights granted under this - License. No additional rights or licenses will be implied from the distribution - or licensing of Covered Software under this License. Notwithstanding Section - 2.1(b) above, no patent license is granted by a Contributor: +Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved. - a. for any code that a Contributor has removed from Covered Software; or +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: - b. for infringements caused by: (i) Your and any other third party’s - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. - c. under Patent Claims infringed by Covered Software in the absence of its - Contributions. + 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. - This License does not grant any rights in the trademarks, service marks, or - logos of any Contributor (except as may be necessary to comply with the - notice requirements in Section 3.4). +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 HOLDER 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. -2.4. Subsequent Licenses - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this License - (see Section 10.2) or under the terms of a Secondary License (if permitted - under the terms of Section 3.3). +-------------------------------------------------------------------------------- +Dependency : github.com/gregjones/httpcache +Version: v0.0.0-20180305231024-9cad4c3443a7 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- -2.5. Representation +Contents of probable licence file $GOMODCACHE/github.com/gregjones/httpcache@v0.0.0-20180305231024-9cad4c3443a7/LICENSE.txt: - Each Contributor represents that the Contributor believes its Contributions - are its original creation(s) or it has sufficient rights to grant the - rights to its Contributions conveyed by this License. +Copyright © 2012 Greg Jones (greg.jones@gmail.com) -2.6. Fair Use +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - This License is not intended to limit any rights You have under applicable - copyright doctrines of fair use, fair dealing, or other equivalents. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -2.7. Conditions +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. +-------------------------------------------------------------------------------- +Dependency : github.com/grpc-ecosystem/grpc-gateway +Version: v1.13.0 +Licence type (autodetected): BSD-3-Clause +-------------------------------------------------------------------------------- +Contents of probable licence file $GOMODCACHE/github.com/grpc-ecosystem/grpc-gateway@v1.13.0/LICENSE.txt: -3. Responsibilities +Copyright (c) 2015, Gengo, Inc. +All rights reserved. -3.1. Distribution of Source Form +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under the - terms of this License. You must inform recipients that the Source Code Form - of the Covered Software is governed by the terms of this License, and how - they can obtain a copy of this License. You may not attempt to alter or - restrict the recipients’ rights in the Source Code Form. + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -3.2. Distribution of Executable Form + * 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. - If You distribute Covered Software in Executable Form then: + * Neither the name of Gengo, Inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and +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. - b. You may distribute such Executable Form under the terms of this License, - or sublicense it under different terms, provided that the license for - the Executable Form does not attempt to limit or alter the recipients’ - rights in the Source Code Form under this License. -3.3. Distribution of a Larger Work +-------------------------------------------------------------------------------- +Dependency : github.com/hashicorp/cronexpr +Version: v1.1.0 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for the - Covered Software. If the Larger Work is a combination of Covered Software - with a work governed by one or more Secondary Licenses, and the Covered - Software is not Incompatible With Secondary Licenses, this License permits - You to additionally distribute such Covered Software under the terms of - such Secondary License(s), so that the recipient of the Larger Work may, at - their option, further distribute the Covered Software under the terms of - either this License or such Secondary License(s). +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/cronexpr@v1.1.0/APLv2: -3.4. Notices - You may not remove or alter the substance of any license notices (including - copyright notices, patent notices, disclaimers of warranty, or limitations - of liability) contained within the Source Code Form of the Covered - Software, except that You may alter any license notices to the extent - required to remedy known factual inaccuracies. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -3.5. Application of Additional Terms + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on behalf - of any Contributor. You must make it absolutely clear that any such - warranty, support, indemnity, or liability obligation is offered by You - alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. + 1. Definitions. -4. Inability to Comply Due to Statute or Regulation + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, judicial - order, or regulation then You must: (a) comply with the terms of this License - to the maximum extent possible; and (b) describe the limitations and the code - they affect. Such description must be placed in a text file included with all - distributions of the Covered Software under this License. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. -5. Termination + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. -5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing basis, - if such Contributor fails to notify You of the non-compliance by some - reasonable means prior to 60 days after You have come back into compliance. - Moreover, Your grants from a particular Contributor are reinstated on an - ongoing basis if such Contributor notifies You of the non-compliance by - some reasonable means, this is the first time You have received notice of - non-compliance with this License from such Contributor, and You become - compliant prior to 30 days after Your receipt of the notice. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, counter-claims, - and cross-claims) alleging that a Contributor Version directly or - indirectly infringes any patent, then the rights granted to You by any and - all Contributors for the Covered Software under Section 2.1 of this License - shall terminate. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. -6. Disclaimer of Warranty + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). - Covered Software is provided under this License on an “as is” basis, without - warranty of any kind, either expressed, implied, or statutory, including, - without limitation, warranties that the Covered Software is free of defects, - merchantable, fit for a particular purpose or non-infringing. The entire - risk as to the quality and performance of the Covered Software is with You. - Should any Covered Software prove defective in any respect, You (not any - Contributor) assume the cost of any necessary servicing, repair, or - correction. This disclaimer of warranty constitutes an essential part of this - License. No use of any Covered Software is authorized under this License - except under this disclaimer. + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. -7. Limitation of Liability + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from such - party’s negligence to the extent applicable law prohibits such limitation. - Some jurisdictions do not allow the exclusion or limitation of incidental or - consequential damages, so this exclusion and limitation may not apply to You. + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. -8. Litigation + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. - Any litigation relating to this License may be brought only in the courts of - a jurisdiction where the defendant maintains its principal place of business - and such litigation shall be governed by laws of that jurisdiction, without - reference to its conflict-of-law provisions. Nothing in this Section shall - prevent a party’s ability to bring cross-claims or counter-claims. + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. -9. Miscellaneous + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: - This License represents the complete agreement concerning the subject matter - hereof. If any provision of this License is held to be unenforceable, such - provision shall be reformed only to the extent necessary to make it - enforceable. Any law or regulation which provides that the language of a - contract shall be construed against the drafter shall not be used to construe - this License against a Contributor. + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and -10. Versions of the License + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and -10.1. New Versions + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. -10.2. Effect of New Versions + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. - You may distribute the Covered Software under the terms of the version of - the License under which You originally received the Covered Software, or - under the terms of any subsequent version published by the license - steward. + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. -10.3. Modified Versions + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a modified - version of this License if you rename the license and remove any - references to the name of the license steward (except to note that such - modified license differs from this License). + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. -10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses - If You choose to distribute Source Code Form that is Incompatible With - Secondary Licenses under the terms of this version of the License, the - notice described in Exhibit B of this License must be attached. + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. -Exhibit A - Source Code Form License Notice + END OF TERMS AND CONDITIONS - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. + APPENDIX: How to apply the Apache License to your work. -If it is not possible or desirable to put the notice in a particular file, then -You may include the notice in a location (such as a LICENSE file in a relevant -directory) where a recipient would be likely to look for such a notice. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -You may add additional accurate notices of copyright ownership. + Copyright [yyyy] [name of copyright owner] -Exhibit B - “Incompatible With Secondary Licenses” Notice + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at - This Source Code Form is “Incompatible - With Secondary Licenses”, as defined by - the Mozilla Public License, v. 2.0. + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/go-cleanhttp -Version: v0.5.1 +Dependency : github.com/hashicorp/errwrap +Version: v1.0.0 Licence type (autodetected): MPL-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-cleanhttp@v0.5.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/errwrap@v1.0.0/LICENSE: Mozilla Public License, version 2.0 1. Definitions -1.1. "Contributor" +1.1. “Contributor” means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software. -1.2. "Contributor Version" +1.2. “Contributor Version” means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. + Contributor and that particular Contributor’s Contribution. -1.3. "Contribution" +1.3. “Contribution” means Covered Software of a particular Contributor. -1.4. "Covered Software" +1.4. “Covered Software” means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof. -1.5. "Incompatible With Secondary Licenses" +1.5. “Incompatible With Secondary Licenses” means a. that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. + b. that the Covered Software was made available under the terms of version + 1.1 or earlier of the License, but not also under the terms of a + Secondary License. -1.6. "Executable Form" +1.6. “Executable Form” means any form of the work other than Source Code Form. -1.7. "Larger Work" +1.7. “Larger Work” - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. + means a work that combines Covered Software with other material, in a separate + file or files, that is not Covered Software. -1.8. "License" +1.8. “License” means this document. -1.9. "Licensable" +1.9. “Licensable” - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. + means having the right to grant, to the maximum extent possible, whether at the + time of the initial grant or subsequently, any and all of the rights conveyed by + this License. -1.10. "Modifications" +1.10. “Modifications” means any of the following: - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or + a. any file in Source Code Form that results from an addition to, deletion + from, or modification of the contents of Covered Software; or b. any new file in Source Code Form that contains any Covered Software. -1.11. "Patent Claims" of a Contributor +1.11. “Patent Claims” of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. + means any patent claim(s), including without limitation, method, process, + and apparatus claims, in any patent Licensable by such Contributor that + would be infringed, but for the grant of the License, by the making, + using, selling, offering for sale, having made, import, or transfer of + either its Contributions or its Contributor Version. -1.12. "Secondary License" +1.12. “Secondary License” means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses. -1.13. "Source Code Form" +1.13. “Source Code Form” means the form of the work preferred for making modifications. -1.14. "You" (or "Your") +1.14. “You” (or “Your”) means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is + License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause + definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. @@ -32055,59 +32063,57 @@ Mozilla Public License, version 2.0 a. under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and + Contributions, either on an unmodified basis, with Modifications, or as + part of a Larger Work; and b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. + sale, have made, import, and otherwise transfer either its Contributions + or its Contributor Version. 2.2. Effective Date - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. + The licenses granted in Section 2.1 with respect to any Contribution become + effective for each Contribution on the date the Contributor first distributes + such Contribution. 2.3. Limitations on Grant Scope - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: + The licenses granted in this Section 2 are the only rights granted under this + License. No additional rights or licenses will be implied from the distribution + or licensing of Covered Software under this License. Notwithstanding Section + 2.1(b) above, no patent license is granted by a Contributor: a. for any code that a Contributor has removed from Covered Software; or - b. for infringements caused by: (i) Your and any other third party's + b. for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. + c. under Patent Claims infringed by Covered Software in the absence of its + Contributions. - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). + This License does not grant any rights in the trademarks, service marks, or + logos of any Contributor (except as may be necessary to comply with the + notice requirements in Section 3.4). 2.4. Subsequent Licenses No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). + distribute the Covered Software under a subsequent version of this License + (see Section 10.2) or under the terms of a Secondary License (if permitted + under the terms of Section 3.3). 2.5. Representation - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. + Each Contributor represents that the Contributor believes its Contributions + are its original creation(s) or it has sufficient rights to grant the + rights to its Contributions conveyed by this License. 2.6. Fair Use - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. + This License is not intended to limit any rights You have under applicable + copyright doctrines of fair use, fair dealing, or other equivalents. 2.7. Conditions @@ -32120,12 +32126,11 @@ Mozilla Public License, version 2.0 3.1. Distribution of Source Form All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. + Modifications that You create or to which You contribute, must be under the + terms of this License. You must inform recipients that the Source Code Form + of the Covered Software is governed by the terms of this License, and how + they can obtain a copy of this License. You may not attempt to alter or + restrict the recipients’ rights in the Source Code Form. 3.2. Distribution of Executable Form @@ -32137,40 +32142,39 @@ Mozilla Public License, version 2.0 reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. + b. You may distribute such Executable Form under the terms of this License, + or sublicense it under different terms, provided that the license for + the Executable Form does not attempt to limit or alter the recipients’ + rights in the Source Code Form under this License. 3.3. Distribution of a Larger Work You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). + provided that You also comply with the requirements of this License for the + Covered Software. If the Larger Work is a combination of Covered Software + with a work governed by one or more Secondary Licenses, and the Covered + Software is not Incompatible With Secondary Licenses, this License permits + You to additionally distribute such Covered Software under the terms of + such Secondary License(s), so that the recipient of the Larger Work may, at + their option, further distribute the Covered Software under the terms of + either this License or such Secondary License(s). 3.4. Notices - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. + You may not remove or alter the substance of any license notices (including + copyright notices, patent notices, disclaimers of warranty, or limitations + of liability) contained within the Source Code Form of the Covered + Software, except that You may alter any license notices to the extent + required to remedy known factual inaccuracies. 3.5. Application of Additional Terms You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any + Software. However, You may do so only on Your own behalf, and not on behalf + of any Contributor. You must make it absolutely clear that any such + warranty, support, indemnity, or liability obligation is offered by You + alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any @@ -32179,14 +32183,14 @@ Mozilla Public License, version 2.0 4. Inability to Comply Due to Statute or Regulation If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. + with respect to some or all of the Covered Software due to statute, judicial + order, or regulation then You must: (a) comply with the terms of this License + to the maximum extent possible; and (b) describe the limitations and the code + they affect. Such description must be placed in a text file included with all + distributions of the Covered Software under this License. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. 5. Termination @@ -32194,22 +32198,21 @@ Mozilla Public License, version 2.0 fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. + explicitly and finally terminates Your grants, and (b) on an ongoing basis, + if such Contributor fails to notify You of the non-compliance by some + reasonable means prior to 60 days after You have come back into compliance. + Moreover, Your grants from a particular Contributor are reinstated on an + ongoing basis if such Contributor notifies You of the non-compliance by + some reasonable means, this is the first time You have received notice of + non-compliance with this License from such Contributor, and You become + compliant prior to 30 days after Your receipt of the notice. 5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. + infringement claim (excluding declaratory judgment actions, counter-claims, + and cross-claims) alleging that a Contributor Version directly or + indirectly infringes any patent, then the rights granted to You by any and + all Contributors for the Covered Software under Section 2.1 of this License + shall terminate. 5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been @@ -32218,17 +32221,17 @@ Mozilla Public License, version 2.0 6. Disclaimer of Warranty - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. - + Covered Software is provided under this License on an “as is” basis, without + warranty of any kind, either expressed, implied, or statutory, including, + without limitation, warranties that the Covered Software is free of defects, + merchantable, fit for a particular purpose or non-infringing. The entire + risk as to the quality and performance of the Covered Software is with You. + Should any Covered Software prove defective in any respect, You (not any + Contributor) assume the cost of any necessary servicing, repair, or + correction. This disclaimer of warranty constitutes an essential part of this + License. No use of any Covered Software is authorized under this License + except under this disclaimer. + 7. Limitation of Liability Under no circumstances and under no legal theory, whether tort (including @@ -32239,29 +32242,27 @@ Mozilla Public License, version 2.0 goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. + shall not apply to liability for death or personal injury resulting from such + party’s negligence to the extent applicable law prohibits such limitation. + Some jurisdictions do not allow the exclusion or limitation of incidental or + consequential damages, so this exclusion and limitation may not apply to You. 8. Litigation - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. + Any litigation relating to this License may be brought only in the courts of + a jurisdiction where the defendant maintains its principal place of business + and such litigation shall be governed by laws of that jurisdiction, without + reference to its conflict-of-law provisions. Nothing in this Section shall + prevent a party’s ability to bring cross-claims or counter-claims. 9. Miscellaneous - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. + This License represents the complete agreement concerning the subject matter + hereof. If any provision of this License is held to be unenforceable, such + provision shall be reformed only to the extent necessary to make it + enforceable. Any law or regulation which provides that the language of a + contract shall be construed against the drafter shall not be used to construe + this License against a Contributor. 10. Versions of the License @@ -32275,24 +32276,23 @@ Mozilla Public License, version 2.0 10.2. Effect of New Versions - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license + You may distribute the Covered Software under the terms of the version of + the License under which You originally received the Covered Software, or + under the terms of any subsequent version published by the license steward. 10.3. Modified Versions If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). + create a new license for such software, you may create and use a modified + version of this License if you rename the license and remove any + references to the name of the license steward (except to note that such + modified license differs from this License). -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. +10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses + If You choose to distribute Source Code Form that is Incompatible With + Secondary Licenses under the terms of this version of the License, the + notice described in Exhibit B of this License must be attached. Exhibit A - Source Code Form License Notice @@ -32303,59 +32303,27 @@ Exhibit A - Source Code Form License Notice obtain one at http://mozilla.org/MPL/2.0/. -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. +If it is not possible or desirable to put the notice in a particular file, then +You may include the notice in a location (such as a LICENSE file in a relevant +directory) where a recipient would be likely to look for such a notice. You may add additional accurate notices of copyright ownership. -Exhibit B - "Incompatible With Secondary Licenses" Notice +Exhibit B - “Incompatible With Secondary Licenses” Notice - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by + This Source Code Form is “Incompatible + With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0. -------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/go-hclog -Version: v0.9.2 -Licence type (autodetected): MIT --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-hclog@v0.9.2/LICENSE: - -MIT License - -Copyright (c) 2017 HashiCorp - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - --------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/go-rootcerts -Version: v1.0.2 +Dependency : github.com/hashicorp/go-cleanhttp +Version: v0.5.1 Licence type (autodetected): MPL-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-rootcerts@v1.0.2/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-cleanhttp@v0.5.1/LICENSE: Mozilla Public License, version 2.0 @@ -32723,12 +32691,43 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice -------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/go-uuid +Dependency : github.com/hashicorp/go-hclog +Version: v0.9.2 +Licence type (autodetected): MIT +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-hclog@v0.9.2/LICENSE: + +MIT License + +Copyright (c) 2017 HashiCorp + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +-------------------------------------------------------------------------------- +Dependency : github.com/hashicorp/go-rootcerts Version: v1.0.2 Licence type (autodetected): MPL-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-uuid@v1.0.2/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-rootcerts@v1.0.2/LICENSE: Mozilla Public License, version 2.0 @@ -33096,100 +33095,100 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice -------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/go-version -Version: v1.0.0 +Dependency : github.com/hashicorp/go-uuid +Version: v1.0.2 Licence type (autodetected): MPL-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-version@v1.0.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-uuid@v1.0.2/LICENSE: Mozilla Public License, version 2.0 1. Definitions -1.1. “Contributor” +1.1. "Contributor" means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software. -1.2. “Contributor Version” +1.2. "Contributor Version" means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor’s Contribution. + Contributor and that particular Contributor's Contribution. -1.3. “Contribution” +1.3. "Contribution" means Covered Software of a particular Contributor. -1.4. “Covered Software” +1.4. "Covered Software" means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof. -1.5. “Incompatible With Secondary Licenses” +1.5. "Incompatible With Secondary Licenses" means a. that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or - b. that the Covered Software was made available under the terms of version - 1.1 or earlier of the License, but not also under the terms of a - Secondary License. + b. that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the terms of + a Secondary License. -1.6. “Executable Form” +1.6. "Executable Form" means any form of the work other than Source Code Form. -1.7. “Larger Work” +1.7. "Larger Work" - means a work that combines Covered Software with other material, in a separate - file or files, that is not Covered Software. + means a work that combines Covered Software with other material, in a + separate file or files, that is not Covered Software. -1.8. “License” +1.8. "License" means this document. -1.9. “Licensable” +1.9. "Licensable" - means having the right to grant, to the maximum extent possible, whether at the - time of the initial grant or subsequently, any and all of the rights conveyed by - this License. + means having the right to grant, to the maximum extent possible, whether + at the time of the initial grant or subsequently, any and all of the + rights conveyed by this License. -1.10. “Modifications” +1.10. "Modifications" means any of the following: - a. any file in Source Code Form that results from an addition to, deletion - from, or modification of the contents of Covered Software; or + a. any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered Software; or b. any new file in Source Code Form that contains any Covered Software. -1.11. “Patent Claims” of a Contributor +1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, process, - and apparatus claims, in any patent Licensable by such Contributor that - would be infringed, but for the grant of the License, by the making, - using, selling, offering for sale, having made, import, or transfer of - either its Contributions or its Contributor Version. + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the License, + by the making, using, selling, offering for sale, having made, import, + or transfer of either its Contributions or its Contributor Version. -1.12. “Secondary License” +1.12. "Secondary License" means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses. -1.13. “Source Code Form” +1.13. "Source Code Form" means the form of the work preferred for making modifications. -1.14. “You” (or “Your”) +1.14. "You" (or "Your") means an individual or a legal entity exercising rights under this - License. For legal entities, “You” includes any entity that controls, is + License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with You. For purposes of this - definition, “control” means (a) the power, direct or indirect, to cause + definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. @@ -33205,57 +33204,59 @@ Mozilla Public License, version 2.0 a. under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or as - part of a Larger Work; and + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its Contributions - or its Contributor Version. + sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. 2.2. Effective Date - The licenses granted in Section 2.1 with respect to any Contribution become - effective for each Contribution on the date the Contributor first distributes - such Contribution. + The licenses granted in Section 2.1 with respect to any Contribution + become effective for each Contribution on the date the Contributor first + distributes such Contribution. 2.3. Limitations on Grant Scope - The licenses granted in this Section 2 are the only rights granted under this - License. No additional rights or licenses will be implied from the distribution - or licensing of Covered Software under this License. Notwithstanding Section - 2.1(b) above, no patent license is granted by a Contributor: + The licenses granted in this Section 2 are the only rights granted under + this License. No additional rights or licenses will be implied from the + distribution or licensing of Covered Software under this License. + Notwithstanding Section 2.1(b) above, no patent license is granted by a + Contributor: a. for any code that a Contributor has removed from Covered Software; or - b. for infringements caused by: (i) Your and any other third party’s + b. for infringements caused by: (i) Your and any other third party's modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or - c. under Patent Claims infringed by Covered Software in the absence of its - Contributions. + c. under Patent Claims infringed by Covered Software in the absence of + its Contributions. - This License does not grant any rights in the trademarks, service marks, or - logos of any Contributor (except as may be necessary to comply with the - notice requirements in Section 3.4). + This License does not grant any rights in the trademarks, service marks, + or logos of any Contributor (except as may be necessary to comply with + the notice requirements in Section 3.4). 2.4. Subsequent Licenses No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this License - (see Section 10.2) or under the terms of a Secondary License (if permitted - under the terms of Section 3.3). + distribute the Covered Software under a subsequent version of this + License (see Section 10.2) or under the terms of a Secondary License (if + permitted under the terms of Section 3.3). 2.5. Representation - Each Contributor represents that the Contributor believes its Contributions - are its original creation(s) or it has sufficient rights to grant the - rights to its Contributions conveyed by this License. + Each Contributor represents that the Contributor believes its + Contributions are its original creation(s) or it has sufficient rights to + grant the rights to its Contributions conveyed by this License. 2.6. Fair Use - This License is not intended to limit any rights You have under applicable - copyright doctrines of fair use, fair dealing, or other equivalents. + This License is not intended to limit any rights You have under + applicable copyright doctrines of fair use, fair dealing, or other + equivalents. 2.7. Conditions @@ -33268,11 +33269,12 @@ Mozilla Public License, version 2.0 3.1. Distribution of Source Form All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under the - terms of this License. You must inform recipients that the Source Code Form - of the Covered Software is governed by the terms of this License, and how - they can obtain a copy of this License. You may not attempt to alter or - restrict the recipients’ rights in the Source Code Form. + Modifications that You create or to which You contribute, must be under + the terms of this License. You must inform recipients that the Source + Code Form of the Covered Software is governed by the terms of this + License, and how they can obtain a copy of this License. You may not + attempt to alter or restrict the recipients' rights in the Source Code + Form. 3.2. Distribution of Executable Form @@ -33284,39 +33286,40 @@ Mozilla Public License, version 2.0 reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and - b. You may distribute such Executable Form under the terms of this License, - or sublicense it under different terms, provided that the license for - the Executable Form does not attempt to limit or alter the recipients’ - rights in the Source Code Form under this License. + b. You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter the + recipients' rights in the Source Code Form under this License. 3.3. Distribution of a Larger Work You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for the - Covered Software. If the Larger Work is a combination of Covered Software - with a work governed by one or more Secondary Licenses, and the Covered - Software is not Incompatible With Secondary Licenses, this License permits - You to additionally distribute such Covered Software under the terms of - such Secondary License(s), so that the recipient of the Larger Work may, at - their option, further distribute the Covered Software under the terms of - either this License or such Secondary License(s). + provided that You also comply with the requirements of this License for + the Covered Software. If the Larger Work is a combination of Covered + Software with a work governed by one or more Secondary Licenses, and the + Covered Software is not Incompatible With Secondary Licenses, this + License permits You to additionally distribute such Covered Software + under the terms of such Secondary License(s), so that the recipient of + the Larger Work may, at their option, further distribute the Covered + Software under the terms of either this License or such Secondary + License(s). 3.4. Notices - You may not remove or alter the substance of any license notices (including - copyright notices, patent notices, disclaimers of warranty, or limitations - of liability) contained within the Source Code Form of the Covered - Software, except that You may alter any license notices to the extent - required to remedy known factual inaccuracies. + You may not remove or alter the substance of any license notices + (including copyright notices, patent notices, disclaimers of warranty, or + limitations of liability) contained within the Source Code Form of the + Covered Software, except that You may alter any license notices to the + extent required to remedy known factual inaccuracies. 3.5. Application of Additional Terms You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on behalf - of any Contributor. You must make it absolutely clear that any such - warranty, support, indemnity, or liability obligation is offered by You - alone, and You hereby agree to indemnify every Contributor for any + Software. However, You may do so only on Your own behalf, and not on + behalf of any Contributor. You must make it absolutely clear that any + such warranty, support, indemnity, or liability obligation is offered by + You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any @@ -33325,14 +33328,14 @@ Mozilla Public License, version 2.0 4. Inability to Comply Due to Statute or Regulation If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, judicial - order, or regulation then You must: (a) comply with the terms of this License - to the maximum extent possible; and (b) describe the limitations and the code - they affect. Such description must be placed in a text file included with all - distributions of the Covered Software under this License. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. + with respect to some or all of the Covered Software due to statute, + judicial order, or regulation then You must: (a) comply with the terms of + this License to the maximum extent possible; and (b) describe the + limitations and the code they affect. Such description must be placed in a + text file included with all distributions of the Covered Software under + this License. Except to the extent prohibited by statute or regulation, + such description must be sufficiently detailed for a recipient of ordinary + skill to be able to understand it. 5. Termination @@ -33340,21 +33343,22 @@ Mozilla Public License, version 2.0 fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing basis, - if such Contributor fails to notify You of the non-compliance by some - reasonable means prior to 60 days after You have come back into compliance. - Moreover, Your grants from a particular Contributor are reinstated on an - ongoing basis if such Contributor notifies You of the non-compliance by - some reasonable means, this is the first time You have received notice of - non-compliance with this License from such Contributor, and You become - compliant prior to 30 days after Your receipt of the notice. + explicitly and finally terminates Your grants, and (b) on an ongoing + basis, if such Contributor fails to notify You of the non-compliance by + some reasonable means prior to 60 days after You have come back into + compliance. Moreover, Your grants from a particular Contributor are + reinstated on an ongoing basis if such Contributor notifies You of the + non-compliance by some reasonable means, this is the first time You have + received notice of non-compliance with this License from such + Contributor, and You become compliant prior to 30 days after Your receipt + of the notice. 5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, counter-claims, - and cross-claims) alleging that a Contributor Version directly or - indirectly infringes any patent, then the rights granted to You by any and - all Contributors for the Covered Software under Section 2.1 of this License - shall terminate. + infringement claim (excluding declaratory judgment actions, + counter-claims, and cross-claims) alleging that a Contributor Version + directly or indirectly infringes any patent, then the rights granted to + You by any and all Contributors for the Covered Software under Section + 2.1 of this License shall terminate. 5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been @@ -33363,16 +33367,16 @@ Mozilla Public License, version 2.0 6. Disclaimer of Warranty - Covered Software is provided under this License on an “as is” basis, without - warranty of any kind, either expressed, implied, or statutory, including, - without limitation, warranties that the Covered Software is free of defects, - merchantable, fit for a particular purpose or non-infringing. The entire - risk as to the quality and performance of the Covered Software is with You. - Should any Covered Software prove defective in any respect, You (not any - Contributor) assume the cost of any necessary servicing, repair, or - correction. This disclaimer of warranty constitutes an essential part of this - License. No use of any Covered Software is authorized under this License - except under this disclaimer. + Covered Software is provided under this License on an "as is" basis, + without warranty of any kind, either expressed, implied, or statutory, + including, without limitation, warranties that the Covered Software is free + of defects, merchantable, fit for a particular purpose or non-infringing. + The entire risk as to the quality and performance of the Covered Software + is with You. Should any Covered Software prove defective in any respect, + You (not any Contributor) assume the cost of any necessary servicing, + repair, or correction. This disclaimer of warranty constitutes an essential + part of this License. No use of any Covered Software is authorized under + this License except under this disclaimer. 7. Limitation of Liability @@ -33384,27 +33388,29 @@ Mozilla Public License, version 2.0 goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from such - party’s negligence to the extent applicable law prohibits such limitation. - Some jurisdictions do not allow the exclusion or limitation of incidental or - consequential damages, so this exclusion and limitation may not apply to You. + shall not apply to liability for death or personal injury resulting from + such party's negligence to the extent applicable law prohibits such + limitation. Some jurisdictions do not allow the exclusion or limitation of + incidental or consequential damages, so this exclusion and limitation may + not apply to You. 8. Litigation - Any litigation relating to this License may be brought only in the courts of - a jurisdiction where the defendant maintains its principal place of business - and such litigation shall be governed by laws of that jurisdiction, without - reference to its conflict-of-law provisions. Nothing in this Section shall - prevent a party’s ability to bring cross-claims or counter-claims. + Any litigation relating to this License may be brought only in the courts + of a jurisdiction where the defendant maintains its principal place of + business and such litigation shall be governed by laws of that + jurisdiction, without reference to its conflict-of-law provisions. Nothing + in this Section shall prevent a party's ability to bring cross-claims or + counter-claims. 9. Miscellaneous - This License represents the complete agreement concerning the subject matter - hereof. If any provision of this License is held to be unenforceable, such - provision shall be reformed only to the extent necessary to make it - enforceable. Any law or regulation which provides that the language of a - contract shall be construed against the drafter shall not be used to construe - this License against a Contributor. + This License represents the complete agreement concerning the subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. Any law or regulation which provides that + the language of a contract shall be construed against the drafter shall not + be used to construe this License against a Contributor. 10. Versions of the License @@ -33418,23 +33424,24 @@ Mozilla Public License, version 2.0 10.2. Effect of New Versions - You may distribute the Covered Software under the terms of the version of - the License under which You originally received the Covered Software, or - under the terms of any subsequent version published by the license + You may distribute the Covered Software under the terms of the version + of the License under which You originally received the Covered Software, + or under the terms of any subsequent version published by the license steward. 10.3. Modified Versions If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a modified - version of this License if you rename the license and remove any - references to the name of the license steward (except to note that such - modified license differs from this License). + create a new license for such software, you may create and use a + modified version of this License if you rename the license and remove + any references to the name of the license steward (except to note that + such modified license differs from this License). -10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses - If You choose to distribute Source Code Form that is Incompatible With - Secondary Licenses under the terms of this version of the License, the - notice described in Exhibit B of this License must be attached. +10.4. Distributing Source Code Form that is Incompatible With Secondary + Licenses If You choose to distribute Source Code Form that is + Incompatible With Secondary Licenses under the terms of this version of + the License, the notice described in Exhibit B of this License must be + attached. Exhibit A - Source Code Form License Notice @@ -33445,115 +33452,116 @@ Exhibit A - Source Code Form License Notice obtain one at http://mozilla.org/MPL/2.0/. -If it is not possible or desirable to put the notice in a particular file, then -You may include the notice in a location (such as a LICENSE file in a relevant -directory) where a recipient would be likely to look for such a notice. +If it is not possible or desirable to put the notice in a particular file, +then You may include the notice in a location (such as a LICENSE file in a +relevant directory) where a recipient would be likely to look for such a +notice. You may add additional accurate notices of copyright ownership. -Exhibit B - “Incompatible With Secondary Licenses” Notice +Exhibit B - "Incompatible With Secondary Licenses" Notice - This Source Code Form is “Incompatible - With Secondary Licenses”, as defined by + This Source Code Form is "Incompatible + With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -------------------------------------------------------------------------------- -Dependency : github.com/hashicorp/golang-lru -Version: v0.5.2-0.20190520140433-59383c442f7d +Dependency : github.com/hashicorp/go-version +Version: v1.0.0 Licence type (autodetected): MPL-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/golang-lru@v0.5.2-0.20190520140433-59383c442f7d/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-version@v1.0.0/LICENSE: Mozilla Public License, version 2.0 1. Definitions -1.1. "Contributor" +1.1. “Contributor” means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software. -1.2. "Contributor Version" +1.2. “Contributor Version” means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. + Contributor and that particular Contributor’s Contribution. -1.3. "Contribution" +1.3. “Contribution” means Covered Software of a particular Contributor. -1.4. "Covered Software" +1.4. “Covered Software” means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof. -1.5. "Incompatible With Secondary Licenses" +1.5. “Incompatible With Secondary Licenses” means a. that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. + b. that the Covered Software was made available under the terms of version + 1.1 or earlier of the License, but not also under the terms of a + Secondary License. -1.6. "Executable Form" +1.6. “Executable Form” means any form of the work other than Source Code Form. -1.7. "Larger Work" +1.7. “Larger Work” - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. + means a work that combines Covered Software with other material, in a separate + file or files, that is not Covered Software. -1.8. "License" +1.8. “License” means this document. -1.9. "Licensable" +1.9. “Licensable” - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. + means having the right to grant, to the maximum extent possible, whether at the + time of the initial grant or subsequently, any and all of the rights conveyed by + this License. -1.10. "Modifications" +1.10. “Modifications” means any of the following: - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or + a. any file in Source Code Form that results from an addition to, deletion + from, or modification of the contents of Covered Software; or b. any new file in Source Code Form that contains any Covered Software. -1.11. "Patent Claims" of a Contributor - - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. - -1.12. "Secondary License" +1.11. “Patent Claims” of a Contributor + + means any patent claim(s), including without limitation, method, process, + and apparatus claims, in any patent Licensable by such Contributor that + would be infringed, but for the grant of the License, by the making, + using, selling, offering for sale, having made, import, or transfer of + either its Contributions or its Contributor Version. + +1.12. “Secondary License” means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses. -1.13. "Source Code Form" +1.13. “Source Code Form” means the form of the work preferred for making modifications. -1.14. "You" (or "Your") +1.14. “You” (or “Your”) means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is + License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause + definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. @@ -33569,59 +33577,57 @@ Mozilla Public License, version 2.0 a. under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and + Contributions, either on an unmodified basis, with Modifications, or as + part of a Larger Work; and b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. + sale, have made, import, and otherwise transfer either its Contributions + or its Contributor Version. 2.2. Effective Date - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. + The licenses granted in Section 2.1 with respect to any Contribution become + effective for each Contribution on the date the Contributor first distributes + such Contribution. 2.3. Limitations on Grant Scope - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: + The licenses granted in this Section 2 are the only rights granted under this + License. No additional rights or licenses will be implied from the distribution + or licensing of Covered Software under this License. Notwithstanding Section + 2.1(b) above, no patent license is granted by a Contributor: a. for any code that a Contributor has removed from Covered Software; or - b. for infringements caused by: (i) Your and any other third party's + b. for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. + c. under Patent Claims infringed by Covered Software in the absence of its + Contributions. - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). + This License does not grant any rights in the trademarks, service marks, or + logos of any Contributor (except as may be necessary to comply with the + notice requirements in Section 3.4). 2.4. Subsequent Licenses No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). + distribute the Covered Software under a subsequent version of this License + (see Section 10.2) or under the terms of a Secondary License (if permitted + under the terms of Section 3.3). 2.5. Representation - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. + Each Contributor represents that the Contributor believes its Contributions + are its original creation(s) or it has sufficient rights to grant the + rights to its Contributions conveyed by this License. 2.6. Fair Use - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. + This License is not intended to limit any rights You have under applicable + copyright doctrines of fair use, fair dealing, or other equivalents. 2.7. Conditions @@ -33634,12 +33640,11 @@ Mozilla Public License, version 2.0 3.1. Distribution of Source Form All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. + Modifications that You create or to which You contribute, must be under the + terms of this License. You must inform recipients that the Source Code Form + of the Covered Software is governed by the terms of this License, and how + they can obtain a copy of this License. You may not attempt to alter or + restrict the recipients’ rights in the Source Code Form. 3.2. Distribution of Executable Form @@ -33651,40 +33656,39 @@ Mozilla Public License, version 2.0 reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. + b. You may distribute such Executable Form under the terms of this License, + or sublicense it under different terms, provided that the license for + the Executable Form does not attempt to limit or alter the recipients’ + rights in the Source Code Form under this License. 3.3. Distribution of a Larger Work You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). + provided that You also comply with the requirements of this License for the + Covered Software. If the Larger Work is a combination of Covered Software + with a work governed by one or more Secondary Licenses, and the Covered + Software is not Incompatible With Secondary Licenses, this License permits + You to additionally distribute such Covered Software under the terms of + such Secondary License(s), so that the recipient of the Larger Work may, at + their option, further distribute the Covered Software under the terms of + either this License or such Secondary License(s). 3.4. Notices - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. + You may not remove or alter the substance of any license notices (including + copyright notices, patent notices, disclaimers of warranty, or limitations + of liability) contained within the Source Code Form of the Covered + Software, except that You may alter any license notices to the extent + required to remedy known factual inaccuracies. 3.5. Application of Additional Terms You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any + Software. However, You may do so only on Your own behalf, and not on behalf + of any Contributor. You must make it absolutely clear that any such + warranty, support, indemnity, or liability obligation is offered by You + alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any @@ -33693,14 +33697,14 @@ Mozilla Public License, version 2.0 4. Inability to Comply Due to Statute or Regulation If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. + with respect to some or all of the Covered Software due to statute, judicial + order, or regulation then You must: (a) comply with the terms of this License + to the maximum extent possible; and (b) describe the limitations and the code + they affect. Such description must be placed in a text file included with all + distributions of the Covered Software under this License. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. 5. Termination @@ -33708,22 +33712,21 @@ Mozilla Public License, version 2.0 fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. + explicitly and finally terminates Your grants, and (b) on an ongoing basis, + if such Contributor fails to notify You of the non-compliance by some + reasonable means prior to 60 days after You have come back into compliance. + Moreover, Your grants from a particular Contributor are reinstated on an + ongoing basis if such Contributor notifies You of the non-compliance by + some reasonable means, this is the first time You have received notice of + non-compliance with this License from such Contributor, and You become + compliant prior to 30 days after Your receipt of the notice. 5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. + infringement claim (excluding declaratory judgment actions, counter-claims, + and cross-claims) alleging that a Contributor Version directly or + indirectly infringes any patent, then the rights granted to You by any and + all Contributors for the Covered Software under Section 2.1 of this License + shall terminate. 5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been @@ -33732,16 +33735,16 @@ Mozilla Public License, version 2.0 6. Disclaimer of Warranty - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. + Covered Software is provided under this License on an “as is” basis, without + warranty of any kind, either expressed, implied, or statutory, including, + without limitation, warranties that the Covered Software is free of defects, + merchantable, fit for a particular purpose or non-infringing. The entire + risk as to the quality and performance of the Covered Software is with You. + Should any Covered Software prove defective in any respect, You (not any + Contributor) assume the cost of any necessary servicing, repair, or + correction. This disclaimer of warranty constitutes an essential part of this + License. No use of any Covered Software is authorized under this License + except under this disclaimer. 7. Limitation of Liability @@ -33753,29 +33756,27 @@ Mozilla Public License, version 2.0 goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. + shall not apply to liability for death or personal injury resulting from such + party’s negligence to the extent applicable law prohibits such limitation. + Some jurisdictions do not allow the exclusion or limitation of incidental or + consequential damages, so this exclusion and limitation may not apply to You. 8. Litigation - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. + Any litigation relating to this License may be brought only in the courts of + a jurisdiction where the defendant maintains its principal place of business + and such litigation shall be governed by laws of that jurisdiction, without + reference to its conflict-of-law provisions. Nothing in this Section shall + prevent a party’s ability to bring cross-claims or counter-claims. 9. Miscellaneous - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. + This License represents the complete agreement concerning the subject matter + hereof. If any provision of this License is held to be unenforceable, such + provision shall be reformed only to the extent necessary to make it + enforceable. Any law or regulation which provides that the language of a + contract shall be construed against the drafter shall not be used to construe + this License against a Contributor. 10. Versions of the License @@ -33789,24 +33790,23 @@ Mozilla Public License, version 2.0 10.2. Effect of New Versions - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license + You may distribute the Covered Software under the terms of the version of + the License under which You originally received the Covered Software, or + under the terms of any subsequent version published by the license steward. 10.3. Modified Versions If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). + create a new license for such software, you may create and use a modified + version of this License if you rename the license and remove any + references to the name of the license steward (except to note that such + modified license differs from this License). -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. +10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses + If You choose to distribute Source Code Form that is Incompatible With + Secondary Licenses under the terms of this version of the License, the + notice described in Exhibit B of this License must be attached. Exhibit A - Source Code Form License Notice @@ -33817,20 +33817,20 @@ Exhibit A - Source Code Form License Notice obtain one at http://mozilla.org/MPL/2.0/. -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. +If it is not possible or desirable to put the notice in a particular file, then +You may include the notice in a location (such as a LICENSE file in a relevant +directory) where a recipient would be likely to look for such a notice. You may add additional accurate notices of copyright ownership. -Exhibit B - "Incompatible With Secondary Licenses" Notice +Exhibit B - “Incompatible With Secondary Licenses” Notice - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by + This Source Code Form is “Incompatible + With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0. + -------------------------------------------------------------------------------- Dependency : github.com/hashicorp/hcl Version: v1.0.0 diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc index 56f60c9d347..c1d508a9ec6 100644 --- a/filebeat/docs/fields.asciidoc +++ b/filebeat/docs/fields.asciidoc @@ -64951,7 +64951,7 @@ Module for handling logs from Google Cloud. [float] -=== googlecloud +=== gcp Fields from Google Cloud logs. @@ -64964,7 +64964,7 @@ If the destination of the connection was a VM located on the same VPC, this fiel -*`googlecloud.destination.instance.project_id`*:: +*`gcp.destination.instance.project_id`*:: + -- ID of the project containing the VM. @@ -64974,7 +64974,7 @@ type: keyword -- -*`googlecloud.destination.instance.region`*:: +*`gcp.destination.instance.region`*:: + -- Region of the VM. @@ -64984,7 +64984,7 @@ type: keyword -- -*`googlecloud.destination.instance.zone`*:: +*`gcp.destination.instance.zone`*:: + -- Zone of the VM. @@ -65001,7 +65001,7 @@ If the destination of the connection was a VM located on the same VPC, this fiel -*`googlecloud.destination.vpc.project_id`*:: +*`gcp.destination.vpc.project_id`*:: + -- ID of the project containing the VM. @@ -65011,7 +65011,7 @@ type: keyword -- -*`googlecloud.destination.vpc.vpc_name`*:: +*`gcp.destination.vpc.vpc_name`*:: + -- VPC on which the VM is operating. @@ -65021,7 +65021,7 @@ type: keyword -- -*`googlecloud.destination.vpc.subnetwork_name`*:: +*`gcp.destination.vpc.subnetwork_name`*:: + -- Subnetwork on which the VM is operating. @@ -65038,7 +65038,7 @@ If the source of the connection was a VM located on the same VPC, this field is -*`googlecloud.source.instance.project_id`*:: +*`gcp.source.instance.project_id`*:: + -- ID of the project containing the VM. @@ -65048,7 +65048,7 @@ type: keyword -- -*`googlecloud.source.instance.region`*:: +*`gcp.source.instance.region`*:: + -- Region of the VM. @@ -65058,7 +65058,7 @@ type: keyword -- -*`googlecloud.source.instance.zone`*:: +*`gcp.source.instance.zone`*:: + -- Zone of the VM. @@ -65075,7 +65075,7 @@ If the source of the connection was a VM located on the same VPC, this field is -*`googlecloud.source.vpc.project_id`*:: +*`gcp.source.vpc.project_id`*:: + -- ID of the project containing the VM. @@ -65085,7 +65085,7 @@ type: keyword -- -*`googlecloud.source.vpc.vpc_name`*:: +*`gcp.source.vpc.vpc_name`*:: + -- VPC on which the VM is operating. @@ -65095,7 +65095,7 @@ type: keyword -- -*`googlecloud.source.vpc.subnetwork_name`*:: +*`gcp.source.vpc.subnetwork_name`*:: + -- Subnetwork on which the VM is operating. @@ -65112,7 +65112,7 @@ Fields for Google Cloud audit logs. -*`googlecloud.audit.type`*:: +*`gcp.audit.type`*:: + -- Type property. @@ -65129,7 +65129,7 @@ Authentication information. -*`googlecloud.audit.authentication_info.principal_email`*:: +*`gcp.audit.authentication_info.principal_email`*:: + -- The email address of the authenticated user making the request. @@ -65139,7 +65139,7 @@ type: keyword -- -*`googlecloud.audit.authentication_info.authority_selector`*:: +*`gcp.audit.authentication_info.authority_selector`*:: + -- The authority selector specified by the requestor, if any. It is not guaranteed that the principal was allowed to use this authority. @@ -65149,7 +65149,7 @@ type: keyword -- -*`googlecloud.audit.authorization_info`*:: +*`gcp.audit.authorization_info`*:: + -- Authorization information for the operation. @@ -65159,7 +65159,7 @@ type: array -- -*`googlecloud.audit.method_name`*:: +*`gcp.audit.method_name`*:: + -- The name of the service method or operation. For API calls, this should be the name of the API method. For example, 'google.datastore.v1.Datastore.RunQuery'. @@ -65169,7 +65169,7 @@ type: keyword -- -*`googlecloud.audit.num_response_items`*:: +*`gcp.audit.num_response_items`*:: + -- The number of items returned from a List or Query API method, if applicable. @@ -65186,7 +65186,7 @@ The operation request. -*`googlecloud.audit.request.proto_name`*:: +*`gcp.audit.request.proto_name`*:: + -- Type property of the request. @@ -65196,7 +65196,7 @@ type: keyword -- -*`googlecloud.audit.request.filter`*:: +*`gcp.audit.request.filter`*:: + -- Filter of the request. @@ -65206,7 +65206,7 @@ type: keyword -- -*`googlecloud.audit.request.name`*:: +*`gcp.audit.request.name`*:: + -- Name of the request. @@ -65216,7 +65216,7 @@ type: keyword -- -*`googlecloud.audit.request.resource_name`*:: +*`gcp.audit.request.resource_name`*:: + -- Name of the request resource. @@ -65233,7 +65233,7 @@ Metadata about the request. -*`googlecloud.audit.request_metadata.caller_ip`*:: +*`gcp.audit.request_metadata.caller_ip`*:: + -- The IP address of the caller. @@ -65243,7 +65243,7 @@ type: ip -- -*`googlecloud.audit.request_metadata.caller_supplied_user_agent`*:: +*`gcp.audit.request_metadata.caller_supplied_user_agent`*:: + -- The user agent of the caller. This information is not authenticated and should be treated accordingly. @@ -65260,7 +65260,7 @@ The operation response. -*`googlecloud.audit.response.proto_name`*:: +*`gcp.audit.response.proto_name`*:: + -- Type property of the response. @@ -65277,7 +65277,7 @@ The details of the response. -*`googlecloud.audit.response.details.group`*:: +*`gcp.audit.response.details.group`*:: + -- The name of the group. @@ -65287,7 +65287,7 @@ type: keyword -- -*`googlecloud.audit.response.details.kind`*:: +*`gcp.audit.response.details.kind`*:: + -- The kind of the response details. @@ -65297,7 +65297,7 @@ type: keyword -- -*`googlecloud.audit.response.details.name`*:: +*`gcp.audit.response.details.name`*:: + -- The name of the response details. @@ -65307,7 +65307,7 @@ type: keyword -- -*`googlecloud.audit.response.details.uid`*:: +*`gcp.audit.response.details.uid`*:: + -- The uid of the response details. @@ -65317,7 +65317,7 @@ type: keyword -- -*`googlecloud.audit.response.status`*:: +*`gcp.audit.response.status`*:: + -- Status of the response. @@ -65327,7 +65327,7 @@ type: keyword -- -*`googlecloud.audit.resource_name`*:: +*`gcp.audit.resource_name`*:: + -- The resource or collection that is the target of the operation. The name is a scheme-less URI, not including the API service name. For example, 'shelves/SHELF_ID/books'. @@ -65344,7 +65344,7 @@ The location of the resource. -*`googlecloud.audit.resource_location.current_locations`*:: +*`gcp.audit.resource_location.current_locations`*:: + -- Current locations of the resource. @@ -65354,7 +65354,7 @@ type: keyword -- -*`googlecloud.audit.service_name`*:: +*`gcp.audit.service_name`*:: + -- The name of the API service performing the operation. For example, datastore.googleapis.com. @@ -65371,7 +65371,7 @@ The status of the overall operation. -*`googlecloud.audit.status.code`*:: +*`gcp.audit.status.code`*:: + -- The status code, which should be an enum value of google.rpc.Code. @@ -65381,7 +65381,7 @@ type: integer -- -*`googlecloud.audit.status.message`*:: +*`gcp.audit.status.message`*:: + -- A developer-facing error message, which should be in English. Any user-facing error message should be localized and sent in the google.rpc.Status.details field, or localized by the client. @@ -65405,7 +65405,7 @@ Description of the firewall rule that matched this connection. -*`googlecloud.firewall.rule_details.priority`*:: +*`gcp.firewall.rule_details.priority`*:: + -- The priority for the firewall rule. @@ -65414,7 +65414,7 @@ type: long -- -*`googlecloud.firewall.rule_details.action`*:: +*`gcp.firewall.rule_details.action`*:: + -- Action that the rule performs on match. @@ -65423,7 +65423,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.direction`*:: +*`gcp.firewall.rule_details.direction`*:: + -- Direction of traffic that matches this rule. @@ -65432,7 +65432,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.reference`*:: +*`gcp.firewall.rule_details.reference`*:: + -- Reference to the firewall rule. @@ -65441,7 +65441,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.source_range`*:: +*`gcp.firewall.rule_details.source_range`*:: + -- List of source ranges that the firewall rule applies to. @@ -65450,7 +65450,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.destination_range`*:: +*`gcp.firewall.rule_details.destination_range`*:: + -- List of destination ranges that the firewall applies to. @@ -65459,7 +65459,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.source_tag`*:: +*`gcp.firewall.rule_details.source_tag`*:: + -- List of all the source tags that the firewall rule applies to. @@ -65469,7 +65469,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.target_tag`*:: +*`gcp.firewall.rule_details.target_tag`*:: + -- List of all the target tags that the firewall rule applies to. @@ -65479,7 +65479,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.ip_port_info`*:: +*`gcp.firewall.rule_details.ip_port_info`*:: + -- List of ip protocols and applicable port ranges for rules. @@ -65489,7 +65489,7 @@ type: array -- -*`googlecloud.firewall.rule_details.source_service_account`*:: +*`gcp.firewall.rule_details.source_service_account`*:: + -- List of all the source service accounts that the firewall rule applies to. @@ -65499,7 +65499,7 @@ type: keyword -- -*`googlecloud.firewall.rule_details.target_service_account`*:: +*`gcp.firewall.rule_details.target_service_account`*:: + -- List of all the target service accounts that the firewall rule applies to. @@ -65516,7 +65516,7 @@ Fields for Google Cloud VPC flow logs. -*`googlecloud.vpcflow.reporter`*:: +*`gcp.vpcflow.reporter`*:: + -- The side which reported the flow. Can be either 'SRC' or 'DEST'. @@ -65526,7 +65526,7 @@ type: keyword -- -*`googlecloud.vpcflow.rtt.ms`*:: +*`gcp.vpcflow.rtt.ms`*:: + -- Latency as measured (for TCP flows only) during the time interval. This is the time elapsed between sending a SEQ and receiving a corresponding ACK and it contains the network RTT as well as the application related delay. diff --git a/filebeat/input/filestream/input_integration_test.go b/filebeat/input/filestream/input_integration_test.go index c768abfa32b..ab9ed187bd7 100644 --- a/filebeat/input/filestream/input_integration_test.go +++ b/filebeat/input/filestream/input_integration_test.go @@ -24,6 +24,7 @@ import ( "context" "os" "runtime" + "strconv" "testing" "time" @@ -736,3 +737,169 @@ func TestFilestreamTruncateBlockedOutput(t *testing.T) { cancelInput() env.waitUntilInputStops() } + +// test_symlinks_enabled from test_harvester.py +func TestFilestreamSymlinksEnabled(t *testing.T) { + env := newInputTestingEnvironment(t) + + testlogName := "test.log" + symlinkName := "test.log.symlink" + inp := env.mustCreateInput(map[string]interface{}{ + "paths": []string{ + env.abspath(symlinkName), + }, + "prospector.scanner.symlinks": "true", + }) + + testlines := []byte("first line\n") + env.mustWriteLinesToFile(testlogName, testlines) + + env.mustSymlink(testlogName, symlinkName) + + ctx, cancelInput := context.WithCancel(context.Background()) + env.startInput(ctx, inp) + + env.waitUntilEventCount(1) + + cancelInput() + env.waitUntilInputStops() + + env.requireOffsetInRegistry(testlogName, len(testlines)) +} + +// test_symlink_rotated from test_harvester.py +func TestFilestreamSymlinkRotated(t *testing.T) { + env := newInputTestingEnvironment(t) + + firstTestlogName := "test1.log" + secondTestlogName := "test2.log" + symlinkName := "test.log" + inp := env.mustCreateInput(map[string]interface{}{ + "paths": []string{ + env.abspath(symlinkName), + }, + "prospector.scanner.check_interval": "1ms", + "prospector.scanner.symlinks": "true", + "close.on_state_change.removed": "false", + "clean_removed": "false", + }) + + commonLine := "first line in file " + for i, path := range []string{firstTestlogName, secondTestlogName} { + env.mustWriteLinesToFile(path, []byte(commonLine+strconv.Itoa(i)+"\n")) + } + + env.mustSymlink(firstTestlogName, symlinkName) + + ctx, cancelInput := context.WithCancel(context.Background()) + env.startInput(ctx, inp) + + env.waitUntilEventCount(1) + + expectedOffset := len(commonLine) + 2 + env.requireOffsetInRegistry(firstTestlogName, expectedOffset) + + // rotate symlink + env.mustRemoveFile(symlinkName) + env.mustSymlink(secondTestlogName, symlinkName) + + moreLines := "second line in file 2\nthird line in file 2\n" + env.mustAppendLinesToFile(secondTestlogName, []byte(moreLines)) + + env.waitUntilEventCount(4) + env.requireOffsetInRegistry(firstTestlogName, expectedOffset) + env.requireOffsetInRegistry(secondTestlogName, expectedOffset+len(moreLines)) + + cancelInput() + env.waitUntilInputStops() + + env.requireRegistryEntryCount(2) +} + +// test_symlink_removed from test_harvester.py +func TestFilestreamSymlinkRemoved(t *testing.T) { + env := newInputTestingEnvironment(t) + + testlogName := "test.log" + symlinkName := "test.log.symlink" + inp := env.mustCreateInput(map[string]interface{}{ + "paths": []string{ + env.abspath(symlinkName), + }, + "prospector.scanner.check_interval": "1ms", + "prospector.scanner.symlinks": "true", + "close.on_state_change.removed": "false", + "clean_removed": "false", + }) + + line := []byte("first line\n") + env.mustWriteLinesToFile(testlogName, line) + + env.mustSymlink(testlogName, symlinkName) + + ctx, cancelInput := context.WithCancel(context.Background()) + env.startInput(ctx, inp) + + env.waitUntilEventCount(1) + + env.requireOffsetInRegistry(testlogName, len(line)) + + // remove symlink + env.mustRemoveFile(symlinkName) + + env.mustAppendLinesToFile(testlogName, line) + + env.waitUntilEventCount(2) + env.requireOffsetInRegistry(testlogName, 2*len(line)) + + cancelInput() + env.waitUntilInputStops() + + env.requireRegistryEntryCount(1) +} + +// test_truncate from test_harvester.py +func TestFilestreamTruncate(t *testing.T) { + env := newInputTestingEnvironment(t) + + testlogName := "test.log" + symlinkName := "test.log.symlink" + inp := env.mustCreateInput(map[string]interface{}{ + "paths": []string{ + env.abspath("*"), + }, + "prospector.scanner.check_interval": "1ms", + "prospector.scanner.symlinks": "true", + }) + + lines := []byte("first line\nsecond line\nthird line\n") + env.mustWriteLinesToFile(testlogName, lines) + + env.mustSymlink(testlogName, symlinkName) + + ctx, cancelInput := context.WithCancel(context.Background()) + env.startInput(ctx, inp) + + env.waitUntilEventCount(3) + + env.requireOffsetInRegistry(testlogName, len(lines)) + + // remove symlink + env.mustRemoveFile(symlinkName) + env.mustTruncateFile(testlogName, 0) + env.waitUntilOffsetInRegistry(testlogName, 0) + + // recreate symlink + env.mustSymlink(testlogName, symlinkName) + + moreLines := []byte("forth line\nfifth line\n") + env.mustWriteLinesToFile(testlogName, moreLines) + + env.waitUntilEventCount(5) + env.requireOffsetInRegistry(testlogName, len(moreLines)) + + cancelInput() + env.waitUntilInputStops() + + env.requireRegistryEntryCount(1) +} diff --git a/go.mod b/go.mod index 3763a357798..72e071aea01 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/elastic/go-lumber v0.1.0 github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595 github.com/elastic/go-seccomp-bpf v1.1.0 - github.com/elastic/go-structform v0.0.7 + github.com/elastic/go-structform v0.0.8 github.com/elastic/go-sysinfo v1.6.0 github.com/elastic/go-txfile v0.0.7 github.com/elastic/go-ucfg v0.8.3 @@ -100,7 +100,7 @@ require ( github.com/h2non/filetype v1.1.1-0.20201130172452-f60988ab73d5 github.com/hashicorp/go-multierror v1.1.0 github.com/hashicorp/go-retryablehttp v0.6.6 - github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d // indirect + github.com/hashicorp/golang-lru v0.5.4 github.com/hashicorp/nomad/api v0.0.0-20201203164818-6318a8ac7bf8 github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 github.com/insomniacslk/dhcp v0.0.0-20180716145214-633285ba52b2 @@ -147,7 +147,7 @@ require ( github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.5 github.com/stretchr/objx v0.2.0 // indirect - github.com/stretchr/testify v1.6.1 + github.com/stretchr/testify v1.7.0 github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786 github.com/ugorji/go/codec v1.1.8 diff --git a/go.sum b/go.sum index 37d3e0d8d19..ee234fb91d8 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,7 @@ 4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod h1:HxEsUxoVZyRxsZML/S6e2xAuieFMlGO0756ncWx1aXE= 4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b h1:+TO4EgK74+Qo/ilRDiF2WpY09Jk9VSJSLe3wEn+dJBw= 4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod h1:SHGqVdL7hd2ZaX2T9uEiOZ/OFAUfCCLURdLPJsd8ZNs= +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898 h1:SC+c6A1qTFstO9qmB86mPV2IpYme/2ZoEQ0hrP+wo+Q= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -28,6 +29,7 @@ code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f h1:UrKzEwTg code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI= code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a h1:8rqv2w8xEceNwckcF5ONeRt0qBHlh5bnNfFnYTrZbxs= code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod h1:tkZo8GtzBjySJ7USvxm4E36lNQw1D3xM6oKHGqdaAJ4= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-amqp-common-go/v3 v3.0.0 h1:j9tjcwhypb/jek3raNrwlCIl7iKQYOug7CLpSyBBodc= github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod h1:SY08giD/XbhTz07tJdpw1SoxQXHPN30+DI3Z04SYqyg= @@ -76,6 +78,7 @@ github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VY github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -83,10 +86,13 @@ github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITg github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Microsoft/hcsshim v0.8.7 h1:ptnOoufxGSzauVTsdE+wMYnCWA301PdoN4xg5oRdZpg= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.0.0 h1:0GoNN3taZV6QI81IXgCbxMyEaJDXMSIjArYBCYzVVvs= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2 h1:JCHLVE3B+kJde7bIEo5N4J+ZbLhp0J1Fs+ulyRws4gE= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= @@ -101,13 +107,16 @@ github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/g github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw= github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20 h1:7rj9qZ63knnVo2ZeepYHvHuRdG76f3tRUTdIQDzRBeI= github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod h1:cI59GRkC2FRaFYtgbYEqMlgnnfvAwXzjojyZKXwklNg= github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43 h1:WFwa9pqou0Nb4DdfBOyaBTH0GqLE74Qwdf61E7ITHwQ= github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod h1:tJPYQG4mnMeUtQvQKNkbsFrnmZOg59Qnf8CcctFv5v4= +github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6 h1:uZuxRZCz65cG1o6K/xUqImNcYKtmk9ylqaH0itMSvzA= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d h1:OE3kzLBpy7pOJEzE55j9sdgrSilUPzzj++FWvp1cmIs= github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y= @@ -115,6 +124,7 @@ github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f h1:33BV5v3u8I6dA2 github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 h1:afT88tB6u9JCKQZVAAaa9ICz/uGn5Uw9ekn6P22mYKM= github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod h1:bXvGk6IkT1Agy7qzJ+DjIw/SJ1AaB3AvAuMDVV+Vkoo= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -124,6 +134,7 @@ github.com/aws/aws-lambda-go v1.6.0 h1:T+u/g79zPKw1oJM7xYhvpq7i4Sjc0iVsXZUaqRVVS github.com/aws/aws-lambda-go v1.6.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A= github.com/aws/aws-sdk-go-v2 v0.9.0 h1:dWtJKGRFv3UZkMBQaIzMsF0/y4ge3iQPWTzeC4r/vl4= github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod h1:sa1GePZ/LfBGI4dSq30f6uR4Tthll8axxtEPvlpXZ8U= +github.com/awslabs/goformation/v3 v3.1.0 h1:1WhWJrMtuwphJ+x1+0wM7v4QPDzcArvX+i4/sK1Z4e4= github.com/awslabs/goformation/v3 v3.1.0/go.mod h1:hQ5RXo3GNm2laHWKizDzU5DsDy+yNcenSca2UxN0850= github.com/awslabs/goformation/v4 v4.1.0 h1:JRxIW0IjhYpYDrIZOTJGMu2azXKI+OK5dP56ubpywGU= github.com/awslabs/goformation/v4 v4.1.0/go.mod h1:MBDN7u1lMNDoehbFuO4uPvgwPeolTMA2TzX1yO6KlxI= @@ -137,6 +148,7 @@ github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa h1:aXHPZwx8Y5 github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa/go.mod h1:RrJI2xn5vve/r32U5suTbeaSGoMU6GbNPoj36CVYcHc= github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 h1:oMCHnXa6CCCafdPDbMh/lWRhRByN0VFLvv+g+ayx1SI= github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI= +github.com/blang/semver v3.1.0+incompatible h1:7hqmJYuaEK3qwVjWubYiht3j93YI0WQBuysxHIfUriU= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible h1:4g18+HnTDwEtO0n7K8B1Kjq+04MEKJRkhJNQ/hb9d5A= github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM= @@ -144,14 +156,19 @@ github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e h1:YYUjy5BRwO5 github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod h1:V284PjgVwSk4ETmz84rpu9ehpGg7swlIH8npP9k2bGw= github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e h1:Gbx+iVCXG/1m5WSnidDGuHgN+vbIwl+6fR092ANU+Y8= github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod h1:AZIh1CCnMrcVm6afFf96PBvE2MRpWFco91z8ObJtgDY= +github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f h1:fK3ikA1s77arBhpDwFuyO0hUZ2Aa8O6o2Uzy8Q6iLbs= github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod h1:RtIewdO+K/czvxvIFCMbPyx7jdxSLL1RZ+DA/Vk8Lwg= @@ -159,10 +176,13 @@ github.com/cloudfoundry/noaa v2.1.0+incompatible h1:hr6VnM5VlYRN3YD+NmAedQLW8686 github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod h1:5LmacnptvxzrTvMfL9+EJhgkUfIgcwI61BVSTh47ECo= github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 h1:cWfya7mo/zbnwYVio6eWGsFJHqYw4/k/uhwIJ1eqRPI= github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod h1:GS0pCHd7onIsewbw8Ue9qa9pZPv2V88cUZDttK6KzgI= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f h1:WBZRG4aNOuI15bLRrCgN8fCq8E5Xuty6jGbmSNEvSsU= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= +github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1 h1:uict5mhHFTzKLUCufdSLym7z/J0CbBJT59lYbP9wtbg= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.3 h1:LoIzb5y9x5l8VKAlyrbusNPXqBY0+kviRloxFUMFwKc= @@ -173,11 +193,17 @@ github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod h1:Dq github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c h1:KFbqHhDeaHM7IfFtXHfUHMDaUStpM2YwBR+iJCIOsKk= github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3 h1:esQOJREg8nw8aXj6uCN5dfW5cKUBiEJ/+nni1Q/D/sw= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de h1:dlfGmNcE3jDAecLqwKPMNX6nk2qh1c1Vg1/YTzpOOF4= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8NEo3bC/vx9pbi/g2WI8mtP2/nXzu297Y= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= +github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -185,7 +211,9 @@ github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQa github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea h1:n2Ltr3SrfQlf/9nOna1DoGKxLx3qTSI8Ttl6Xrqp6mw= github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/godog v0.8.1 h1:lVb+X41I4YDreE+ibZ50bdXmySxgRviYFgKY6Aw4XE8= github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA= @@ -229,6 +257,7 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 h1:RrkoB0pT3gnjXhL/t10BSP1mcr/0Ldea2uMyuBr2SWk= github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= @@ -267,8 +296,8 @@ github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f h1:Fvsq github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod h1:OPGqFNdTS34kMReS5hPFtBhD9J8itmSDurs1ix2wx7c= github.com/elastic/go-seccomp-bpf v1.1.0 h1:jUzzDc6LyCtdolZdvL/26dad6rZ9vsc7xZ2eadKECAU= github.com/elastic/go-seccomp-bpf v1.1.0/go.mod h1:l+89Vy5BzjVcaX8USZRMOwmwwDScE+vxCFzzvQwN7T8= -github.com/elastic/go-structform v0.0.7 h1:ihszOJQryNuIIHE2ZgsbiDq+agKO6V4yK0JYAI3tjzc= -github.com/elastic/go-structform v0.0.7/go.mod h1:QrMyP3oM9Sjk92EVGLgRaL2lKt0Qx7ZNDRWDxB6khVs= +github.com/elastic/go-structform v0.0.8 h1:U0qnb9Zqig7w+FhF+sLI3VZPPi/+2aJ0bIEW6R1z6Tk= +github.com/elastic/go-structform v0.0.8/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= github.com/elastic/go-sysinfo v1.6.0 h1:u0QbU8eWSwKRPcFQancnSY4Zi0COksCJXkUgPHxE5Tw= github.com/elastic/go-sysinfo v1.6.0/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= @@ -286,10 +315,13 @@ github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877 h1:C9LsbipColsz0 github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4 h1:rEvIZUSZ3fx39WIi3JkQqQBitGwpELBIYWeBVh6wn+E= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -300,7 +332,9 @@ github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHqu github.com/frankban/quicktest v1.10.2 h1:19ARM85nVi4xH7xPXuc5eM/udya5ieh7b/Sv+d844Tk= github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 h1:b+9H1GAsx5RsjvDFLoS5zkNBzIQMuVKUYQDmxU3N5XE= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= @@ -315,9 +349,13 @@ github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab h1:xveKWz2iauee github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647 h1:whypLownH338a3Ork2w9t0KUKtVxbXYySuz7V1YGsJo= github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1 h1:wSt/4CYxs70xbATrGXhokKF1i0tZjENLOo1ioIO13zk= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9 h1:tF+augKRWlWx0J0B7ZyyKSiTyV6E1zZe+7b3qQlcEf8= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501 h1:C1JKChikHGpXwT5UQDFaryIpDtyyGL/CR6C2kB7F1oc= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87 h1:zP3nY8Tk2E6RTkqGYrarZXuzh+ffyLDljLxCy1iJw80= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-sourcemap/sourcemap v2.1.2+incompatible h1:0b/xya7BKGhXuqFESKM4oIiRo9WOt2ebz7KxfreD6ug= github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= @@ -349,12 +387,14 @@ github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -366,7 +406,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -375,6 +414,7 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc= github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9 h1:b4EyQBj8pgtcWOr7YCSxK6NUQzJr0n4hxJ3mc+dtKk4= github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -394,7 +434,9 @@ github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPg github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc h1:DLpL8pWq0v4JYoRpEhDfsJhhJyGKCcQM2WPW2TJs31c= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -414,6 +456,7 @@ github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/grpc-gateway v1.13.0 h1:sBDQoHXrOlfPobnKw69FIKa1wg9qsLLvvQ/Y19WtFgI= github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= @@ -441,8 +484,9 @@ github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnn github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d h1:Ft6PtvobE9vwkCsuoNO5DZDbhKkKuktAlSsiOi1X5NA= -github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/nomad/api v0.0.0-20201203164818-6318a8ac7bf8 h1:Yrz9yGVJf5Ce2KS7x8hS/MUTIeBmGEhF8nhzolRpSqY= github.com/hashicorp/nomad/api v0.0.0-20201203164818-6318a8ac7bf8/go.mod h1:vYHP9jMXk4/T2qNUbWlQ1OHCA1hHLil3nvqSmz8mtgc= @@ -450,6 +494,7 @@ github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 h1:S4qyfL2sEm5Budr4 github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 h1:UDMh68UUwekSh5iP2OMhRRZJiiBccgV7axzUG8vi56c= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= @@ -460,6 +505,7 @@ github.com/jarcoal/httpmock v1.0.4 h1:jp+dy/+nonJE4g4xbVtl9QdrUNbn6/3hDT5R4nDIZn github.com/jarcoal/httpmock v1.0.4/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -486,11 +532,14 @@ github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfE github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/karrick/godirwalk v1.15.6 h1:Yf2mmR8TJy+8Fa0SuQVto5SYap6IF7lNVX4Jdl8G1qA= github.com/karrick/godirwalk v1.15.6/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.11.0 h1:wJbzvpYMVGG9iTI9VxpnNZfd4DzMPoCWze3GgSqz8yg= github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= @@ -505,6 +554,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -515,6 +565,7 @@ github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod h1:5WUZQaWbwv1U+lT github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magefile/mage v1.11.0 h1:C/55Ywp9BpgVVclD3lRnSYCwXTYxmSppIgLeDYlNuls= github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8= @@ -561,8 +612,11 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d h1:7PxY7LVfSZm7PEeBTyK1rj1gABdCO2mbri6GKO1cMDs= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 h1:F9x/1yl3T2AeKLr2AMdilSD8+f9bvMnNN8VS5iDtovc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -590,7 +644,9 @@ github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5X github.com/opencontainers/runc v1.0.0-rc9 h1:/k06BMULKF5hidyoZymkoDCzdJzltZpz/UU4LguQVtc= github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.1 h1:wY4pOY8fBdSIvs9+IDHC55thBuEulhzfSgKeC1yFvzQ= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39 h1:H7DMc6FAjgwZZi8BRqjrAAHWoqEr5e5L6pS4V0ezet4= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= @@ -602,7 +658,9 @@ github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2 h1:CXwSGu/LYmbjEab5aMCs5usQRVBGThelUKBNnoSOuso= github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -642,8 +700,11 @@ github.com/prometheus/prometheus v2.5.0+incompatible h1:7QPitgO2kOFG8ecuRn9O/4L9 github.com/prometheus/prometheus v2.5.0+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e h1:hUGyBE/4CXRPThr4b6kt+f1CN90no4Fs5CNrYOKYSIg= github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod h1:Sb6li54lXV0yYEjI4wX8cucdQ9gqUJV3+Ngg3l9g30I= @@ -678,17 +739,21 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -702,6 +767,9 @@ github.com/stretchr/testify v1.5.0/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8 h1:zLV6q4e8Jv9EHjNg/iHfzwDkCve6Ua5jCygptrtXHvI= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b h1:X/8hkb4rQq3+QuOxpJK7gWmAXmZucF0EI1s1BfBLq6U= github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod h1:jAqhj/JBVC1PwcLTWd6rjQyGyItxxrhpiBl8LSuAGmw= @@ -712,6 +780,7 @@ github.com/ugorji/go v1.1.8/go.mod h1:0lNM99SwWUIRhCXnigEMClngXBk/EmpTXa7mgiewYW github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.8 h1:4dryPvxMP9OtkjIbuNeK2nb27M38XMHLGlfNSNph/5s= github.com/ugorji/go/codec v1.1.8/go.mod h1:X00B19HDtwvKbQY2DcYjvZxKQp8mzrJoQ6EgoIY/D2E= +github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5 h1:MCfT24H3f//U5+UCrZp1/riVO3B50BovxtDiNn0XKkk= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 h1:OHNw/6pXODJAB32NujjdQO/KIYQ3KAbHQfCzH81XdCs= github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod h1:pNWFTeQ+V1OYT/TzWpnWb6eQBdoXpdx+H+lrH97/Oyo= @@ -723,6 +792,7 @@ github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4 h1:hhA8EBThzz9PztawVTyc github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod h1:RspW+E2Yb7Fs7HclB2tiDaiu6Rp41BiIG4Wo1YaoXGc= github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec h1:HkZIDJrMKZHPsYhmH2XjTTSk1pbMCFfpxSnyzZUFm+k= github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod h1:Wp40HwmjM59FkDIVFfcCb9LzBbnc0XAMp8++hJuWvSU= +github.com/vbatts/tar-split v0.11.1 h1:0Odu65rhcZ3JZaPHxl7tCI3V/C/Q9Zf82UFravl02dE= github.com/vbatts/tar-split v0.11.1/go.mod h1:LEuURwDEiWjRjwu46yU3KVGuUdVv/dcnpcEPSzR8z6g= github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41 h1:NeNpIvfvaFOh0BH7nMEljE5Rk/VJlxhm58M41SeOD20= github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= @@ -738,6 +808,7 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1: github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56 h1:yhqBHs09SmmUoNOHc9jgK4a60T3XFRtPAkYxVnqgY50= github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7 h1:0gYLpmzecnaDCoeWxSfEJ7J1b6B/67+NV++4HKQXx+Y= github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU= @@ -790,6 +861,7 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0 golang.org/x/exp v0.0.0-20191227195350-da58074b4299 h1:zQpM52jfKHG6II1ISZY1ZcpygvuSFZpLwfluuF89XOg= golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -802,6 +874,7 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367 h1:0IiAsCRByjO2QjX7ZPkw5oU9x+n1YqRL802rjC0c3Aw= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= @@ -830,7 +903,6 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA= golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -886,16 +958,15 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210308170721-88b6017d0656 h1:FuBaiPCiXkq4v+JY5JEGPU/HwEZwpVyDbu/KBz9fU+4= golang.org/x/sys v0.0.0-20210308170721-88b6017d0656/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -933,7 +1004,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb h1:hcskBH5qZCOa7WpTUFUFvoebnSFZBYpjykLtjIp9DVk= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -956,11 +1026,12 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -968,9 +1039,11 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -1019,15 +1092,18 @@ k8s.io/apimachinery v0.19.4 h1:+ZoddM7nbzrDCp0T3SWnyxqf8cbWPT2fkZImoyvHUG0= k8s.io/apimachinery v0.19.4/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/client-go v0.19.4 h1:85D3mDNoLF+xqpyE9Dh/OtrJDyJrSRKkHmDXIbEzer8= k8s.io/client-go v0.19.4/go.mod h1:ZrEy7+wj9PjH5VMBCuu/BDlvtUAku0oVFk4MmnW9mWA= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac h1:sAvhNk5RRuc6FNYGqe7Ygz3PSo/2wGWbulskmzRX8Vs= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= +k8s.io/kubernetes v1.13.0 h1:qTfB+u5M92k2fCCCVP2iuhgwwSOv1EkAkvQY1tQODD8= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= diff --git a/heartbeat/monitors/active/icmp/stdloop.go b/heartbeat/monitors/active/icmp/stdloop.go index 932154c61ad..05858f5537f 100644 --- a/heartbeat/monitors/active/icmp/stdloop.go +++ b/heartbeat/monitors/active/icmp/stdloop.go @@ -87,20 +87,25 @@ type requestResult struct { // These vars should not be used directly, but rather getStdLoop // should be invoked to initialize and return stdLoop. var ( - stdICMPLoopInit sync.Once + stdICMPLoopInit sync.Mutex stdICMPLoopSingleton *stdICMPLoop ) func getStdLoop() (*stdICMPLoop, error) { - var loopErr error - stdICMPLoopInit.Do(func() { + stdICMPLoopInit.Lock() + defer stdICMPLoopInit.Unlock() + + if stdICMPLoopSingleton == nil { debugf("initializing ICMP loop") - stdICMPLoopSingleton, loopErr = newICMPLoop() - if loopErr == nil { - debugf("ICMP loop successfully initialized") + singleton, err := newICMPLoop() + if err != nil { + return nil, err } - }) - return stdICMPLoopSingleton, loopErr + stdICMPLoopSingleton = singleton + debugf("ICMP loop successfully initialized") + } + + return stdICMPLoopSingleton, nil } func noPingCapabilityError(message string) error { diff --git a/libbeat/cmd/instance/metrics/metrics.go b/libbeat/cmd/instance/metrics/metrics.go index f47bf59a335..9960db99e9f 100644 --- a/libbeat/cmd/instance/metrics/metrics.go +++ b/libbeat/cmd/instance/metrics/metrics.go @@ -59,7 +59,7 @@ func SetupMetrics(name string) error { beatProcessStats = &process.Stats{ Procs: []string{name}, EnvWhitelist: nil, - CpuTicks: true, + CPUTicks: true, CacheCmdLine: true, IncludeTop: process.IncludeTopConfig{}, } diff --git a/metricbeat/module/system/process/cgroup.go b/libbeat/metric/system/process/cgroup.go similarity index 79% rename from metricbeat/module/system/process/cgroup.go rename to libbeat/metric/system/process/cgroup.go index c71dc7fe34d..db4f768f38b 100644 --- a/metricbeat/module/system/process/cgroup.go +++ b/libbeat/metric/system/process/cgroup.go @@ -26,31 +26,31 @@ import ( // cgroupStatsToMap returns a MapStr containing the data from the stats object. // If stats is nil then nil is returned. -func cgroupStatsToMap(stats *cgroup.Stats, perCPU bool) common.MapStr { - if stats == nil { +func cgroupStatsToMap(stats *Process) common.MapStr { + if stats == nil || stats.RawStats == nil { return nil } cgroup := common.MapStr{} // id and path are only available when all subsystems share a common path. - if stats.ID != "" { - cgroup["id"] = stats.ID + if stats.RawStats.ID != "" { + cgroup["id"] = stats.RawStats.ID } - if stats.Path != "" { - cgroup["path"] = stats.Path + if stats.RawStats.Path != "" { + cgroup["path"] = stats.RawStats.Path } - if cpu := cgroupCPUToMapStr(stats.CPU); cpu != nil { + if cpu := cgroupCPUToMapStr(stats.RawStats.CPU); cpu != nil { cgroup["cpu"] = cpu } - if cpuacct := cgroupCPUAccountingToMapStr(stats.CPUAccounting, perCPU); cpuacct != nil { + if cpuacct := cgroupCPUAccountingToMapStr(stats); cpuacct != nil { cgroup["cpuacct"] = cpuacct } - if memory := cgroupMemoryToMapStr(stats.Memory); memory != nil { + if memory := cgroupMemoryToMapStr(stats.RawStats.Memory); memory != nil { cgroup["memory"] = memory } - if blkio := cgroupBlockIOToMapStr(stats.BlockIO); blkio != nil { + if blkio := cgroupBlockIOToMapStr(stats.RawStats.BlockIO); blkio != nil { cgroup["blkio"] = blkio } @@ -97,7 +97,8 @@ func cgroupCPUToMapStr(cpu *cgroup.CPUSubsystem) common.MapStr { // cgroupCPUAccountingToMapStr returns a MapStr containing // CPUAccountingSubsystem data. If the cpuacct parameter is nil then nil is // returned. -func cgroupCPUAccountingToMapStr(cpuacct *cgroup.CPUAccountingSubsystem, perCPU bool) common.MapStr { +func cgroupCPUAccountingToMapStr(process *Process) common.MapStr { + cpuacct := process.RawStats.CPUAccounting if cpuacct == nil { return nil } @@ -106,25 +107,35 @@ func cgroupCPUAccountingToMapStr(cpuacct *cgroup.CPUAccountingSubsystem, perCPU "id": cpuacct.ID, "path": cpuacct.Path, "total": common.MapStr{ - "ns": cpuacct.TotalNanos, + "ns": cpuacct.TotalNanos, + "pct": process.PctStats.CPUTotalPct, + "norm": common.MapStr{ + "pct": process.PctStats.CPUTotalPctNorm, + }, }, "stats": common.MapStr{ "system": common.MapStr{ - "ns": cpuacct.Stats.SystemNanos, + "ns": cpuacct.Stats.SystemNanos, + "pct": process.PctStats.CPUSystemPct, + "norm": common.MapStr{ + "pct": process.PctStats.CPUSystemPctNorm, + }, }, "user": common.MapStr{ - "ns": cpuacct.Stats.UserNanos, + "ns": cpuacct.Stats.UserNanos, + "pct": process.PctStats.CPUUserPct, + "norm": common.MapStr{ + "pct": process.PctStats.CPUUserPctNorm, + }, }, }, } - if perCPU { - perCPUUsage := common.MapStr{} - for i, usage := range cpuacct.UsagePerCPU { - perCPUUsage[strconv.Itoa(i+1)] = usage - } - event["percpu"] = perCPUUsage + perCPUUsage := common.MapStr{} + for i, usage := range cpuacct.UsagePerCPU { + perCPUUsage[strconv.Itoa(i+1)] = usage } + event["percpu"] = perCPUUsage return event } diff --git a/libbeat/metric/system/process/process.go b/libbeat/metric/system/process/process.go index 76098a43f19..9e7eb5ac932 100644 --- a/libbeat/metric/system/process/process.go +++ b/libbeat/metric/system/process/process.go @@ -34,6 +34,7 @@ import ( "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/beats/v7/libbeat/metric/system/memory" sigar "github.com/elastic/gosigar" + "github.com/elastic/gosigar/cgroup" ) // ProcsMap is a map where the keys are the names of processes and the value is the Process with that name @@ -42,39 +43,57 @@ type ProcsMap map[int]*Process // Process is the structure which holds the information of a process running on the host. // It includes pid, gid and it interacts with gosigar to fetch process data from the host. type Process struct { - Pid int `json:"pid"` - Ppid int `json:"ppid"` - Pgid int `json:"pgid"` - Name string `json:"name"` - Username string `json:"username"` - State string `json:"state"` - Args []string `json:"args"` - CmdLine string `json:"cmdline"` - Cwd string `json:"cwd"` - Executable string `json:"executable"` - Mem sigar.ProcMem - Cpu sigar.ProcTime - SampleTime time.Time - FD sigar.ProcFDUsage - Env common.MapStr + Pid int `json:"pid"` + Ppid int `json:"ppid"` + Pgid int `json:"pgid"` + Name string `json:"name"` + Username string `json:"username"` + State string `json:"state"` + Args []string `json:"args"` + CmdLine string `json:"cmdline"` + Cwd string `json:"cwd"` + Executable string `json:"executable"` + Mem sigar.ProcMem + CPU sigar.ProcTime + SampleTime time.Time + FD sigar.ProcFDUsage + Env common.MapStr + + //cpu stats cpuSinceStart float64 cpuTotalPct float64 cpuTotalPctNorm float64 + + // cgroup stats + RawStats *cgroup.Stats + PctStats CgroupPctStats +} + +// CgroupPctStats stores rendered percent values from cgroup CPU data +type CgroupPctStats struct { + CPUTotalPct float64 + CPUTotalPctNorm float64 + CPUUserPct float64 + CPUUserPctNorm float64 + CPUSystemPct float64 + CPUSystemPctNorm float64 } // Stats stores the stats of processes on the host. type Stats struct { - Procs []string - ProcsMap ProcsMap - CpuTicks bool - EnvWhitelist []string - CacheCmdLine bool - IncludeTop IncludeTopConfig + Procs []string + ProcsMap ProcsMap + CPUTicks bool + EnvWhitelist []string + CacheCmdLine bool + IncludeTop IncludeTopConfig + CgroupOpts cgroup.ReaderOptions + EnableCgroups bool procRegexps []match.Matcher // List of regular expressions used to whitelist processes. envRegexps []match.Matcher // List of regular expressions used to whitelist env vars. - - logger *logp.Logger + cgroups *cgroup.Reader + logger *logp.Logger } // Ticks of CPU for a process @@ -127,8 +146,8 @@ func (proc *Process) getDetails(envPredicate func(string) bool) error { return fmt.Errorf("error getting process mem for pid=%d: %v", proc.Pid, err) } - proc.Cpu = sigar.ProcTime{} - if err := proc.Cpu.Get(proc.Pid); err != nil { + proc.CPU = sigar.ProcTime{} + if err := proc.CPU.Get(proc.Pid); err != nil { return fmt.Errorf("error getting process cpu time for pid=%d: %v", proc.Pid, err) } @@ -322,13 +341,13 @@ func (procStats *Stats) getProcessEvent(process *Process) common.MapStr { "pct": process.cpuTotalPctNorm, }, }, - "start_time": unixTimeMsToTime(process.Cpu.StartTime), + "start_time": unixTimeMsToTime(process.CPU.StartTime), } - if procStats.CpuTicks { - proc.Put("cpu.user.ticks", process.Cpu.User) - proc.Put("cpu.system.ticks", process.Cpu.Sys) - proc.Put("cpu.total.ticks", process.Cpu.Total) + if procStats.CPUTicks { + proc.Put("cpu.user.ticks", process.CPU.User) + proc.Put("cpu.system.ticks", process.CPU.Sys) + proc.Put("cpu.total.ticks", process.CPU.Total) } if process.FD != (sigar.ProcFDUsage{}) { @@ -341,6 +360,12 @@ func (procStats *Stats) getProcessEvent(process *Process) common.MapStr { } } + if procStats.EnableCgroups { + if statsMap := cgroupStatsToMap(process); statsMap != nil { + proc["cgroup"] = statsMap + } + } + return proc } @@ -359,18 +384,63 @@ func GetProcCPUPercentage(s0, s1 *Process) (normalizedPct, pct, totalPct float64 if s0 != nil && s1 != nil { timeDelta := s1.SampleTime.Sub(s0.SampleTime) timeDeltaMillis := timeDelta / time.Millisecond - totalCPUDeltaMillis := int64(s1.Cpu.Total - s0.Cpu.Total) + totalCPUDeltaMillis := int64(s1.CPU.Total - s0.CPU.Total) pct := float64(totalCPUDeltaMillis) / float64(timeDeltaMillis) normalizedPct := pct / float64(runtime.NumCPU()) - return common.Round(normalizedPct, common.DefaultDecimalPlacesCount), common.Round(pct, common.DefaultDecimalPlacesCount), - common.Round(float64(s1.Cpu.Total), common.DefaultDecimalPlacesCount) + common.Round(float64(s1.CPU.Total), common.DefaultDecimalPlacesCount) } return 0, 0, 0 } +// GetCgroupPercentage returns CPU usage percentages for a given cgroup +// see GetProcCPUPercentage for implementation details, as the two are conceptually similar. +// Note that the cgroup controller reports system and user times in USER_HZ, while +// totals are reported in nanoseconds. Because of this, any math that mixes the two might be slightly off, +// as USER_HZ is less precise value that will get rounded up to nanseconds. +// Because of that, `user` and `system` metrics reflect a precentage of overall CPU time, but can't be compared to the total pct values. +func GetCgroupPercentage(s0, s1 *Process) CgroupPctStats { + if s0 == nil || s1 == nil || s0.RawStats == nil || s1.RawStats == nil || s0.RawStats.CPUAccounting == nil || s1.RawStats.CPUAccounting == nil { + return CgroupPctStats{} + } + timeDelta := s1.SampleTime.Sub(s0.SampleTime) + timeDeltaNanos := timeDelta / time.Nanosecond + totalCPUDeltaNanos := int64(s1.RawStats.CPUAccounting.TotalNanos - s0.RawStats.CPUAccounting.TotalNanos) + + pct := float64(totalCPUDeltaNanos) / float64(timeDeltaNanos) + // Avoid using NumCPU unless we need to; the values in UsagePerCPU are more likely to reflect the running conditions of the cgroup + // NumCPU can vary based on the conditions of the running metricbeat process, as it uses Affinity Masks, not hardware data. + var cpuCount int + if len(s1.RawStats.CPUAccounting.UsagePerCPU) > 0 { + cpuCount = len(s1.RawStats.CPUAccounting.UsagePerCPU) + } else { + cpuCount = runtime.NumCPU() + } + + // if you look at the raw cgroup stats, the following normalized value is literally an average of per-cpu numbers. + normalizedPct := pct / float64(cpuCount) + userCPUDeltaMillis := int64(s1.RawStats.CPUAccounting.Stats.UserNanos - s0.RawStats.CPUAccounting.Stats.UserNanos) + systemCPUDeltaMillis := int64(s1.RawStats.CPUAccounting.Stats.SystemNanos - s0.RawStats.CPUAccounting.Stats.SystemNanos) + + userPct := float64(userCPUDeltaMillis) / float64(timeDeltaNanos) + systemPct := float64(systemCPUDeltaMillis) / float64(timeDeltaNanos) + + normalizedUser := userPct / float64(cpuCount) + normalizedSystem := systemPct / float64(cpuCount) + + pctValues := CgroupPctStats{ + CPUTotalPct: common.Round(pct, common.DefaultDecimalPlacesCount), + CPUTotalPctNorm: common.Round(normalizedPct, common.DefaultDecimalPlacesCount), + CPUUserPct: common.Round(userPct, common.DefaultDecimalPlacesCount), + CPUUserPctNorm: common.Round(normalizedUser, common.DefaultDecimalPlacesCount), + CPUSystemPct: common.Round(systemPct, common.DefaultDecimalPlacesCount), + CPUSystemPctNorm: common.Round(normalizedSystem, common.DefaultDecimalPlacesCount), + } + return pctValues +} + // matchProcess checks if the provided process name matches any of the process regexes func (procStats *Stats) matchProcess(name string) bool { for _, reg := range procStats.procRegexps { @@ -409,6 +479,16 @@ func (procStats *Stats) Init() error { procStats.envRegexps = append(procStats.envRegexps, reg) } + if procStats.EnableCgroups { + cgReader, err := cgroup.NewReaderOptions(procStats.CgroupOpts) + if err == cgroup.ErrCgroupsMissing { + logp.Warn("cgroup data collection will be disabled: %v", err) + } else if err != nil { + return errors.Wrap(err, "error initializing cgroup reader") + } + procStats.cgroups = cgReader + } + return nil } @@ -492,6 +572,17 @@ func (procStats *Stats) getSingleProcess(pid int, newProcs ProcsMap) *Process { return nil } + if procStats.EnableCgroups { + cgStats, err := procStats.cgroups.GetStatsForProcess(pid) + if err != nil { + procStats.logger.Debug("Error fetching cgroup data for process %s with pid=%d: %v", process.Name, process.Pid, err) + return nil + } + process.RawStats = cgStats + last := procStats.ProcsMap[process.Pid] + process.PctStats = GetCgroupPercentage(last, process) + } + newProcs[process.Pid] = process last := procStats.ProcsMap[process.Pid] process.cpuTotalPctNorm, process.cpuTotalPct, process.cpuSinceStart = GetProcCPUPercentage(last, process) diff --git a/libbeat/metric/system/process/process_test.go b/libbeat/metric/system/process/process_test.go index 6bc6be447a5..712b7808547 100644 --- a/libbeat/metric/system/process/process_test.go +++ b/libbeat/metric/system/process/process_test.go @@ -68,10 +68,10 @@ func TestGetProcess(t *testing.T) { assert.True(t, (process.Mem.Share >= 0)) // CPU Checks - assert.True(t, (process.Cpu.StartTime > 0)) - assert.True(t, (process.Cpu.Total >= 0)) - assert.True(t, (process.Cpu.User >= 0)) - assert.True(t, (process.Cpu.Sys >= 0)) + assert.True(t, (process.CPU.StartTime > 0)) + assert.True(t, (process.CPU.Total >= 0)) + assert.True(t, (process.CPU.User >= 0)) + assert.True(t, (process.CPU.Sys >= 0)) assert.True(t, (process.SampleTime.Unix() <= time.Now().Unix())) @@ -143,7 +143,7 @@ func TestProcMemPercentage(t *testing.T) { func TestProcCpuPercentage(t *testing.T) { p1 := &Process{ - Cpu: gosigar.ProcTime{ + CPU: gosigar.ProcTime{ User: 11345, Sys: 37, Total: 11382, @@ -152,7 +152,7 @@ func TestProcCpuPercentage(t *testing.T) { } p2 := &Process{ - Cpu: gosigar.ProcTime{ + CPU: gosigar.ProcTime{ User: 14794, Sys: 47, Total: 14841, diff --git a/libbeat/outputs/codec/json/json.go b/libbeat/outputs/codec/json/json.go index 01d4f324104..15f28aa3388 100644 --- a/libbeat/outputs/codec/json/json.go +++ b/libbeat/outputs/codec/json/json.go @@ -73,6 +73,7 @@ func New(version string, config Config) *Encoder { func (e *Encoder) reset() { visitor := json.NewVisitor(&e.buf) visitor.SetEscapeHTML(e.config.EscapeHTML) + visitor.SetIgnoreInvalidFloat(true) var err error diff --git a/libbeat/outputs/codec/json/json_test.go b/libbeat/outputs/codec/json/json_test.go index be2381e38c4..18a1903abe8 100644 --- a/libbeat/outputs/codec/json/json_test.go +++ b/libbeat/outputs/codec/json/json_test.go @@ -18,6 +18,7 @@ package json import ( + "math" "testing" "time" @@ -52,27 +53,31 @@ func TestJsonCodec(t *testing.T) { "msg": "message" }`, }, - "html escaping enabled": testCase{ + "html escaping enabled": { config: Config{EscapeHTML: true}, in: common.MapStr{"msg": "world"}, expected: `{"@timestamp":"0001-01-01T00:00:00.000Z","@metadata":{"beat":"test","type":"_doc","version":"1.2.3"},"msg":"\u003chello\u003eworld\u003c/hello\u003e"}`, }, - "html escaping disabled": testCase{ + "html escaping disabled": { config: Config{EscapeHTML: false}, in: common.MapStr{"msg": "world"}, expected: `{"@timestamp":"0001-01-01T00:00:00.000Z","@metadata":{"beat":"test","type":"_doc","version":"1.2.3"},"msg":"world"}`, }, - "UTC timezone offset": testCase{ + "UTC timezone offset": { config: Config{LocalTime: true}, in: common.MapStr{"msg": "message"}, expected: `{"@timestamp":"0001-01-01T00:00:00.000+00:00","@metadata":{"beat":"test","type":"_doc","version":"1.2.3"},"msg":"message"}`, }, - "PST timezone offset": testCase{ + "PST timezone offset": { config: Config{LocalTime: true}, ts: time.Time{}.In(time.FixedZone("PST", -8*60*60)), in: common.MapStr{"msg": "message"}, expected: `{"@timestamp":"0000-12-31T16:00:00.000-08:00","@metadata":{"beat":"test","type":"_doc","version":"1.2.3"},"msg":"message"}`, }, + "float undefined values": { + in: common.MapStr{"nan": math.NaN()}, + expected: `{"@timestamp":"0001-01-01T00:00:00.000Z","@metadata":{"beat":"test","type":"_doc","version":"1.2.3"},"nan":null}`, + }, } for name, test := range cases { diff --git a/libbeat/processors/actions/docs/copy_fields.asciidoc b/libbeat/processors/actions/docs/copy_fields.asciidoc index c958d3c6e82..07a56dbf149 100644 --- a/libbeat/processors/actions/docs/copy_fields.asciidoc +++ b/libbeat/processors/actions/docs/copy_fields.asciidoc @@ -8,10 +8,9 @@ The `copy_fields` processor copies a field to another one. `fields`:: List of `from` and `to` pairs to copy from and to. -`fail_on_error`:: (Optional) If set to true, in case of an error the changes to -the event are reverted, and the original event is returned. If set to `false`, -processing continues also if an error happens. Default is `true`. -`ignore_missing`:: (Optional) Whether to ignore events that lack the source +`fail_on_error`:: (Optional) If set to `true` and an error occurs, the changes are reverted and the original is returned. If set to `false`, +processing continues if an error occurs. Default is `true`. +`ignore_missing`:: (Optional) Indicates whether to ignore events that lack the source field. The default is `false`, which will fail processing of an event if a field is missing. diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml index b8b57664e50..40fba11d00d 100644 --- a/metricbeat/docker-compose.yml +++ b/metricbeat/docker-compose.yml @@ -15,11 +15,11 @@ services: # Used by base tests elasticsearch: - image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.10.0}-1 + image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.12.0}-1 build: context: ./module/elasticsearch/_meta args: - ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.10.0} + ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.12.0} environment: - "ES_JAVA_OPTS=-Xms256m -Xmx256m" - "network.host=" @@ -37,11 +37,11 @@ services: # Used by base tests kibana: - image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.10.0}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.12.0}-1 build: context: ./module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-7.10.0} + KIBANA_VERSION: ${KIBANA_VERSION:-7.12.0} depends_on: - elasticsearch ports: @@ -49,11 +49,11 @@ services: # Used by base tests metricbeat: - image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.10.0}-1 + image: docker.elastic.co/integrations-ci/beats-metricbeat:${BEAT_VERSION:-7.12.0}-1 build: context: ./module/beat/_meta args: - BEAT_VERSION: ${BEAT_VERSION:-7.10.0} + BEAT_VERSION: ${BEAT_VERSION:-7.12.0} command: '-e' ports: - 5066 diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index a1a8913819b..4c2278437ab 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -44966,6 +44966,26 @@ type: long -- +*`system.process.cgroup.cpuacct.total.pct`*:: ++ +-- +CPU time of the cgroup as a percentage of overall CPU time. + + +type: scaled_float + +-- + +*`system.process.cgroup.cpuacct.total.norm.pct`*:: ++ +-- +CPU time of the cgroup as a percentage of overall CPU time, normalized by CPU count. This is functionally an average of time spent across individual CPUs. + + +type: scaled_float + +-- + *`system.process.cgroup.cpuacct.stats.user.ns`*:: + -- @@ -44975,6 +44995,24 @@ type: long -- +*`system.process.cgroup.cpuacct.stats.user.pct`*:: ++ +-- +time the cgroup spent in user space, as a percentage of total CPU time + +type: scaled_float + +-- + +*`system.process.cgroup.cpuacct.stats.user.norm.pct`*:: ++ +-- +time the cgroup spent in user space, as a percentage of total CPU time, normalized by CPU count. + +type: scaled_float + +-- + *`system.process.cgroup.cpuacct.stats.system.ns`*:: + -- @@ -44984,6 +45022,24 @@ type: long -- +*`system.process.cgroup.cpuacct.stats.system.pct`*:: ++ +-- +Time the cgroup spent in kernel space, as a percentage of total CPU time + +type: scaled_float + +-- + +*`system.process.cgroup.cpuacct.stats.system.norm.pct`*:: ++ +-- +Time the cgroup spent in kernel space, as a percentage of total CPU time, normalized by CPU count. + +type: scaled_float + +-- + *`system.process.cgroup.cpuacct.percpu`*:: + -- diff --git a/metricbeat/helper/prometheus/ptest/ptest.go b/metricbeat/helper/prometheus/ptest/ptest.go index c59c62c4050..76a1899c457 100644 --- a/metricbeat/helper/prometheus/ptest/ptest.go +++ b/metricbeat/helper/prometheus/ptest/ptest.go @@ -30,7 +30,6 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/beats/v7/metricbeat/mb" mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" @@ -45,87 +44,6 @@ type TestCases []struct { ExpectedFile string } -// TestMetricSetEventsFetcher goes over the given TestCases and ensures that source Prometheus metrics gets converted -// into the expected events when passed by the given metricset. -// If -data flag is passed, the expected JSON file will be updated with the result -func TestMetricSetEventsFetcher(t *testing.T, module, metricset string, cases TestCases) { - for _, test := range cases { - t.Logf("Testing %s file\n", test.MetricsFile) - - file, err := os.Open(test.MetricsFile) - assert.NoError(t, err, "cannot open test file "+test.MetricsFile) - - body, err := ioutil.ReadAll(file) - assert.NoError(t, err, "cannot read test file "+test.MetricsFile) - - server := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(200) - w.Header().Set("Content-Type", "text/plain; charset=ISO-8859-1") - w.Write([]byte(body)) - })) - - server.Start() - defer server.Close() - - config := map[string]interface{}{ - "module": module, - "metricsets": []string{metricset}, - "hosts": []string{server.URL}, - } - - f := mbtest.NewEventsFetcher(t, config) - events, err := f.Fetch() - assert.Nil(t, err, "Errors while fetching metrics") - - if *flags.DataFlag { - sort.SliceStable(events, func(i, j int) bool { - h1, _ := hashstructure.Hash(events[i], nil) - h2, _ := hashstructure.Hash(events[j], nil) - return h1 < h2 - }) - eventsJSON, _ := json.MarshalIndent(events, "", "\t") - err = ioutil.WriteFile(test.ExpectedFile, eventsJSON, 0644) - assert.NoError(t, err) - } - - // Read expected events from reference file - expected, err := ioutil.ReadFile(test.ExpectedFile) - if err != nil { - t.Fatal(err) - } - - var expectedEvents []common.MapStr - err = json.Unmarshal(expected, &expectedEvents) - if err != nil { - t.Fatal(err) - } - - for _, event := range events { - // ensure the event is in expected list - found := -1 - for i, expectedEvent := range expectedEvents { - if event.String() == expectedEvent.String() { - found = i - break - } - } - if found > -1 { - expectedEvents = append(expectedEvents[:found], expectedEvents[found+1:]...) - } else { - t.Errorf("Event was not expected: %+v", event) - } - } - - if len(expectedEvents) > 0 { - t.Error("Some events were missing:") - for _, e := range expectedEvents { - t.Error(e) - } - t.Fatal() - } - } -} - // TestMetricSet goes over the given TestCases and ensures that source Prometheus metrics gets converted into the expected // events when passed by the given metricset. // If -data flag is passed, the expected JSON file will be updated with the result diff --git a/metricbeat/mb/builders.go b/metricbeat/mb/builders.go index 48683e05e8a..042c4124862 100644 --- a/metricbeat/mb/builders.go +++ b/metricbeat/mb/builders.go @@ -217,14 +217,6 @@ func mustHaveModule(ms MetricSet, base BaseMetricSet) error { // of them. func mustImplementFetcher(ms MetricSet) error { var ifcs []string - if _, ok := ms.(EventFetcher); ok { - ifcs = append(ifcs, "EventFetcher") - } - - if _, ok := ms.(EventsFetcher); ok { - ifcs = append(ifcs, "EventsFetcher") - } - if _, ok := ms.(ReportingMetricSet); ok { ifcs = append(ifcs, "ReportingMetricSet") } @@ -256,7 +248,7 @@ func mustImplementFetcher(ms MetricSet) error { switch len(ifcs) { case 0: return fmt.Errorf("MetricSet '%s/%s' does not implement an event "+ - "producing interface (EventFetcher, EventsFetcher, "+ + "producing interface ("+ "ReportingMetricSet, ReportingMetricSetV2, ReportingMetricSetV2Error, ReportingMetricSetV2WithContext"+ "PushMetricSet, PushMetricSetV2, or PushMetricSetV2WithContext)", ms.Module().Name(), ms.Name()) diff --git a/metricbeat/mb/mb.go b/metricbeat/mb/mb.go index 2bec71d88e8..c86380fdcf1 100644 --- a/metricbeat/mb/mb.go +++ b/metricbeat/mb/mb.go @@ -133,8 +133,7 @@ func (m *BaseModule) WithConfig(config common.Config) (*BaseModule, error) { // MetricSet interfaces // MetricSet is the common interface for all MetricSet implementations. In -// addition to this interface, all MetricSets must implement either -// EventFetcher or EventsFetcher (but not both). +// addition to this interface, all MetricSets must implement a fetcher interface. type MetricSet interface { ID() string // Unique ID identifying a running MetricSet. Name() string // Name returns the name of the MetricSet. @@ -154,20 +153,6 @@ type Closer interface { Close() error } -// EventFetcher is a MetricSet that returns a single event when collecting data. -// Use ReportingMetricSet for new MetricSet implementations. -type EventFetcher interface { - MetricSet - Fetch() (common.MapStr, error) -} - -// EventsFetcher is a MetricSet that returns a multiple events when collecting -// data. Use ReportingMetricSet for new MetricSet implementations. -type EventsFetcher interface { - MetricSet - Fetch() ([]common.MapStr, error) -} - // Reporter is used by a MetricSet to report events, errors, or errors with // metadata. The methods return false if and only if publishing failed because // the MetricSet is being closed. diff --git a/metricbeat/mb/mb_test.go b/metricbeat/mb/mb_test.go index 83306d51cef..f0dedec348c 100644 --- a/metricbeat/mb/mb_test.go +++ b/metricbeat/mb/mb_test.go @@ -30,6 +30,8 @@ import ( "github.com/elastic/beats/v7/libbeat/common" ) +// Reporting V2 MetricSet + type testModule struct { BaseModule hostParser func(string) (HostData, error) @@ -39,25 +41,11 @@ func (m testModule) ParseHost(host string) (HostData, error) { return m.hostParser(host) } -// EventFetcher - type testMetricSet struct { BaseMetricSet } -func (m *testMetricSet) Fetch() (common.MapStr, error) { - return nil, nil -} - -// EventsFetcher - -type testMetricSetEventsFetcher struct { - BaseMetricSet -} - -func (m *testMetricSetEventsFetcher) Fetch() ([]common.MapStr, error) { - return nil, nil -} +func (m *testMetricSet) Fetch(reporter ReporterV2) {} // ReportingFetcher @@ -259,25 +247,7 @@ func TestNewModulesMetricSetTypes(t *testing.T) { return &testMetricSet{base}, nil } - name := "EventFetcher" - if err := r.AddMetricSet(moduleName, name, factory); err != nil { - t.Fatal(err) - } - - t.Run(name+" MetricSet", func(t *testing.T) { - ms := newTestMetricSet(t, r, map[string]interface{}{ - "module": moduleName, - "metricsets": []string{name}, - }) - _, ok := ms.(EventFetcher) - assert.True(t, ok, name+" not implemented") - }) - - factory = func(base BaseMetricSet) (MetricSet, error) { - return &testMetricSetEventsFetcher{base}, nil - } - - name = "EventsFetcher" + name := "ReportingMetricSetV2" if err := r.AddMetricSet(moduleName, name, factory); err != nil { t.Fatal(err) } @@ -287,7 +257,7 @@ func TestNewModulesMetricSetTypes(t *testing.T) { "module": moduleName, "metricsets": []string{name}, }) - _, ok := ms.(EventsFetcher) + _, ok := ms.(ReportingMetricSetV2) assert.True(t, ok, name+" not implemented") }) diff --git a/metricbeat/mb/module/example_test.go b/metricbeat/mb/module/example_test.go index ba94f2162d2..f07b5edae56 100644 --- a/metricbeat/mb/module/example_test.go +++ b/metricbeat/mb/module/example_test.go @@ -40,7 +40,7 @@ func ExampleWrapper() { // Build a configuration object. config, err := common.NewConfigFrom(map[string]interface{}{ "module": moduleName, - "metricsets": []string{eventFetcherName}, + "metricsets": []string{reportingFetcherName}, }) if err != nil { fmt.Println("Error:", err) @@ -91,17 +91,17 @@ func ExampleWrapper() { // }, // "@timestamp": "2016-05-10T23:27:58.485Z", // "event": { - // "dataset": "fake.eventfetcher", + // "dataset": "fake.reportingfetcher", // "duration": 111, // "module": "fake" // }, // "fake": { - // "eventfetcher": { + // "reportingfetcher": { // "metric": 1 // } // }, // "metricset": { - // "name": "eventfetcher", + // "name": "reportingfetcher", // "period": 10000 // }, // "service": { @@ -120,7 +120,7 @@ func ExampleRunner() { config, err := common.NewConfigFrom(map[string]interface{}{ "module": moduleName, - "metricsets": []string{eventFetcherName}, + "metricsets": []string{reportingFetcherName}, }) if err != nil { return diff --git a/metricbeat/mb/module/runner_test.go b/metricbeat/mb/module/runner_test.go index 6b8b2d705ef..a6396f63ff5 100644 --- a/metricbeat/mb/module/runner_test.go +++ b/metricbeat/mb/module/runner_test.go @@ -36,7 +36,7 @@ func TestRunner(t *testing.T) { config, err := common.NewConfigFrom(map[string]interface{}{ "module": moduleName, - "metricsets": []string{eventFetcherName}, + "metricsets": []string{reportingFetcherName}, }) if err != nil { t.Fatal(err) diff --git a/metricbeat/mb/module/wrapper.go b/metricbeat/mb/module/wrapper.go index f0d1552c815..8d18dfbe552 100644 --- a/metricbeat/mb/module/wrapper.go +++ b/metricbeat/mb/module/wrapper.go @@ -203,8 +203,7 @@ func (msw *metricSetWrapper) run(done <-chan struct{}, out chan<- beat.Event) { ms.Run(reporter.V2()) case mb.PushMetricSetV2WithContext: ms.Run(&channelContext{done}, reporter.V2()) - case mb.EventFetcher, mb.EventsFetcher, - mb.ReportingMetricSet, mb.ReportingMetricSetV2, mb.ReportingMetricSetV2Error, mb.ReportingMetricSetV2WithContext: + case mb.ReportingMetricSet, mb.ReportingMetricSetV2, mb.ReportingMetricSetV2Error, mb.ReportingMetricSetV2WithContext: msw.startPeriodicFetching(&channelContext{done}, reporter) default: // Earlier startup stages prevent this from happening. @@ -241,10 +240,6 @@ func (msw *metricSetWrapper) startPeriodicFetching(ctx context.Context, reporter // and log a stack track if one occurs. func (msw *metricSetWrapper) fetch(ctx context.Context, reporter reporter) { switch fetcher := msw.MetricSet.(type) { - case mb.EventFetcher: - msw.singleEventFetch(fetcher, reporter) - case mb.EventsFetcher: - msw.multiEventFetch(fetcher, reporter) case mb.ReportingMetricSet: reporter.StartFetchTimer() fetcher.Fetch(reporter.V1()) @@ -270,24 +265,6 @@ func (msw *metricSetWrapper) fetch(ctx context.Context, reporter reporter) { } } -func (msw *metricSetWrapper) singleEventFetch(fetcher mb.EventFetcher, reporter reporter) { - reporter.StartFetchTimer() - event, err := fetcher.Fetch() - reporter.V1().ErrorWith(err, event) -} - -func (msw *metricSetWrapper) multiEventFetch(fetcher mb.EventsFetcher, reporter reporter) { - reporter.StartFetchTimer() - events, err := fetcher.Fetch() - if len(events) == 0 { - reporter.V1().ErrorWith(err, nil) - } else { - for _, event := range events { - reporter.V1().ErrorWith(err, event) - } - } -} - // close closes the underlying MetricSet if it implements the mb.Closer // interface. func (msw *metricSetWrapper) close() error { diff --git a/metricbeat/mb/module/wrapper_test.go b/metricbeat/mb/module/wrapper_test.go index 1108b5bd737..8fcc0230bc9 100644 --- a/metricbeat/mb/module/wrapper_test.go +++ b/metricbeat/mb/module/wrapper_test.go @@ -33,7 +33,6 @@ import ( const ( moduleName = "fake" - eventFetcherName = "EventFetcher" reportingFetcherName = "ReportingFetcher" pushMetricSetName = "PushMetricSet" ) @@ -41,34 +40,8 @@ const ( // fakeMetricSet func init() { - if err := mb.Registry.AddMetricSet(moduleName, eventFetcherName, newFakeEventFetcher); err != nil { - panic(err) - } - if err := mb.Registry.AddMetricSet(moduleName, reportingFetcherName, newFakeReportingFetcher); err != nil { - panic(err) - } - if err := mb.Registry.AddMetricSet(moduleName, pushMetricSetName, newFakePushMetricSet); err != nil { - panic(err) - } -} - -// EventFetcher - -type fakeEventFetcher struct { - mb.BaseMetricSet -} - -func (ms *fakeEventFetcher) Fetch() (common.MapStr, error) { - t, _ := time.Parse(time.RFC3339, "2016-05-10T23:27:58.485Z") - return common.MapStr{"@timestamp": common.Time(t), "metric": 1}, nil -} - -func (ms *fakeEventFetcher) Close() error { - return nil -} - -func newFakeEventFetcher(base mb.BaseMetricSet) (mb.MetricSet, error) { - return &fakeEventFetcher{BaseMetricSet: base}, nil + mb.Registry.MustAddMetricSet(moduleName, reportingFetcherName, newFakeReportingFetcher) + mb.Registry.MustAddMetricSet(moduleName, pushMetricSetName, newFakePushMetricSet) } // ReportingFetcher @@ -83,7 +56,8 @@ func (ms *fakeReportingFetcher) Fetch(r mb.Reporter) { } func newFakeReportingFetcher(base mb.BaseMetricSet) (mb.MetricSet, error) { - return &fakeReportingFetcher{BaseMetricSet: base}, nil + var r mb.ReportingMetricSet = &fakeReportingFetcher{BaseMetricSet: base} + return r, nil } // PushMetricSet @@ -100,7 +74,8 @@ func (ms *fakePushMetricSet) Run(r mb.PushReporter) { } func newFakePushMetricSet(base mb.BaseMetricSet) (mb.MetricSet, error) { - return &fakePushMetricSet{BaseMetricSet: base}, nil + var r mb.PushMetricSet = &fakePushMetricSet{BaseMetricSet: base} + return r, nil } // test utilities @@ -108,9 +83,7 @@ func newFakePushMetricSet(base mb.BaseMetricSet) (mb.MetricSet, error) { func newTestRegistry(t testing.TB) *mb.Register { r := mb.NewRegister() - err := r.AddMetricSet(moduleName, eventFetcherName, newFakeEventFetcher) - require.NoError(t, err) - err = r.AddMetricSet(moduleName, reportingFetcherName, newFakeReportingFetcher) + err := r.AddMetricSet(moduleName, reportingFetcherName, newFakeReportingFetcher) require.NoError(t, err) err = r.AddMetricSet(moduleName, pushMetricSetName, newFakePushMetricSet) require.NoError(t, err) @@ -125,37 +98,6 @@ func newConfig(t testing.TB, moduleConfig interface{}) *common.Config { // test cases -func TestWrapperOfEventFetcher(t *testing.T) { - hosts := []string{"alpha", "beta"} - c := newConfig(t, map[string]interface{}{ - "module": moduleName, - "metricsets": []string{eventFetcherName}, - "hosts": hosts, - }) - - m, err := module.NewWrapper(c, newTestRegistry(t)) - require.NoError(t, err) - - done := make(chan struct{}) - output := m.Start(done) - - <-output - <-output - close(done) - - // Validate that the channel is closed after receiving the two - // initial events. - select { - case _, ok := <-output: - if !ok { - // Channel is closed. - return - } else { - assert.Fail(t, "received unexpected event") - } - } -} - func TestWrapperOfReportingFetcher(t *testing.T) { hosts := []string{"alpha", "beta"} c := newConfig(t, map[string]interface{}{ @@ -222,7 +164,7 @@ func TestPeriodIsAddedToEvent(t *testing.T) { hasPeriod bool }{ "fetch metricset events should have period": { - metricset: eventFetcherName, + metricset: reportingFetcherName, hasPeriod: true, }, "push metricset events should not have period": { @@ -262,7 +204,7 @@ func TestNewWrapperForMetricSet(t *testing.T) { hosts := []string{"alpha"} c := newConfig(t, map[string]interface{}{ "module": moduleName, - "metricsets": []string{eventFetcherName}, + "metricsets": []string{reportingFetcherName}, "hosts": hosts, }) diff --git a/metricbeat/mb/registry.go b/metricbeat/mb/registry.go index 62ee4f6c1d0..b5b24ca865c 100644 --- a/metricbeat/mb/registry.go +++ b/metricbeat/mb/registry.go @@ -48,8 +48,7 @@ type ModuleFactory func(base BaseModule) (Module, error) // MetricSetFactory accepts a BaseMetricSet and returns a MetricSet. If there // was an error creating the MetricSet then an error will be returned. The -// returned MetricSet must also implement either EventFetcher or EventsFetcher -// (but not both). +// returned MetricSet must also implement a Fetcher interface. type MetricSetFactory func(base BaseMetricSet) (MetricSet, error) // HostParser is a function that parses a host value from the configuration diff --git a/metricbeat/mb/testing/data_generator.go b/metricbeat/mb/testing/data_generator.go index 61edf3b7d5e..abad9d5e205 100644 --- a/metricbeat/mb/testing/data_generator.go +++ b/metricbeat/mb/testing/data_generator.go @@ -32,56 +32,6 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" ) -// WriteEvent fetches a single event writes the output to a ./_meta/data.json -// file. -func WriteEvent(f mb.EventFetcher, t testing.TB) error { - if !*flags.DataFlag { - t.Skip("skip data generation tests") - } - - event, err := f.Fetch() - if err != nil { - return err - } - - fullEvent := CreateFullEvent(f, event) - WriteEventToDataJSON(t, fullEvent, ".") - return nil -} - -// WriteEvents fetches events and writes the first event to a ./_meta/data.json -// file. -func WriteEvents(f mb.EventsFetcher, t testing.TB) error { - return WriteEventsCond(f, t, nil) - -} - -// WriteEventsCond fetches events and writes the first event that matches the condition -// to a ./_meta/data.json file. -func WriteEventsCond(f mb.EventsFetcher, t testing.TB, cond func(e common.MapStr) bool) error { - if !*flags.DataFlag { - t.Skip("skip data generation tests") - } - - events, err := f.Fetch() - if err != nil { - return err - } - - if len(events) == 0 { - return fmt.Errorf("no events were generated") - } - - event, err := SelectEvent(events, cond) - if err != nil { - return err - } - - fullEvent := CreateFullEvent(f, event) - WriteEventToDataJSON(t, fullEvent, "") - return nil -} - // WriteEventsReporterV2 fetches events and writes the first event to a ./_meta/data.json // file. func WriteEventsReporterV2(f mb.ReportingMetricSetV2, t testing.TB, path string) error { diff --git a/metricbeat/mb/testing/modules.go b/metricbeat/mb/testing/modules.go index 673deef850d..605e44a4d32 100644 --- a/metricbeat/mb/testing/modules.go +++ b/metricbeat/mb/testing/modules.go @@ -28,16 +28,18 @@ that Metricbeat does it and with the same validations. package mymetricset_test import ( + "github.com/stretchr/testify/assert" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { - f := mbtest.NewEventFetcher(t, getConfig()) - event, err := f.Fetch() - if err != nil { - t.Fatal(err) - } + f := mbtest.NewFetcher(t, getConfig()) + events, errs := f.FetchEvents() + assert.Empty(t, errs) + assert.NotEmpty(t, events) + event := events[0] t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(), event) // Test event attributes... @@ -117,34 +119,6 @@ func NewMetricSets(t testing.TB, config interface{}) []mb.MetricSet { return metricsets } -// NewEventFetcher instantiates a new EventFetcher using the given -// configuration. The ModuleFactory and MetricSetFactory are obtained from the -// global Registry. -func NewEventFetcher(t testing.TB, config interface{}) mb.EventFetcher { - metricSet := NewMetricSet(t, config) - - fetcher, ok := metricSet.(mb.EventFetcher) - if !ok { - t.Fatal("MetricSet does not implement EventFetcher") - } - - return fetcher -} - -// NewEventsFetcher instantiates a new EventsFetcher using the given -// configuration. The ModuleFactory and MetricSetFactory are obtained from the -// global Registry. -func NewEventsFetcher(t testing.TB, config interface{}) mb.EventsFetcher { - metricSet := NewMetricSet(t, config) - - fetcher, ok := metricSet.(mb.EventsFetcher) - if !ok { - t.Fatal("MetricSet does not implement EventsFetcher") - } - - return fetcher -} - func NewReportingMetricSet(t testing.TB, config interface{}) mb.ReportingMetricSet { metricSet := NewMetricSet(t, config) diff --git a/metricbeat/module/kubernetes/apiserver/metricset.go b/metricbeat/module/kubernetes/apiserver/metricset.go index 75cf428157c..eac924e1135 100644 --- a/metricbeat/module/kubernetes/apiserver/metricset.go +++ b/metricbeat/module/kubernetes/apiserver/metricset.go @@ -48,7 +48,7 @@ func getMetricsetFactory(prometheusMappings *prometheus.MetricsMapping) mb.Metri } } -// Fetch as expected by `mb.EventFetcher` +// Fetch gathers information from the apiserver and reports events with this information. func (m *metricset) Fetch(reporter mb.ReporterV2) error { events, err := m.prometheusClient.GetProcessedMetrics(m.prometheusMappings) if err != nil { diff --git a/metricbeat/module/logstash/docker-compose.yml b/metricbeat/module/logstash/docker-compose.yml index 26b6608c01c..f9e0d873946 100644 --- a/metricbeat/module/logstash/docker-compose.yml +++ b/metricbeat/module/logstash/docker-compose.yml @@ -2,22 +2,22 @@ version: '2.3' services: logstash: - image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.10.0}-1 + image: docker.elastic.co/integrations-ci/beats-logstash:${LOGSTASH_VERSION:-7.12.0}-1 build: context: ./_meta args: - LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.10.0} + LOGSTASH_VERSION: ${LOGSTASH_VERSION:-7.12.0} ports: - 9600 depends_on: - elasticsearch elasticsearch: - image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.10.0}-1 + image: docker.elastic.co/integrations-ci/beats-elasticsearch:${ELASTICSEARCH_VERSION:-7.12.0}-1 build: context: ../elasticsearch/_meta args: - ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.10.0} + ELASTICSEARCH_VERSION: ${ELASTICSEARCH_VERSION:-7.12.0} environment: - "network.host=" - "transport.host=127.0.0.1" diff --git a/metricbeat/module/logstash/logstash_integration_test.go b/metricbeat/module/logstash/logstash_integration_test.go index d5a1375839c..c9f3f4e43ab 100644 --- a/metricbeat/module/logstash/logstash_integration_test.go +++ b/metricbeat/module/logstash/logstash_integration_test.go @@ -41,6 +41,7 @@ var metricSets = []string{ } func TestFetch(t *testing.T) { + t.Skip("flaky test: https://github.com/elastic/beats/issues/25043") service := compose.EnsureUpWithTimeout(t, 300, "logstash") for _, metricSet := range metricSets { diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index 9c99bdfe5c8..d52d17d7276 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -32,5 +32,5 @@ func init() { // AssetSystem returns asset data. // This is the base64 encoded gzipped contents of module/system. func AssetSystem() string { - return "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" + return "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" } diff --git a/metricbeat/module/system/process/_meta/data.json b/metricbeat/module/system/process/_meta/data.json index 6577bb55b59..9d748e2f39c 100644 --- a/metricbeat/module/system/process/_meta/data.json +++ b/metricbeat/module/system/process/_meta/data.json @@ -11,16 +11,19 @@ }, "process": { "args": [ - "/sbin/init", - "splash" + "/usr/lib/systemd/systemd", + "--switched-root", + "--system", + "--deserialize", + "29" ], - "command_line": "/sbin/init splash", + "command_line": "/usr/lib/systemd/systemd --switched-root --system --deserialize 29", "cpu": { - "pct": 0, - "start_time": "2020-12-04T22:17:35.000Z" + "pct": 0.0029, + "start_time": "2021-03-29T04:24:52.000Z" }, "memory": { - "pct": 0.0004 + "pct": 0.0011 }, "name": "systemd", "pgid": 1, @@ -33,24 +36,191 @@ }, "system": { "process": { - "cmdline": "/sbin/init splash", + "cgroup": { + "blkio": { + "id": "init.scope", + "path": "/init.scope", + "total": { + "bytes": 3188736, + "ios": 238 + } + }, + "cpu": { + "cfs": { + "period": { + "us": 100000 + }, + "quota": { + "us": 0 + }, + "shares": 1024 + }, + "id": "init.scope", + "path": "/init.scope", + "rt": { + "period": { + "us": 0 + }, + "runtime": { + "us": 0 + } + }, + "stats": { + "periods": 0, + "throttled": { + "ns": 0, + "periods": 0 + } + } + }, + "cpuacct": { + "id": "init.scope", + "path": "/init.scope", + "percpu": { + "1": 7906237728724, + "2": 8055519955790, + "3": 7985757217648, + "4": 7270310725150 + }, + "stats": { + "system": { + "norm": { + "pct": 0.0015 + }, + "ns": 10276870000000, + "pct": 0.0058 + }, + "user": { + "norm": { + "pct": 0.0044 + }, + "ns": 20915760000000, + "pct": 0.0174 + } + }, + "total": { + "norm": { + "pct": 0.0047 + }, + "ns": 31217825627312, + "pct": 0.0188 + } + }, + "id": "init.scope", + "memory": { + "id": "init.scope", + "kmem": { + "failures": 0, + "limit": { + "bytes": 9223372036854771712 + }, + "usage": { + "bytes": 4755456, + "max": { + "bytes": 8380416 + } + } + }, + "kmem_tcp": { + "failures": 0, + "limit": { + "bytes": 9223372036854771712 + }, + "usage": { + "bytes": 0, + "max": { + "bytes": 0 + } + } + }, + "mem": { + "failures": 0, + "limit": { + "bytes": 9223372036854771712 + }, + "usage": { + "bytes": 31584256, + "max": { + "bytes": 53239808 + } + } + }, + "memsw": { + "failures": 0, + "limit": { + "bytes": 9223372036854771712 + }, + "usage": { + "bytes": 31821824, + "max": { + "bytes": 53239808 + } + } + }, + "path": "/init.scope", + "stats": { + "active_anon": { + "bytes": 0 + }, + "active_file": { + "bytes": 16642048 + }, + "cache": { + "bytes": 20140032 + }, + "hierarchical_memory_limit": { + "bytes": 9223372036854771712 + }, + "hierarchical_memsw_limit": { + "bytes": 9223372036854771712 + }, + "inactive_anon": { + "bytes": 7016448 + }, + "inactive_file": { + "bytes": 2977792 + }, + "major_page_faults": 165, + "mapped_file": { + "bytes": 15814656 + }, + "page_faults": 1288584, + "pages_in": 364353, + "pages_out": 357844, + "rss": { + "bytes": 6893568 + }, + "rss_huge": { + "bytes": 0 + }, + "swap": { + "bytes": 0 + }, + "unevictable": { + "bytes": 0 + } + } + }, + "path": "/init.scope" + }, + "cmdline": "/usr/lib/systemd/systemd --switched-root --system --deserialize 29", "cpu": { - "start_time": "2020-12-04T22:17:35.000Z", + "start_time": "2021-03-29T04:24:52.000Z", "total": { "norm": { - "pct": 0 + "pct": 0.0029 }, - "pct": 0, - "value": 1290 + "pct": 0.0116, + "value": 31214570 } }, "memory": { "rss": { - "bytes": 12173312, - "pct": 0.0004 + "bytes": 17108992, + "pct": 0.0011 }, - "share": 8679424, - "size": 172113920 + "share": 11341824, + "size": 178851840 }, "state": "sleeping" } diff --git a/metricbeat/module/system/process/_meta/fields.yml b/metricbeat/module/system/process/_meta/fields.yml index 51ab8b81e09..7c89b50f080 100644 --- a/metricbeat/module/system/process/_meta/fields.yml +++ b/metricbeat/module/system/process/_meta/fields.yml @@ -240,14 +240,40 @@ Total CPU time in nanoseconds consumed by all tasks in the cgroup. + - name: total.pct + type: scaled_float + description: > + CPU time of the cgroup as a percentage of overall CPU time. + + - name: total.norm.pct + type: scaled_float + description: > + CPU time of the cgroup as a percentage of overall CPU time, normalized by CPU count. This is functionally an average of time spent across individual CPUs. + - name: stats.user.ns type: long description: CPU time consumed by tasks in user mode. + - name: stats.user.pct + type: scaled_float + description: time the cgroup spent in user space, as a percentage of total CPU time + + - name: stats.user.norm.pct + type: scaled_float + description: time the cgroup spent in user space, as a percentage of total CPU time, normalized by CPU count. + - name: stats.system.ns type: long description: CPU time consumed by tasks in user (kernel) mode. + - name: stats.system.pct + type: scaled_float + description: Time the cgroup spent in kernel space, as a percentage of total CPU time + + - name: stats.system.norm.pct + type: scaled_float + description: Time the cgroup spent in kernel space, as a percentage of total CPU time, normalized by CPU count. + - name: percpu type: object object_type: long diff --git a/metricbeat/module/system/process/process.go b/metricbeat/module/system/process/process.go index 5b1bcee0b2e..1cb8723e919 100644 --- a/metricbeat/module/system/process/process.go +++ b/metricbeat/module/system/process/process.go @@ -65,14 +65,27 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { return nil, fmt.Errorf("unexpected module type") } + enableCgroups := false + if runtime.GOOS == "linux" { + if config.Cgroups == nil || *config.Cgroups { + enableCgroups = true + debugf("process cgroup data collection is enabled, using hostfs='%v'", paths.Paths.Hostfs) + } + } + m := &MetricSet{ BaseMetricSet: base, stats: &process.Stats{ - Procs: config.Procs, - EnvWhitelist: config.EnvWhitelist, - CpuTicks: config.IncludeCPUTicks || (config.CPUTicks != nil && *config.CPUTicks), - CacheCmdLine: config.CacheCmdLine, - IncludeTop: config.IncludeTop, + Procs: config.Procs, + EnvWhitelist: config.EnvWhitelist, + CPUTicks: config.IncludeCPUTicks || (config.CPUTicks != nil && *config.CPUTicks), + CacheCmdLine: config.CacheCmdLine, + IncludeTop: config.IncludeTop, + EnableCgroups: enableCgroups, + CgroupOpts: cgroup.ReaderOptions{ + RootfsMountpoint: paths.Paths.Hostfs, + IgnoreRootCgroups: true, + }, }, perCPU: config.IncludePerCPU, IsAgent: systemModule.IsAgent, @@ -82,20 +95,6 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) { return nil, err } - if runtime.GOOS == "linux" { - if config.Cgroups == nil || *config.Cgroups { - debugf("process cgroup data collection is enabled, using hostfs='%v'", paths.Paths.Hostfs) - m.cgroup, err = cgroup.NewReader(paths.Paths.Hostfs, true) - if err != nil { - if err == cgroup.ErrCgroupsMissing { - logp.Warn("cgroup data collection will be disabled: %v", err) - } else { - return nil, errors.Wrap(err, "error initializing cgroup reader") - } - } - } - } - return m, nil } @@ -107,25 +106,6 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { return errors.Wrap(err, "process stats") } - if m.cgroup != nil { - for _, proc := range procs { - pid, ok := proc["pid"].(int) - if !ok { - debugf("error converting pid to int for proc %+v", proc) - continue - } - stats, err := m.cgroup.GetStatsForProcess(pid) - if err != nil { - debugf("error getting cgroups stats for pid=%d, %v", pid, err) - continue - } - - if statsMap := cgroupStatsToMap(stats, m.perCPU); statsMap != nil { - proc["cgroup"] = statsMap - } - } - } - for _, proc := range procs { rootFields := common.MapStr{ "process": common.MapStr{ @@ -139,6 +119,10 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error { }, } + if m.stats.EnableCgroups && !m.perCPU { + proc.Delete("cgroup.cpuacct.percpu") + } + // Duplicate system.process.cmdline with ECS name process.command_line rootFields = getAndCopy(proc, "cmdline", rootFields, "process.command_line") diff --git a/testing/environments/latest.yml b/testing/environments/latest.yml index d5d944f918b..7925b8b6838 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:7.10.0 + image: docker.elastic.co/elasticsearch/elasticsearch:7.12.0 healthcheck: test: ["CMD-SHELL", "curl -s http://localhost:9200/_cat/health?h=status | grep -q green"] retries: 300 @@ -20,7 +20,7 @@ services: - "script.context.template.cache_max_size=2000" logstash: - image: docker.elastic.co/logstash/logstash:7.10.0 + image: docker.elastic.co/logstash/logstash:7.12.0 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"] retries: 300 @@ -30,7 +30,7 @@ services: - ./docker/logstash/pki:/etc/pki:ro kibana: - image: docker.elastic.co/kibana/kibana:7.10.0 + image: docker.elastic.co/kibana/kibana:7.12.0 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:5601"] retries: 300 diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index 9af931816c9..0a0b5ae7548 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -86,3 +86,4 @@ - Add STATE_PATH, CONFIG_PATH, LOGS_PATH to Elastic Agent docker image {pull}24817[24817] - Add status subcommand {pull}24856[24856] - Add leader_election provider for k8s {pull}24267[24267] +- Add --fleet-server-service-token and FLEET_SERVER_SERVICE_TOKEN options {pull}25083[25083] diff --git a/x-pack/elastic-agent/pkg/agent/cmd/container.go b/x-pack/elastic-agent/pkg/agent/cmd/container.go index 83ae0cf1039..9ca963eec19 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/container.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/container.go @@ -80,6 +80,7 @@ The following actions are possible and grouped based on the actions. FLEET_SERVER_ELASTICSEARCH_USERNAME - elasticsearch username for Fleet Server [$ELASTICSEARCH_USERNAME] FLEET_SERVER_ELASTICSEARCH_PASSWORD - elasticsearch password for Fleet Server [$ELASTICSEARCH_PASSWORD] FLEET_SERVER_ELASTICSEARCH_CA - path to certificate authority to use with communicate with elasticsearch [$ELASTICSEARCH_CA] + FLEET_SERVER_SERVICE_TOKEN - service token to use for communication with elasticsearch FLEET_SERVER_POLICY_NAME - name of policy for the Fleet Server to use for itself [$FLEET_TOKEN_POLICY_NAME] FLEET_SERVER_POLICY_ID - policy ID for Fleet Server to use for itself ("Default Fleet Server policy" used when undefined) FLEET_SERVER_HOST - binding host for Fleet Server HTTP (overrides the policy) @@ -143,6 +144,9 @@ func containerCmd(streams *cli.IOStreams, cmd *cobra.Command) error { return err } + elasticCloud := envBool("ELASTIC_AGENT_CLOUD") + // if not in cloud mode, always run the agent + runAgent := !elasticCloud // create access configuration from ENV and config files cfg := defaultAccessConfig() for _, f := range []string{"fleet-setup.yml", "credentials.yml"} { @@ -155,13 +159,14 @@ func containerCmd(streams *cli.IOStreams, cmd *cobra.Command) error { if err != nil { return fmt.Errorf("unpacking config file(%s): %s", f, err) } + // if in elastic cloud mode, only run the agent when configured + runAgent = true } } // start apm-server legacy process when in cloud mode var wg sync.WaitGroup var apmProc *process.Info - _, elasticCloud := os.LookupEnv("ELASTIC_AGENT_CLOUD") apmPath := os.Getenv("APM_SERVER_PATH") if elasticCloud { logInfo(streams, "Starting in elastic cloud mode") @@ -202,13 +207,18 @@ func containerCmd(streams *cli.IOStreams, cmd *cobra.Command) error { apmProc.Stop() logInfo(streams, "Initiate shutdown legacy apm-server.") } - wg.Wait() }() } } - // run the main elastic-agent container command - return runContainerCmd(streams, cmd, cfg) + var err error + if runAgent { + // run the main elastic-agent container command + err = runContainerCmd(streams, cmd, cfg) + } + // wait until APM Server shut down + wg.Wait() + return err } func runContainerCmd(streams *cli.IOStreams, cmd *cobra.Command, cfg setupConfig) error { @@ -295,7 +305,10 @@ func buildEnrollArgs(cfg setupConfig, token string, policyID string) ([]string, if err != nil { return nil, err } - args = append(args, "--fleet-server", connStr) + args = append(args, "--fleet-server-es", connStr) + if cfg.FleetServer.Elasticsearch.ServiceToken != "" { + args = append(args, "--fleet-server-service-token", cfg.FleetServer.Elasticsearch.ServiceToken) + } if policyID == "" { policyID = cfg.FleetServer.PolicyID } @@ -303,7 +316,7 @@ func buildEnrollArgs(cfg setupConfig, token string, policyID string) ([]string, args = append(args, "--fleet-server-policy", policyID) } if cfg.FleetServer.Elasticsearch.CA != "" { - args = append(args, "--fleet-server-elasticsearch-ca", cfg.FleetServer.Elasticsearch.CA) + args = append(args, "--fleet-server-es-ca", cfg.FleetServer.Elasticsearch.CA) } if cfg.FleetServer.Host != "" { args = append(args, "--fleet-server-host", cfg.FleetServer.Host) @@ -351,6 +364,9 @@ func buildFleetServerConnStr(cfg fleetServerConfig) (string, error) { if u.Path != "" { path += "/" + strings.TrimLeft(u.Path, "/") } + if cfg.Elasticsearch.ServiceToken != "" { + return fmt.Sprintf("%s://%s%s", u.Scheme, u.Host, path), nil + } return fmt.Sprintf("%s://%s:%s@%s%s", u.Scheme, cfg.Elasticsearch.Username, cfg.Elasticsearch.Password, u.Host, path), nil } @@ -710,10 +726,11 @@ type setupConfig struct { } type elasticsearchConfig struct { - CA string `config:"ca"` - Host string `config:"host"` - Username string `config:"username"` - Password string `config:"password"` + CA string `config:"ca"` + Host string `config:"host"` + Username string `config:"username"` + Password string `config:"password"` + ServiceToken string `config:"service_token"` } type fleetConfig struct { @@ -767,10 +784,11 @@ func defaultAccessConfig() setupConfig { Cert: envWithDefault("", "FLEET_SERVER_CERT"), CertKey: envWithDefault("", "FLEET_SERVER_CERT_KEY"), Elasticsearch: elasticsearchConfig{ - Host: envWithDefault("http://elasticsearch:9200", "FLEET_SERVER_ELASTICSEARCH_HOST", "ELASTICSEARCH_HOST"), - Username: envWithDefault("elastic", "FLEET_SERVER_ELASTICSEARCH_USERNAME", "ELASTICSEARCH_USERNAME"), - Password: envWithDefault("changeme", "FLEET_SERVER_ELASTICSEARCH_PASSWORD", "ELASTICSEARCH_PASSWORD"), - CA: envWithDefault("", "FLEET_SERVER_ELASTICSEARCH_CA", "ELASTICSEARCH_CA"), + Host: envWithDefault("http://elasticsearch:9200", "FLEET_SERVER_ELASTICSEARCH_HOST", "ELASTICSEARCH_HOST"), + Username: envWithDefault("elastic", "FLEET_SERVER_ELASTICSEARCH_USERNAME", "ELASTICSEARCH_USERNAME"), + Password: envWithDefault("changeme", "FLEET_SERVER_ELASTICSEARCH_PASSWORD", "ELASTICSEARCH_PASSWORD"), + ServiceToken: envWithDefault("", "FLEET_SERVER_SERVICE_TOKEN"), + CA: envWithDefault("", "FLEET_SERVER_ELASTICSEARCH_CA", "ELASTICSEARCH_CA"), }, Enable: envBool("FLEET_SERVER_ENABLE"), Host: envWithDefault("", "FLEET_SERVER_HOST"), diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go index ec7cec1211d..ebd06bfdd44 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go @@ -52,8 +52,9 @@ func addEnrollFlags(cmd *cobra.Command) { cmd.Flags().StringP("url", "", "", "URL to enroll Agent into Fleet") cmd.Flags().StringP("kibana-url", "k", "", "URL of Kibana to enroll Agent into Fleet") cmd.Flags().StringP("enrollment-token", "t", "", "Enrollment token to use to enroll Agent into Fleet") - cmd.Flags().StringP("fleet-server", "", "", "Start and run a Fleet Server along side this Elastic Agent") - cmd.Flags().StringP("fleet-server-elasticsearch-ca", "", "", "Path to certificate authority to use with communicate with elasticsearch") + cmd.Flags().StringP("fleet-server-es", "", "", "Start and run a Fleet Server along side this Elastic Agent connecting to the provided elasticsearch") + cmd.Flags().StringP("fleet-server-es-ca", "", "", "Path to certificate authority to use with communicate with elasticsearch") + cmd.Flags().StringP("fleet-server-service-token", "", "", "Service token to use for communication with elasticsearch") cmd.Flags().StringP("fleet-server-policy", "", "", "Start and run a Fleet Server on this specific policy") cmd.Flags().StringP("fleet-server-host", "", "", "Fleet Server HTTP binding host (overrides the policy)") cmd.Flags().Uint16P("fleet-server-port", "", 0, "Fleet Server HTTP binding port (overrides the policy)") @@ -76,8 +77,9 @@ func buildEnrollmentFlags(cmd *cobra.Command, url string, token string) []string if token == "" { token, _ = cmd.Flags().GetString("enrollment-token") } - fServer, _ := cmd.Flags().GetString("fleet-server") - fElasticSearchCA, _ := cmd.Flags().GetString("fleet-server-elasticsearch-ca") + fServer, _ := cmd.Flags().GetString("fleet-server-es") + fElasticSearchCA, _ := cmd.Flags().GetString("fleet-server-es-ca") + fServiceToken, _ := cmd.Flags().GetString("fleet-server-service-token") fPolicy, _ := cmd.Flags().GetString("fleet-server-policy") fHost, _ := cmd.Flags().GetString("fleet-server-host") fPort, _ := cmd.Flags().GetUint16("fleet-server-port") @@ -99,13 +101,17 @@ func buildEnrollmentFlags(cmd *cobra.Command, url string, token string) []string args = append(args, token) } if fServer != "" { - args = append(args, "--fleet-server") + args = append(args, "--fleet-server-es") args = append(args, fServer) } if fElasticSearchCA != "" { - args = append(args, "--fleet-server-elasticsearch-ca") + args = append(args, "--fleet-server-es-ca") args = append(args, fElasticSearchCA) } + if fServiceToken != "" { + args = append(args, "--fleet-server-service-token") + args = append(args, fServiceToken) + } if fPolicy != "" { args = append(args, "--fleet-server-policy") args = append(args, fPolicy) @@ -210,8 +216,9 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, args []string) error { url, _ = cmd.Flags().GetString("kibana-url") } enrollmentToken, _ := cmd.Flags().GetString("enrollment-token") - fServer, _ := cmd.Flags().GetString("fleet-server") - fElasticSearchCA, _ := cmd.Flags().GetString("fleet-server-elasticsearch-ca") + fServer, _ := cmd.Flags().GetString("fleet-server-es") + fElasticSearchCA, _ := cmd.Flags().GetString("fleet-server-es-ca") + fServiceToken, _ := cmd.Flags().GetString("fleet-server-service-token") fPolicy, _ := cmd.Flags().GetString("fleet-server-policy") fHost, _ := cmd.Flags().GetString("fleet-server-host") fPort, _ := cmd.Flags().GetUint16("fleet-server-port") @@ -238,6 +245,7 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, args []string) error { FleetServer: enrollCmdFleetServerOption{ ConnStr: fServer, ElasticsearchCA: fElasticSearchCA, + ServiceToken: fServiceToken, PolicyID: fPolicy, Host: fHost, Port: fPort, diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go index 96636822bf1..b4a8cb24afd 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go @@ -68,6 +68,7 @@ type enrollCmd struct { type enrollCmdFleetServerOption struct { ConnStr string ElasticsearchCA string + ServiceToken string PolicyID string Host string Port uint16 @@ -219,7 +220,8 @@ func (c *enrollCmd) fleetServerBootstrap(ctx context.Context) (string, error) { } fleetConfig, err := createFleetServerBootstrapConfig( - c.options.FleetServer.ConnStr, c.options.FleetServer.PolicyID, + c.options.FleetServer.ConnStr, c.options.FleetServer.ServiceToken, + c.options.FleetServer.PolicyID, c.options.FleetServer.Host, c.options.FleetServer.Port, c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA) if err != nil { @@ -389,7 +391,8 @@ func (c *enrollCmd) enroll(ctx context.Context) error { } if c.options.FleetServer.ConnStr != "" { serverConfig, err := createFleetServerBootstrapConfig( - c.options.FleetServer.ConnStr, c.options.FleetServer.PolicyID, + c.options.FleetServer.ConnStr, c.options.FleetServer.ServiceToken, + c.options.FleetServer.PolicyID, c.options.FleetServer.Host, c.options.FleetServer.Port, c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA) if err != nil { @@ -693,8 +696,8 @@ func storeAgentInfo(s saver, reader io.Reader) error { return nil } -func createFleetServerBootstrapConfig(connStr string, policyID string, host string, port uint16, cert string, key string, esCA string) (*configuration.FleetAgentConfig, error) { - es, err := configuration.ElasticsearchFromConnStr(connStr) +func createFleetServerBootstrapConfig(connStr string, serviceToken string, policyID string, host string, port uint16, cert string, key string, esCA string) (*configuration.FleetAgentConfig, error) { + es, err := configuration.ElasticsearchFromConnStr(connStr, serviceToken) if err != nil { return nil, err } diff --git a/x-pack/elastic-agent/pkg/agent/cmd/install.go b/x-pack/elastic-agent/pkg/agent/cmd/install.go index 6df49f43ca6..3cffe1bb8df 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/install.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/install.go @@ -101,7 +101,7 @@ func installCmd(streams *cli.IOStreams, cmd *cobra.Command, args []string) error if url != "" && token != "" { askEnroll = false } - fleetServer, _ := cmd.Flags().GetString("fleet-server") + fleetServer, _ := cmd.Flags().GetString("fleet-server-es") if fleetServer != "" { askEnroll = false } diff --git a/x-pack/elastic-agent/pkg/agent/configuration/fleet_server.go b/x-pack/elastic-agent/pkg/agent/configuration/fleet_server.go index 939fb550482..e90f4bf3b1c 100644 --- a/x-pack/elastic-agent/pkg/agent/configuration/fleet_server.go +++ b/x-pack/elastic-agent/pkg/agent/configuration/fleet_server.go @@ -33,16 +33,17 @@ type FleetServerOutputConfig struct { // Elasticsearch is the configuration for elasticsearch. type Elasticsearch struct { - Protocol string `config:"protocol" yaml:"protocol"` - Hosts []string `config:"hosts" yaml:"hosts"` - Path string `config:"path" yaml:"path,omitempty"` - Username string `config:"username" yaml:"username"` - Password string `config:"password" yaml:"password"` - TLS *tlscommon.Config `config:"ssl" yaml:"ssl,omitempty"` + Protocol string `config:"protocol" yaml:"protocol"` + Hosts []string `config:"hosts" yaml:"hosts"` + Path string `config:"path" yaml:"path,omitempty"` + Username string `config:"username" yaml:"username,omitempty"` + Password string `config:"password" yaml:"password,omitempty"` + ServiceToken string `config:"service_token" yaml:"service_token,omitempty"` + TLS *tlscommon.Config `config:"ssl" yaml:"ssl,omitempty"` } // ElasticsearchFromConnStr returns an Elasticsearch configuration from the connection string. -func ElasticsearchFromConnStr(conn string) (Elasticsearch, error) { +func ElasticsearchFromConnStr(conn string, serviceToken string) (Elasticsearch, error) { u, err := url.Parse(conn) if err != nil { return Elasticsearch{}, err @@ -53,19 +54,24 @@ func ElasticsearchFromConnStr(conn string) (Elasticsearch, error) { if u.Host == "" { return Elasticsearch{}, errors.New("invalid connection string: must include a host") } + cfg := Elasticsearch{ + Protocol: u.Scheme, + Hosts: []string{u.Host}, + Path: u.Path, + TLS: nil, + } + if serviceToken != "" { + cfg.ServiceToken = serviceToken + return cfg, nil + } if u.User == nil || u.User.Username() == "" { - return Elasticsearch{}, errors.New("invalid connection string: must include a username") + return Elasticsearch{}, errors.New("invalid connection string: must include a username unless a service token is provided") } password, ok := u.User.Password() if !ok { - return Elasticsearch{}, errors.New("invalid connection string: must include a password") + return Elasticsearch{}, errors.New("invalid connection string: must include a password unless a service token is provided") } - return Elasticsearch{ - Protocol: u.Scheme, - Hosts: []string{u.Host}, - Path: u.Path, - Username: u.User.Username(), - Password: password, - TLS: nil, - }, nil + cfg.Username = u.User.Username() + cfg.Password = password + return cfg, nil } diff --git a/x-pack/elastic-agent/pkg/agent/program/supported.go b/x-pack/elastic-agent/pkg/agent/program/supported.go index a893c7858cb..9909f9eafe3 100644 --- a/x-pack/elastic-agent/pkg/agent/program/supported.go +++ b/x-pack/elastic-agent/pkg/agent/program/supported.go @@ -25,7 +25,7 @@ func init() { // spec/metricbeat.yml // spec/osquerybeat.yml // spec/packetbeat.yml - unpacked := packer.MustUnpack("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") + unpacked := packer.MustUnpack("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") SupportedMap = make(map[string]Spec) for f, v := range unpacked { diff --git a/x-pack/elastic-agent/spec/osquerybeat.yml b/x-pack/elastic-agent/spec/osquerybeat.yml index 8a7dd8b3538..f92574128a2 100644 --- a/x-pack/elastic-agent/spec/osquerybeat.yml +++ b/x-pack/elastic-agent/spec/osquerybeat.yml @@ -1,6 +1,7 @@ name: Osquerybeat cmd: osquerybeat args: ["-E", "setup.ilm.enabled=false", "-E", "setup.template.enabled=false", "-E", "management.mode=x-pack-fleet", "-E", "management.enabled=true", "-E", "logging.level=debug"] +artifact: beats/osquerybeat action_input_types: - osquery diff --git a/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc b/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc index c698c99e4cc..41108d4a192 100644 --- a/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc +++ b/x-pack/filebeat/docs/inputs/input-httpjson.asciidoc @@ -121,7 +121,7 @@ The access limitations are described in the corresponding configuration sections [float] ==== `append` -Appends a value to a list. If the field does not exist, the first entry will be a scalar value, and subsequent additions will convert the value to a list. +Appends a value to an array. If the field does not exist, the first entry will create a new array. If the field exists, the value is appended to the existing field and converted to a list. ["source","yaml",subs="attributes"] ---- diff --git a/x-pack/filebeat/input/azureeventhub/input.go b/x-pack/filebeat/input/azureeventhub/input.go index 010e2807b56..5f0d1b3df5e 100644 --- a/x-pack/filebeat/input/azureeventhub/input.go +++ b/x-pack/filebeat/input/azureeventhub/input.go @@ -8,6 +8,7 @@ import ( "context" "encoding/json" "fmt" + "strings" "sync" "time" @@ -80,7 +81,7 @@ func NewInput( in := &azureInput{ config: config, - log: logp.NewLogger(fmt.Sprintf("%s input", inputName)).With("connection string", config.ConnectionString), + log: logp.NewLogger(fmt.Sprintf("%s input", inputName)).With("connection string", stripConnectionString(config.ConnectionString)), context: inputContext, workerCtx: workerCtx, workerCancel: workerCancel, @@ -235,3 +236,17 @@ func (a *azureInput) parseMultipleMessages(bMessage []byte) []string { } return messages } + +// Strip connection string to remove sensitive information +// A connection string should look like this: +// Endpoint=sb://dummynamespace.servicebus.windows.net/;SharedAccessKeyName=DummyAccessKeyName;SharedAccessKey=5dOntTRytoC24opYThisAsit3is2B+OGY1US/fuL3ly= +// This code will remove everything after ';' so key information is stripped +func stripConnectionString(c string) string { + if parts := strings.SplitN(c, ";", 2); len(parts) == 2 { + return parts[0] + } + + // We actually expect the string to have the documented format + // if we reach here something is wrong, so let's stay on the safe side + return "(redacted)" +} diff --git a/x-pack/filebeat/input/azureeventhub/input_test.go b/x-pack/filebeat/input/azureeventhub/input_test.go index 8537e7529f5..d4268d9d96a 100644 --- a/x-pack/filebeat/input/azureeventhub/input_test.go +++ b/x-pack/filebeat/input/azureeventhub/input_test.go @@ -120,6 +120,30 @@ func TestNewInputDone(t *testing.T) { inputtest.AssertNotStartedInputCanBeDone(t, NewInput, &config) } +func TestStripConnectionString(t *testing.T) { + tests := []struct { + connectionString, expected string + }{ + { + "Endpoint=sb://something", + "(redacted)", + }, + { + "Endpoint=sb://dummynamespace.servicebus.windows.net/;SharedAccessKeyName=DummyAccessKeyName;SharedAccessKey=5dOntTRytoC24opYThisAsit3is2B+OGY1US/fuL3ly=", + "Endpoint=sb://dummynamespace.servicebus.windows.net/", + }, + { + "Endpoint=sb://dummynamespace.servicebus.windows.net/;SharedAccessKey=5dOntTRytoC24opYThisAsit3is2B+OGY1US/fuL3ly=", + "Endpoint=sb://dummynamespace.servicebus.windows.net/", + }, + } + + for _, tt := range tests { + res := stripConnectionString(tt.connectionString) + assert.Equal(t, res, tt.expected) + } +} + type stubOutleter struct { sync.Mutex cond *sync.Cond diff --git a/x-pack/filebeat/input/httpjson/internal/v2/transform_append.go b/x-pack/filebeat/input/httpjson/internal/v2/transform_append.go index f2561ecd55b..50163ab1938 100644 --- a/x-pack/filebeat/input/httpjson/internal/v2/transform_append.go +++ b/x-pack/filebeat/input/httpjson/internal/v2/transform_append.go @@ -125,7 +125,7 @@ func appendToCommonMap(m common.MapStr, key, val string) error { if val == "" { return nil } - var value interface{} = val + var value interface{} if found, _ := m.HasKey(key); found { prev, _ := m.GetValue(key) switch t := prev.(type) { @@ -137,6 +137,8 @@ func appendToCommonMap(m common.MapStr, key, val string) error { value = []interface{}{prev, val} } + } else { + value = []interface{}{val} } if _, err := m.Put(key, value); err != nil { return err diff --git a/x-pack/filebeat/input/httpjson/internal/v2/transform_append_test.go b/x-pack/filebeat/input/httpjson/internal/v2/transform_append_test.go index 12b49af4395..73cb3e78026 100644 --- a/x-pack/filebeat/input/httpjson/internal/v2/transform_append_test.go +++ b/x-pack/filebeat/input/httpjson/internal/v2/transform_append_test.go @@ -147,6 +147,16 @@ func TestAppendFunctions(t *testing.T) { expectedTr: transformable{"body": common.MapStr{"a_key": []interface{}{"a_value", "another_value"}}}, expectedErr: nil, }, + { + name: "appendBodyWithSingleValue", + tfunc: appendBody, + paramCtx: &transformContext{}, + paramTr: transformable{"body": common.MapStr{}}, + paramKey: "a_key", + paramVal: "a_value", + expectedTr: transformable{"body": common.MapStr{"a_key": []interface{}{"a_value"}}}, + expectedErr: nil, + }, { name: "appendHeader", tfunc: appendHeader, diff --git a/x-pack/filebeat/module/gcp/_meta/fields.yml b/x-pack/filebeat/module/gcp/_meta/fields.yml index f574d666eb7..8b07d07e4e0 100644 --- a/x-pack/filebeat/module/gcp/_meta/fields.yml +++ b/x-pack/filebeat/module/gcp/_meta/fields.yml @@ -3,7 +3,7 @@ description: > Module for handling logs from Google Cloud. fields: - - name: googlecloud + - name: gcp type: group description: > Fields from Google Cloud logs. diff --git a/x-pack/filebeat/module/gcp/audit/config/pipeline.js b/x-pack/filebeat/module/gcp/audit/config/pipeline.js index a24bd621934..878f2b19b8d 100644 --- a/x-pack/filebeat/module/gcp/audit/config/pipeline.js +++ b/x-pack/filebeat/module/gcp/audit/config/pipeline.js @@ -79,121 +79,121 @@ function Audit(keep_original_message) { fields: [ { from: "json.@type", - to: "googlecloud.audit.type", + to: "gcp.audit.type", type: "string" }, { from: "json.authenticationInfo.principalEmail", - to: "googlecloud.audit.authentication_info.principal_email", + to: "gcp.audit.authentication_info.principal_email", type: "string" }, { from: "json.authenticationInfo.authoritySelector", - to: "googlecloud.audit.authentication_info.authority_selector", + to: "gcp.audit.authentication_info.authority_selector", type: "string" }, { from: "json.authorizationInfo", - to: "googlecloud.audit.authorization_info" + to: "gcp.audit.authorization_info" // Type is an array of objects. }, { from: "json.methodName", - to: "googlecloud.audit.method_name", + to: "gcp.audit.method_name", type: "string", }, { from: "json.numResponseItems", - to: "googlecloud.audit.num_response_items", + to: "gcp.audit.num_response_items", type: "long" }, { from: "json.request.@type", - to: "googlecloud.audit.request.proto_name", + to: "gcp.audit.request.proto_name", type: "string" }, // The values in the request object will depend on the proto type. // So be very careful about making any assumptions about data shape. { from: "json.request.filter", - to: "googlecloud.audit.request.filter", + to: "gcp.audit.request.filter", type: "string" }, { from: "json.request.name", - to: "googlecloud.audit.request.name", + to: "gcp.audit.request.name", type: "string" }, { from: "json.request.resourceName", - to: "googlecloud.audit.request.resource_name", + to: "gcp.audit.request.resource_name", type: "string" }, { from: "json.requestMetadata.callerIp", - to: "googlecloud.audit.request_metadata.caller_ip", + to: "gcp.audit.request_metadata.caller_ip", type: "ip" }, { from: "json.requestMetadata.callerSuppliedUserAgent", - to: "googlecloud.audit.request_metadata.caller_supplied_user_agent", + to: "gcp.audit.request_metadata.caller_supplied_user_agent", type: "string", }, { from: "json.response.@type", - to: "googlecloud.audit.response.proto_name", + to: "gcp.audit.response.proto_name", type: "string" }, // The values in the response object will depend on the proto type. // So be very careful about making any assumptions about data shape. { from: "json.response.status", - to: "googlecloud.audit.response.status", + to: "gcp.audit.response.status", type: "string" }, { from: "json.response.details.group", - to: "googlecloud.audit.response.details.group", + to: "gcp.audit.response.details.group", type: "string" }, { from: "json.response.details.kind", - to: "googlecloud.audit.response.details.kind", + to: "gcp.audit.response.details.kind", type: "string" }, { from: "json.response.details.name", - to: "googlecloud.audit.response.details.name", + to: "gcp.audit.response.details.name", type: "string" }, { from: "json.response.details.uid", - to: "googlecloud.audit.response.details.uid", + to: "gcp.audit.response.details.uid", type: "string", }, { from: "json.resourceName", - to: "googlecloud.audit.resource_name", + to: "gcp.audit.resource_name", type: "string", }, { from: "json.resourceLocation.currentLocations", - to: "googlecloud.audit.resource_location.current_locations" + to: "gcp.audit.resource_location.current_locations" // Type is a string array. }, { from: "json.serviceName", - to: "googlecloud.audit.service_name", + to: "gcp.audit.service_name", type: "string", }, { from: "json.status.code", - to: "googlecloud.audit.status.code", + to: "gcp.audit.status.code", type: "integer", }, { from: "json.status.message", - to: "googlecloud.audit.status.message", + to: "gcp.audit.status.message", type: "string" }, ], @@ -206,27 +206,27 @@ function Audit(keep_original_message) { var copyFields = new processor.Convert({ fields: [ { - from: "googlecloud.audit.request_metadata.caller_ip", + from: "gcp.audit.request_metadata.caller_ip", to: "source.ip", type: "ip" }, { - from: "googlecloud.audit.authentication_info.principal_email", + from: "gcp.audit.authentication_info.principal_email", to: "user.email", type: "string" }, { - from: "googlecloud.audit.service_name", + from: "gcp.audit.service_name", to: "service.name", type: "string" }, { - from: "googlecloud.audit.request_metadata.caller_supplied_user_agent", + from: "gcp.audit.request_metadata.caller_supplied_user_agent", to: "user_agent.original", type: "string" }, { - from: "googlecloud.audit.method_name", + from: "gcp.audit.method_name", to: "event.action", type: "string" }, @@ -242,7 +242,7 @@ function Audit(keep_original_message) { // Rename nested fields. var renameNestedFields = function(evt) { - var arr = evt.Get("googlecloud.audit.authorization_info"); + var arr = evt.Get("gcp.audit.authorization_info"); if (Array.isArray(arr)) { for (var i = 0; i < arr.length; i++) { if (arr[i].resourceAttributes) { @@ -259,14 +259,14 @@ function Audit(keep_original_message) { evt.Put("event.kind", "event"); // google.rpc.Code value for OK is 0. - if (evt.Get("googlecloud.audit.status.code") === 0) { + if (evt.Get("gcp.audit.status.code") === 0) { evt.Put("event.outcome", "success"); return; } // Try to use authorization_info.granted when there was no status code. - if (evt.Get("googlecloud.audit.status.code") == null) { - var authorization_info = evt.Get("googlecloud.audit.authorization_info"); + if (evt.Get("gcp.audit.status.code") == null) { + var authorization_info = evt.Get("gcp.audit.authorization_info"); if (Array.isArray(authorization_info) && authorization_info.length === 1) { if (authorization_info[0].granted === true) { evt.Put("event.outcome", "success"); diff --git a/x-pack/filebeat/module/gcp/audit/test/audit-log-entries.json.log-expected.json b/x-pack/filebeat/module/gcp/audit/test/audit-log-entries.json.log-expected.json index d7e057c466a..4f3a0264141 100644 --- a/x-pack/filebeat/module/gcp/audit/test/audit-log-entries.json.log-expected.json +++ b/x-pack/filebeat/module/gcp/audit/test/audit-log-entries.json.log-expected.json @@ -9,8 +9,8 @@ "event.module": "gcp", "event.outcome": "success", "fileset.name": "audit", - "googlecloud.audit.authentication_info.principal_email": "xxx@xxx.xxx", - "googlecloud.audit.authorization_info": [ + "gcp.audit.authentication_info.principal_email": "xxx@xxx.xxx", + "gcp.audit.authorization_info": [ { "granted": true, "permission": "resourcemanager.projects.get", @@ -18,13 +18,13 @@ "resource_attributes": {} } ], - "googlecloud.audit.method_name": "GetResourceBillingInfo", - "googlecloud.audit.request.proto_name": "type.googleapis.com/google.internal.cloudbilling.billingaccount.v1.GetResourceBillingInfoRequest", - "googlecloud.audit.request.resource_name": "projects/189716325846", - "googlecloud.audit.request_metadata.caller_ip": "192.168.1.1", - "googlecloud.audit.resource_name": "projects/elastic-beats", - "googlecloud.audit.service_name": "cloudbilling.googleapis.com", - "googlecloud.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", + "gcp.audit.method_name": "GetResourceBillingInfo", + "gcp.audit.request.proto_name": "type.googleapis.com/google.internal.cloudbilling.billingaccount.v1.GetResourceBillingInfoRequest", + "gcp.audit.request.resource_name": "projects/189716325846", + "gcp.audit.request_metadata.caller_ip": "192.168.1.1", + "gcp.audit.resource_name": "projects/elastic-beats", + "gcp.audit.service_name": "cloudbilling.googleapis.com", + "gcp.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", "input.type": "log", "log.logger": "projects/elastic-beats/logs/cloudaudit.googleapis.com%2Fdata_access", "log.offset": 0, @@ -46,8 +46,8 @@ "event.module": "gcp", "event.outcome": "failure", "fileset.name": "audit", - "googlecloud.audit.authentication_info.principal_email": "xxx@xxx.xxx", - "googlecloud.audit.authorization_info": [ + "gcp.audit.authentication_info.principal_email": "xxx@xxx.xxx", + "gcp.audit.authorization_info": [ { "granted": false, "permission": "compute.machineTypes.list", @@ -58,17 +58,17 @@ } } ], - "googlecloud.audit.method_name": "beta.compute.machineTypes.aggregatedList", - "googlecloud.audit.num_response_items": 71, - "googlecloud.audit.request.proto_name": "type.googleapis.com/compute.machineTypes.aggregatedList", - "googlecloud.audit.request_metadata.caller_ip": "192.168.1.1", - "googlecloud.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:71.0) Gecko/20100101 Firefox/71.0,gzip(gfe),gzip(gfe)", - "googlecloud.audit.resource_location.current_locations": [ + "gcp.audit.method_name": "beta.compute.machineTypes.aggregatedList", + "gcp.audit.num_response_items": 71, + "gcp.audit.request.proto_name": "type.googleapis.com/compute.machineTypes.aggregatedList", + "gcp.audit.request_metadata.caller_ip": "192.168.1.1", + "gcp.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:71.0) Gecko/20100101 Firefox/71.0,gzip(gfe),gzip(gfe)", + "gcp.audit.resource_location.current_locations": [ "global" ], - "googlecloud.audit.resource_name": "projects/elastic-beats/global/machineTypes", - "googlecloud.audit.service_name": "compute.googleapis.com", - "googlecloud.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", + "gcp.audit.resource_name": "projects/elastic-beats/global/machineTypes", + "gcp.audit.service_name": "compute.googleapis.com", + "gcp.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", "input.type": "log", "log.logger": "projects/elastic-beats/logs/cloudaudit.googleapis.com%2Fdata_access", "log.offset": 945, @@ -98,8 +98,8 @@ "event.module": "gcp", "event.outcome": "success", "fileset.name": "audit", - "googlecloud.audit.authentication_info.principal_email": "xxx@xxx.xxx", - "googlecloud.audit.authorization_info": [ + "gcp.audit.authentication_info.principal_email": "xxx@xxx.xxx", + "gcp.audit.authorization_info": [ { "granted": true, "permission": "compute.instances.list", @@ -110,23 +110,23 @@ } } ], - "googlecloud.audit.method_name": "beta.compute.instances.aggregatedList", - "googlecloud.audit.num_response_items": 61, - "googlecloud.audit.request.proto_name": "type.googleapis.com/compute.instances.aggregatedList", - "googlecloud.audit.request_metadata.caller_ip": "192.168.1.1", - "googlecloud.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:71.0) Gecko/20100101 Firefox/71.0,gzip(gfe),gzip(gfe)", - "googlecloud.audit.resource_location.current_locations": [ + "gcp.audit.method_name": "beta.compute.instances.aggregatedList", + "gcp.audit.num_response_items": 61, + "gcp.audit.request.proto_name": "type.googleapis.com/compute.instances.aggregatedList", + "gcp.audit.request_metadata.caller_ip": "192.168.1.1", + "gcp.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:71.0) Gecko/20100101 Firefox/71.0,gzip(gfe),gzip(gfe)", + "gcp.audit.resource_location.current_locations": [ "global" ], - "googlecloud.audit.resource_name": "projects/elastic-beats/global/instances", - "googlecloud.audit.response.details.group": "batch", - "googlecloud.audit.response.details.kind": "jobs", - "googlecloud.audit.response.details.name": "gsuite-exporter-1589294700", - "googlecloud.audit.response.details.uid": "2beff34a-945f-11ea-bacf-42010a80007f", - "googlecloud.audit.response.proto_name": "core.k8s.io/v1.Status", - "googlecloud.audit.response.status": "Success", - "googlecloud.audit.service_name": "compute.googleapis.com", - "googlecloud.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", + "gcp.audit.resource_name": "projects/elastic-beats/global/instances", + "gcp.audit.response.details.group": "batch", + "gcp.audit.response.details.kind": "jobs", + "gcp.audit.response.details.name": "gsuite-exporter-1589294700", + "gcp.audit.response.details.uid": "2beff34a-945f-11ea-bacf-42010a80007f", + "gcp.audit.response.proto_name": "core.k8s.io/v1.Status", + "gcp.audit.response.status": "Success", + "gcp.audit.service_name": "compute.googleapis.com", + "gcp.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", "input.type": "log", "log.logger": "projects/elastic-beats/logs/cloudaudit.googleapis.com%2Fdata_access", "log.offset": 2252, @@ -156,8 +156,8 @@ "event.module": "gcp", "event.outcome": "failure", "fileset.name": "audit", - "googlecloud.audit.authentication_info.principal_email": "xxx@xxx.xxx", - "googlecloud.audit.authorization_info": [ + "gcp.audit.authentication_info.principal_email": "xxx@xxx.xxx", + "gcp.audit.authorization_info": [ { "permission": "compute.instances.list", "resource_attributes": { @@ -167,19 +167,19 @@ } } ], - "googlecloud.audit.method_name": "beta.compute.instances.aggregatedList", - "googlecloud.audit.num_response_items": 61, - "googlecloud.audit.request.proto_name": "type.googleapis.com/compute.instances.aggregatedList", - "googlecloud.audit.request_metadata.caller_ip": "192.168.1.1", - "googlecloud.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:71.0) Gecko/20100101 Firefox/71.0,gzip(gfe),gzip(gfe)", - "googlecloud.audit.resource_location.current_locations": [ + "gcp.audit.method_name": "beta.compute.instances.aggregatedList", + "gcp.audit.num_response_items": 61, + "gcp.audit.request.proto_name": "type.googleapis.com/compute.instances.aggregatedList", + "gcp.audit.request_metadata.caller_ip": "192.168.1.1", + "gcp.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:71.0) Gecko/20100101 Firefox/71.0,gzip(gfe),gzip(gfe)", + "gcp.audit.resource_location.current_locations": [ "global" ], - "googlecloud.audit.resource_name": "projects/elastic-beats/global/instances", - "googlecloud.audit.service_name": "compute.googleapis.com", - "googlecloud.audit.status.code": 7, - "googlecloud.audit.status.message": "PERMISSION_DENIED", - "googlecloud.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", + "gcp.audit.resource_name": "projects/elastic-beats/global/instances", + "gcp.audit.service_name": "compute.googleapis.com", + "gcp.audit.status.code": 7, + "gcp.audit.status.message": "PERMISSION_DENIED", + "gcp.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", "input.type": "log", "log.logger": "projects/elastic-beats/logs/cloudaudit.googleapis.com%2Fdata_access", "log.offset": 3776, @@ -209,24 +209,24 @@ "event.module": "gcp", "event.outcome": "success", "fileset.name": "audit", - "googlecloud.audit.authentication_info.principal_email": "system:serviceaccount:cert-manager:cert-manager-webhook", - "googlecloud.audit.authorization_info": [ + "gcp.audit.authentication_info.principal_email": "system:serviceaccount:cert-manager:cert-manager-webhook", + "gcp.audit.authorization_info": [ { "granted": true, "permission": "io.k8s.authorization.v1beta1.subjectaccessreviews.create", "resource": "authorization.k8s.io/v1beta1/subjectaccessreviews" } ], - "googlecloud.audit.method_name": "io.k8s.authorization.v1beta1.subjectaccessreviews.create", - "googlecloud.audit.request.proto_name": "authorization.k8s.io/v1beta1.SubjectAccessReview", - "googlecloud.audit.request_metadata.caller_ip": "10.11.12.13", - "googlecloud.audit.request_metadata.caller_supplied_user_agent": "webhook/v0.0.0 (linux/amd64) kubernetes/$Format", - "googlecloud.audit.resource_name": "authorization.k8s.io/v1beta1/subjectaccessreviews", - "googlecloud.audit.response.proto_name": "authorization.k8s.io/v1beta1.SubjectAccessReview", - "googlecloud.audit.response.status": "map[allowed:true reason:RBAC: allowed by ClusterRoleBinding \"system:discovery\" of ClusterRole \"system:discovery\" to Group \"system:authenticated\"]", - "googlecloud.audit.service_name": "k8s.io", - "googlecloud.audit.status.code": 0, - "googlecloud.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", + "gcp.audit.method_name": "io.k8s.authorization.v1beta1.subjectaccessreviews.create", + "gcp.audit.request.proto_name": "authorization.k8s.io/v1beta1.SubjectAccessReview", + "gcp.audit.request_metadata.caller_ip": "10.11.12.13", + "gcp.audit.request_metadata.caller_supplied_user_agent": "webhook/v0.0.0 (linux/amd64) kubernetes/$Format", + "gcp.audit.resource_name": "authorization.k8s.io/v1beta1/subjectaccessreviews", + "gcp.audit.response.proto_name": "authorization.k8s.io/v1beta1.SubjectAccessReview", + "gcp.audit.response.status": "map[allowed:true reason:RBAC: allowed by ClusterRoleBinding \"system:discovery\" of ClusterRole \"system:discovery\" to Group \"system:authenticated\"]", + "gcp.audit.service_name": "k8s.io", + "gcp.audit.status.code": 0, + "gcp.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", "input.type": "log", "log.logger": "projects/foo/logs/cloudaudit.googleapis.com%2Fdata_access", "log.offset": 5100, @@ -253,8 +253,8 @@ "event.module": "gcp", "event.outcome": "success", "fileset.name": "audit", - "googlecloud.audit.authentication_info.principal_email": "user@mycompany.com", - "googlecloud.audit.authorization_info": [ + "gcp.audit.authentication_info.principal_email": "user@mycompany.com", + "gcp.audit.authorization_info": [ { "granted": true, "permission": "compute.images.create", @@ -265,19 +265,19 @@ } } ], - "googlecloud.audit.method_name": "v1.compute.images.insert", - "googlecloud.audit.request.name": "windows-server-2016-v20200805", - "googlecloud.audit.request.proto_name": "type.googleapis.com/compute.images.insert", - "googlecloud.audit.request_metadata.caller_ip": "1.2.3.4", - "googlecloud.audit.request_metadata.caller_supplied_user_agent": "google-cloud-sdk gcloud/290.0.1 command/gcloud.compute.images.create invocation-id/032752ad0fa44b4ea951951d2deef6a3 environment/None environment-version/None interactive/True from-script/False python/2.7.17 term/xterm-256color (Macintosh; Intel Mac OS X 19.6.0),gzip(gfe)", - "googlecloud.audit.resource_location.current_locations": [ + "gcp.audit.method_name": "v1.compute.images.insert", + "gcp.audit.request.name": "windows-server-2016-v20200805", + "gcp.audit.request.proto_name": "type.googleapis.com/compute.images.insert", + "gcp.audit.request_metadata.caller_ip": "1.2.3.4", + "gcp.audit.request_metadata.caller_supplied_user_agent": "google-cloud-sdk gcloud/290.0.1 command/gcloud.compute.images.create invocation-id/032752ad0fa44b4ea951951d2deef6a3 environment/None environment-version/None interactive/True from-script/False python/2.7.17 term/xterm-256color (Macintosh; Intel Mac OS X 19.6.0),gzip(gfe)", + "gcp.audit.resource_location.current_locations": [ "eu" ], - "googlecloud.audit.resource_name": "projects/foo/global/images/windows-server-2016-v20200805", - "googlecloud.audit.response.proto_name": "type.googleapis.com/operation", - "googlecloud.audit.response.status": "RUNNING", - "googlecloud.audit.service_name": "compute.googleapis.com", - "googlecloud.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", + "gcp.audit.resource_name": "projects/foo/global/images/windows-server-2016-v20200805", + "gcp.audit.response.proto_name": "type.googleapis.com/operation", + "gcp.audit.response.status": "RUNNING", + "gcp.audit.service_name": "compute.googleapis.com", + "gcp.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", "input.type": "log", "log.logger": "projects/foo/logs/cloudaudit.googleapis.com%2Factivity", "log.offset": 7530, @@ -315,14 +315,14 @@ "event.module": "gcp", "event.outcome": "unknown", "fileset.name": "audit", - "googlecloud.audit.authentication_info.principal_email": "user@mycompany.com", - "googlecloud.audit.method_name": "beta.compute.instances.stop", - "googlecloud.audit.request.proto_name": "type.googleapis.com/compute.instances.stop", - "googlecloud.audit.request_metadata.caller_ip": "2.3.4.5", - "googlecloud.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:79.0) Gecko/20100101 Firefox/79.0,gzip(gfe),gzip(gfe)", - "googlecloud.audit.resource_name": "projects/foo/zones/us-central1-a/instances/win10-test", - "googlecloud.audit.service_name": "compute.googleapis.com", - "googlecloud.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", + "gcp.audit.authentication_info.principal_email": "user@mycompany.com", + "gcp.audit.method_name": "beta.compute.instances.stop", + "gcp.audit.request.proto_name": "type.googleapis.com/compute.instances.stop", + "gcp.audit.request_metadata.caller_ip": "2.3.4.5", + "gcp.audit.request_metadata.caller_supplied_user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:79.0) Gecko/20100101 Firefox/79.0,gzip(gfe),gzip(gfe)", + "gcp.audit.resource_name": "projects/foo/zones/us-central1-a/instances/win10-test", + "gcp.audit.service_name": "compute.googleapis.com", + "gcp.audit.type": "type.googleapis.com/google.cloud.audit.AuditLog", "input.type": "log", "log.logger": "projects/foo/logs/cloudaudit.googleapis.com%2Factivity", "log.offset": 9946, diff --git a/x-pack/filebeat/module/gcp/fields.go b/x-pack/filebeat/module/gcp/fields.go index 0e5675483bb..ca7a5e13091 100644 --- a/x-pack/filebeat/module/gcp/fields.go +++ b/x-pack/filebeat/module/gcp/fields.go @@ -19,5 +19,5 @@ func init() { // AssetGcp returns asset data. // This is the base64 encoded gzipped contents of module/gcp. func AssetGcp() string { - return "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" + return "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" } diff --git a/x-pack/filebeat/module/gcp/firewall/config/pipeline.js b/x-pack/filebeat/module/gcp/firewall/config/pipeline.js index 5b254cccecc..7bdb322b117 100644 --- a/x-pack/filebeat/module/gcp/firewall/config/pipeline.js +++ b/x-pack/filebeat/module/gcp/firewall/config/pipeline.js @@ -224,12 +224,12 @@ function FirewallProcessor(keep_original_message, debug, internalNetworks) { {from: "json.src_location.region", to: "source.geo.region_name"}, {from: "json.src_location.city", to: "source.geo.city_name"}, - {from: "json.dest_instance", to: "googlecloud.destination.instance"}, - {from: "json.dest_vpc", to: "googlecloud.destination.vpc"}, - {from: "json.src_instance", to: "googlecloud.source.instance"}, - {from: "json.src_vpc", to: "googlecloud.source.vpc"}, + {from: "json.dest_instance", to: "gcp.destination.instance"}, + {from: "json.dest_vpc", to: "gcp.destination.vpc"}, + {from: "json.src_instance", to: "gcp.source.instance"}, + {from: "json.src_vpc", to: "gcp.source.vpc"}, {from: "json.rule_details.reference", to: "rule.name"}, - {from: "json", to: "googlecloud.firewall"}, + {from: "json", to: "gcp.firewall"}, ], mode: "rename", ignore_missing: true, @@ -238,10 +238,10 @@ function FirewallProcessor(keep_original_message, debug, internalNetworks) { // Delete emtpy object's whose fields have been renamed leaving them childless. builder.Add("dropEmptyObjects", function (evt) { - evt.Delete("googlecloud.firewall.connection"); - evt.Delete("googlecloud.firewall.dest_location"); - evt.Delete("googlecloud.firewall.disposition"); - evt.Delete("googlecloud.firewall.src_location"); + evt.Delete("gcp.firewall.connection"); + evt.Delete("gcp.firewall.dest_location"); + evt.Delete("gcp.firewall.disposition"); + evt.Delete("gcp.firewall.src_location"); }); // Copy the source/destination.address to source/destination.ip if they are @@ -260,22 +260,22 @@ function FirewallProcessor(keep_original_message, debug, internalNetworks) { }, EGRESS: new processor.Convert({ fields: [ - {from: "googlecloud.source.instance.project_id", to: "cloud.project.id"}, - {from: "googlecloud.source.instance.vm_name", to: "cloud.instance.name"}, - {from: "googlecloud.source.instance.region", to: "cloud.region"}, - {from: "googlecloud.source.instance.zone", to: "cloud.availability_zone"}, - {from: "googlecloud.source.vpc.subnetwork_name", to: "network.name"} + {from: "gcp.source.instance.project_id", to: "cloud.project.id"}, + {from: "gcp.source.instance.vm_name", to: "cloud.instance.name"}, + {from: "gcp.source.instance.region", to: "cloud.region"}, + {from: "gcp.source.instance.zone", to: "cloud.availability_zone"}, + {from: "gcp.source.vpc.subnetwork_name", to: "network.name"} ], ignore_missing: true }), INGRESS: new processor.Convert({ fields: [ - {from: "googlecloud.destination.instance.project_id", to: "cloud.project.id"}, - {from: "googlecloud.destination.instance.vm_name", to: "cloud.instance.name"}, - {from: "googlecloud.destination.instance.region", to: "cloud.region"}, - {from: "googlecloud.destination.instance.zone", to: "cloud.availability_zone"}, - {from: "googlecloud.destination.vpc.subnetwork_name", to: "network.name"}, + {from: "gcp.destination.instance.project_id", to: "cloud.project.id"}, + {from: "gcp.destination.instance.vm_name", to: "cloud.instance.name"}, + {from: "gcp.destination.instance.region", to: "cloud.region"}, + {from: "gcp.destination.instance.zone", to: "cloud.availability_zone"}, + {from: "gcp.destination.vpc.subnetwork_name", to: "network.name"}, ], ignore_missing: true }) @@ -288,8 +288,8 @@ function FirewallProcessor(keep_original_message, debug, internalNetworks) { })); builder.Add("setInternalDirection", function(event) { - var srcInstance = event.Get("googlecloud.source.instance"); - var destInstance = event.Get("googlecloud.destination.instance"); + var srcInstance = event.Get("gcp.source.instance"); + var destInstance = event.Get("gcp.destination.instance"); if (srcInstance && destInstance) { event.Put("network.direction", "internal"); } diff --git a/x-pack/filebeat/module/gcp/firewall/test/rare.log-expected.json b/x-pack/filebeat/module/gcp/firewall/test/rare.log-expected.json index 1d799e8edbc..28a67d649f9 100644 --- a/x-pack/filebeat/module/gcp/firewall/test/rare.log-expected.json +++ b/x-pack/filebeat/module/gcp/firewall/test/rare.log-expected.json @@ -16,15 +16,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "local-test", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "mysubnet", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "local-test", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "mysubnet", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -33,19 +33,19 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], - "googlecloud.source.instance.project_id": "remote-beats", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "remote-beats", - "googlecloud.source.vpc.subnetwork_name": "mysubnet", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "remote-beats", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "remote-beats", + "gcp.source.vpc.subnetwork_name": "mysubnet", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 0, @@ -83,15 +83,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "remote-beats", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "remote-beats", - "googlecloud.destination.vpc.subnetwork_name": "mysubnet", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "EGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "remote-beats", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "remote-beats", + "gcp.destination.vpc.subnetwork_name": "mysubnet", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "EGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -100,19 +100,19 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], - "googlecloud.source.instance.project_id": "local-test", - "googlecloud.source.instance.region": "us-central1", - "googlecloud.source.instance.zone": "us-central1-a", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "mysubnet", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "local-test", + "gcp.source.instance.region": "us-central1", + "gcp.source.instance.zone": "us-central1-a", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "mysubnet", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 1153, diff --git a/x-pack/filebeat/module/gcp/firewall/test/test.log-expected.json b/x-pack/filebeat/module/gcp/firewall/test/test.log-expected.json index 908b2436bd9..eeba0d7268c 100644 --- a/x-pack/filebeat/module/gcp/firewall/test/test.log-expected.json +++ b/x-pack/filebeat/module/gcp/firewall/test/test.log-expected.json @@ -22,26 +22,26 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.destination_range": [ + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.destination_range": [ "8.8.8.0/24" ], - "googlecloud.firewall.rule_details.direction": "EGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.firewall.rule_details.direction": "EGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "ALL" } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-central1", - "googlecloud.source.instance.zone": "us-central1-a", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-central1", + "gcp.source.instance.zone": "us-central1-a", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 0, @@ -82,15 +82,15 @@ "allowed" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "windows-isolated", - "googlecloud.destination.vpc.vpc_name": "windows-isolated", - "googlecloud.firewall.rule_details.action": "ALLOW", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "windows-isolated", + "gcp.destination.vpc.vpc_name": "windows-isolated", + "gcp.firewall.rule_details.action": "ALLOW", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -98,11 +98,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "allow-rdp" ], "input.type": "log", @@ -146,15 +146,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -163,11 +163,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -213,15 +213,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -230,11 +230,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -278,15 +278,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -295,11 +295,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -343,15 +343,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -360,11 +360,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -410,15 +410,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -427,11 +427,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -477,15 +477,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -494,11 +494,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -544,15 +544,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -561,11 +561,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -611,15 +611,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -628,11 +628,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -678,15 +678,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -695,11 +695,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -745,15 +745,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -762,11 +762,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], "input.type": "log", @@ -818,26 +818,26 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.destination_range": [ + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.destination_range": [ "8.8.8.0/24" ], - "googlecloud.firewall.rule_details.direction": "EGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.firewall.rule_details.direction": "EGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "ALL" } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-central1", - "googlecloud.source.instance.zone": "us-central1-a", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-central1", + "gcp.source.instance.zone": "us-central1-a", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 12444, @@ -884,26 +884,26 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.destination_range": [ + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.destination_range": [ "8.8.8.0/24" ], - "googlecloud.firewall.rule_details.direction": "EGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.firewall.rule_details.direction": "EGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "ALL" } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-central1", - "googlecloud.source.instance.zone": "us-central1-a", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-central1", + "gcp.source.instance.zone": "us-central1-a", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 13425, @@ -944,15 +944,15 @@ "allowed" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "ALLOW", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "ALLOW", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -960,19 +960,19 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "allow9200" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 14407, @@ -1015,15 +1015,15 @@ "allowed" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "ALLOW", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "ALLOW", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -1031,19 +1031,19 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "allow9200" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 15594, @@ -1086,15 +1086,15 @@ "allowed" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "windows-isolated", - "googlecloud.destination.vpc.vpc_name": "windows-isolated", - "googlecloud.firewall.rule_details.action": "ALLOW", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "windows-isolated", + "gcp.destination.vpc.vpc_name": "windows-isolated", + "gcp.firewall.rule_details.action": "ALLOW", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -1102,11 +1102,11 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "allow-rdp" ], "input.type": "log", @@ -1152,15 +1152,15 @@ "allowed" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "ALLOW", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "ALLOW", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -1168,19 +1168,19 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "allow9200" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 17858, @@ -1223,15 +1223,15 @@ "allowed" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "ALLOW", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "ALLOW", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -1239,19 +1239,19 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "allow9200" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 19045, @@ -1294,15 +1294,15 @@ "denied" ], "fileset.name": "firewall", - "googlecloud.destination.instance.project_id": "test-beats", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "test-beats", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.firewall.rule_details.action": "DENY", - "googlecloud.firewall.rule_details.direction": "INGRESS", - "googlecloud.firewall.rule_details.ip_port_info": [ + "gcp.destination.instance.project_id": "test-beats", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "test-beats", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.firewall.rule_details.action": "DENY", + "gcp.firewall.rule_details.direction": "INGRESS", + "gcp.firewall.rule_details.ip_port_info": [ { "ip_protocol": "TCP", "port_range": [ @@ -1311,19 +1311,19 @@ ] } ], - "googlecloud.firewall.rule_details.priority": 1000, - "googlecloud.firewall.rule_details.source_range": [ + "gcp.firewall.rule_details.priority": 1000, + "gcp.firewall.rule_details.source_range": [ "0.0.0.0/0" ], - "googlecloud.firewall.rule_details.target_tag": [ + "gcp.firewall.rule_details.target_tag": [ "adrian-test" ], - "googlecloud.source.instance.project_id": "test-beats", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "test-beats", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "test-beats", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "test-beats", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", "input.type": "log", "log.logger": "projects/test-beats/logs/compute.googleapis.com%2Ffirewall", "log.offset": 20231, diff --git a/x-pack/filebeat/module/gcp/vpcflow/config/pipeline.js b/x-pack/filebeat/module/gcp/vpcflow/config/pipeline.js index c619f888474..0320e44d713 100644 --- a/x-pack/filebeat/module/gcp/vpcflow/config/pipeline.js +++ b/x-pack/filebeat/module/gcp/vpcflow/config/pipeline.js @@ -96,13 +96,13 @@ function VPCFlow(keep_original_message, internalNetworks) { {from: "json.src_location.region", to: "source.geo.region_name"}, {from: "json.src_location.city", to: "source.geo.city_name"}, - {from: "json.dest_instance", to: "googlecloud.destination.instance"}, - {from: "json.dest_vpc", to: "googlecloud.destination.vpc"}, - {from: "json.src_instance", to: "googlecloud.source.instance"}, - {from: "json.src_vpc", to: "googlecloud.source.vpc"}, + {from: "json.dest_instance", to: "gcp.destination.instance"}, + {from: "json.dest_vpc", to: "gcp.destination.vpc"}, + {from: "json.src_instance", to: "gcp.source.instance"}, + {from: "json.src_vpc", to: "gcp.source.vpc"}, {from: "json.rtt_msec", to: "json.rtt.ms", type: "long"}, - {from: "json", to: "googlecloud.vpcflow"}, + {from: "json", to: "gcp.vpcflow"}, ], mode: "rename", ignore_missing: true, @@ -110,9 +110,9 @@ function VPCFlow(keep_original_message, internalNetworks) { // Delete emtpy object's whose fields have been renamed leaving them childless. var dropEmptyObjects = function (evt) { - evt.Delete("googlecloud.vpcflow.connection"); - evt.Delete("googlecloud.vpcflow.dest_location"); - evt.Delete("googlecloud.vpcflow.src_location"); + evt.Delete("gcp.vpcflow.connection"); + evt.Delete("gcp.vpcflow.dest_location"); + evt.Delete("gcp.vpcflow.src_location"); }; // Copy the source/destination.address to source/destination.ip if they are @@ -127,22 +127,22 @@ function VPCFlow(keep_original_message, internalNetworks) { var setCloudFromDestInstance = new processor.Convert({ fields: [ - {from: "googlecloud.destination.instance.project_id", to: "cloud.project.id"}, - {from: "googlecloud.destination.instance.vm_name", to: "cloud.instance.name"}, - {from: "googlecloud.destination.instance.region", to: "cloud.region"}, - {from: "googlecloud.destination.instance.zone", to: "cloud.availability_zone"}, - {from: "googlecloud.destination.vpc.subnetwork_name", to: "network.name"}, + {from: "gcp.destination.instance.project_id", to: "cloud.project.id"}, + {from: "gcp.destination.instance.vm_name", to: "cloud.instance.name"}, + {from: "gcp.destination.instance.region", to: "cloud.region"}, + {from: "gcp.destination.instance.zone", to: "cloud.availability_zone"}, + {from: "gcp.destination.vpc.subnetwork_name", to: "network.name"}, ], ignore_missing: true, }); var setCloudFromSrcInstance = new processor.Convert({ fields: [ - {from: "googlecloud.source.instance.project_id", to: "cloud.project.id"}, - {from: "googlecloud.source.instance.vm_name", to: "cloud.instance.name"}, - {from: "googlecloud.source.instance.region", to: "cloud.region"}, - {from: "googlecloud.source.instance.zone", to: "cloud.availability_zone"}, - {from: "googlecloud.source.vpc.subnetwork_name", to: "network.name"}, + {from: "gcp.source.instance.project_id", to: "cloud.project.id"}, + {from: "gcp.source.instance.vm_name", to: "cloud.instance.name"}, + {from: "gcp.source.instance.region", to: "cloud.region"}, + {from: "gcp.source.instance.zone", to: "cloud.availability_zone"}, + {from: "gcp.source.vpc.subnetwork_name", to: "network.name"}, ], ignore_missing: true, }); @@ -150,7 +150,7 @@ function VPCFlow(keep_original_message, internalNetworks) { // Set the cloud metadata fields based on the instance that reported the // event. var setCloudMetadata = function(evt) { - var reporter = evt.Get("googlecloud.vpcflow.reporter"); + var reporter = evt.Get("gcp.vpcflow.reporter"); if (reporter === "DEST") { setCloudFromDestInstance.Run(evt); @@ -190,8 +190,8 @@ function VPCFlow(keep_original_message, internalNetworks) { }; var setNetworkDirection = function(event) { - var srcInstance = event.Get("googlecloud.source.instance"); - var destInstance = event.Get("googlecloud.destination.instance"); + var srcInstance = event.Get("gcp.source.instance"); + var destInstance = event.Get("gcp.destination.instance"); var direction = "unknown"; if (srcInstance && destInstance) { diff --git a/x-pack/filebeat/module/gcp/vpcflow/test/vpc-flow-log-entries.json.log-expected.json b/x-pack/filebeat/module/gcp/vpcflow/test/vpc-flow-log-entries.json.log-expected.json index b9d0250b9be..da74fec40d6 100644 --- a/x-pack/filebeat/module/gcp/vpcflow/test/vpc-flow-log-entries.json.log-expected.json +++ b/x-pack/filebeat/module/gcp/vpcflow/test/vpc-flow-log-entries.json.log-expected.json @@ -19,14 +19,14 @@ "event.start": "2019-06-14T03:45:37.186193305Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 0, @@ -71,20 +71,20 @@ "event.start": "2019-06-14T03:40:08.466657665Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 934, @@ -135,20 +135,20 @@ "event.start": "2019-06-14T03:40:20.510622432Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 201, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 201, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 2084, @@ -197,13 +197,13 @@ "event.start": "2019-06-14T03:40:45.860349247Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 3237, @@ -250,14 +250,14 @@ "event.start": "2019-06-14T03:40:36.895188084Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 4210, @@ -302,14 +302,14 @@ "event.start": "2019-06-14T03:40:36.895188084Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 5143, @@ -356,20 +356,20 @@ "event.start": "2019-06-14T03:39:59.500498059Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 6078, @@ -420,20 +420,20 @@ "event.start": "2019-06-14T03:40:08.469099728Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 3, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 3, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 7229, @@ -478,20 +478,20 @@ "event.start": "2019-06-14T03:39:59.500506974Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 8378, @@ -539,20 +539,20 @@ "event.start": "2019-06-14T03:40:08.469099728Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 3, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 3, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 9529, @@ -600,13 +600,13 @@ "event.start": "2019-06-14T03:40:45.860349247Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 10679, @@ -655,20 +655,20 @@ "event.start": "2019-06-14T03:40:20.510622432Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 201, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 201, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 11654, @@ -716,20 +716,20 @@ "event.start": "2019-06-14T03:40:01.074897435Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 192, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 192, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 12806, @@ -780,20 +780,20 @@ "event.start": "2019-06-14T03:39:59.500498059Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 13959, @@ -841,20 +841,20 @@ "event.start": "2019-06-14T03:40:08.150720950Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 15109, @@ -902,20 +902,20 @@ "event.start": "2019-06-14T03:40:08.466657665Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 16259, @@ -960,14 +960,14 @@ "event.start": "2019-06-14T03:40:17.343890802Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 17408, @@ -1011,14 +1011,14 @@ "event.start": "2019-06-14T03:48:38.961050187Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 18297, @@ -1068,20 +1068,20 @@ "event.start": "2019-06-14T03:39:59.500506974Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 19233, @@ -1130,14 +1130,14 @@ "event.start": "2019-06-14T03:40:00.560917237Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 220, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 220, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 20383, @@ -1185,20 +1185,20 @@ "event.start": "2019-06-14T03:40:01.074897435Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 192, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 192, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 21370, @@ -1242,14 +1242,14 @@ "event.start": "2019-06-14T03:40:17.306085222Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 22524, @@ -1294,14 +1294,14 @@ "event.start": "2019-06-14T03:45:37.186193305Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 23412, @@ -1351,20 +1351,20 @@ "event.start": "2019-06-14T03:40:05.147252064Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 50, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 50, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 24348, @@ -1409,14 +1409,14 @@ "event.start": "2019-06-14T03:40:00.560917237Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 220, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 220, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 25501, @@ -1465,20 +1465,20 @@ "event.start": "2019-06-14T03:40:08.150720950Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 26490, @@ -1526,20 +1526,20 @@ "event.start": "2019-06-14T03:40:05.147252064Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 50, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 50, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 27641, @@ -1589,14 +1589,14 @@ "event.start": "2019-06-14T03:48:38.961050187Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 28793, @@ -1641,14 +1641,14 @@ "event.start": "2019-06-14T03:40:46.541094678Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 233, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 233, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 29727, @@ -1700,20 +1700,20 @@ "event.start": "2019-06-14T03:40:06.075811571Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 2, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 2, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 30719, @@ -1758,14 +1758,14 @@ "event.start": "2019-06-14T03:46:20.634435179Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 31870, @@ -1815,20 +1815,20 @@ "event.start": "2019-06-14T03:40:06.075942176Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 311, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 311, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 32809, @@ -1876,20 +1876,20 @@ "event.start": "2019-06-14T03:40:05.566551903Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 216, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 216, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 33964, @@ -1938,14 +1938,14 @@ "event.start": "2019-06-14T03:40:01.270990648Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 87, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 87, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 35119, @@ -1990,20 +1990,20 @@ "event.start": "2019-06-14T03:40:06.075942176Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 311, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 311, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 36107, @@ -2054,20 +2054,20 @@ "event.start": "2019-06-14T03:39:59.711043814Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "windows-isolated", - "googlecloud.destination.vpc.vpc_name": "windows-isolated", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 113, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "windows-isolated", + "gcp.destination.vpc.vpc_name": "windows-isolated", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 113, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 37261, @@ -2114,14 +2114,14 @@ "event.start": "2019-06-14T03:46:11.655143526Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 38440, @@ -2170,14 +2170,14 @@ "event.start": "2019-06-14T03:39:59.843986502Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 219, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 219, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 39374, @@ -2222,20 +2222,20 @@ "event.start": "2019-06-14T03:40:24.790136141Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 0, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 0, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 40363, @@ -2286,20 +2286,20 @@ "event.start": "2019-06-14T03:40:14.031541248Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 41513, @@ -2344,20 +2344,20 @@ "event.start": "2019-06-14T03:40:06.075811571Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 2, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 2, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 42677, @@ -2408,20 +2408,20 @@ "event.start": "2019-06-14T03:40:24.790136141Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 0, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 0, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 43829, @@ -2466,20 +2466,20 @@ "event.start": "2019-06-14T03:40:05.147072949Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 44980, @@ -2527,20 +2527,20 @@ "event.start": "2019-06-14T03:40:05.566551903Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 216, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 216, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 46132, @@ -2590,14 +2590,14 @@ "event.start": "2019-06-14T03:46:20.634545217Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 47286, @@ -2646,14 +2646,14 @@ "event.start": "2019-06-14T03:40:00.155378070Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 89, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 89, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 48223, @@ -2698,14 +2698,14 @@ "event.start": "2019-06-14T03:46:11.655143526Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 49211, @@ -2752,14 +2752,14 @@ "event.start": "2019-06-14T03:39:59.843986502Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 219, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 219, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 50147, @@ -2812,14 +2812,14 @@ "event.start": "2019-06-14T03:40:00.565831992Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 86, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 86, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 51137, @@ -2864,20 +2864,20 @@ "event.start": "2019-06-14T03:39:59.711043814Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "windows-isolated", - "googlecloud.source.vpc.vpc_name": "windows-isolated", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 113, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "windows-isolated", + "gcp.source.vpc.vpc_name": "windows-isolated", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 113, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 52125, @@ -2925,20 +2925,20 @@ "event.start": "2019-06-14T03:40:14.031541248Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-central1", - "googlecloud.source.instance.zone": "us-central1-a", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-central1", + "gcp.source.instance.zone": "us-central1-a", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 53305, @@ -2989,20 +2989,20 @@ "event.start": "2019-06-14T03:39:58.492572765Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 144, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 144, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 54470, @@ -3047,14 +3047,14 @@ "event.start": "2019-06-14T03:40:00.565831992Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 86, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 86, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 55625, @@ -3103,14 +3103,14 @@ "event.start": "2019-06-14T03:40:01.270990648Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 87, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 87, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 56614, @@ -3159,14 +3159,14 @@ "event.start": "2019-06-14T03:40:20.454046087Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 57603, @@ -3215,14 +3215,14 @@ "event.start": "2019-06-14T03:40:20.454046087Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 58539, @@ -3271,14 +3271,14 @@ "event.start": "2019-06-14T03:40:46.541094678Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 233, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 233, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 59473, @@ -3323,20 +3323,20 @@ "event.start": "2019-06-14T03:39:58.492572765Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 144, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 144, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 60463, @@ -3387,20 +3387,20 @@ "event.start": "2019-06-14T03:40:05.147072949Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 61617, @@ -3445,14 +3445,14 @@ "event.start": "2019-06-14T03:40:00.155378070Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 89, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 89, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 62768, @@ -3501,14 +3501,14 @@ "event.start": "2019-06-14T03:46:51.237256499Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 63757, @@ -3555,14 +3555,14 @@ "event.start": "2019-06-14T03:45:50.954948790Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 64693, @@ -3609,20 +3609,20 @@ "event.start": "2019-06-14T03:40:02.143837873Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 224, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 224, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 65631, @@ -3672,14 +3672,14 @@ "event.start": "2019-06-14T03:45:50.954948790Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 66784, @@ -3724,14 +3724,14 @@ "event.start": "2019-06-14T03:42:40.779893091Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 67720, @@ -3778,20 +3778,20 @@ "event.start": "2019-06-14T03:40:06.075756033Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 2, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 2, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 68656, @@ -3841,14 +3841,14 @@ "event.start": "2019-06-14T03:42:11.063146265Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 69807, @@ -3896,20 +3896,20 @@ "event.start": "2019-06-14T03:40:00.140119099Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 70741, @@ -3957,20 +3957,20 @@ "event.start": "2019-06-14T03:39:59.500498059Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 15, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 15, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 71891, @@ -4015,20 +4015,20 @@ "event.start": "2019-06-14T03:40:08.469473010Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 230, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 230, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 73042, @@ -4079,20 +4079,20 @@ "event.start": "2019-06-14T03:40:02.143837873Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 224, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 224, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 74194, @@ -4139,14 +4139,14 @@ "event.start": "2019-06-14T03:43:50.703302550Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 43, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 43, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 75348, @@ -4191,20 +4191,20 @@ "event.start": "2019-06-14T03:40:08.458515996Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 253, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 253, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 76282, @@ -4252,14 +4252,14 @@ "event.start": "2019-06-14T03:44:40.125336665Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 77435, @@ -4306,20 +4306,20 @@ "event.start": "2019-06-14T03:39:59.500498059Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 15, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 15, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 78373, @@ -4367,14 +4367,14 @@ "event.start": "2019-06-14T03:43:50.703302550Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 43, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 43, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 79525, @@ -4421,14 +4421,14 @@ "event.start": "2019-06-14T03:42:11.063146265Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 80461, @@ -4477,14 +4477,14 @@ "event.start": "2019-06-14T03:46:37.712749588Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 81397, @@ -4531,14 +4531,14 @@ "event.start": "2019-06-14T03:46:51.237256499Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 82331, @@ -4585,14 +4585,14 @@ "event.start": "2019-06-14T03:44:40.125336665Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 83265, @@ -4637,14 +4637,14 @@ "event.start": "2019-06-14T03:48:50.642206049Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 84201, @@ -4693,14 +4693,14 @@ "event.start": "2019-06-14T03:49:36.865198297Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 85139, @@ -4748,20 +4748,20 @@ "event.start": "2019-06-14T03:40:06.075756033Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 2, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 2, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 86073, @@ -4809,20 +4809,20 @@ "event.start": "2019-06-14T03:39:59.500418290Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 16, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 16, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 87223, @@ -4867,14 +4867,14 @@ "event.start": "2019-06-14T03:49:36.865198297Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 88374, @@ -4921,20 +4921,20 @@ "event.start": "2019-06-14T03:39:59.500418290Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 16, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 16, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 89310, @@ -4984,14 +4984,14 @@ "event.start": "2019-06-14T03:48:50.642206049Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 90462, @@ -5038,14 +5038,14 @@ "event.start": "2019-06-14T03:42:40.779893091Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 91398, @@ -5090,14 +5090,14 @@ "event.start": "2019-06-14T03:46:37.712749588Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 92332, @@ -5144,20 +5144,20 @@ "event.start": "2019-06-14T03:40:00.140119099Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 1, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 1, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 93268, @@ -5208,20 +5208,20 @@ "event.start": "2019-06-14T03:40:08.469473010Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 230, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 230, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 94419, @@ -5269,20 +5269,20 @@ "event.start": "2019-06-14T03:40:08.458515996Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 253, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 253, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 95572, @@ -5330,20 +5330,20 @@ "event.start": "2019-06-14T03:40:05.147151100Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 109, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 109, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 96724, @@ -5391,20 +5391,20 @@ "event.start": "2019-06-14T03:40:00.762958327Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-central1", - "googlecloud.destination.instance.zone": "us-central1-a", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-central1", + "gcp.destination.instance.zone": "us-central1-a", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 97878, @@ -5452,20 +5452,20 @@ "event.start": "2019-06-14T03:40:08.150481417Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 194, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 194, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 99041, @@ -5510,20 +5510,20 @@ "event.start": "2019-06-14T03:40:06.075859688Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 11, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 11, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 100195, @@ -5571,20 +5571,20 @@ "event.start": "2019-06-14T03:40:00.762958327Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-central1", - "googlecloud.source.instance.zone": "us-central1-a", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 36, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-central1", + "gcp.source.instance.zone": "us-central1-a", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 36, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 101347, @@ -5635,20 +5635,20 @@ "event.start": "2019-06-14T03:40:20.513551480Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "SRC", - "googlecloud.vpcflow.rtt.ms": 142, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "SRC", + "gcp.vpcflow.rtt.ms": 142, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 102512, @@ -5693,20 +5693,20 @@ "event.start": "2019-06-14T03:40:08.480430427Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 201, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 201, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 103665, @@ -5754,20 +5754,20 @@ "event.start": "2019-06-14T03:40:05.147151100Z", "event.type": "connection", "fileset.name": "vpcflow", - "googlecloud.destination.instance.project_id": "my-sample-project", - "googlecloud.destination.instance.region": "us-east1", - "googlecloud.destination.instance.zone": "us-east1-b", - "googlecloud.destination.vpc.project_id": "my-sample-project", - "googlecloud.destination.vpc.subnetwork_name": "default", - "googlecloud.destination.vpc.vpc_name": "default", - "googlecloud.source.instance.project_id": "my-sample-project", - "googlecloud.source.instance.region": "us-east1", - "googlecloud.source.instance.zone": "us-east1-b", - "googlecloud.source.vpc.project_id": "my-sample-project", - "googlecloud.source.vpc.subnetwork_name": "default", - "googlecloud.source.vpc.vpc_name": "default", - "googlecloud.vpcflow.reporter": "DEST", - "googlecloud.vpcflow.rtt.ms": 109, + "gcp.destination.instance.project_id": "my-sample-project", + "gcp.destination.instance.region": "us-east1", + "gcp.destination.instance.zone": "us-east1-b", + "gcp.destination.vpc.project_id": "my-sample-project", + "gcp.destination.vpc.subnetwork_name": "default", + "gcp.destination.vpc.vpc_name": "default", + "gcp.source.instance.project_id": "my-sample-project", + "gcp.source.instance.region": "us-east1", + "gcp.source.instance.zone": "us-east1-b", + "gcp.source.vpc.project_id": "my-sample-project", + "gcp.source.vpc.subnetwork_name": "default", + "gcp.source.vpc.vpc_name": "default", + "gcp.vpcflow.reporter": "DEST", + "gcp.vpcflow.rtt.ms": 109, "input.type": "log", "log.logger": "projects/my-sample-project/logs/compute.googleapis.com%2Fvpc_flows", "log.offset": 104817, diff --git a/x-pack/metricbeat/docker-compose.yml b/x-pack/metricbeat/docker-compose.yml index f026d2cc7cf..e0d6f51617e 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:-7.10.0}-1 + image: docker.elastic.co/integrations-ci/beats-kibana:${KIBANA_VERSION:-7.12.0}-1 build: context: ../../metricbeat/module/kibana/_meta args: - KIBANA_VERSION: ${KIBANA_VERSION:-7.10.0} + KIBANA_VERSION: ${KIBANA_VERSION:-7.12.0} depends_on: - elasticsearch ports: diff --git a/x-pack/osquerybeat/beater/osquerybeat.go b/x-pack/osquerybeat/beater/osquerybeat.go index 40398d16bc7..f5c9ce47fbf 100644 --- a/x-pack/osquerybeat/beater/osquerybeat.go +++ b/x-pack/osquerybeat/beater/osquerybeat.go @@ -14,6 +14,7 @@ import ( "time" "github.com/gofrs/uuid" + lru "github.com/hashicorp/golang-lru" "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/common" @@ -31,6 +32,11 @@ var ( ErrActionRequest = errors.New("invalid action request") ) +const ( + scheduledOsqueriesTypesCacheSize = 256 // Default number of queries types kept in memory to avoid fetching GetQueryColumns all the time + adhocOsqueriesTypesCacheSize = 256 // The final cache size equals the number of periodic queries plus this value, in order to have additional cache for ad-hoc queries +) + // osquerybeat configuration. type osquerybeat struct { b *beat.Beat @@ -109,6 +115,9 @@ func (bt *osquerybeat) Run(b *beat.Beat) error { } defer bt.close() + // Watch input configuration updates + inputConfigCh := config.WatchInputs(ctx) + var wg sync.WaitGroup exefp, err := os.Executable() @@ -157,22 +166,33 @@ func (bt *osquerybeat) Run(b *beat.Beat) error { return err } + // Create a cache for queries + cache, err := lru.New(scheduledOsqueriesTypesCacheSize + adhocOsqueriesTypesCacheSize) + if err != nil { + bt.log.Errorf("Failed to create osquery query results types cache: %v", err) + return err + } + // Connect to osqueryd socket. Replying on the client library retry logic that checks for the socket availability - bt.osqCli, err = osqueryd.NewClient(ctx, osd.SocketPath, osqueryd.DefaultTimeout) + bt.osqCli, err = osqueryd.NewClient(ctx, osd.SocketPath, osqueryd.DefaultTimeout, bt.log, osqueryd.WithCache(cache)) if err != nil { bt.log.Errorf("Failed to create osqueryd client: %v", err) return err } + cacheResize := func(size int) { + if size <= 0 { + size = scheduledOsqueriesTypesCacheSize + } + cache.Resize(size + adhocOsqueriesTypesCacheSize) + } + // Unlink socket path early if removeTmpDir != nil { removeTmpDir() removeTmpDir = nil } - // Watch input configuration updates - inputConfigCh := config.WatchInputs(ctx) - // Start queries execution scheduler scheduler := NewScheduler(ctx, bt.query) wg.Add(1) @@ -182,15 +202,20 @@ func (bt *osquerybeat) Run(b *beat.Beat) error { }() // Load initial queries + loadSchedulerStreams := func(streams []config.StreamConfig) { + cacheResize(len(streams)) + scheduler.Load(streams) + } streams, inputTypes := config.StreamsFromInputs(bt.config.Inputs) sz := len(streams) if sz > 0 { - scheduler.Load(streams) + loadSchedulerStreams(streams) } // Agent actions handlers var actionHandlers []*actionHandler unregisterActionHandlers := func() { + bt.log.Debug("unregisterActionHandlers") // Unregister action handlers if b.Manager != nil { for _, ah := range actionHandlers { @@ -198,19 +223,24 @@ func (bt *osquerybeat) Run(b *beat.Beat) error { ah.bt = nil } } + actionHandlers = nil } registerActionHandlers := func(itypes []string) { unregisterActionHandlers() // Register action handler if b.Manager != nil { + bt.log.Debugf("registerActionHandlers register actions: %v", itypes) for _, inType := range itypes { ah := &actionHandler{ inputType: inType, bt: bt, } b.Manager.RegisterAction(ah) + actionHandlers = append(actionHandlers, ah) } + } else { + bt.log.Debug("registerActionHandlers b.Manager is nil, not registering actions") } } @@ -236,7 +266,7 @@ LOOP: streams, inputTypes = config.StreamsFromInputs(inputConfigs) registerActionHandlers(inputTypes) setManagerPayload(inputTypes) - scheduler.Load(streams) + loadSchedulerStreams(streams) } } diff --git a/x-pack/osquerybeat/internal/osqueryd/client.go b/x-pack/osquerybeat/internal/osqueryd/client.go index f282cd6ddbd..6ef8019929e 100644 --- a/x-pack/osquerybeat/internal/osqueryd/client.go +++ b/x-pack/osquerybeat/internal/osqueryd/client.go @@ -8,6 +8,7 @@ import ( "context" "errors" "fmt" + "strconv" "time" "github.com/elastic/beats/v7/libbeat/logp" @@ -18,23 +19,48 @@ import ( const ( DefaultTimeout = 30 * time.Second + lruCacheSize = 1024 + retryWait = 200 * time.Millisecond retryTimes = 10 logTag = "osqueryd_cli" ) +type Cache interface { + Add(key, value interface{}) (evicted bool) + Get(key interface{}) (value interface{}, ok bool) + Resize(size int) (evicted int) +} + type Client struct { - cli *osquery.ExtensionManagerClient + cli *osquery.ExtensionManagerClient + cache Cache + log *logp.Logger } -func NewClient(ctx context.Context, socketPath string, to time.Duration) (*Client, error) { +type Option func(*Client) + +func NewClient(ctx context.Context, socketPath string, to time.Duration, log *logp.Logger, opts ...Option) (*Client, error) { cli, err := newClientWithRetries(ctx, socketPath, to) if err != nil { return nil, err } - return &Client{ + c := &Client{ cli: cli, - }, nil + log: log, + } + + for _, opt := range opts { + opt(c) + } + + return c, nil +} + +func WithCache(cache Cache) Option { + return func(c *Client) { + c.cache = cache + } } func newClientWithRetries(ctx context.Context, socketPath string, to time.Duration) (cli *osquery.ExtensionManagerClient, err error) { @@ -72,7 +98,7 @@ func (c *Client) Close() { } } -func (c *Client) Query(ctx context.Context, sql string) ([]map[string]string, error) { +func (c *Client) Query(ctx context.Context, sql string) ([]map[string]interface{}, error) { res, err := c.cli.Client.Query(ctx, sql) if err != nil { return nil, fmt.Errorf("osquery failed: %w", err) @@ -80,7 +106,89 @@ func (c *Client) Query(ctx context.Context, sql string) ([]map[string]string, er if res.Status.Code != int32(0) { return nil, errors.New(res.Status.Message) } - return res.Response, nil + + // Get column types + colTypes, err := c.queryColumnTypes(ctx, sql) + if err != nil { + return nil, err + } + + return resolveTypes(res.Response, colTypes), nil +} + +func (c *Client) queryColumnTypes(ctx context.Context, sql string) (map[string]string, error) { + var colTypes map[string]string + if c.cache != nil { + if v, ok := c.cache.Get(sql); ok { + colTypes, ok = v.(map[string]string) + if ok { + c.log.Debug("Using cached column types for query: %s", sql) + } else { + c.log.Error("Failed get the column types from cache, incompatible type") + } + } + } + if colTypes == nil { + exres, err := c.cli.GetQueryColumns(sql) + if err != nil { + return nil, fmt.Errorf("osquery get query columns failed: %w", err) + } + + colTypes = make(map[string]string) + for _, m := range exres.Response { + for k, v := range m { + colTypes[k] = v + } + } + c.cache.Add(sql, colTypes) + } + return colTypes, nil +} + +func resolveTypes(hits []map[string]string, colTypes map[string]string) []map[string]interface{} { + resolved := make([]map[string]interface{}, 0, len(hits)) + for _, hit := range hits { + res := resolveHitTypes(hit, colTypes) + resolved = append(resolved, res) + } + return resolved +} + +// Best effort to convert value types and replace values in the +// If conversion fails the value is kept as string +func resolveHitTypes(hit, colTypes map[string]string) map[string]interface{} { + m := make(map[string]interface{}) + for k, v := range hit { + t, ok := colTypes[k] + if ok { + var err error + switch t { + case "BIGINT", "INTEGER": + var n int64 + n, err = strconv.ParseInt(v, 10, 64) + if err == nil { + m[k] = n + } + case "UNSIGNED_BIGINT": + var n uint64 + n, err = strconv.ParseUint(v, 10, 64) + if err == nil { + m[k] = n + } + case "DOUBLE": + var n float64 + n, err = strconv.ParseFloat(v, 64) + if err == nil { + m[k] = n + } + default: + m[k] = v + } + } else { + m[k] = v + } + } + return m } func waitWithContext(ctx context.Context, to time.Duration) error {