Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.0] Update to elastic/beats@4d7e91351f6e #6605

Merged
merged 5 commits into from
Nov 16, 2021
Merged

[8.0] Update to elastic/beats@4d7e91351f6e #6605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e097a7f
Update to elastic/beats@bb9ab3ec5e1b
axw Nov 15, 2021
329ac2a
beater/config: adjust tests
axw Nov 15, 2021
4af545f
Update to elastic/beats@4d7e91351f6e
axw Nov 15, 2021
68c9c60
Merge branch '8.0' into update-beats-8.0
axw Nov 16, 2021
a6c66da
Merge branch '8.0' into update-beats-8.0
axw Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20211106152924-84e668cb1f75
Version: v7.0.0-alpha2.0.20211115162123-4d7e91351f6e
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20211106152924-84e668cb1f75/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20211115162123-4d7e91351f6e/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down Expand Up @@ -949,11 +949,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/go-ucfg
Version: v0.8.4-0.20200415140258-1232bd4774a6
Version: v0.8.4
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.4-0.20200415140258-1232bd4774a6/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-ucfg@v0.8.4/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4577,11 +4577,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/net
Version: v0.0.0-20211105192438-b53810dc28af
Version: v0.0.0-20211112202133-69e39bad7dc2
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20211105192438-b53810dc28af/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20211112202133-69e39bad7dc2/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -19662,11 +19662,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
Version: v0.0.0-20210921155107-089bfa567519
Version: v0.0.0-20211108221036-ceb1ce70b4fa
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.0.0-20210921155107-089bfa567519/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.0.0-20211108221036-ceb1ce70b4fa/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -19736,11 +19736,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.0.0-20211107104306-e0b2ad06fe42
Version: v0.0.0-20211113001501-0c823b97ae02
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20211107104306-e0b2ad06fe42/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.0.0-20211113001501-0c823b97ae02/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -19847,11 +19847,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto
Version: v0.0.0-20211104193956-4c6863e31247
Version: v0.0.0-20211115160612-a5da7257a6f7
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/genproto@v0.0.0-20211104193956-4c6863e31247/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/genproto@v0.0.0-20211115160612-a5da7257a6f7/LICENSE:


Apache License
Expand Down
10 changes: 4 additions & 6 deletions beater/config/aggregation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,26 @@ func TestAggregationConfigInvalid(t *testing.T) {
expect string
}

// TODO(axw) fix these error messages once https://github.com/elastic/go-ucfg/pull/163 is merged

for _, test := range []test{{
name: "non-positive interval",
key: "aggregation.transactions.interval",
value: "0",
expect: "Error processing configuration: requires duration < 1 accessing 'aggregation.transactions.interval'",
expect: "Error processing configuration: requires duration >= 1 accessing 'aggregation.transactions.interval'",
}, {
name: "non-positive max_groups",
key: "aggregation.transactions.max_groups",
value: float64(0),
expect: "Error processing configuration: requires value < 1 accessing 'aggregation.transactions.max_groups'",
expect: "Error processing configuration: requires value >= 1 accessing 'aggregation.transactions.max_groups'",
}, {
name: "non-positive hdrhistogram_significant_figures",
key: "aggregation.transactions.hdrhistogram_significant_figures",
value: float64(0),
expect: "Error processing configuration: requires value < 1 accessing 'aggregation.transactions.hdrhistogram_significant_figures'",
expect: "Error processing configuration: requires value >= 1 accessing 'aggregation.transactions.hdrhistogram_significant_figures'",
}, {
name: "hdrhistogram_significant_figures too high",
key: "aggregation.transactions.hdrhistogram_significant_figures",
value: float64(6),
expect: "Error processing configuration: requires value > 5 accessing 'aggregation.transactions.hdrhistogram_significant_figures'",
expect: "Error processing configuration: requires value <= 5 accessing 'aggregation.transactions.hdrhistogram_significant_figures'",
}} {
t.Run(test.name, func(t *testing.T) {
_, err := NewConfig(common.MustNewConfigFrom(map[string]interface{}{
Expand Down
3 changes: 3 additions & 0 deletions beater/config/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ func (u *urls) Unpack(c interface{}) error {
if !ok {
return fmt.Errorf("hosts must be a list, got: %#v", c)
}
if len(hosts) == 0 {
return nil
}

nu := make(urls, len(hosts))
for i, host := range hosts {
Expand Down
14 changes: 7 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ require (
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06 // indirect
github.com/dop251/goja v0.0.0-20211115154819-26ebff68a7d5 // indirect
github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d // indirect
github.com/dustin/go-humanize v1.0.0
github.com/elastic/apm-server/approvaltest v0.0.0-00010101000000-000000000000
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20211106152924-84e668cb1f75
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20211115162123-4d7e91351f6e
github.com/elastic/ecs v1.12.0
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210922110810-e6f1f402a9ed // indirect
github.com/elastic/gmux v0.2.0
github.com/elastic/go-elasticsearch/v8 v8.0.0-20210727161915-8cf93274b968
github.com/elastic/go-hdrhistogram v0.1.0
github.com/elastic/go-sysinfo v1.7.1 // indirect
github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6
github.com/elastic/go-ucfg v0.8.4
github.com/fatih/color v1.13.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
github.com/gofrs/uuid v4.1.0+incompatible
Expand Down Expand Up @@ -63,14 +63,14 @@ require (
go.uber.org/atomic v1.9.0
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.1
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20211105192438-b53810dc28af
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect
golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 // indirect
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
golang.org/x/tools v0.1.7
google.golang.org/genproto v0.0.0-20211104193956-4c6863e31247 // indirect
google.golang.org/genproto v0.0.0-20211115160612-a5da7257a6f7 // indirect
google.golang.org/grpc v1.42.0
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/gotestsum v1.7.0
Expand Down
Loading