From af011b2ffdfd50a41d53d67278c0e190387f11a8 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 5 Jun 2020 13:48:26 +0800 Subject: [PATCH 1/5] Makefile: update beats message Use the format elastic/beats@commit, so we can easily link through to the commit to inspect. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e51190302b0..f1ea045fdc5 100644 --- a/Makefile +++ b/Makefile @@ -170,8 +170,7 @@ BEATS_MODULE=$(shell go list -m -f {{.Path}} all | grep github.com/elastic/beats .PHONY: update-beats update-beats: update-beats-module update - @echo --- Use this commit message: Update beats framework to \ - $(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3) + @echo --- Use this commit message: Update to elastic/beats@$(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3) .PHONY: update-beats-module update-beats-module: From 2484b8900b145e90a6b72a8d9e4b6b9a346d756b Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 5 Jun 2020 14:04:08 +0800 Subject: [PATCH 2/5] Makefile: check .go-version is up to date --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index f1ea045fdc5..c089dbb948d 100644 --- a/Makefile +++ b/Makefile @@ -175,6 +175,8 @@ update-beats: update-beats-module update .PHONY: update-beats-module update-beats-module: go get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) + diff -u .go-version $$(go list -m -f {{.Dir}} $(BEATS_MODULE))/.go-version \ + || { code=$$?; echo ".go-version out of sync with Beats"; exit $$code; } rsync -crv --delete $$(go list -m -f {{.Dir}} $(BEATS_MODULE))/testing/environments testing/ ############################################################################## From c600c2ee6f9f001d059ba38837b9599d33d8bf17 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 5 Jun 2020 13:50:24 +0800 Subject: [PATCH 3/5] Update to elastic/beats@7b9c535b4a0b --- NOTICE.txt | 6 +++--- go.mod | 7 ++++--- go.sum | 14 ++++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index ed65a58be51..cf5e9b3904a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -512,7 +512,7 @@ Contents of "LICENSE": -------------------------------------------------------------------- Dependency: github.com/elastic/beats/v7 Version: v7.0.0 -Revision: 6e91ce4988a7 +Revision: 7b9c535b4a0b License type (autodetected): Apache-2.0 -------------------------------------------------------------------- @@ -2785,7 +2785,7 @@ Contents of "LICENSE.txt": -------------------------------------------------------------------- Dependency: golang.org/x/crypto -Revision: 06a226fb4e37 +Revision: 70a84ac30bf9 License type (autodetected): BSD-3-Clause Contents of "LICENSE": @@ -2921,7 +2921,7 @@ Contents of "LICENSE": -------------------------------------------------------------------- Dependency: golang.org/x/sys -Revision: 059865788121 +Revision: 6fdc65e7d980 License type (autodetected): BSD-3-Clause Contents of "LICENSE": diff --git a/go.mod b/go.mod index f0eed634fa2..0d00c8009d7 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/dop251/goja v0.0.0-20200526165454-f1752421c432 // indirect github.com/dop251/goja_nodejs v0.0.0-20200128125109-2d688c7e0ac4 // indirect github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200601203544-6e91ce4988a7 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200604220802-7b9c535b4a0b github.com/elastic/go-elasticsearch/v7 v7.5.0 github.com/elastic/go-elasticsearch/v8 v8.0.0-20200210103600-aff00e5adfde github.com/elastic/go-hdrhistogram v0.1.0 @@ -55,12 +55,13 @@ require ( go.elastic.co/ecszap v0.2.0 // indirect go.uber.org/atomic v1.6.0 go.uber.org/zap v1.15.0 + golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 // indirect golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect golang.org/x/net v0.0.0-20200226121028-0de0cce0169b golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e - golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect + golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 // indirect golang.org/x/time v0.0.0-20191024005414-555d28b269f0 - golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 // indirect + golang.org/x/tools v0.0.0-20200604183345-4d5ea46c79fe // indirect google.golang.org/grpc v1.29.1 gopkg.in/yaml.v2 v2.3.0 howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 // indirect diff --git a/go.sum b/go.sum index baa1f9ca216..5779f1f522b 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200601203544-6e91ce4988a7 h1:JAA8oRIKxIuoJzcrhzeYhMtp/oRTYuqdel+FFcb4Q0Q= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200601203544-6e91ce4988a7/go.mod h1:8O4YZOGcs17PLnU48RQoX4MRlhKja7cE/5Ox9yjwKnc= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200604220802-7b9c535b4a0b h1:ddCntWznUCfr+MuB0jB5Duvi0eefdgXpX3eZDMBS6E4= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200604220802-7b9c535b4a0b/go.mod h1:8O4YZOGcs17PLnU48RQoX4MRlhKja7cE/5Ox9yjwKnc= github.com/elastic/ecs v1.5.0 h1:/VEIBsRU4ecq2+U3RPfKNc6bFyomP6qnthYEcQZu8GU= github.com/elastic/ecs v1.5.0/go.mod h1:pgiLbQsijLOJvFR8OTILLu0Ni/R/foUNg0L+T6mU9b4= github.com/elastic/elastic-agent-client/v7 v7.0.0-20200601155656-d6a9eb4f6d07/go.mod h1:uh/Gj9a0XEbYoM4NYz4LvaBVARz3QXLmlNjsrKY9fTc= @@ -1034,6 +1034,8 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM= +golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1146,8 +1148,8 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y= +golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180805044716-cb6730876b98/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1199,8 +1201,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 h1:deddXmhOJb/bvD/4M/j2AUMrhHeh6GkqykJSCWyTNVk= -golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200604183345-4d5ea46c79fe h1:nHJ3EpvC/Nk6Gc4FTwTQ3YOBAODRx412L5jEPjgJcEg= +golang.org/x/tools v0.0.0-20200604183345-4d5ea46c79fe/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= From d98b3e9263464b0cf4672c4f33077fd4453691ee Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 5 Jun 2020 15:33:07 +0800 Subject: [PATCH 4/5] Makefile: run `go mod tidy` after updating beats --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c089dbb948d..85b99c1f1eb 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ update-beats: update-beats-module update .PHONY: update-beats-module update-beats-module: - go get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) + go get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) && go mod tidy diff -u .go-version $$(go list -m -f {{.Dir}} $(BEATS_MODULE))/.go-version \ || { code=$$?; echo ".go-version out of sync with Beats"; exit $$code; } rsync -crv --delete $$(go list -m -f {{.Dir}} $(BEATS_MODULE))/testing/environments testing/ From 4f57568da199160caee45f9000efbc6a4ded5e27 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 5 Jun 2020 15:33:24 +0800 Subject: [PATCH 5/5] Update to elastic/beats@d5fee98f724b --- NOTICE.txt | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index cf5e9b3904a..963582ee0d6 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -512,7 +512,7 @@ Contents of "LICENSE": -------------------------------------------------------------------- Dependency: github.com/elastic/beats/v7 Version: v7.0.0 -Revision: 7b9c535b4a0b +Revision: d5fee98f724b License type (autodetected): Apache-2.0 -------------------------------------------------------------------- diff --git a/go.mod b/go.mod index 0d00c8009d7..423c0b8444e 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/dop251/goja v0.0.0-20200526165454-f1752421c432 // indirect github.com/dop251/goja_nodejs v0.0.0-20200128125109-2d688c7e0ac4 // indirect github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200604220802-7b9c535b4a0b + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200605064436-d5fee98f724b github.com/elastic/go-elasticsearch/v7 v7.5.0 github.com/elastic/go-elasticsearch/v8 v8.0.0-20200210103600-aff00e5adfde github.com/elastic/go-hdrhistogram v0.1.0 diff --git a/go.sum b/go.sum index 5779f1f522b..4cf07921904 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200604220802-7b9c535b4a0b h1:ddCntWznUCfr+MuB0jB5Duvi0eefdgXpX3eZDMBS6E4= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200604220802-7b9c535b4a0b/go.mod h1:8O4YZOGcs17PLnU48RQoX4MRlhKja7cE/5Ox9yjwKnc= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200605064436-d5fee98f724b h1:hSsSxVB7gZlCnESnjs1yGwb9oa9/9gMC8V4Nxk41Vh8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200605064436-d5fee98f724b/go.mod h1:8O4YZOGcs17PLnU48RQoX4MRlhKja7cE/5Ox9yjwKnc= github.com/elastic/ecs v1.5.0 h1:/VEIBsRU4ecq2+U3RPfKNc6bFyomP6qnthYEcQZu8GU= github.com/elastic/ecs v1.5.0/go.mod h1:pgiLbQsijLOJvFR8OTILLu0Ni/R/foUNg0L+T6mU9b4= github.com/elastic/elastic-agent-client/v7 v7.0.0-20200601155656-d6a9eb4f6d07/go.mod h1:uh/Gj9a0XEbYoM4NYz4LvaBVARz3QXLmlNjsrKY9fTc=