Skip to content

Commit

Permalink
Revert "Update beats import to v7.17.18 (#3391)" (#3441)
Browse files Browse the repository at this point in the history
  • Loading branch information
@juliaElastic
juliaElastic authored Apr 9, 2024
1 parent 095a04d commit b9e2434
Show file tree
Hide file tree
Showing 6 changed files with 41,142 additions and 11,583 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.build
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG GO_VERSION
FROM golang:${GO_VERSION}-buster
FROM golang:${GO_VERSION}-bullseye

RUN \
apt-get update \
Expand Down
51,613 changes: 40,103 additions & 11,510 deletions NOTICE.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cmd/fleet/main_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func newDebugLogger(t *testing.T) *logger.Logger {
loggerCfg := logger.DefaultLoggingConfig()
loggerCfg.Level = logp.DebugLevel

log, err := logger.NewFromConfig("", loggerCfg, false)
log, err := logger.NewFromConfig("", loggerCfg)
require.NoError(t, err)
return log
}
Expand Down
3 changes: 0 additions & 3 deletions dev-tools/notice/overrides.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@
{"name": "github.com/pelletier/go-buffruneio", "licenceType": "MIT", "url": "https://github.com/pelletier/go-buffruneio/blob/master/LICENSE"}
{"name": "github.com/xi2/xz", "licenceType": "Public Domain", "url": "https://github.com/xi2/xz/blob/master/LICENSE"}
{"name": "gopkg.in/yaml.v1", "licenceType": "Apache-2.0"}
{"name": "github.com/awslabs/kinesis-aggregation/go", "licenceType": "Apache-2.0", "url": "https://github.com/awslabs/kinesis-aggregation/blob/master/LICENSE.txt"}
{"name": "kernel.org/pub/linux/libs/security/libcap/cap", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
{"name": "kernel.org/pub/linux/libs/security/libcap/psx", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
40 changes: 19 additions & 21 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ go 1.19
require (
github.com/Pallinder/go-randomdata v1.2.0
github.com/dgraph-io/ristretto v0.1.1
github.com/elastic/beats/v7 v7.17.18
github.com/elastic/beats/v7 v7.11.2
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210727140539-f0905d9377f6
github.com/elastic/go-elasticsearch/v7 v7.16.0
github.com/elastic/go-ucfg v0.8.6
github.com/gofrs/uuid v4.4.0+incompatible
github.com/google/go-cmp v0.6.0
github.com/gofrs/uuid v4.2.0+incompatible
github.com/google/go-cmp v0.5.9
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/go-version v1.3.0
github.com/hashicorp/golang-lru v0.5.4
Expand All @@ -21,40 +21,38 @@ require (
github.com/pkg/errors v0.9.1
github.com/rs/xid v1.3.0
github.com/rs/zerolog v1.27.0
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.2
github.com/spf13/cobra v1.3.0
github.com/stretchr/testify v1.7.0
go.uber.org/zap v1.21.0
golang.org/x/sync v0.3.0
golang.org/x/time v0.3.0
golang.org/x/sync v0.1.0
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
)

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/elastic/go-structform v0.0.9 // indirect
github.com/elastic/go-sysinfo v1.8.1 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/elastic/go-sysinfo v1.7.1 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/magefile/mage v1.14.0 // indirect
github.com/magefile/mage v1.13.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.elastic.co/apm v1.11.0 // indirect
go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b // indirect
go.elastic.co/ecszap v1.0.1 // indirect
go.elastic.co/fastjson v1.1.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
Expand All @@ -64,9 +62,9 @@ require (
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.29.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.0 // indirect
Expand Down
Loading

0 comments on commit b9e2434

Please sign in to comment.