diff --git a/.golangci.yml b/.golangci.yml index 20fbe3b1fff8..595562deedf3 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -35,7 +35,7 @@ linters: files: - '!**/x-pack/**/*.go' deny: - - pkg: github.com/elastic/beats/v7/x-pack + - pkg: github.com/elastic/beats/v9/x-pack desc: Apache 2.0 licensed code cannot depend on Elastic licensed code (x-pack/). main: list-mode: lax diff --git a/auditbeat/ab/registry.go b/auditbeat/ab/registry.go index be0e1256781a..586585313ff6 100644 --- a/auditbeat/ab/registry.go +++ b/auditbeat/ab/registry.go @@ -17,7 +17,7 @@ package ab -import "github.com/elastic/beats/v7/metricbeat/mb" +import "github.com/elastic/beats/v9/metricbeat/mb" // Registry is the singleton Register instance where all ModuleFactory's and // MetricSetFactory's should be registered. diff --git a/auditbeat/cmd/root.go b/auditbeat/cmd/root.go index 7b86111d56dd..204e4ede78fd 100644 --- a/auditbeat/cmd/root.go +++ b/auditbeat/cmd/root.go @@ -23,18 +23,18 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/metricbeat/beater" - "github.com/elastic/beats/v7/metricbeat/mb/module" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/metricbeat/beater" + "github.com/elastic/beats/v9/metricbeat/mb/module" // Register required includes - _ "github.com/elastic/beats/v7/auditbeat/include" + _ "github.com/elastic/beats/v9/auditbeat/include" ) const ( diff --git a/auditbeat/core/eventmod.go b/auditbeat/core/eventmod.go index 02e980bb10cc..46ebf71720d8 100644 --- a/auditbeat/core/eventmod.go +++ b/auditbeat/core/eventmod.go @@ -18,7 +18,7 @@ package core import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/auditbeat/helper/hasher/hasher.go b/auditbeat/helper/hasher/hasher.go index 76710f38522a..38e577b7b540 100644 --- a/auditbeat/helper/hasher/hasher.go +++ b/auditbeat/helper/hasher/hasher.go @@ -29,7 +29,7 @@ import ( "github.com/dustin/go-humanize" "golang.org/x/time/rate" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" ) // HashType identifies a cryptographic algorithm. diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go index c98c1ed19016..87a92ef4c51e 100644 --- a/auditbeat/include/fields.go +++ b/auditbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/auditbeat/include/list.go b/auditbeat/include/list.go index c83f39b8bbe0..f181d01b0633 100644 --- a/auditbeat/include/list.go +++ b/auditbeat/include/list.go @@ -21,6 +21,6 @@ package include import ( // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/auditbeat/module/auditd" - _ "github.com/elastic/beats/v7/auditbeat/module/file_integrity" + _ "github.com/elastic/beats/v9/auditbeat/module/auditd" + _ "github.com/elastic/beats/v9/auditbeat/module/file_integrity" ) diff --git a/auditbeat/magefile.go b/auditbeat/magefile.go index cf9c37653a8b..ad3890de30cc 100644 --- a/auditbeat/magefile.go +++ b/auditbeat/magefile.go @@ -26,20 +26,20 @@ import ( "github.com/magefile/mage/mg" "go.uber.org/multierr" - auditbeat "github.com/elastic/beats/v7/auditbeat/scripts/mage" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + auditbeat "github.com/elastic/beats/v9/auditbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/integtest" + "github.com/elastic/beats/v9/dev-tools/mage/target/integtest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/auditbeat/main.go b/auditbeat/main.go index ff3f400f0864..a55c3e6f249f 100644 --- a/auditbeat/main.go +++ b/auditbeat/main.go @@ -21,7 +21,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/auditbeat/cmd" + "github.com/elastic/beats/v9/auditbeat/cmd" ) func main() { diff --git a/auditbeat/main_test.go b/auditbeat/main_test.go index f91bc1f94822..3ae735e4d288 100644 --- a/auditbeat/main_test.go +++ b/auditbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/auditbeat/cmd" - "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v9/auditbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" ) var systemTest *bool diff --git a/auditbeat/module/auditd/audit_linux.go b/auditbeat/module/auditd/audit_linux.go index f267388c6d4e..1f0f20dbd806 100644 --- a/auditbeat/module/auditd/audit_linux.go +++ b/auditbeat/module/auditd/audit_linux.go @@ -28,10 +28,10 @@ import ( "syscall" "time" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/auditbeat/module/auditd/audit_linux_test.go b/auditbeat/module/auditd/audit_linux_test.go index 2640678034bd..198d50b9e82b 100644 --- a/auditbeat/module/auditd/audit_linux_test.go +++ b/auditbeat/module/auditd/audit_linux_test.go @@ -34,11 +34,11 @@ import ( "github.com/prometheus/procfs" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - "github.com/elastic/beats/v7/libbeat/mapping" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + "github.com/elastic/beats/v9/libbeat/mapping" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-libaudit/v2" "github.com/elastic/go-libaudit/v2/auparse" @@ -86,7 +86,7 @@ func TestSetPID(t *testing.T) { clientMock: NewMock(). returnSendValue(1). returnReceiveError(syscall.ENOBUFS). // first recv fails - returnReceiveError(syscall.EAGAIN). // second is eagain, indicating it would block + returnReceiveError(syscall.EAGAIN). // second is eagain, indicating it would block // now we retry the send returnSendValue(1). returnReceiveAckWithSeq(1), @@ -109,7 +109,7 @@ func TestSetPID(t *testing.T) { clientMock: NewMock(). returnSendValue(1). returnReceiveError(syscall.ENOBUFS). // first recv fails - returnReceiveError(syscall.EAGAIN). // second is eagain from the drain loop, indicating it would block + returnReceiveError(syscall.EAGAIN). // second is eagain from the drain loop, indicating it would block // now we retry the send with error again returnSendValue(2). returnReceiveError(syscall.ENOBUFS). @@ -135,7 +135,7 @@ func TestSetPID(t *testing.T) { clientMock: NewMock(). returnSendValue(1). returnReceiveError(syscall.ENOBUFS). // first recv fails - returnReceiveError(syscall.EBADFD), // non-recoverable error + returnReceiveError(syscall.EBADFD), // non-recoverable error controlMock: NewMock().returnACK().returnStatus(), expectedError: true, diff --git a/auditbeat/module/auditd/audit_unsupported.go b/auditbeat/module/auditd/audit_unsupported.go index b100077c2020..f86f81c68e29 100644 --- a/auditbeat/module/auditd/audit_unsupported.go +++ b/auditbeat/module/auditd/audit_unsupported.go @@ -22,9 +22,9 @@ package auditd import ( "fmt" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) func init() { diff --git a/auditbeat/module/auditd/fields.go b/auditbeat/module/auditd/fields.go index 922708a2a2ff..d9e84e97331b 100644 --- a/auditbeat/module/auditd/fields.go +++ b/auditbeat/module/auditd/fields.go @@ -20,7 +20,7 @@ package auditd import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/auditbeat/module/auditd/golden_files_test.go b/auditbeat/module/auditd/golden_files_test.go index a121b9371dc6..520c71e90dc9 100644 --- a/auditbeat/module/auditd/golden_files_test.go +++ b/auditbeat/module/auditd/golden_files_test.go @@ -37,9 +37,9 @@ import ( "github.com/elastic/go-libaudit/v2" "github.com/elastic/go-libaudit/v2/aucoalesce" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) const ( diff --git a/auditbeat/module/file_integrity/action.go b/auditbeat/module/file_integrity/action.go index 779db7941bd6..85ee5813d3fb 100644 --- a/auditbeat/module/file_integrity/action.go +++ b/auditbeat/module/file_integrity/action.go @@ -21,7 +21,7 @@ import ( "math/bits" "strings" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) // Action is a description of the changes described by an event. diff --git a/auditbeat/module/file_integrity/config.go b/auditbeat/module/file_integrity/config.go index 28b55c3024a2..0c83e7ff36d7 100644 --- a/auditbeat/module/file_integrity/config.go +++ b/auditbeat/module/file_integrity/config.go @@ -29,7 +29,7 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" ) // MaxValidFileSizeLimit is the largest possible value for `max_file_size`. diff --git a/auditbeat/module/file_integrity/event.go b/auditbeat/module/file_integrity/event.go index 4632d4a35aee..c4d4cbc11464 100644 --- a/auditbeat/module/file_integrity/event.go +++ b/auditbeat/module/file_integrity/event.go @@ -33,8 +33,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common/file" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/file" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/auditbeat/module/file_integrity/event_linux.go b/auditbeat/module/file_integrity/event_linux.go index 3f849e359b17..52d4c1cb4e13 100644 --- a/auditbeat/module/file_integrity/event_linux.go +++ b/auditbeat/module/file_integrity/event_linux.go @@ -27,7 +27,7 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/libbeat/ebpf/sys" + "github.com/elastic/beats/v9/libbeat/ebpf/sys" "github.com/elastic/ebpfevents" ) diff --git a/auditbeat/module/file_integrity/eventreader_ebpf.go b/auditbeat/module/file_integrity/eventreader_ebpf.go index 8e56866d9b1f..6942a2b3c609 100644 --- a/auditbeat/module/file_integrity/eventreader_ebpf.go +++ b/auditbeat/module/file_integrity/eventreader_ebpf.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/ebpf" + "github.com/elastic/beats/v9/libbeat/ebpf" "github.com/elastic/ebpfevents" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/auditbeat/module/file_integrity/eventreader_fsnotify.go b/auditbeat/module/file_integrity/eventreader_fsnotify.go index 0420d0f8f814..c20af8d131dd 100644 --- a/auditbeat/module/file_integrity/eventreader_fsnotify.go +++ b/auditbeat/module/file_integrity/eventreader_fsnotify.go @@ -28,7 +28,7 @@ import ( "github.com/fsnotify/fsnotify" - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/monitor" + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/monitor" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/auditbeat/module/file_integrity/eventreader_kprobes.go b/auditbeat/module/file_integrity/eventreader_kprobes.go index 666783c936ad..1d49819a8a1f 100644 --- a/auditbeat/module/file_integrity/eventreader_kprobes.go +++ b/auditbeat/module/file_integrity/eventreader_kprobes.go @@ -25,9 +25,9 @@ import ( "path/filepath" "time" - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/kprobes" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors/add_process_metadata" + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/kprobes" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors/add_process_metadata" "golang.org/x/sys/unix" diff --git a/auditbeat/module/file_integrity/exeobjparser_test.go b/auditbeat/module/file_integrity/exeobjparser_test.go index 46ff24b8ad85..7ee1b89fcab3 100644 --- a/auditbeat/module/file_integrity/exeobjparser_test.go +++ b/auditbeat/module/file_integrity/exeobjparser_test.go @@ -28,7 +28,7 @@ import ( "strconv" "testing" - "github.com/elastic/beats/v7/testing/testutils" + "github.com/elastic/beats/v9/testing/testutils" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -273,8 +273,8 @@ var want = map[string]mapstr.M{ "imports_names_entropy": 4.2079021689106195, "imports_names_var_entropy": 0.0014785066641319837, "go_imports": []string{ - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/testdata/b.Used", - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/testdata/b.hash", + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/testdata/b.Used", + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/testdata/b.hash", }, }, }, @@ -311,8 +311,8 @@ var want = map[string]mapstr.M{ "import_hash": "d41d8cd98f00b204e9800998ecf8427e", "go_import_hash": "10bddcb4cee42080f76c88d9ff964491", "go_imports": []string{ - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/testdata/b.Used", - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/testdata/b.hash", + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/testdata/b.Used", + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/testdata/b.hash", }, }, }, @@ -387,8 +387,8 @@ var want = map[string]mapstr.M{ "_write", }, "go_imports": []string{ - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/testdata/b.Used", - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/testdata/b.hash", + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/testdata/b.Used", + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/testdata/b.hash", }, "sections": []objSection{ {Name: strPtr("__text"), Size: uint64Ptr(0x8be36), Entropy: float64Ptr(6.16), VarEntropy: float64Ptr(0.0001)}, diff --git a/auditbeat/module/file_integrity/fields.go b/auditbeat/module/file_integrity/fields.go index 9e7b566facaa..0cdbe5c2350f 100644 --- a/auditbeat/module/file_integrity/fields.go +++ b/auditbeat/module/file_integrity/fields.go @@ -20,7 +20,7 @@ package file_integrity import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/auditbeat/module/file_integrity/fileinfo_windows.go b/auditbeat/module/file_integrity/fileinfo_windows.go index 8f8caec8b404..142f8a52e712 100644 --- a/auditbeat/module/file_integrity/fileinfo_windows.go +++ b/auditbeat/module/file_integrity/fileinfo_windows.go @@ -27,7 +27,7 @@ import ( "time" "unsafe" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" ) // NewMetadata returns a new Metadata object. If an error is returned it is diff --git a/auditbeat/module/file_integrity/flatbuffers.go b/auditbeat/module/file_integrity/flatbuffers.go index f380e42252c3..ec81f47f2325 100644 --- a/auditbeat/module/file_integrity/flatbuffers.go +++ b/auditbeat/module/file_integrity/flatbuffers.go @@ -25,7 +25,7 @@ import ( flatbuffers "github.com/google/flatbuffers/go" - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/schema" + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/schema" ) // Requires the Google flatbuffer compiler and Elastic go-licenser. diff --git a/auditbeat/module/file_integrity/kprobes/events.go b/auditbeat/module/file_integrity/kprobes/events.go index 2ab2b3e1bdb7..cd10086ff1b9 100644 --- a/auditbeat/module/file_integrity/kprobes/events.go +++ b/auditbeat/module/file_integrity/kprobes/events.go @@ -22,7 +22,7 @@ package kprobes import ( "sync" - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" ) var probeEventPool = sync.Pool{ diff --git a/auditbeat/module/file_integrity/kprobes/events_process_test.go b/auditbeat/module/file_integrity/kprobes/events_process_test.go index 1d0b44b2622d..cdc00d44dc7f 100644 --- a/auditbeat/module/file_integrity/kprobes/events_process_test.go +++ b/auditbeat/module/file_integrity/kprobes/events_process_test.go @@ -23,7 +23,7 @@ import ( "context" "testing" - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/auditbeat/module/file_integrity/kprobes/monitor_test.go b/auditbeat/module/file_integrity/kprobes/monitor_test.go index bdac655aa796..07086405fa98 100644 --- a/auditbeat/module/file_integrity/kprobes/monitor_test.go +++ b/auditbeat/module/file_integrity/kprobes/monitor_test.go @@ -32,7 +32,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/auditbeat/module/file_integrity/kprobes/perf_channel.go b/auditbeat/module/file_integrity/kprobes/perf_channel.go index a76fe3f2a631..3c2f7980548a 100644 --- a/auditbeat/module/file_integrity/kprobes/perf_channel.go +++ b/auditbeat/module/file_integrity/kprobes/perf_channel.go @@ -22,7 +22,7 @@ package kprobes import ( "time" - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" ) type perfChannel interface { diff --git a/auditbeat/module/file_integrity/kprobes/probes.go b/auditbeat/module/file_integrity/kprobes/probes.go index 836dff04cdf1..d0ca38d8e181 100644 --- a/auditbeat/module/file_integrity/kprobes/probes.go +++ b/auditbeat/module/file_integrity/kprobes/probes.go @@ -20,7 +20,7 @@ package kprobes import ( - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" tkbtf "github.com/elastic/tk-btf" diff --git a/auditbeat/module/file_integrity/kprobes/seccomp_linux_amd64.go b/auditbeat/module/file_integrity/kprobes/seccomp_linux_amd64.go index ee281831b251..f0fcbc103d05 100644 --- a/auditbeat/module/file_integrity/kprobes/seccomp_linux_amd64.go +++ b/auditbeat/module/file_integrity/kprobes/seccomp_linux_amd64.go @@ -18,7 +18,7 @@ package kprobes import ( - "github.com/elastic/beats/v7/libbeat/common/seccomp" + "github.com/elastic/beats/v9/libbeat/common/seccomp" ) func init() { diff --git a/auditbeat/module/file_integrity/kprobes/verifier.go b/auditbeat/module/file_integrity/kprobes/verifier.go index 0ea1cf57f1e8..a82272060c2c 100644 --- a/auditbeat/module/file_integrity/kprobes/verifier.go +++ b/auditbeat/module/file_integrity/kprobes/verifier.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" tkbtf "github.com/elastic/tk-btf" ) diff --git a/auditbeat/module/file_integrity/metricset.go b/auditbeat/module/file_integrity/metricset.go index e9cc7b2265a6..1481eb053466 100644 --- a/auditbeat/module/file_integrity/metricset.go +++ b/auditbeat/module/file_integrity/metricset.go @@ -26,11 +26,11 @@ import ( bolt "go.etcd.io/bbolt" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/datastore" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/datastore" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/auditbeat/module/file_integrity/metricset_test.go b/auditbeat/module/file_integrity/metricset_test.go index eccca1a1f5ac..809300359960 100644 --- a/auditbeat/module/file_integrity/metricset_test.go +++ b/auditbeat/module/file_integrity/metricset_test.go @@ -29,12 +29,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - "github.com/elastic/beats/v7/auditbeat/datastore" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + "github.com/elastic/beats/v9/auditbeat/datastore" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/auditbeat/module/file_integrity/mime.go b/auditbeat/module/file_integrity/mime.go index 94dcdc60de5e..212b96d37936 100644 --- a/auditbeat/module/file_integrity/mime.go +++ b/auditbeat/module/file_integrity/mime.go @@ -20,7 +20,7 @@ package file_integrity import ( "github.com/h2non/filetype" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" ) const ( diff --git a/auditbeat/module/file_integrity/testdata/main.go b/auditbeat/module/file_integrity/testdata/main.go index e8634a50f77d..d864cf4dc2f8 100644 --- a/auditbeat/module/file_integrity/testdata/main.go +++ b/auditbeat/module/file_integrity/testdata/main.go @@ -20,7 +20,7 @@ package main import ( "fmt" - "github.com/elastic/beats/v7/auditbeat/module/file_integrity/testdata/b" + "github.com/elastic/beats/v9/auditbeat/module/file_integrity/testdata/b" ) func main() { diff --git a/auditbeat/scripts/mage/config.go b/auditbeat/scripts/mage/config.go index 6ff296264ef7..37929188af95 100644 --- a/auditbeat/scripts/mage/config.go +++ b/auditbeat/scripts/mage/config.go @@ -21,7 +21,7 @@ import ( "fmt" "path/filepath" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) const ( diff --git a/auditbeat/scripts/mage/docs.go b/auditbeat/scripts/mage/docs.go index cbb5c0d66057..f991e320c86d 100644 --- a/auditbeat/scripts/mage/docs.go +++ b/auditbeat/scripts/mage/docs.go @@ -25,7 +25,7 @@ import ( "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // ModuleDocs collects documentation from modules (both OSS and X-Pack). diff --git a/auditbeat/scripts/mage/package.go b/auditbeat/scripts/mage/package.go index f8d5caa8890b..8ee95dda6492 100644 --- a/auditbeat/scripts/mage/package.go +++ b/auditbeat/scripts/mage/package.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // PackagingFlavor specifies the type of packaging (OSS vs X-Pack). diff --git a/dev-tools/cmd/asset/asset.go b/dev-tools/cmd/asset/asset.go index b98a9e29b6fc..ce6f758186b6 100644 --- a/dev-tools/cmd/asset/asset.go +++ b/dev-tools/cmd/asset/asset.go @@ -27,8 +27,8 @@ import ( "io/ioutil" "os" - "github.com/elastic/beats/v7/libbeat/asset/gen" - "github.com/elastic/beats/v7/licenses" + "github.com/elastic/beats/v9/libbeat/asset/gen" + "github.com/elastic/beats/v9/licenses" ) var ( diff --git a/dev-tools/cmd/dashboards/export_dashboards.go b/dev-tools/cmd/dashboards/export_dashboards.go index 530181da09e3..6c78dc3093ea 100644 --- a/dev-tools/cmd/dashboards/export_dashboards.go +++ b/dev-tools/cmd/dashboards/export_dashboards.go @@ -25,8 +25,8 @@ import ( "path/filepath" "time" - "github.com/elastic/beats/v7/libbeat/dashboards" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/dashboards" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/kibana" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/httpcommon" diff --git a/dev-tools/cmd/module_fields/module_fields.go b/dev-tools/cmd/module_fields/module_fields.go index df0bd182d117..aa9e26032baa 100644 --- a/dev-tools/cmd/module_fields/module_fields.go +++ b/dev-tools/cmd/module_fields/module_fields.go @@ -24,9 +24,9 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/v7/libbeat/asset/gen" - "github.com/elastic/beats/v7/libbeat/generator/fields" - "github.com/elastic/beats/v7/licenses" + "github.com/elastic/beats/v9/libbeat/asset/gen" + "github.com/elastic/beats/v9/libbeat/generator/fields" + "github.com/elastic/beats/v9/licenses" ) var usageText = ` diff --git a/dev-tools/cmd/module_include_list/module_include_list.go b/dev-tools/cmd/module_include_list/module_include_list.go index 8bc58537b81e..19905060f0ad 100644 --- a/dev-tools/cmd/module_include_list/module_include_list.go +++ b/dev-tools/cmd/module_include_list/module_include_list.go @@ -29,8 +29,8 @@ import ( "strings" "text/template" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/licenses" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/licenses" ) var usageText = ` diff --git a/dev-tools/mage/check.go b/dev-tools/mage/check.go index 3b70c907d4fd..944cf56fd0d4 100644 --- a/dev-tools/mage/check.go +++ b/dev-tools/mage/check.go @@ -36,9 +36,9 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - "github.com/elastic/beats/v7/dev-tools/mage/gotool" - "github.com/elastic/beats/v7/libbeat/dashboards" - "github.com/elastic/beats/v7/libbeat/processors/dissect" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/libbeat/dashboards" + "github.com/elastic/beats/v9/libbeat/processors/dissect" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go index de52df9ac856..3ff37351cdcd 100644 --- a/dev-tools/mage/crossbuild.go +++ b/dev-tools/mage/crossbuild.go @@ -33,7 +33,7 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" "github.com/elastic/elastic-agent-libs/file" ) diff --git a/dev-tools/mage/fmt.go b/dev-tools/mage/fmt.go index 721cd7c74d6d..8a849925bfe6 100644 --- a/dev-tools/mage/fmt.go +++ b/dev-tools/mage/fmt.go @@ -26,7 +26,7 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" ) var ( diff --git a/dev-tools/mage/gomod.go b/dev-tools/mage/gomod.go index de67f94797a5..472e0698f69b 100644 --- a/dev-tools/mage/gomod.go +++ b/dev-tools/mage/gomod.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" ) // CopyModule contains a module name and the list of files or directories diff --git a/dev-tools/mage/gotest.go b/dev-tools/mage/gotest.go index 0ead8ae6aed6..215d94038927 100644 --- a/dev-tools/mage/gotest.go +++ b/dev-tools/mage/gotest.go @@ -35,7 +35,7 @@ import ( "github.com/magefile/mage/sh" "golang.org/x/sys/execabs" - "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" ) // GoTestArgs are the arguments used for the "go*Test" targets and they define diff --git a/dev-tools/mage/install.go b/dev-tools/mage/install.go index ec3607f0ec0c..e7c4de7e24ac 100644 --- a/dev-tools/mage/install.go +++ b/dev-tools/mage/install.go @@ -18,7 +18,7 @@ package mage import ( - "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" ) var ( diff --git a/dev-tools/mage/kubernetes/kuberemote.go b/dev-tools/mage/kubernetes/kuberemote.go index fb028dc94db3..fdea048cad30 100644 --- a/dev-tools/mage/kubernetes/kuberemote.go +++ b/dev-tools/mage/kubernetes/kuberemote.go @@ -50,7 +50,7 @@ import ( watchtools "k8s.io/client-go/tools/watch" "k8s.io/client-go/transport/spdy" - "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage" ) const sshBitSize = 4096 diff --git a/dev-tools/mage/kubernetes/kubernetes.go b/dev-tools/mage/kubernetes/kubernetes.go index e93632d7b65f..8547d34f0105 100644 --- a/dev-tools/mage/kubernetes/kubernetes.go +++ b/dev-tools/mage/kubernetes/kubernetes.go @@ -30,7 +30,7 @@ import ( "github.com/magefile/mage/mg" - "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage" ) func init() { diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index f620c92b2640..e435919fde67 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -36,7 +36,7 @@ import ( "golang.org/x/text/language" "gopkg.in/yaml.v3" - "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" ) const ( diff --git a/dev-tools/mage/target/build/build.go b/dev-tools/mage/target/build/build.go index fbc7f725cd6c..f02a0a260fc6 100644 --- a/dev-tools/mage/target/build/build.go +++ b/dev-tools/mage/target/build/build.go @@ -24,7 +24,7 @@ import ( "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // Build builds the Beat binary. diff --git a/dev-tools/mage/target/collectors/collect.go b/dev-tools/mage/target/collectors/collect.go index 5a1e6dc05c1a..a580f0eb1300 100644 --- a/dev-tools/mage/target/collectors/collect.go +++ b/dev-tools/mage/target/collectors/collect.go @@ -18,7 +18,7 @@ package collectors import ( - metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" + metricbeat "github.com/elastic/beats/v9/metricbeat/scripts/mage" ) // CollectDocs creates the documentation under docs/ diff --git a/dev-tools/mage/target/common/check.go b/dev-tools/mage/target/common/check.go index 90e4e56a256c..af97ff26c2e6 100644 --- a/dev-tools/mage/target/common/check.go +++ b/dev-tools/mage/target/common/check.go @@ -20,7 +20,7 @@ package common import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) var checkDeps []interface{} diff --git a/dev-tools/mage/target/common/clean.go b/dev-tools/mage/target/common/clean.go index fcda6e25fe51..e666cf66ac65 100644 --- a/dev-tools/mage/target/common/clean.go +++ b/dev-tools/mage/target/common/clean.go @@ -17,7 +17,7 @@ package common -import devtools "github.com/elastic/beats/v7/dev-tools/mage" +import devtools "github.com/elastic/beats/v9/dev-tools/mage" // Clean cleans all generated files and build artifacts. func Clean() error { diff --git a/dev-tools/mage/target/common/fmt.go b/dev-tools/mage/target/common/fmt.go index b29dac7ae906..e09dce5fe79a 100644 --- a/dev-tools/mage/target/common/fmt.go +++ b/dev-tools/mage/target/common/fmt.go @@ -20,7 +20,7 @@ package common import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // Fmt formats source code (.go and .py) and adds license headers. diff --git a/dev-tools/mage/target/common/package.go b/dev-tools/mage/target/common/package.go index 2054538df1f9..e9463f377a61 100644 --- a/dev-tools/mage/target/common/package.go +++ b/dev-tools/mage/target/common/package.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // PackageSystemTests packages the python system tests results diff --git a/dev-tools/mage/target/common/shared.go b/dev-tools/mage/target/common/shared.go index a062bf50084e..3f58df7c3b90 100644 --- a/dev-tools/mage/target/common/shared.go +++ b/dev-tools/mage/target/common/shared.go @@ -17,7 +17,7 @@ package common -import devtools "github.com/elastic/beats/v7/dev-tools/mage" +import devtools "github.com/elastic/beats/v9/dev-tools/mage" // DumpVariables writes the template variables and values to stdout. func DumpVariables() error { diff --git a/dev-tools/mage/target/dashboards/dashboards.go b/dev-tools/mage/target/dashboards/dashboards.go index 80f0614eaf66..ff9cf1041128 100644 --- a/dev-tools/mage/target/dashboards/dashboards.go +++ b/dev-tools/mage/target/dashboards/dashboards.go @@ -22,7 +22,7 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) var ( diff --git a/dev-tools/mage/target/docs/docs.go b/dev-tools/mage/target/docs/docs.go index fa972056b5ae..533ebdc92868 100644 --- a/dev-tools/mage/target/docs/docs.go +++ b/dev-tools/mage/target/docs/docs.go @@ -20,7 +20,7 @@ package docs import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) var ( diff --git a/dev-tools/mage/target/integtest/docker/docker.go b/dev-tools/mage/target/integtest/docker/docker.go index eb2daef5e602..a5146df1154e 100644 --- a/dev-tools/mage/target/integtest/docker/docker.go +++ b/dev-tools/mage/target/integtest/docker/docker.go @@ -23,7 +23,7 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) type Docker mg.Namespace diff --git a/dev-tools/mage/target/integtest/integtest.go b/dev-tools/mage/target/integtest/integtest.go index 9ed68460f72c..6ce7dc3e3304 100644 --- a/dev-tools/mage/target/integtest/integtest.go +++ b/dev-tools/mage/target/integtest/integtest.go @@ -22,8 +22,8 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/dev-tools/mage/target/pkg/test.go b/dev-tools/mage/target/pkg/test.go index 7d4f0ef92213..5a7d5da12f6c 100644 --- a/dev-tools/mage/target/pkg/test.go +++ b/dev-tools/mage/target/pkg/test.go @@ -17,7 +17,7 @@ package pkg -import devtools "github.com/elastic/beats/v7/dev-tools/mage" +import devtools "github.com/elastic/beats/v9/dev-tools/mage" // PackageTest tests the generated packages in build/distributions. It checks // things like file ownership/mode, package attributes, etc. diff --git a/dev-tools/mage/target/unittest/unittest.go b/dev-tools/mage/target/unittest/unittest.go index 8a78d74011dc..fcc9173ce4e6 100644 --- a/dev-tools/mage/target/unittest/unittest.go +++ b/dev-tools/mage/target/unittest/unittest.go @@ -24,8 +24,8 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/dev-tools/magefile.go b/dev-tools/magefile.go index 7f703ba20775..ee17729bc114 100644 --- a/dev-tools/magefile.go +++ b/dev-tools/magefile.go @@ -23,12 +23,12 @@ package main import ( "context" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/common" // mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/dev-tools/packaging/package_test.go b/dev-tools/packaging/package_test.go index 3473dfeb84c6..4763a75baa07 100644 --- a/dev-tools/packaging/package_test.go +++ b/dev-tools/packaging/package_test.go @@ -49,7 +49,7 @@ import ( "github.com/docker/docker/client" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage" ) const ( diff --git a/docs/extend/creating-metricsets.md b/docs/extend/creating-metricsets.md index 67f459dc80ed..6e16ef3f5c2d 100644 --- a/docs/extend/creating-metricsets.md +++ b/docs/extend/creating-metricsets.md @@ -70,8 +70,8 @@ package {metricset} import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/docs/go.mod b/docs/go.mod index 3bd6144e1243..f1ee3c3b9be9 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -1,5 +1,5 @@ // turn docs folder into a go module to reduce beats dependency // size for downstream clients -module github.com/elastic/beats/v7/docs +module github.com/elastic/beats/v9/docs go 1.23 diff --git a/filebeat/autodiscover/builder/hints/logs.go b/filebeat/autodiscover/builder/hints/logs.go index cadef8bd7211..d65cfaeb3621 100644 --- a/filebeat/autodiscover/builder/hints/logs.go +++ b/filebeat/autodiscover/builder/hints/logs.go @@ -26,11 +26,11 @@ import ( "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/utils" - "github.com/elastic/beats/v7/filebeat/fileset" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/fileset" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/autodiscover/defaults.go b/filebeat/autodiscover/defaults.go index 0c0e6d15ddfb..135873ac07b1 100644 --- a/filebeat/autodiscover/defaults.go +++ b/filebeat/autodiscover/defaults.go @@ -22,8 +22,8 @@ package autodiscover import ( "time" - "github.com/elastic/beats/v7/libbeat/autodiscover/providers/docker" - "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/libbeat/autodiscover/providers/docker" + "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" ) // InitializeModule initializes this module. diff --git a/filebeat/autodiscover/imports.go b/filebeat/autodiscover/imports.go index 561c2395ac41..f4b320d989f9 100644 --- a/filebeat/autodiscover/imports.go +++ b/filebeat/autodiscover/imports.go @@ -18,5 +18,5 @@ package autodiscover import ( - _ "github.com/elastic/beats/v7/filebeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v9/filebeat/autodiscover/builder/hints" ) diff --git a/filebeat/beater/acker.go b/filebeat/beater/acker.go index 9c7df1f202cf..9a2703d6398c 100644 --- a/filebeat/beater/acker.go +++ b/filebeat/beater/acker.go @@ -18,9 +18,9 @@ package beater import ( - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" ) type statefulLogger interface { diff --git a/filebeat/beater/acker_test.go b/filebeat/beater/acker_test.go index 4200552f31bc..01fae35a1984 100644 --- a/filebeat/beater/acker_test.go +++ b/filebeat/beater/acker_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/beat" ) type mockStatefulLogger struct { diff --git a/filebeat/beater/channels.go b/filebeat/beater/channels.go index 0b42862b1ea5..5697de0788d9 100644 --- a/filebeat/beater/channels.go +++ b/filebeat/beater/channels.go @@ -20,10 +20,10 @@ package beater import ( "sync" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/filebeat/registrar" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/filebeat/registrar" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/filebeat/beater/crawler.go b/filebeat/beater/crawler.go index 1fd2ee2db452..1da5c1341015 100644 --- a/filebeat/beater/crawler.go +++ b/filebeat/beater/crawler.go @@ -23,9 +23,9 @@ import ( "github.com/gohugoio/hashstructure" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/beater/filebeat.go b/filebeat/beater/filebeat.go index 75e25336d03a..48acc0e55570 100644 --- a/filebeat/beater/filebeat.go +++ b/filebeat/beater/filebeat.go @@ -24,37 +24,37 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/filebeat/channel" - cfg "github.com/elastic/beats/v7/filebeat/config" - "github.com/elastic/beats/v7/filebeat/fileset" - _ "github.com/elastic/beats/v7/filebeat/include" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/filestream" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/input/v2/compat" - "github.com/elastic/beats/v7/filebeat/registrar" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/filebeat/channel" + cfg "github.com/elastic/beats/v9/filebeat/config" + "github.com/elastic/beats/v9/filebeat/fileset" + _ "github.com/elastic/beats/v9/filebeat/include" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/filestream" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/input/v2/compat" + "github.com/elastic/beats/v9/filebeat/registrar" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/go-concert/unison" // Add filebeat level processors - _ "github.com/elastic/beats/v7/filebeat/processor/add_kubernetes_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/decode_csv_fields" + _ "github.com/elastic/beats/v9/filebeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/decode_csv_fields" // include all filebeat specific autodiscover features - _ "github.com/elastic/beats/v7/filebeat/autodiscover" + _ "github.com/elastic/beats/v9/filebeat/autodiscover" ) const pipelinesWarning = "Filebeat is unable to load the ingest pipelines for the configured" + diff --git a/filebeat/beater/store.go b/filebeat/beater/store.go index 08c1354789ef..0f1f37f5c74f 100644 --- a/filebeat/beater/store.go +++ b/filebeat/beater/store.go @@ -21,13 +21,13 @@ import ( "context" "time" - "github.com/elastic/beats/v7/filebeat/config" - "github.com/elastic/beats/v7/filebeat/features" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/backend" - "github.com/elastic/beats/v7/libbeat/statestore/backend/es" - "github.com/elastic/beats/v7/libbeat/statestore/backend/memlog" + "github.com/elastic/beats/v9/filebeat/config" + "github.com/elastic/beats/v9/filebeat/features" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend/es" + "github.com/elastic/beats/v9/libbeat/statestore/backend/memlog" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/filebeat/channel/connector.go b/filebeat/channel/connector.go index 408e32d65c7a..fcdc2dd4c7c7 100644 --- a/filebeat/channel/connector.go +++ b/filebeat/channel/connector.go @@ -18,7 +18,7 @@ package channel import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/channel/factory.go b/filebeat/channel/factory.go index 7962377856cd..0e60f8cb9861 100644 --- a/filebeat/channel/factory.go +++ b/filebeat/channel/factory.go @@ -18,7 +18,7 @@ package channel import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type OutletFactory struct { diff --git a/filebeat/channel/interface.go b/filebeat/channel/interface.go index e725e6bd3590..7af7ea518725 100644 --- a/filebeat/channel/interface.go +++ b/filebeat/channel/interface.go @@ -18,7 +18,7 @@ package channel import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/channel/outlet.go b/filebeat/channel/outlet.go index 257470463961..ec7a21170d85 100644 --- a/filebeat/channel/outlet.go +++ b/filebeat/channel/outlet.go @@ -20,7 +20,7 @@ package channel import ( "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type outlet struct { diff --git a/filebeat/channel/runner.go b/filebeat/channel/runner.go index 598d76890ee7..739dfba916a4 100644 --- a/filebeat/channel/runner.go +++ b/filebeat/channel/runner.go @@ -18,12 +18,12 @@ package channel import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" @@ -40,7 +40,7 @@ type onCreateWrapper func(cfgfile.RunnerFactory, beat.PipelineConnector, *conf.C // for the publisher pipeline. type commonInputConfig struct { // event processing - mapstr.EventMetadata `config:",inline"` // Fields and tags to add to events. + mapstr.EventMetadata `config:",inline"` // Fields and tags to add to events. Processors processors.PluginConfig `config:"processors"` KeepNull bool `config:"keep_null"` diff --git a/filebeat/channel/runner_mock_test.go b/filebeat/channel/runner_mock_test.go index 55cda0f1d480..dcdb6b6f66e6 100644 --- a/filebeat/channel/runner_mock_test.go +++ b/filebeat/channel/runner_mock_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" conf "github.com/elastic/elastic-agent-libs/config" diff --git a/filebeat/channel/runner_test.go b/filebeat/channel/runner_test.go index 94c7d0a59330..e7ba1fbd13ed 100644 --- a/filebeat/channel/runner_test.go +++ b/filebeat/channel/runner_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/processors" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - "github.com/elastic/beats/v7/libbeat/processors/actions/addfields" - _ "github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/processors" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + "github.com/elastic/beats/v9/libbeat/processors/actions/addfields" + _ "github.com/elastic/beats/v9/libbeat/processors/add_cloud_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_kubernetes_metadata" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/filebeat/channel/util.go b/filebeat/channel/util.go index 4097c789e4d6..f1a5cf76ee6e 100644 --- a/filebeat/channel/util.go +++ b/filebeat/channel/util.go @@ -20,7 +20,7 @@ package channel import ( "sync" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type subOutlet struct { diff --git a/filebeat/channel/util_test.go b/filebeat/channel/util_test.go index 49bd2da3094c..c71ce3b4bd67 100644 --- a/filebeat/channel/util_test.go +++ b/filebeat/channel/util_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/tests/resources" ) type dummyOutletter struct { diff --git a/filebeat/cmd/generate.go b/filebeat/cmd/generate.go index 582038716a1e..ae488fbec11c 100644 --- a/filebeat/cmd/generate.go +++ b/filebeat/cmd/generate.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/filebeat/generator/fields" - "github.com/elastic/beats/v7/filebeat/generator/fileset" - "github.com/elastic/beats/v7/filebeat/generator/module" - "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v9/filebeat/generator/fields" + "github.com/elastic/beats/v9/filebeat/generator/fileset" + "github.com/elastic/beats/v9/filebeat/generator/module" + "github.com/elastic/beats/v9/libbeat/common/cli" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/filebeat/cmd/modules.go b/filebeat/cmd/modules.go index e443bfb1e196..dc3f5f201528 100644 --- a/filebeat/cmd/modules.go +++ b/filebeat/cmd/modules.go @@ -22,9 +22,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cmd" ) func buildModulesManager(beat *beat.Beat) (cmd.ModulesManager, error) { diff --git a/filebeat/cmd/root.go b/filebeat/cmd/root.go index 2420a03efdba..aee44e41b9d4 100644 --- a/filebeat/cmd/root.go +++ b/filebeat/cmd/root.go @@ -22,16 +22,16 @@ import ( "github.com/spf13/pflag" - "github.com/elastic/beats/v7/filebeat/beater" - "github.com/elastic/beats/v7/filebeat/fileset" - "github.com/elastic/beats/v7/filebeat/include" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/filebeat/beater" + "github.com/elastic/beats/v9/filebeat/fileset" + "github.com/elastic/beats/v9/filebeat/include" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd/instance" // Import processors. - _ "github.com/elastic/beats/v7/libbeat/processors/cache" - _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v9/libbeat/processors/cache" + _ "github.com/elastic/beats/v9/libbeat/processors/timestamp" ) // Name of this beat diff --git a/filebeat/config/config.go b/filebeat/config/config.go index 49fbee3ee017..cad03060e513 100644 --- a/filebeat/config/config.go +++ b/filebeat/config/config.go @@ -22,7 +22,7 @@ import ( "sort" "time" - "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/config/config_test.go b/filebeat/config/config_test.go index 3ec23637fe79..8cd25943d613 100644 --- a/filebeat/config/config_test.go +++ b/filebeat/config/config_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cfgfile" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/config/main_test.go b/filebeat/config/main_test.go index 3405195ee1cd..208f2db859a7 100644 --- a/filebeat/config/main_test.go +++ b/filebeat/config/main_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/testing/testflag" + "github.com/elastic/beats/v9/testing/testflag" ) func TestMain(m *testing.M) { diff --git a/filebeat/fileset/config.go b/filebeat/fileset/config.go index b6ef5322c503..039f22e52a8d 100644 --- a/filebeat/fileset/config.go +++ b/filebeat/fileset/config.go @@ -21,7 +21,7 @@ import ( "fmt" "path/filepath" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/filebeat/fileset/factory.go b/filebeat/fileset/factory.go index 5588cdcc8e49..d329f6df38cf 100644 --- a/filebeat/fileset/factory.go +++ b/filebeat/fileset/factory.go @@ -24,10 +24,10 @@ import ( "github.com/gofrs/uuid/v5" "github.com/gohugoio/hashstructure" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/fileset/fileset.go b/filebeat/fileset/fileset.go index 99e9757dc39f..24af40c23099 100644 --- a/filebeat/fileset/fileset.go +++ b/filebeat/fileset/fileset.go @@ -35,9 +35,9 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/version" diff --git a/filebeat/fileset/fileset_test.go b/filebeat/fileset/fileset_test.go index 289a134ecdf5..69ef03806690 100644 --- a/filebeat/fileset/fileset_test.go +++ b/filebeat/fileset/fileset_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/version" diff --git a/filebeat/fileset/main_test.go b/filebeat/fileset/main_test.go index 6708c340c230..27ee7f6dc9bf 100644 --- a/filebeat/fileset/main_test.go +++ b/filebeat/fileset/main_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/testing/testflag" + "github.com/elastic/beats/v9/testing/testflag" ) func TestMain(m *testing.M) { diff --git a/filebeat/fileset/modules.go b/filebeat/fileset/modules.go index 7bca75f7945c..d6ff3fb859a6 100644 --- a/filebeat/fileset/modules.go +++ b/filebeat/fileset/modules.go @@ -27,8 +27,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" diff --git a/filebeat/fileset/modules_integration_test.go b/filebeat/fileset/modules_integration_test.go index 0470bef9e21a..ddd3d89d7987 100644 --- a/filebeat/fileset/modules_integration_test.go +++ b/filebeat/fileset/modules_integration_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/esleg/eslegtest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/esleg/eslegtest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/fileset/modules_test.go b/filebeat/fileset/modules_test.go index d90da2aa814c..8556556cea60 100644 --- a/filebeat/fileset/modules_test.go +++ b/filebeat/fileset/modules_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/paths" diff --git a/filebeat/fileset/pipelines_test.go b/filebeat/fileset/pipelines_test.go index 11b1470c3b3a..2cf76892b86e 100644 --- a/filebeat/fileset/pipelines_test.go +++ b/filebeat/fileset/pipelines_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) diff --git a/filebeat/fileset/setup.go b/filebeat/fileset/setup.go index a17a504ab7f3..43e13b2930cf 100644 --- a/filebeat/fileset/setup.go +++ b/filebeat/fileset/setup.go @@ -18,9 +18,9 @@ package fileset import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - pubpipeline "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + pubpipeline "github.com/elastic/beats/v9/libbeat/publisher/pipeline" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/generator/fileset/fileset.go b/filebeat/generator/fileset/fileset.go index d17219e2c52e..1faaa834aa05 100644 --- a/filebeat/generator/fileset/fileset.go +++ b/filebeat/generator/fileset/fileset.go @@ -21,7 +21,7 @@ import ( "fmt" "path" - "github.com/elastic/beats/v7/filebeat/generator" + "github.com/elastic/beats/v9/filebeat/generator" ) // Generate creates directories and placeholder files required by a fileset. diff --git a/filebeat/generator/module/module.go b/filebeat/generator/module/module.go index 3d7a71f95ffd..232728164911 100644 --- a/filebeat/generator/module/module.go +++ b/filebeat/generator/module/module.go @@ -22,7 +22,7 @@ import ( "os" "path" - "github.com/elastic/beats/v7/filebeat/generator" + "github.com/elastic/beats/v9/filebeat/generator" ) // Generate creates directories and placeholder files required by a new module. diff --git a/filebeat/harvester/forwarder.go b/filebeat/harvester/forwarder.go index ec8297757883..aa6839b27a7a 100644 --- a/filebeat/harvester/forwarder.go +++ b/filebeat/harvester/forwarder.go @@ -20,7 +20,7 @@ package harvester import ( "errors" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/harvester/util.go b/filebeat/harvester/util.go index acfa19108512..334826948344 100644 --- a/filebeat/harvester/util.go +++ b/filebeat/harvester/util.go @@ -17,7 +17,7 @@ package harvester -import "github.com/elastic/beats/v7/libbeat/common/match" +import "github.com/elastic/beats/v9/libbeat/common/match" // Contains available input types const ( diff --git a/filebeat/harvester/util_test.go b/filebeat/harvester/util_test.go index da79e9945d7f..384c62150113 100644 --- a/filebeat/harvester/util_test.go +++ b/filebeat/harvester/util_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go index 07cff58f8cda..0ca05b721b67 100644 --- a/filebeat/include/fields.go +++ b/filebeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/include/list.go b/filebeat/include/list.go index d71af2bc1ff9..5a94c3d48759 100644 --- a/filebeat/include/list.go +++ b/filebeat/include/list.go @@ -21,39 +21,39 @@ package include import ( // Import packages to perform 'func InitializeModule()' when in-use. - m0 "github.com/elastic/beats/v7/filebeat/autodiscover" - m1 "github.com/elastic/beats/v7/filebeat/autodiscover/builder/hints" - m2 "github.com/elastic/beats/v7/filebeat/processor/add_kubernetes_metadata" + m0 "github.com/elastic/beats/v9/filebeat/autodiscover" + m1 "github.com/elastic/beats/v9/filebeat/autodiscover/builder/hints" + m2 "github.com/elastic/beats/v9/filebeat/processor/add_kubernetes_metadata" // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/filebeat/input" - _ "github.com/elastic/beats/v7/filebeat/input/container" - _ "github.com/elastic/beats/v7/filebeat/input/filestream" - _ "github.com/elastic/beats/v7/filebeat/input/log" - _ "github.com/elastic/beats/v7/filebeat/input/mqtt" - _ "github.com/elastic/beats/v7/filebeat/input/redis" - _ "github.com/elastic/beats/v7/filebeat/input/stdin" - _ "github.com/elastic/beats/v7/filebeat/input/syslog" - _ "github.com/elastic/beats/v7/filebeat/module/apache" - _ "github.com/elastic/beats/v7/filebeat/module/auditd" - _ "github.com/elastic/beats/v7/filebeat/module/elasticsearch" - _ "github.com/elastic/beats/v7/filebeat/module/haproxy" - _ "github.com/elastic/beats/v7/filebeat/module/icinga" - _ "github.com/elastic/beats/v7/filebeat/module/iis" - _ "github.com/elastic/beats/v7/filebeat/module/kafka" - _ "github.com/elastic/beats/v7/filebeat/module/kibana" - _ "github.com/elastic/beats/v7/filebeat/module/logstash" - _ "github.com/elastic/beats/v7/filebeat/module/mongodb" - _ "github.com/elastic/beats/v7/filebeat/module/mysql" - _ "github.com/elastic/beats/v7/filebeat/module/nats" - _ "github.com/elastic/beats/v7/filebeat/module/nginx" - _ "github.com/elastic/beats/v7/filebeat/module/osquery" - _ "github.com/elastic/beats/v7/filebeat/module/pensando" - _ "github.com/elastic/beats/v7/filebeat/module/postgresql" - _ "github.com/elastic/beats/v7/filebeat/module/redis" - _ "github.com/elastic/beats/v7/filebeat/module/santa" - _ "github.com/elastic/beats/v7/filebeat/module/system" - _ "github.com/elastic/beats/v7/filebeat/module/traefik" + _ "github.com/elastic/beats/v9/filebeat/input" + _ "github.com/elastic/beats/v9/filebeat/input/container" + _ "github.com/elastic/beats/v9/filebeat/input/filestream" + _ "github.com/elastic/beats/v9/filebeat/input/log" + _ "github.com/elastic/beats/v9/filebeat/input/mqtt" + _ "github.com/elastic/beats/v9/filebeat/input/redis" + _ "github.com/elastic/beats/v9/filebeat/input/stdin" + _ "github.com/elastic/beats/v9/filebeat/input/syslog" + _ "github.com/elastic/beats/v9/filebeat/module/apache" + _ "github.com/elastic/beats/v9/filebeat/module/auditd" + _ "github.com/elastic/beats/v9/filebeat/module/elasticsearch" + _ "github.com/elastic/beats/v9/filebeat/module/haproxy" + _ "github.com/elastic/beats/v9/filebeat/module/icinga" + _ "github.com/elastic/beats/v9/filebeat/module/iis" + _ "github.com/elastic/beats/v9/filebeat/module/kafka" + _ "github.com/elastic/beats/v9/filebeat/module/kibana" + _ "github.com/elastic/beats/v9/filebeat/module/logstash" + _ "github.com/elastic/beats/v9/filebeat/module/mongodb" + _ "github.com/elastic/beats/v9/filebeat/module/mysql" + _ "github.com/elastic/beats/v9/filebeat/module/nats" + _ "github.com/elastic/beats/v9/filebeat/module/nginx" + _ "github.com/elastic/beats/v9/filebeat/module/osquery" + _ "github.com/elastic/beats/v9/filebeat/module/pensando" + _ "github.com/elastic/beats/v9/filebeat/module/postgresql" + _ "github.com/elastic/beats/v9/filebeat/module/redis" + _ "github.com/elastic/beats/v9/filebeat/module/santa" + _ "github.com/elastic/beats/v9/filebeat/module/system" + _ "github.com/elastic/beats/v9/filebeat/module/traefik" ) // InitializeModules initialize all of the modules. diff --git a/filebeat/input/config.go b/filebeat/input/config.go index 62d2aa344ee0..9e1810304828 100644 --- a/filebeat/input/config.go +++ b/filebeat/input/config.go @@ -20,8 +20,8 @@ package input import ( "time" - cfg "github.com/elastic/beats/v7/filebeat/config" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + cfg "github.com/elastic/beats/v9/filebeat/config" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/container/input.go b/filebeat/input/container/input.go index fa2b1ff550b8..519c56eb5f99 100644 --- a/filebeat/input/container/input.go +++ b/filebeat/input/container/input.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/log" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/log" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/container/input_test.go b/filebeat/input/container/input_test.go index 2e3c7321d00c..0aa9067b8335 100644 --- a/filebeat/input/container/input_test.go +++ b/filebeat/input/container/input_test.go @@ -24,7 +24,7 @@ import ( "path" "testing" - "github.com/elastic/beats/v7/filebeat/input/inputtest" + "github.com/elastic/beats/v9/filebeat/input/inputtest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/default-inputs/inputs.go b/filebeat/input/default-inputs/inputs.go index 38a7ba542e23..0733f253bdf0 100644 --- a/filebeat/input/default-inputs/inputs.go +++ b/filebeat/input/default-inputs/inputs.go @@ -18,14 +18,14 @@ package inputs import ( - "github.com/elastic/beats/v7/filebeat/input/filestream" - "github.com/elastic/beats/v7/filebeat/input/kafka" - "github.com/elastic/beats/v7/filebeat/input/net/tcp" - "github.com/elastic/beats/v7/filebeat/input/net/udp" - "github.com/elastic/beats/v7/filebeat/input/unix" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/filebeat/input/filestream" + "github.com/elastic/beats/v9/filebeat/input/kafka" + "github.com/elastic/beats/v9/filebeat/input/net/tcp" + "github.com/elastic/beats/v9/filebeat/input/net/udp" + "github.com/elastic/beats/v9/filebeat/input/unix" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/default-inputs/inputs_linux.go b/filebeat/input/default-inputs/inputs_linux.go index 1d67966bf4e7..25d5534e8a0d 100644 --- a/filebeat/input/default-inputs/inputs_linux.go +++ b/filebeat/input/default-inputs/inputs_linux.go @@ -18,10 +18,10 @@ package inputs import ( - "github.com/elastic/beats/v7/filebeat/input/journald" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/filebeat/input/journald" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/default-inputs/inputs_other.go b/filebeat/input/default-inputs/inputs_other.go index 7a0c5ff81b1c..cb6834302295 100644 --- a/filebeat/input/default-inputs/inputs_other.go +++ b/filebeat/input/default-inputs/inputs_other.go @@ -20,8 +20,8 @@ package inputs import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/default-inputs/inputs_windows.go b/filebeat/input/default-inputs/inputs_windows.go index 11bd71d89042..3ab2a3e85c1d 100644 --- a/filebeat/input/default-inputs/inputs_windows.go +++ b/filebeat/input/default-inputs/inputs_windows.go @@ -18,10 +18,10 @@ package inputs import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/input/winlog" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/input/winlog" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/file/identifier_test.go b/filebeat/input/file/identifier_test.go index de3d4045a873..0ee373f23e49 100644 --- a/filebeat/input/file/identifier_test.go +++ b/filebeat/input/file/identifier_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/file/state.go b/filebeat/input/file/state.go index 560daf8a7bc7..6f5790d4f5da 100644 --- a/filebeat/input/file/state.go +++ b/filebeat/input/file/state.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" ) // State is used to communicate the reading state of a file diff --git a/filebeat/input/filestream/config.go b/filebeat/input/filestream/config.go index 3f92d430ec55..bf9dfa057867 100644 --- a/filebeat/input/filestream/config.go +++ b/filebeat/input/filestream/config.go @@ -25,11 +25,11 @@ import ( "github.com/dustin/go-humanize" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader/parser" - "github.com/elastic/beats/v7/libbeat/reader/readfile" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader/parser" + "github.com/elastic/beats/v9/libbeat/reader/readfile" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/config_test.go b/filebeat/input/filestream/config_test.go index 3e4c32dfe1c3..ce575c2df577 100644 --- a/filebeat/input/filestream/config_test.go +++ b/filebeat/input/filestream/config_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest/observer" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/copytruncate_prospector.go b/filebeat/input/filestream/copytruncate_prospector.go index e6ee4c908d96..9b8a9529d2d9 100644 --- a/filebeat/input/filestream/copytruncate_prospector.go +++ b/filebeat/input/filestream/copytruncate_prospector.go @@ -25,9 +25,9 @@ import ( "strconv" "time" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/common/file" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/common/file" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" ) diff --git a/filebeat/input/filestream/copytruncate_prospector_test.go b/filebeat/input/filestream/copytruncate_prospector_test.go index 81bfe6c596a7..58bef30fadbb 100644 --- a/filebeat/input/filestream/copytruncate_prospector_test.go +++ b/filebeat/input/filestream/copytruncate_prospector_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - input "github.com/elastic/beats/v7/filebeat/input/v2" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + input "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/environment_test.go b/filebeat/input/filestream/environment_test.go index b6ce4fd6a55d..da3c55629991 100644 --- a/filebeat/input/filestream/environment_test.go +++ b/filebeat/input/filestream/environment_test.go @@ -32,15 +32,15 @@ import ( "github.com/stretchr/testify/require" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/common/file" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/filebeat/input/filestream/file_test.go b/filebeat/input/filestream/file_test.go index 942a244a2a80..607ac849a336 100644 --- a/filebeat/input/filestream/file_test.go +++ b/filebeat/input/filestream/file_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/testing/gziptest" + "github.com/elastic/beats/v9/filebeat/testing/gziptest" ) var ( diff --git a/filebeat/input/filestream/filestream.go b/filebeat/input/filestream/filestream.go index 70392d680abd..a5cdd3493f81 100644 --- a/filebeat/input/filestream/filestream.go +++ b/filebeat/input/filestream/filestream.go @@ -30,9 +30,9 @@ import ( "github.com/elastic/go-concert/timed" "github.com/elastic/go-concert/unison" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/libbeat/common/file" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/libbeat/common/file" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/fswatch.go b/filebeat/input/filestream/fswatch.go index 3526db37f0c2..a63f20319ed7 100644 --- a/filebeat/input/filestream/fswatch.go +++ b/filebeat/input/filestream/fswatch.go @@ -31,10 +31,10 @@ import ( "github.com/elastic/go-concert/timed" "github.com/elastic/go-concert/unison" - "github.com/elastic/beats/v7/filebeat/input/file" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - commonfile "github.com/elastic/beats/v7/libbeat/common/file" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/filebeat/input/file" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + commonfile "github.com/elastic/beats/v9/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/match" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/fswatch_test.go b/filebeat/input/filestream/fswatch_test.go index e7cb90d48283..9a90a237810d 100644 --- a/filebeat/input/filestream/fswatch_test.go +++ b/filebeat/input/filestream/fswatch_test.go @@ -32,8 +32,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - "github.com/elastic/beats/v7/libbeat/common/file" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + "github.com/elastic/beats/v9/libbeat/common/file" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/filebeat/input/filestream/fswatch_test_non_windows.go b/filebeat/input/filestream/fswatch_test_non_windows.go index 20d38762522f..09a84140effe 100644 --- a/filebeat/input/filestream/fswatch_test_non_windows.go +++ b/filebeat/input/filestream/fswatch_test_non_windows.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - "github.com/elastic/beats/v7/libbeat/common/match" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + "github.com/elastic/beats/v9/libbeat/common/match" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/input/filestream/identifier.go b/filebeat/input/filestream/identifier.go index dea7359755a1..c09f87267bad 100644 --- a/filebeat/input/filestream/identifier.go +++ b/filebeat/input/filestream/identifier.go @@ -20,7 +20,7 @@ package filestream import ( "fmt" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/identifier_fingerprint.go b/filebeat/input/filestream/identifier_fingerprint.go index c5d91835666f..cf3b74767221 100644 --- a/filebeat/input/filestream/identifier_fingerprint.go +++ b/filebeat/input/filestream/identifier_fingerprint.go @@ -18,7 +18,7 @@ package filestream import ( - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/identifier_inode_deviceid.go b/filebeat/input/filestream/identifier_inode_deviceid.go index cc9346fd1595..baca0c322289 100644 --- a/filebeat/input/filestream/identifier_inode_deviceid.go +++ b/filebeat/input/filestream/identifier_inode_deviceid.go @@ -26,7 +26,7 @@ import ( "path/filepath" "time" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/identifier_test.go b/filebeat/input/filestream/identifier_test.go index c4434485ea31..44f53dbeda1f 100644 --- a/filebeat/input/filestream/identifier_test.go +++ b/filebeat/input/filestream/identifier_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - "github.com/elastic/beats/v7/libbeat/common/file" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + "github.com/elastic/beats/v9/libbeat/common/file" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/input/filestream/identifier_test_non_windows.go b/filebeat/input/filestream/identifier_test_non_windows.go index 3f42ce79cef7..a6fe6a5e28f2 100644 --- a/filebeat/input/filestream/identifier_test_non_windows.go +++ b/filebeat/input/filestream/identifier_test_non_windows.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - "github.com/elastic/beats/v7/libbeat/common/file" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + "github.com/elastic/beats/v9/libbeat/common/file" ) func TestFileIdentifierInodeMarker(t *testing.T) { diff --git a/filebeat/input/filestream/input.go b/filebeat/input/filestream/input.go index dc28034a2c8a..bd91764cf611 100644 --- a/filebeat/input/filestream/input.go +++ b/filebeat/input/filestream/input.go @@ -29,18 +29,18 @@ import ( "github.com/elastic/go-concert/ctxtool" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/common/cleanup" - "github.com/elastic/beats/v7/libbeat/common/file" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/debug" - "github.com/elastic/beats/v7/libbeat/reader/parser" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" - "github.com/elastic/beats/v7/libbeat/statestore" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/common/cleanup" + "github.com/elastic/beats/v9/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/debug" + "github.com/elastic/beats/v9/libbeat/reader/parser" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/filestream/input_delete_integration_test.go b/filebeat/input/filestream/input_delete_integration_test.go index c88da0192b00..a7de1c16c273 100644 --- a/filebeat/input/filestream/input_delete_integration_test.go +++ b/filebeat/input/filestream/input_delete_integration_test.go @@ -34,9 +34,9 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/filebeat/input/filestream/input_test.go b/filebeat/input/filestream/input_test.go index 97782bb8eaba..d7ed027ba066 100644 --- a/filebeat/input/filestream/input_test.go +++ b/filebeat/input/filestream/input_test.go @@ -33,12 +33,12 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/testing/gziptest" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/testing/gziptest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/filebeat/input/filestream/internal/input-logfile/fswatch.go b/filebeat/input/filestream/internal/input-logfile/fswatch.go index cd23f55066c8..1a66a06cdb23 100644 --- a/filebeat/input/filestream/internal/input-logfile/fswatch.go +++ b/filebeat/input/filestream/internal/input-logfile/fswatch.go @@ -20,7 +20,7 @@ package input_logfile import ( "github.com/elastic/go-concert/unison" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" ) const ( diff --git a/filebeat/input/filestream/internal/input-logfile/harvester.go b/filebeat/input/filestream/internal/input-logfile/harvester.go index b92fe982d3e1..59007233a6c0 100644 --- a/filebeat/input/filestream/internal/input-logfile/harvester.go +++ b/filebeat/input/filestream/internal/input-logfile/harvester.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/filebeat/input/filestream/internal/task" - inputv2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/input/filestream/internal/task" + inputv2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/ctxtool" ) diff --git a/filebeat/input/filestream/internal/input-logfile/harvester_test.go b/filebeat/input/filestream/internal/input-logfile/harvester_test.go index 0ac3bb7b41ce..ed82607ddef2 100644 --- a/filebeat/input/filestream/internal/input-logfile/harvester_test.go +++ b/filebeat/input/filestream/internal/input-logfile/harvester_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/input/filestream/internal/task" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/filebeat/input/filestream/internal/task" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/filestream/internal/input-logfile/input.go b/filebeat/input/filestream/internal/input-logfile/input.go index 1ed988262744..e2a0203aa8b5 100644 --- a/filebeat/input/filestream/internal/input-logfile/input.go +++ b/filebeat/input/filestream/internal/input-logfile/input.go @@ -21,11 +21,11 @@ import ( "context" "time" - "github.com/elastic/beats/v7/filebeat/input/filestream/internal/task" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/filebeat/input/filestream/internal/task" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/go-concert/ctxtool" ) diff --git a/filebeat/input/filestream/internal/input-logfile/manager.go b/filebeat/input/filestream/internal/input-logfile/manager.go index f7a7eb889c05..9755233da035 100644 --- a/filebeat/input/filestream/internal/input-logfile/manager.go +++ b/filebeat/input/filestream/internal/input-logfile/manager.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/go-concert/unison" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/internal/input-logfile/manager_test.go b/filebeat/input/filestream/internal/input-logfile/manager_test.go index 58e014dba0a0..e8ac850827df 100644 --- a/filebeat/input/filestream/internal/input-logfile/manager_test.go +++ b/filebeat/input/filestream/internal/input-logfile/manager_test.go @@ -30,9 +30,9 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/internal/input-logfile/prospector.go b/filebeat/input/filestream/internal/input-logfile/prospector.go index 9c826987725d..892a0ebbc370 100644 --- a/filebeat/input/filestream/internal/input-logfile/prospector.go +++ b/filebeat/input/filestream/internal/input-logfile/prospector.go @@ -18,7 +18,7 @@ package input_logfile import ( - input "github.com/elastic/beats/v7/filebeat/input/v2" + input "github.com/elastic/beats/v9/filebeat/input/v2" ) // Prospector is responsible for starting, stopping harvesters diff --git a/filebeat/input/filestream/internal/input-logfile/publish.go b/filebeat/input/filestream/internal/input-logfile/publish.go index 427e129bcc0f..22ea6c1782cb 100644 --- a/filebeat/input/filestream/internal/input-logfile/publish.go +++ b/filebeat/input/filestream/internal/input-logfile/publish.go @@ -20,10 +20,10 @@ package input_logfile import ( "time" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/statestore" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/statestore" ) // Publisher is used to publish an event and update the cursor in a single call to Publish. diff --git a/filebeat/input/filestream/internal/input-logfile/publish_test.go b/filebeat/input/filestream/internal/input-logfile/publish_test.go index 8f29fe4f45dc..6cd4f908d9c3 100644 --- a/filebeat/input/filestream/internal/input-logfile/publish_test.go +++ b/filebeat/input/filestream/internal/input-logfile/publish_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" + "github.com/elastic/beats/v9/libbeat/beat" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" ) func TestPublish(t *testing.T) { diff --git a/filebeat/input/filestream/internal/input-logfile/store.go b/filebeat/input/filestream/internal/input-logfile/store.go index 2e471314392e..dc2e7ee86712 100644 --- a/filebeat/input/filestream/internal/input-logfile/store.go +++ b/filebeat/input/filestream/internal/input-logfile/store.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/common/cleanup" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/common/cleanup" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/filestream/internal/input-logfile/store_test.go b/filebeat/input/filestream/internal/input-logfile/store_test.go index 9f600fa58b95..b72a1c0383d6 100644 --- a/filebeat/input/filestream/internal/input-logfile/store_test.go +++ b/filebeat/input/filestream/internal/input-logfile/store_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/go-concert/unison" diff --git a/filebeat/input/filestream/legacy_metrics_integration_test.go b/filebeat/input/filestream/legacy_metrics_integration_test.go index 82d4f19c2cc1..1dcf2de8b11e 100644 --- a/filebeat/input/filestream/legacy_metrics_integration_test.go +++ b/filebeat/input/filestream/legacy_metrics_integration_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) var fconfig = ` diff --git a/filebeat/input/filestream/logger.go b/filebeat/input/filestream/logger.go index 62cb416cdb26..c7a5c2600df3 100644 --- a/filebeat/input/filestream/logger.go +++ b/filebeat/input/filestream/logger.go @@ -18,7 +18,7 @@ package filestream import ( - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/metrics_integration_test.go b/filebeat/input/filestream/metrics_integration_test.go index d811eac87fbf..5b27bdbc08ae 100644 --- a/filebeat/input/filestream/metrics_integration_test.go +++ b/filebeat/input/filestream/metrics_integration_test.go @@ -26,7 +26,7 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/filebeat/input/filestream/prospector.go b/filebeat/input/filestream/prospector.go index 84d9da3b6659..295c7ec48f63 100644 --- a/filebeat/input/filestream/prospector.go +++ b/filebeat/input/filestream/prospector.go @@ -23,9 +23,9 @@ import ( "strings" "time" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/filebeat/input/filestream/prospector_creator.go b/filebeat/input/filestream/prospector_creator.go index 709a0043d254..8f600bde8bb1 100644 --- a/filebeat/input/filestream/prospector_creator.go +++ b/filebeat/input/filestream/prospector_creator.go @@ -22,8 +22,8 @@ import ( "regexp" "sync" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/filestream/prospector_test.go b/filebeat/input/filestream/prospector_test.go index 18691a26356f..1ade309e0ee1 100644 --- a/filebeat/input/filestream/prospector_test.go +++ b/filebeat/input/filestream/prospector_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/common/file" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" + loginp "github.com/elastic/beats/v9/filebeat/input/filestream/internal/input-logfile" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" ) diff --git a/filebeat/input/filestream/reader.go b/filebeat/input/filestream/reader.go index d61980f92ea4..1b11257a536e 100644 --- a/filebeat/input/filestream/reader.go +++ b/filebeat/input/filestream/reader.go @@ -21,7 +21,7 @@ import ( "errors" "io" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) // EOFLookaheadReader wraps a reader to provide a one-message lookahead buffer. diff --git a/filebeat/input/filestream/reader_test.go b/filebeat/input/filestream/reader_test.go index bcbabc1ce36a..d4ed61a26c86 100644 --- a/filebeat/input/filestream/reader_test.go +++ b/filebeat/input/filestream/reader_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) type readerResponse struct { diff --git a/filebeat/input/input.go b/filebeat/input/input.go index f89fe1138bf7..6f65599709a6 100644 --- a/filebeat/input/input.go +++ b/filebeat/input/input.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/inputtest/input.go b/filebeat/input/inputtest/input.go index 7376edaae839..97208acc5f8d 100644 --- a/filebeat/input/inputtest/input.go +++ b/filebeat/input/inputtest/input.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/tests/resources" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/journald/config.go b/filebeat/input/journald/config.go index cba0b1e45cb3..1ada5f4e2a1f 100644 --- a/filebeat/input/journald/config.go +++ b/filebeat/input/journald/config.go @@ -26,11 +26,11 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-ucfg" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalctl" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalfield" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalctl" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalfield" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/reader/parser" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/reader/parser" ) // includeMatchesWarnOnce allow for a config deprecation warning to be diff --git a/filebeat/input/journald/environment_test.go b/filebeat/input/journald/environment_test.go index 121645c5b6ac..a7e8ee8139bf 100644 --- a/filebeat/input/journald/environment_test.go +++ b/filebeat/input/journald/environment_test.go @@ -30,12 +30,12 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/journald/input.go b/filebeat/input/journald/input.go index f1ff853e8f67..c897ad34d621 100644 --- a/filebeat/input/journald/input.go +++ b/filebeat/input/journald/input.go @@ -25,15 +25,15 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalctl" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalfield" - input "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/parser" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalctl" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalfield" + input "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/parser" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/journald/input_stub.go b/filebeat/input/journald/input_stub.go index c635c259b2e3..9b392964e9b4 100644 --- a/filebeat/input/journald/input_stub.go +++ b/filebeat/input/journald/input_stub.go @@ -20,8 +20,8 @@ package journald import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/journald/input_test.go b/filebeat/input/journald/input_test.go index 3332ac8150c9..cb150bd97eb6 100644 --- a/filebeat/input/journald/input_test.go +++ b/filebeat/input/journald/input_test.go @@ -33,11 +33,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalctl" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalfield" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalctl" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalfield" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/journald/journalReadMock_test.go b/filebeat/input/journald/journalReadMock_test.go index 8a6111f3e653..fc44bade59fd 100644 --- a/filebeat/input/journald/journalReadMock_test.go +++ b/filebeat/input/journald/journalReadMock_test.go @@ -25,8 +25,8 @@ package journald import ( "sync" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalctl" - input "github.com/elastic/beats/v7/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalctl" + input "github.com/elastic/beats/v9/filebeat/input/v2" ) // Ensure, that journalReaderMock does implement journalReader. diff --git a/filebeat/input/journald/pkg/journalctl/jctlmock_test.go b/filebeat/input/journald/pkg/journalctl/jctlmock_test.go index 9fed391de5ef..3f773cc4aac4 100644 --- a/filebeat/input/journald/pkg/journalctl/jctlmock_test.go +++ b/filebeat/input/journald/pkg/journalctl/jctlmock_test.go @@ -25,7 +25,7 @@ package journalctl import ( "sync" - input "github.com/elastic/beats/v7/filebeat/input/v2" + input "github.com/elastic/beats/v9/filebeat/input/v2" ) // Ensure, that JctlMock does implement Jctl. diff --git a/filebeat/input/journald/pkg/journalctl/journalctl.go b/filebeat/input/journald/pkg/journalctl/journalctl.go index b015b896e3d1..d2af24a72c1e 100644 --- a/filebeat/input/journald/pkg/journalctl/journalctl.go +++ b/filebeat/input/journald/pkg/journalctl/journalctl.go @@ -29,7 +29,7 @@ import ( "strings" "sync" - input "github.com/elastic/beats/v7/filebeat/input/v2" + input "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/journald/pkg/journalctl/reader.go b/filebeat/input/journald/pkg/journalctl/reader.go index 7f85d82b558d..b89545054d10 100644 --- a/filebeat/input/journald/pkg/journalctl/reader.go +++ b/filebeat/input/journald/pkg/journalctl/reader.go @@ -26,9 +26,9 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalfield" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalfield" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/common/backoff" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/journald/pkg/journalctl/reader_test.go b/filebeat/input/journald/pkg/journalctl/reader_test.go index 27224ee55830..dbf7a4973c73 100644 --- a/filebeat/input/journald/pkg/journalctl/reader_test.go +++ b/filebeat/input/journald/pkg/journalctl/reader_test.go @@ -28,8 +28,8 @@ import ( "sync/atomic" "testing" - "github.com/elastic/beats/v7/filebeat/input/journald/pkg/journalfield" - input "github.com/elastic/beats/v7/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/input/journald/pkg/journalfield" + input "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/journald/pkg/journalfield/conv.go b/filebeat/input/journald/pkg/journalfield/conv.go index 4c7575114d2a..2b315f913c6a 100644 --- a/filebeat/input/journald/pkg/journalfield/conv.go +++ b/filebeat/input/journald/pkg/journalfield/conv.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/libbeat/common/capabilities" + "github.com/elastic/beats/v9/libbeat/common/capabilities" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/kafka/config.go b/filebeat/input/kafka/config.go index d5404f013f1a..e95ad8cc83f5 100644 --- a/filebeat/input/kafka/config.go +++ b/filebeat/input/kafka/config.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/kafka" - "github.com/elastic/beats/v7/libbeat/common/transport/kerberos" - "github.com/elastic/beats/v7/libbeat/reader/parser" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/kafka" + "github.com/elastic/beats/v9/libbeat/common/transport/kerberos" + "github.com/elastic/beats/v9/libbeat/reader/parser" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/elastic-agent-libs/monitoring/adapter" diff --git a/filebeat/input/kafka/input.go b/filebeat/input/kafka/input.go index 1fe6b07a197a..4ff5a6bcab0b 100644 --- a/filebeat/input/kafka/input.go +++ b/filebeat/input/kafka/input.go @@ -30,14 +30,14 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/libbeat/common/kafka" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/parser" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/libbeat/common/kafka" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/parser" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/sarama" diff --git a/filebeat/input/kafka/input_test.go b/filebeat/input/kafka/input_test.go index 72e5b3b2bfeb..fd9e8c1e8616 100644 --- a/filebeat/input/kafka/input_test.go +++ b/filebeat/input/kafka/input_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/tests/resources" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/kafka/kafka_integration_test.go b/filebeat/input/kafka/kafka_integration_test.go index e9f168ebc796..9cc39e7f5cba 100644 --- a/filebeat/input/kafka/kafka_integration_test.go +++ b/filebeat/input/kafka/kafka_integration_test.go @@ -29,9 +29,9 @@ import ( "testing" "time" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - beattest "github.com/elastic/beats/v7/libbeat/publisher/testing" - "github.com/elastic/beats/v7/testing/testutils" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + beattest "github.com/elastic/beats/v9/libbeat/publisher/testing" + "github.com/elastic/beats/v9/testing/testutils" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" @@ -41,9 +41,9 @@ import ( "github.com/elastic/sarama" - "github.com/elastic/beats/v7/libbeat/beat" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/beat" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/json" ) const ( diff --git a/filebeat/input/log/config.go b/filebeat/input/log/config.go index fcadb242dc17..69ff33b0b602 100644 --- a/filebeat/input/log/config.go +++ b/filebeat/input/log/config.go @@ -24,14 +24,14 @@ import ( "github.com/dustin/go-humanize" - cfg "github.com/elastic/beats/v7/filebeat/config" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader/multiline" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readjson" + cfg "github.com/elastic/beats/v9/filebeat/config" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader/multiline" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readjson" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/log/config_test.go b/filebeat/input/log/config_test.go index 2b9fd6149684..41c96b03a6c9 100644 --- a/filebeat/input/log/config_test.go +++ b/filebeat/input/log/config_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/harvester" ) func TestCleanOlderError(t *testing.T) { diff --git a/filebeat/input/log/file.go b/filebeat/input/log/file.go index 27858c0c4c7f..54dbb507acfe 100644 --- a/filebeat/input/log/file.go +++ b/filebeat/input/log/file.go @@ -20,7 +20,7 @@ package log import ( "os" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" ) type File struct { diff --git a/filebeat/input/log/harvester.go b/filebeat/input/log/harvester.go index 309147510601..8370ecd40620 100644 --- a/filebeat/input/log/harvester.go +++ b/filebeat/input/log/harvester.go @@ -40,22 +40,22 @@ import ( "github.com/gofrs/uuid/v5" "golang.org/x/text/transform" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - file_helper "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + file_helper "github.com/elastic/beats/v9/libbeat/common/file" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/debug" - "github.com/elastic/beats/v7/libbeat/reader/multiline" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" - "github.com/elastic/beats/v7/libbeat/reader/readjson" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/debug" + "github.com/elastic/beats/v9/libbeat/reader/multiline" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/reader/readjson" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/input/log/harvester_test.go b/filebeat/input/log/harvester_test.go index 7f8db0d25a21..402f29d58b14 100644 --- a/filebeat/input/log/harvester_test.go +++ b/filebeat/input/log/harvester_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/log/input.go b/filebeat/input/log/input.go index 34d1ff8834f0..3357d3d123fd 100644 --- a/filebeat/input/log/input.go +++ b/filebeat/input/log/input.go @@ -30,15 +30,15 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/fileset" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/fileset" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/log/input_other_test.go b/filebeat/input/log/input_other_test.go index 844e374a76d8..a2b4cbe20184 100644 --- a/filebeat/input/log/input_other_test.go +++ b/filebeat/input/log/input_other_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/filebeat/input/inputtest" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/filebeat/input/inputtest" + "github.com/elastic/beats/v9/libbeat/common/match" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/input/log/input_test.go b/filebeat/input/log/input_test.go index 1b56625cd8f7..96de056bf110 100644 --- a/filebeat/input/log/input_test.go +++ b/filebeat/input/log/input_test.go @@ -30,14 +30,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/filebeat/input/inputtest" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/filebeat/input/inputtest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/tests/resources" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/log/log.go b/filebeat/input/log/log.go index c178e5d06c2c..6800f3c3496d 100644 --- a/filebeat/input/log/log.go +++ b/filebeat/input/log/log.go @@ -22,8 +22,8 @@ import ( "os" "time" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/input/file" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/log/logger.go b/filebeat/input/log/logger.go index 7094b2c329e6..45609dfbede6 100644 --- a/filebeat/input/log/logger.go +++ b/filebeat/input/log/logger.go @@ -18,7 +18,7 @@ package log import ( - "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v9/filebeat/input/file" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/log/prospector_windows_test.go b/filebeat/input/log/prospector_windows_test.go index e12369ea77fa..8df9f854f306 100644 --- a/filebeat/input/log/prospector_windows_test.go +++ b/filebeat/input/log/prospector_windows_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" ) var matchTestsWindows = []struct { diff --git a/filebeat/input/mqtt/client_mocked.go b/filebeat/input/mqtt/client_mocked.go index fcab2b800535..1457520bd3ce 100644 --- a/filebeat/input/mqtt/client_mocked.go +++ b/filebeat/input/mqtt/client_mocked.go @@ -22,9 +22,9 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/backoff" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/input/mqtt/input.go b/filebeat/input/mqtt/input.go index 43fcb3ac4f82..4852157d0d31 100644 --- a/filebeat/input/mqtt/input.go +++ b/filebeat/input/mqtt/input.go @@ -25,10 +25,10 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/backoff" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/mqtt/input_test.go b/filebeat/input/mqtt/input_test.go index 7d69fa99a323..6321fcbe8bc0 100644 --- a/filebeat/input/mqtt/input_test.go +++ b/filebeat/input/mqtt/input_test.go @@ -26,10 +26,10 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" "github.com/stretchr/testify/require" - finput "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/inputtest" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/backoff" + finput "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/inputtest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/backoff" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/mqtt/mqtt_integration_test.go b/filebeat/input/mqtt/mqtt_integration_test.go index 8681c5566042..a403313a86ab 100644 --- a/filebeat/input/mqtt/mqtt_integration_test.go +++ b/filebeat/input/mqtt/mqtt_integration_test.go @@ -29,9 +29,9 @@ import ( libmqtt "github.com/eclipse/paho.mqtt.golang" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" @@ -46,7 +46,7 @@ const ( var ( hostPort = fmt.Sprintf("tcp://%s:%s", getOrDefault(os.Getenv("MOSQUITTO_HOST"), "localhost"), //nolint:misspell //required - getOrDefault(os.Getenv("MOSQUITTO_PORT"), "1883")) //nolint:misspell //required + getOrDefault(os.Getenv("MOSQUITTO_PORT"), "1883")) //nolint:misspell //required topic = fmt.Sprintf("topic-%d", time.Now().UnixNano()) ) diff --git a/filebeat/input/net/inputmock_test.go b/filebeat/input/net/inputmock_test.go index c2b05b0062a6..424898b9093b 100644 --- a/filebeat/input/net/inputmock_test.go +++ b/filebeat/input/net/inputmock_test.go @@ -23,7 +23,7 @@ package net import ( "sync" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/filebeat/input/net/manager.go b/filebeat/input/net/manager.go index 2e5ac1750dde..990f985b52d0 100644 --- a/filebeat/input/net/manager.go +++ b/filebeat/input/net/manager.go @@ -25,10 +25,10 @@ import ( "runtime/debug" "time" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/net/manager_test.go b/filebeat/input/net/manager_test.go index 7cd2b61b2938..d15efd58e1f7 100644 --- a/filebeat/input/net/manager_test.go +++ b/filebeat/input/net/manager_test.go @@ -32,9 +32,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/input/v2/testpipeline" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/input/v2/testpipeline" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/net/tcp/input.go b/filebeat/input/net/tcp/input.go index d56a862b0ffa..73906bca3b84 100644 --- a/filebeat/input/net/tcp/input.go +++ b/filebeat/input/net/tcp/input.go @@ -24,14 +24,14 @@ import ( "github.com/dustin/go-humanize" - netinput "github.com/elastic/beats/v7/filebeat/input/net" - "github.com/elastic/beats/v7/filebeat/input/netmetrics" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/common/streaming" - "github.com/elastic/beats/v7/filebeat/inputsource/tcp" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" + netinput "github.com/elastic/beats/v9/filebeat/input/net" + "github.com/elastic/beats/v9/filebeat/input/netmetrics" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/common/streaming" + "github.com/elastic/beats/v9/filebeat/inputsource/tcp" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/go-concert/ctxtool" conf "github.com/elastic/elastic-agent-libs/config" diff --git a/filebeat/input/net/tcp/input_test.go b/filebeat/input/net/tcp/input_test.go index e2f14fd24ba9..814e529eeccd 100644 --- a/filebeat/input/net/tcp/input_test.go +++ b/filebeat/input/net/tcp/input_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - netinput "github.com/elastic/beats/v7/filebeat/input/net" - "github.com/elastic/beats/v7/filebeat/input/net/nettest" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + netinput "github.com/elastic/beats/v9/filebeat/input/net" + "github.com/elastic/beats/v9/filebeat/input/net/nettest" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/net/udp/input.go b/filebeat/input/net/udp/input.go index fe98c7d94fd7..b65805d56283 100644 --- a/filebeat/input/net/udp/input.go +++ b/filebeat/input/net/udp/input.go @@ -23,13 +23,13 @@ import ( "github.com/dustin/go-humanize" - netinput "github.com/elastic/beats/v7/filebeat/input/net" - "github.com/elastic/beats/v7/filebeat/input/netmetrics" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/udp" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" + netinput "github.com/elastic/beats/v9/filebeat/input/net" + "github.com/elastic/beats/v9/filebeat/input/netmetrics" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/udp" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/net/udp/input_test.go b/filebeat/input/net/udp/input_test.go index 50f6359a8965..34efb1734e6a 100644 --- a/filebeat/input/net/udp/input_test.go +++ b/filebeat/input/net/udp/input_test.go @@ -29,9 +29,9 @@ import ( "testing" "time" - netinput "github.com/elastic/beats/v7/filebeat/input/net" - "github.com/elastic/beats/v7/filebeat/input/net/nettest" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + netinput "github.com/elastic/beats/v9/filebeat/input/net" + "github.com/elastic/beats/v9/filebeat/input/net/nettest" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/plugin.go b/filebeat/input/plugin.go index c0d273d97e2b..88ed80b3f2e4 100644 --- a/filebeat/input/plugin.go +++ b/filebeat/input/plugin.go @@ -20,7 +20,7 @@ package input import ( "errors" - "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/plugin" ) type inputPlugin struct { diff --git a/filebeat/input/redis/config.go b/filebeat/input/redis/config.go index 09a310c97283..cf854f93f277 100644 --- a/filebeat/input/redis/config.go +++ b/filebeat/input/redis/config.go @@ -21,7 +21,7 @@ import ( "crypto/tls" "time" - "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/harvester" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/filebeat/input/redis/harvester.go b/filebeat/input/redis/harvester.go index 381ca9e11d22..c2c1b68ebb17 100644 --- a/filebeat/input/redis/harvester.go +++ b/filebeat/input/redis/harvester.go @@ -25,11 +25,11 @@ import ( "github.com/gofrs/uuid/v5" rd "github.com/gomodule/redigo/redis" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/harvester" ) // Harvester contains all redis harvester data diff --git a/filebeat/input/redis/input.go b/filebeat/input/redis/input.go index 24923e3861f8..5a06db6928ba 100644 --- a/filebeat/input/redis/input.go +++ b/filebeat/input/redis/input.go @@ -20,11 +20,11 @@ package redis import ( rd "github.com/gomodule/redigo/redis" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/tlscommon" diff --git a/filebeat/input/redis/input_test.go b/filebeat/input/redis/input_test.go index ff57ed0fd206..36ee9802b6c4 100644 --- a/filebeat/input/redis/input_test.go +++ b/filebeat/input/redis/input_test.go @@ -22,7 +22,7 @@ package redis import ( "testing" - "github.com/elastic/beats/v7/filebeat/input/inputtest" + "github.com/elastic/beats/v9/filebeat/input/inputtest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/redis/redis_integration_test.go b/filebeat/input/redis/redis_integration_test.go index d33dff8df8e5..23d1bd1a4be4 100644 --- a/filebeat/input/redis/redis_integration_test.go +++ b/filebeat/input/redis/redis_integration_test.go @@ -30,9 +30,9 @@ import ( rd "github.com/gomodule/redigo/redis" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/filebeat/input/registry.go b/filebeat/input/registry.go index 5a905280c91a..a689c2f8b1e8 100644 --- a/filebeat/input/registry.go +++ b/filebeat/input/registry.go @@ -20,9 +20,9 @@ package input import ( "fmt" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/registry_test.go b/filebeat/input/registry_test.go index 221f401cc036..a23e5dae3dbc 100644 --- a/filebeat/input/registry_test.go +++ b/filebeat/input/registry_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/channel" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/runnerfactory.go b/filebeat/input/runnerfactory.go index 262982ecd8ac..a1344e216278 100644 --- a/filebeat/input/runnerfactory.go +++ b/filebeat/input/runnerfactory.go @@ -20,12 +20,12 @@ package input import ( "errors" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/registrar" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/registrar" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/stdin/input.go b/filebeat/input/stdin/input.go index 253f460463d9..4d4423315744 100644 --- a/filebeat/input/stdin/input.go +++ b/filebeat/input/stdin/input.go @@ -20,11 +20,11 @@ package stdin import ( "fmt" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/filebeat/input/log" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/filebeat/input/log" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/stdin/input_test.go b/filebeat/input/stdin/input_test.go index 524a19cafdd9..c3f20b33dadc 100644 --- a/filebeat/input/stdin/input_test.go +++ b/filebeat/input/stdin/input_test.go @@ -22,7 +22,7 @@ package stdin import ( "testing" - "github.com/elastic/beats/v7/filebeat/input/inputtest" + "github.com/elastic/beats/v9/filebeat/input/inputtest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/syslog/config.go b/filebeat/input/syslog/config.go index e45fd8690990..08f4518da5a9 100644 --- a/filebeat/input/syslog/config.go +++ b/filebeat/input/syslog/config.go @@ -23,13 +23,13 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/common/streaming" - "github.com/elastic/beats/v7/filebeat/inputsource/tcp" - "github.com/elastic/beats/v7/filebeat/inputsource/udp" - "github.com/elastic/beats/v7/filebeat/inputsource/unix" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/common/streaming" + "github.com/elastic/beats/v9/filebeat/inputsource/tcp" + "github.com/elastic/beats/v9/filebeat/inputsource/udp" + "github.com/elastic/beats/v9/filebeat/inputsource/unix" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/syslog/input.go b/filebeat/input/syslog/input.go index 9e6881f39d58..db350044cd77 100644 --- a/filebeat/input/syslog/input.go +++ b/filebeat/input/syslog/input.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/syslog/input_test.go b/filebeat/input/syslog/input_test.go index e3ba17078570..67a5624d5f50 100644 --- a/filebeat/input/syslog/input_test.go +++ b/filebeat/input/syslog/input_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/filebeat/input/inputtest" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/input/inputtest" + "github.com/elastic/beats/v9/filebeat/inputsource" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/unix/input.go b/filebeat/input/unix/input.go index 61af355f39de..60d04b3a8d94 100644 --- a/filebeat/input/unix/input.go +++ b/filebeat/input/unix/input.go @@ -24,12 +24,12 @@ import ( "github.com/dustin/go-humanize" "github.com/rcrowley/go-metrics" - input "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/unix" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" + input "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/unix" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/input/v2/compat/compat.go b/filebeat/input/v2/compat/compat.go index 0bf5722b41c8..4f296c5cf1ea 100644 --- a/filebeat/input/v2/compat/compat.go +++ b/filebeat/input/v2/compat/compat.go @@ -29,10 +29,10 @@ import ( "github.com/gofrs/uuid/v5" "github.com/gohugoio/hashstructure" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/v2/compat/compat_test.go b/filebeat/input/v2/compat/compat_test.go index 8e12adc2e8b2..13d5b5973c64 100644 --- a/filebeat/input/v2/compat/compat_test.go +++ b/filebeat/input/v2/compat/compat_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/monitoring" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/input/v2/internal/inputest" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/input/v2/internal/inputest" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/input/v2/compat/composed.go b/filebeat/input/v2/compat/composed.go index 969734a4db3d..8fb1d32ade00 100644 --- a/filebeat/input/v2/compat/composed.go +++ b/filebeat/input/v2/compat/composed.go @@ -18,9 +18,9 @@ package compat import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/input/v2/compat/composed_test.go b/filebeat/input/v2/compat/composed_test.go index cb367185a4e7..78f715efa143 100644 --- a/filebeat/input/v2/compat/composed_test.go +++ b/filebeat/input/v2/compat/composed_test.go @@ -21,9 +21,9 @@ import ( "errors" "testing" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/input/v2/input-cursor/input.go b/filebeat/input/v2/input-cursor/input.go index 57f0a7d40f06..aae3403e52f2 100644 --- a/filebeat/input/v2/input-cursor/input.go +++ b/filebeat/input/v2/input-cursor/input.go @@ -27,10 +27,10 @@ import ( "github.com/elastic/go-concert/ctxtool" "github.com/elastic/go-concert/unison" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/filebeat/input/v2/input-cursor/manager.go b/filebeat/input/v2/input-cursor/manager.go index 68cc13f7ac1a..a0491aba7aae 100644 --- a/filebeat/input/v2/input-cursor/manager.go +++ b/filebeat/input/v2/input-cursor/manager.go @@ -25,9 +25,9 @@ import ( "github.com/elastic/go-concert/unison" - "github.com/elastic/beats/v7/filebeat/features" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/filebeat/features" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/v2/input-cursor/manager_test.go b/filebeat/input/v2/input-cursor/manager_test.go index 27900559d9bc..d9dae787a985 100644 --- a/filebeat/input/v2/input-cursor/manager_test.go +++ b/filebeat/input/v2/input-cursor/manager_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" - "github.com/elastic/beats/v7/libbeat/tests/resources" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" + "github.com/elastic/beats/v9/libbeat/tests/resources" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/filebeat/input/v2/input-cursor/publish.go b/filebeat/input/v2/input-cursor/publish.go index e4f11e13b5d6..b1285ed47f8d 100644 --- a/filebeat/input/v2/input-cursor/publish.go +++ b/filebeat/input/v2/input-cursor/publish.go @@ -20,10 +20,10 @@ package cursor import ( "time" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/statestore" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/statestore" ) // Publisher is used to publish an event and update the cursor in a single call to Publish. diff --git a/filebeat/input/v2/input-cursor/publish_test.go b/filebeat/input/v2/input-cursor/publish_test.go index 28c274baf94c..fdb2ad28f14d 100644 --- a/filebeat/input/v2/input-cursor/publish_test.go +++ b/filebeat/input/v2/input-cursor/publish_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" + "github.com/elastic/beats/v9/libbeat/beat" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" ) func TestPublish(t *testing.T) { diff --git a/filebeat/input/v2/input-cursor/store.go b/filebeat/input/v2/input-cursor/store.go index 2371b0addcc6..a8c793540c28 100644 --- a/filebeat/input/v2/input-cursor/store.go +++ b/filebeat/input/v2/input-cursor/store.go @@ -23,9 +23,9 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/common/cleanup" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/common/cleanup" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert" "github.com/elastic/go-concert/unison" diff --git a/filebeat/input/v2/input-cursor/store_test.go b/filebeat/input/v2/input-cursor/store_test.go index 4f9484bb6dce..a7d8c3c8e2df 100644 --- a/filebeat/input/v2/input-cursor/store_test.go +++ b/filebeat/input/v2/input-cursor/store_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/input/v2/input-stateless/stateless.go b/filebeat/input/v2/input-stateless/stateless.go index 1b75a61b2ad7..51998ac651c3 100644 --- a/filebeat/input/v2/input-stateless/stateless.go +++ b/filebeat/input/v2/input-stateless/stateless.go @@ -23,8 +23,8 @@ import ( "github.com/elastic/go-concert/unison" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/input/v2/input-stateless/stateless_test.go b/filebeat/input/v2/input-stateless/stateless_test.go index 731577e76c34..dbf89df8874d 100644 --- a/filebeat/input/v2/input-stateless/stateless_test.go +++ b/filebeat/input/v2/input-stateless/stateless_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/beat" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/beat" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/input/v2/input.go b/filebeat/input/v2/input.go index 3b84f2b04dad..40cda6e617b2 100644 --- a/filebeat/input/v2/input.go +++ b/filebeat/input/v2/input.go @@ -21,10 +21,10 @@ import ( "context" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/filebeat/input/v2/input_test.go b/filebeat/input/v2/input_test.go index 4c9968e7cc91..786cfac13e98 100644 --- a/filebeat/input/v2/input_test.go +++ b/filebeat/input/v2/input_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/filebeat/input/v2/internal/inputest/inputest.go b/filebeat/input/v2/internal/inputest/inputest.go index 86a23e1875d3..8cb7bce4b309 100644 --- a/filebeat/input/v2/internal/inputest/inputest.go +++ b/filebeat/input/v2/internal/inputest/inputest.go @@ -20,9 +20,9 @@ package inputest import ( "errors" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/go-concert/unison" ) diff --git a/filebeat/input/v2/internal/inputest/loader.go b/filebeat/input/v2/internal/inputest/loader.go index 3b75a851c5ef..552af86e0204 100644 --- a/filebeat/input/v2/internal/inputest/loader.go +++ b/filebeat/input/v2/internal/inputest/loader.go @@ -20,7 +20,7 @@ package inputest import ( "testing" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/input/v2/loader.go b/filebeat/input/v2/loader.go index 4ac3c1124040..ffdf54b45dcd 100644 --- a/filebeat/input/v2/loader.go +++ b/filebeat/input/v2/loader.go @@ -20,8 +20,8 @@ package v2 import ( "fmt" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/version" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/filebeat/input/v2/loader_test.go b/filebeat/input/v2/loader_test.go index 4e9e2c28bb72..7c2c0065e072 100644 --- a/filebeat/input/v2/loader_test.go +++ b/filebeat/input/v2/loader_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/version" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/v2/plugin.go b/filebeat/input/v2/plugin.go index 7a5cfcdbab7d..89821f3cc4cc 100644 --- a/filebeat/input/v2/plugin.go +++ b/filebeat/input/v2/plugin.go @@ -20,7 +20,7 @@ package v2 import ( "fmt" - "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/feature" ) // Plugin describes an input type. Input types should provide a constructor diff --git a/filebeat/input/v2/plugin_test.go b/filebeat/input/v2/plugin_test.go index f9110b8cc8ee..45078d939c4b 100644 --- a/filebeat/input/v2/plugin_test.go +++ b/filebeat/input/v2/plugin_test.go @@ -20,7 +20,7 @@ package v2 import ( "testing" - "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/feature" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/input/v2/testpipeline/pipeline.go b/filebeat/input/v2/testpipeline/pipeline.go index 1f24cd6939cf..1810f58b03ef 100644 --- a/filebeat/input/v2/testpipeline/pipeline.go +++ b/filebeat/input/v2/testpipeline/pipeline.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) // PipelineConnector is a mock for beat.PipelineConnector diff --git a/filebeat/input/v2/util_test.go b/filebeat/input/v2/util_test.go index c568e707eead..ec726208f635 100644 --- a/filebeat/input/v2/util_test.go +++ b/filebeat/input/v2/util_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/filebeat/input/winlog/input.go b/filebeat/input/winlog/input.go index 16f1670e9a11..9ff76df5d305 100644 --- a/filebeat/input/winlog/input.go +++ b/filebeat/input/winlog/input.go @@ -20,16 +20,16 @@ package winlog import ( "fmt" - input "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/statestore" + input "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/go-concert/ctxtool" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" - "github.com/elastic/beats/v7/winlogbeat/eventlog" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/winlogbeat/eventlog" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/filebeat/inputsource/common/dgram/handler.go b/filebeat/inputsource/common/dgram/handler.go index f9ce8c6c648d..8004d3d7d384 100644 --- a/filebeat/inputsource/common/dgram/handler.go +++ b/filebeat/inputsource/common/dgram/handler.go @@ -23,7 +23,7 @@ import ( "runtime" "strings" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/inputsource/common/dgram/server.go b/filebeat/inputsource/common/dgram/server.go index 9e338c63a61e..27e28a07a1be 100644 --- a/filebeat/inputsource/common/dgram/server.go +++ b/filebeat/inputsource/common/dgram/server.go @@ -25,8 +25,8 @@ import ( "github.com/elastic/go-concert/ctxtool" "github.com/elastic/go-concert/unison" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/inputsource/common/streaming/config.go b/filebeat/inputsource/common/streaming/config.go index 5f48ce003cd0..49aa014e0088 100644 --- a/filebeat/inputsource/common/streaming/config.go +++ b/filebeat/inputsource/common/streaming/config.go @@ -20,7 +20,7 @@ package streaming import ( "time" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" ) // ListenerConfig exposes the shared listener configuration. diff --git a/filebeat/inputsource/common/streaming/handler.go b/filebeat/inputsource/common/streaming/handler.go index aac5197c8bd7..f340e1450cd8 100644 --- a/filebeat/inputsource/common/streaming/handler.go +++ b/filebeat/inputsource/common/streaming/handler.go @@ -23,7 +23,7 @@ import ( "fmt" "net" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/inputsource/common/streaming/listener.go b/filebeat/inputsource/common/streaming/listener.go index 5e4f8c1c1766..d3ff776acc3f 100644 --- a/filebeat/inputsource/common/streaming/listener.go +++ b/filebeat/inputsource/common/streaming/listener.go @@ -28,7 +28,7 @@ import ( "sync" "sync/atomic" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/ctxtool" ) diff --git a/filebeat/inputsource/tcp/config.go b/filebeat/inputsource/tcp/config.go index db24b9dfb7f8..93ecb2a45db9 100644 --- a/filebeat/inputsource/tcp/config.go +++ b/filebeat/inputsource/tcp/config.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/filebeat/inputsource/tcp/handler.go b/filebeat/inputsource/tcp/handler.go index 8f6e4af84e70..e85cfb9e27ec 100644 --- a/filebeat/inputsource/tcp/handler.go +++ b/filebeat/inputsource/tcp/handler.go @@ -22,7 +22,7 @@ import ( "crypto/x509" "net" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/filebeat/inputsource/tcp/server.go b/filebeat/inputsource/tcp/server.go index 85b5b4dc7475..2432cbc9cf1f 100644 --- a/filebeat/inputsource/tcp/server.go +++ b/filebeat/inputsource/tcp/server.go @@ -24,8 +24,8 @@ import ( "golang.org/x/net/netutil" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/common/streaming" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/common/streaming" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/filebeat/inputsource/tcp/server_test.go b/filebeat/inputsource/tcp/server_test.go index 764825d36698..88be629ab583 100644 --- a/filebeat/inputsource/tcp/server_test.go +++ b/filebeat/inputsource/tcp/server_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/common/streaming" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/common/streaming" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/inputsource/udp/config.go b/filebeat/inputsource/udp/config.go index c0a31760bb15..3708c446d731 100644 --- a/filebeat/inputsource/udp/config.go +++ b/filebeat/inputsource/udp/config.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" ) // Config options for the UDPServer diff --git a/filebeat/inputsource/udp/server.go b/filebeat/inputsource/udp/server.go index af53d1aa5809..4a189143d768 100644 --- a/filebeat/inputsource/udp/server.go +++ b/filebeat/inputsource/udp/server.go @@ -20,8 +20,8 @@ package udp import ( "net" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/common/dgram" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/common/dgram" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/inputsource/udp/server_test.go b/filebeat/inputsource/udp/server_test.go index 026543b97828..eb8408881539 100644 --- a/filebeat/inputsource/udp/server_test.go +++ b/filebeat/inputsource/udp/server_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/filebeat/inputsource/unix/config.go b/filebeat/inputsource/unix/config.go index 5d227284e21a..d165f5f01939 100644 --- a/filebeat/inputsource/unix/config.go +++ b/filebeat/inputsource/unix/config.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/filebeat/inputsource/common/streaming" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/filebeat/inputsource/common/streaming" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" ) type SocketType uint8 diff --git a/filebeat/inputsource/unix/handler.go b/filebeat/inputsource/unix/handler.go index 70391e35fb3f..4afdf827cb3e 100644 --- a/filebeat/inputsource/unix/handler.go +++ b/filebeat/inputsource/unix/handler.go @@ -20,7 +20,7 @@ package unix import ( "net" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource" ) // MetadataCallback returns common metadata about a unix connection diff --git a/filebeat/inputsource/unix/server.go b/filebeat/inputsource/unix/server.go index 27ab8f25633e..ebad5cf89fa0 100644 --- a/filebeat/inputsource/unix/server.go +++ b/filebeat/inputsource/unix/server.go @@ -24,9 +24,9 @@ import ( "golang.org/x/net/netutil" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/common/dgram" - "github.com/elastic/beats/v7/filebeat/inputsource/common/streaming" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/common/dgram" + "github.com/elastic/beats/v9/filebeat/inputsource/common/streaming" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/filebeat/inputsource/unix/server_test.go b/filebeat/inputsource/unix/server_test.go index a85d99b1116d..d1dab1887b2a 100644 --- a/filebeat/inputsource/unix/server_test.go +++ b/filebeat/inputsource/unix/server_test.go @@ -34,7 +34,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/file" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/filebeat/magefile.go b/filebeat/magefile.go index 87d8fb866f70..0314e9e85e72 100644 --- a/filebeat/magefile.go +++ b/filebeat/magefile.go @@ -26,20 +26,20 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - filebeat "github.com/elastic/beats/v7/filebeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + filebeat "github.com/elastic/beats/v9/filebeat/scripts/mage" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import generate - _ "github.com/elastic/beats/v7/filebeat/scripts/mage/generate" + _ "github.com/elastic/beats/v9/filebeat/scripts/mage/generate" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" ) func init() { diff --git a/filebeat/main.go b/filebeat/main.go index 44c94af114ea..767c2b6163fd 100644 --- a/filebeat/main.go +++ b/filebeat/main.go @@ -21,8 +21,8 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/filebeat/cmd" - inputs "github.com/elastic/beats/v7/filebeat/input/default-inputs" + "github.com/elastic/beats/v9/filebeat/cmd" + inputs "github.com/elastic/beats/v9/filebeat/input/default-inputs" ) // The basic model of execution: diff --git a/filebeat/main_test.go b/filebeat/main_test.go index 0f989a77a355..e6587b7a866a 100644 --- a/filebeat/main_test.go +++ b/filebeat/main_test.go @@ -24,10 +24,10 @@ import ( "os" "testing" - fbcmd "github.com/elastic/beats/v7/filebeat/cmd" - inputs "github.com/elastic/beats/v7/filebeat/input/default-inputs" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/tests/system/template" + fbcmd "github.com/elastic/beats/v9/filebeat/cmd" + inputs "github.com/elastic/beats/v9/filebeat/input/default-inputs" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" ) var ( diff --git a/filebeat/module/apache/fields.go b/filebeat/module/apache/fields.go index b24297a9888d..94b8e4349e06 100644 --- a/filebeat/module/apache/fields.go +++ b/filebeat/module/apache/fields.go @@ -20,7 +20,7 @@ package apache import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/auditd/fields.go b/filebeat/module/auditd/fields.go index 8b258cb16b0a..c903c3e914b5 100644 --- a/filebeat/module/auditd/fields.go +++ b/filebeat/module/auditd/fields.go @@ -20,7 +20,7 @@ package auditd import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/elasticsearch/fields.go b/filebeat/module/elasticsearch/fields.go index 4f27bd426ffb..6bf92584aa77 100644 --- a/filebeat/module/elasticsearch/fields.go +++ b/filebeat/module/elasticsearch/fields.go @@ -20,7 +20,7 @@ package elasticsearch import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/haproxy/fields.go b/filebeat/module/haproxy/fields.go index d125832508d2..005035467846 100644 --- a/filebeat/module/haproxy/fields.go +++ b/filebeat/module/haproxy/fields.go @@ -20,7 +20,7 @@ package haproxy import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/icinga/fields.go b/filebeat/module/icinga/fields.go index 62cd7c38bf26..07fe80ef4144 100644 --- a/filebeat/module/icinga/fields.go +++ b/filebeat/module/icinga/fields.go @@ -20,7 +20,7 @@ package icinga import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/iis/fields.go b/filebeat/module/iis/fields.go index 2ff6867d2a70..fd36c357c3be 100644 --- a/filebeat/module/iis/fields.go +++ b/filebeat/module/iis/fields.go @@ -20,7 +20,7 @@ package iis import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/kafka/fields.go b/filebeat/module/kafka/fields.go index 42053910207d..2e90b7bf3e05 100644 --- a/filebeat/module/kafka/fields.go +++ b/filebeat/module/kafka/fields.go @@ -20,7 +20,7 @@ package kafka import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/kibana/fields.go b/filebeat/module/kibana/fields.go index 510042a1a45e..fe7d504f5fce 100644 --- a/filebeat/module/kibana/fields.go +++ b/filebeat/module/kibana/fields.go @@ -20,7 +20,7 @@ package kibana import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/logstash/fields.go b/filebeat/module/logstash/fields.go index 4c094a9ccb7c..6d0a3fadba92 100644 --- a/filebeat/module/logstash/fields.go +++ b/filebeat/module/logstash/fields.go @@ -20,7 +20,7 @@ package logstash import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/mongodb/fields.go b/filebeat/module/mongodb/fields.go index 18d418a1c96e..230418facba2 100644 --- a/filebeat/module/mongodb/fields.go +++ b/filebeat/module/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/mysql/fields.go b/filebeat/module/mysql/fields.go index 2826e1697776..305f62005921 100644 --- a/filebeat/module/mysql/fields.go +++ b/filebeat/module/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/nats/fields.go b/filebeat/module/nats/fields.go index 7774bfc3af97..79275c82100c 100644 --- a/filebeat/module/nats/fields.go +++ b/filebeat/module/nats/fields.go @@ -20,7 +20,7 @@ package nats import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/nginx/fields.go b/filebeat/module/nginx/fields.go index b342777a7b21..1b44a0a4c0a4 100644 --- a/filebeat/module/nginx/fields.go +++ b/filebeat/module/nginx/fields.go @@ -20,7 +20,7 @@ package nginx import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/osquery/fields.go b/filebeat/module/osquery/fields.go index 31297c41ecf4..eccda4d8e9c0 100644 --- a/filebeat/module/osquery/fields.go +++ b/filebeat/module/osquery/fields.go @@ -20,7 +20,7 @@ package osquery import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/pensando/fields.go b/filebeat/module/pensando/fields.go index d6b51d8cc3e3..89aa931ea1e3 100644 --- a/filebeat/module/pensando/fields.go +++ b/filebeat/module/pensando/fields.go @@ -20,7 +20,7 @@ package pensando import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/postgresql/fields.go b/filebeat/module/postgresql/fields.go index 0ffdf2d7a0c6..727ef5bffc96 100644 --- a/filebeat/module/postgresql/fields.go +++ b/filebeat/module/postgresql/fields.go @@ -20,7 +20,7 @@ package postgresql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/redis/fields.go b/filebeat/module/redis/fields.go index 3f35c619a41b..f9fac7aeee3f 100644 --- a/filebeat/module/redis/fields.go +++ b/filebeat/module/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/santa/fields.go b/filebeat/module/santa/fields.go index 97c661789dfe..2c2a3251d140 100644 --- a/filebeat/module/santa/fields.go +++ b/filebeat/module/santa/fields.go @@ -20,7 +20,7 @@ package santa import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/system/fields.go b/filebeat/module/system/fields.go index ad3229f640ee..f5c9cf433d68 100644 --- a/filebeat/module/system/fields.go +++ b/filebeat/module/system/fields.go @@ -20,7 +20,7 @@ package system import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/module/traefik/fields.go b/filebeat/module/traefik/fields.go index 107364fd4b1e..ecf440224d81 100644 --- a/filebeat/module/traefik/fields.go +++ b/filebeat/module/traefik/fields.go @@ -20,7 +20,7 @@ package traefik import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/filebeat/processor/add_kubernetes_metadata/matchers.go b/filebeat/processor/add_kubernetes_metadata/matchers.go index 222fd46897f2..9b88381117cc 100644 --- a/filebeat/processor/add_kubernetes_metadata/matchers.go +++ b/filebeat/processor/add_kubernetes_metadata/matchers.go @@ -23,7 +23,7 @@ import ( "runtime" "strings" - "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v9/libbeat/processors/add_kubernetes_metadata" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/filebeat/registrar/migrate.go b/filebeat/registrar/migrate.go index 1be807f32995..d5419e0cbc93 100644 --- a/filebeat/registrar/migrate.go +++ b/filebeat/registrar/migrate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/v7/filebeat/config" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/statestore/backend/memlog" + "github.com/elastic/beats/v9/filebeat/config" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/statestore/backend/memlog" helper "github.com/elastic/elastic-agent-libs/file" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" diff --git a/filebeat/registrar/migrate_bench_test.go b/filebeat/registrar/migrate_bench_test.go index 756057d72d57..5b9eed75ddcd 100644 --- a/filebeat/registrar/migrate_bench_test.go +++ b/filebeat/registrar/migrate_bench_test.go @@ -28,8 +28,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/v7/filebeat/input/file" - libfile "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/filebeat/input/file" + libfile "github.com/elastic/beats/v9/libbeat/common/file" ) var keep bool diff --git a/filebeat/registrar/registrar.go b/filebeat/registrar/registrar.go index 2bbb3d2eadf6..e3296aab7442 100644 --- a/filebeat/registrar/registrar.go +++ b/filebeat/registrar/registrar.go @@ -23,9 +23,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/filebeat/input/file" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/filebeat/input/file" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/backend" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/filebeat/scripts/mage/build.go b/filebeat/scripts/mage/build.go index 74ba8479c955..d6efb97cf09b 100644 --- a/filebeat/scripts/mage/build.go +++ b/filebeat/scripts/mage/build.go @@ -20,7 +20,7 @@ package mage import ( "go.uber.org/multierr" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // GolangCrossBuild builds the Beat binary inside the golang-builder and then diff --git a/filebeat/scripts/mage/config.go b/filebeat/scripts/mage/config.go index 0893fbc07439..75dbf9e10500 100644 --- a/filebeat/scripts/mage/config.go +++ b/filebeat/scripts/mage/config.go @@ -20,7 +20,7 @@ package mage import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) const modulesConfigYml = "build/config.modules.yml.tmpl" diff --git a/filebeat/scripts/mage/docs.go b/filebeat/scripts/mage/docs.go index c1b21e7d3a51..5453ee59c530 100644 --- a/filebeat/scripts/mage/docs.go +++ b/filebeat/scripts/mage/docs.go @@ -20,7 +20,7 @@ package mage import ( "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // CollectDocs executes the Filebeat docs_collector script to collect/generate diff --git a/filebeat/scripts/mage/generate/fields.go b/filebeat/scripts/mage/generate/fields.go index 01bc6a1c46af..8979ecc878bd 100644 --- a/filebeat/scripts/mage/generate/fields.go +++ b/filebeat/scripts/mage/generate/fields.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - genfields "github.com/elastic/beats/v7/filebeat/generator/fields" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + genfields "github.com/elastic/beats/v9/filebeat/generator/fields" ) // Fields creates a new fields.yml for an existing Filebeat fileset. diff --git a/filebeat/scripts/mage/generate/fileset.go b/filebeat/scripts/mage/generate/fileset.go index ff54b2546324..97036456b332 100644 --- a/filebeat/scripts/mage/generate/fileset.go +++ b/filebeat/scripts/mage/generate/fileset.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - genfileset "github.com/elastic/beats/v7/filebeat/generator/fileset" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + genfileset "github.com/elastic/beats/v9/filebeat/generator/fileset" ) // Fileset creates a new fileset for an existing Filebeat module. diff --git a/filebeat/scripts/mage/generate/module.go b/filebeat/scripts/mage/generate/module.go index 6995d483c779..f70a61aaaa8a 100644 --- a/filebeat/scripts/mage/generate/module.go +++ b/filebeat/scripts/mage/generate/module.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - genmod "github.com/elastic/beats/v7/filebeat/generator/module" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + genmod "github.com/elastic/beats/v9/filebeat/generator/module" ) // Module creates a new Filebeat module. diff --git a/filebeat/scripts/mage/package.go b/filebeat/scripts/mage/package.go index 80c2e8e651b0..73c483da4c14 100644 --- a/filebeat/scripts/mage/package.go +++ b/filebeat/scripts/mage/package.go @@ -22,7 +22,7 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) const ( diff --git a/filebeat/scripts/tester/main.go b/filebeat/scripts/tester/main.go index 5c5f76561a14..366dc21e7b12 100644 --- a/filebeat/scripts/tester/main.go +++ b/filebeat/scripts/tester/main.go @@ -29,12 +29,12 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/multiline" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/multiline" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/filebeat/testing/integration/cmd_test.go b/filebeat/testing/integration/cmd_test.go index b73752ae7236..7de283d6a5a1 100644 --- a/filebeat/testing/integration/cmd_test.go +++ b/filebeat/testing/integration/cmd_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/testing/integration" + "github.com/elastic/beats/v9/libbeat/testing/integration" ) func TestFilebeatModuleCmd(t *testing.T) { diff --git a/filebeat/testing/integration/container_test.go b/filebeat/testing/integration/container_test.go index cc40d6b2b19b..063d1a6f3975 100644 --- a/filebeat/testing/integration/container_test.go +++ b/filebeat/testing/integration/container_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/testing/integration" + "github.com/elastic/beats/v9/libbeat/testing/integration" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -48,7 +48,7 @@ filebeat.inputs: - type: filestream id: test-container file_identity.native: ~ - prospector.scanner.fingerprint.enabled: false + prospector.scanner.fingerprint.enabled: false paths: - %s parsers: diff --git a/filebeat/testing/integration/deprecated_test.go b/filebeat/testing/integration/deprecated_test.go index 9cbae3fd0938..f2f441ef85b4 100644 --- a/filebeat/testing/integration/deprecated_test.go +++ b/filebeat/testing/integration/deprecated_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/testing/integration" + "github.com/elastic/beats/v9/libbeat/testing/integration" ) func TestFilebeatDeprecated(t *testing.T) { @@ -47,7 +47,7 @@ filebeat.config.modules: path: ${path.config}/modules.d/*.yml reload.enabled: true output.console: - enabled: true + enabled: true ` test := NewTest(t, TestOptions{ diff --git a/filebeat/testing/integration/fields_test.go b/filebeat/testing/integration/fields_test.go index 6f94475fe7df..29e8ca6adf5f 100644 --- a/filebeat/testing/integration/fields_test.go +++ b/filebeat/testing/integration/fields_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/testing/integration" + "github.com/elastic/beats/v9/libbeat/testing/integration" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -63,7 +63,7 @@ filebeat.inputs: hello: world number: 2 file_identity.native: ~ - prospector.scanner.fingerprint.enabled: false + prospector.scanner.fingerprint.enabled: false output.console: enabled: true ` @@ -107,7 +107,7 @@ filebeat.inputs: hello: world number: 2 file_identity.native: ~ - prospector.scanner.fingerprint.enabled: false + prospector.scanner.fingerprint.enabled: false output.console: enabled: true ` diff --git a/filebeat/testing/integration/filestream_gzip_test.go b/filebeat/testing/integration/filestream_gzip_test.go index c7fb2e6f4c54..cef80c303ba7 100644 --- a/filebeat/testing/integration/filestream_gzip_test.go +++ b/filebeat/testing/integration/filestream_gzip_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/testing/gziptest" - "github.com/elastic/beats/v7/libbeat/testing/integration" + "github.com/elastic/beats/v9/filebeat/testing/gziptest" + "github.com/elastic/beats/v9/libbeat/testing/integration" ) func TestFilestreamGZIP(t *testing.T) { diff --git a/filebeat/testing/integration/integration.go b/filebeat/testing/integration/integration.go index d5d9d0373998..7e3ab7d9835d 100644 --- a/filebeat/testing/integration/integration.go +++ b/filebeat/testing/integration/integration.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/libbeat/testing/integration" + "github.com/elastic/beats/v9/libbeat/testing/integration" ) // EnsureCompiled ensures that Filebeat is compiled and ready diff --git a/filebeat/testing/integration/sample_test.go b/filebeat/testing/integration/sample_test.go index 8246a53ca395..fa012ebb6fae 100644 --- a/filebeat/testing/integration/sample_test.go +++ b/filebeat/testing/integration/sample_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/testing/integration" + "github.com/elastic/beats/v9/libbeat/testing/integration" ) func TestFilebeat(t *testing.T) { diff --git a/filebeat/tests/integration/autodiscover_test.go b/filebeat/tests/integration/autodiscover_test.go index e8e49f7ea3ca..16e6ebbcc661 100644 --- a/filebeat/tests/integration/autodiscover_test.go +++ b/filebeat/tests/integration/autodiscover_test.go @@ -43,7 +43,7 @@ import ( "sigs.k8s.io/kind/pkg/apis/config/v1alpha4" "sigs.k8s.io/kind/pkg/cluster" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/logp" ) @@ -111,9 +111,9 @@ func startFlogKubernetes(t *testing.T, tempDir string) (string, string, string) } }() provider := cluster.NewProvider( - // Uncomment the next line to have Kind logs written to stderr. - // You will also have to import "sigs.k8s.io/kind/pkg/cmd" - // cluster.ProviderWithLogger(cmd.NewLogger()), + // Uncomment the next line to have Kind logs written to stderr. + // You will also have to import "sigs.k8s.io/kind/pkg/cmd" + // cluster.ProviderWithLogger(cmd.NewLogger()), ) clusterName := fmt.Sprintf("test-cluster-%s", uid) diff --git a/filebeat/tests/integration/crawler_test.go b/filebeat/tests/integration/crawler_test.go index c6b95420ff2d..2d4ba159ec43 100644 --- a/filebeat/tests/integration/crawler_test.go +++ b/filebeat/tests/integration/crawler_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) // Checks all log lines are ingested diff --git a/filebeat/tests/integration/event_log_file_test.go b/filebeat/tests/integration/event_log_file_test.go index 793a3386af7f..c669e412bdf1 100644 --- a/filebeat/tests/integration/event_log_file_test.go +++ b/filebeat/tests/integration/event_log_file_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) var eventsLogFileCfg = ` diff --git a/filebeat/tests/integration/filebeat_test.go b/filebeat/tests/integration/filebeat_test.go index ca71e7d7eaf7..3283a410aa7c 100644 --- a/filebeat/tests/integration/filebeat_test.go +++ b/filebeat/tests/integration/filebeat_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) var filebeatBasicConfig = ` diff --git a/filebeat/tests/integration/filestream_delete_scale_test.go b/filebeat/tests/integration/filestream_delete_scale_test.go index f665cd35e857..a5401f88ee95 100644 --- a/filebeat/tests/integration/filestream_delete_scale_test.go +++ b/filebeat/tests/integration/filestream_delete_scale_test.go @@ -31,7 +31,7 @@ import ( "github.com/fsnotify/fsnotify" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) // TestLargeScaleFilestreamDelete is a single case of 'scale testing' for the diff --git a/filebeat/tests/integration/filestream_delete_test.go b/filebeat/tests/integration/filestream_delete_test.go index e92c899fbe5e..68c0b703043e 100644 --- a/filebeat/tests/integration/filestream_delete_test.go +++ b/filebeat/tests/integration/filestream_delete_test.go @@ -36,7 +36,7 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/mock-es/pkg/api" ) diff --git a/filebeat/tests/integration/filestream_gzip_test.go b/filebeat/tests/integration/filestream_gzip_test.go index 4a45b7275c06..f90ce3839a70 100644 --- a/filebeat/tests/integration/filestream_gzip_test.go +++ b/filebeat/tests/integration/filestream_gzip_test.go @@ -34,8 +34,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/testing/gziptest" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/filebeat/testing/gziptest" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-libs/iobuf" ) diff --git a/filebeat/tests/integration/filestream_test.go b/filebeat/tests/integration/filestream_test.go index 6e883e8c5d48..bf19e33525e3 100644 --- a/filebeat/tests/integration/filestream_test.go +++ b/filebeat/tests/integration/filestream_test.go @@ -35,7 +35,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) var filestreamCleanInactiveCfg = ` diff --git a/filebeat/tests/integration/filestream_truncation_test.go b/filebeat/tests/integration/filestream_truncation_test.go index 5b56d5a801c4..4eaee5a25a00 100644 --- a/filebeat/tests/integration/filestream_truncation_test.go +++ b/filebeat/tests/integration/filestream_truncation_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) var truncationCfg = ` diff --git a/filebeat/tests/integration/input_reload_test.go b/filebeat/tests/integration/input_reload_test.go index 8bbb4fd7b9ad..88ed2cd10d11 100644 --- a/filebeat/tests/integration/input_reload_test.go +++ b/filebeat/tests/integration/input_reload_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) // This test checks all input-reloading related behavior @@ -64,7 +64,7 @@ logging.level: debug paths: - %s file_identity.native: ~ - prospector.scanner.fingerprint.enabled: false + prospector.scanner.fingerprint.enabled: false ` inputs := filepath.Join(tempDir, "inputs.d") err := os.MkdirAll(inputs, 0777) diff --git a/filebeat/tests/integration/journald_test.go b/filebeat/tests/integration/journald_test.go index 86821f1c2a9c..bd8b8160ec83 100644 --- a/filebeat/tests/integration/journald_test.go +++ b/filebeat/tests/integration/journald_test.go @@ -32,7 +32,7 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) //go:embed testdata/filebeat_journald.yml diff --git a/filebeat/tests/integration/netInputs_test.go b/filebeat/tests/integration/netInputs_test.go index f9bf86a44bfd..cd27ba83d9c9 100644 --- a/filebeat/tests/integration/netInputs_test.go +++ b/filebeat/tests/integration/netInputs_test.go @@ -29,8 +29,8 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/filebeat/input/net/nettest" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/filebeat/input/net/nettest" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) func TestNetInputs(t *testing.T) { diff --git a/filebeat/tests/integration/setup_pipelines_test.go b/filebeat/tests/integration/setup_pipelines_test.go index 51c4e9b022c9..cbdc9dfbc489 100644 --- a/filebeat/tests/integration/setup_pipelines_test.go +++ b/filebeat/tests/integration/setup_pipelines_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) func TestSetupNoModules(t *testing.T) { diff --git a/filebeat/tests/integration/store_test.go b/filebeat/tests/integration/store_test.go index af2f09926a6e..387be4ee9830 100644 --- a/filebeat/tests/integration/store_test.go +++ b/filebeat/tests/integration/store_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) var testStoreCfg = ` diff --git a/filebeat/tests/integration/translate_ldap_attribute_test.go b/filebeat/tests/integration/translate_ldap_attribute_test.go index 7203757a0f98..4fe0869908f1 100644 --- a/filebeat/tests/integration/translate_ldap_attribute_test.go +++ b/filebeat/tests/integration/translate_ldap_attribute_test.go @@ -37,7 +37,7 @@ import ( "github.com/go-ldap/ldap/v3" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/go.mod b/go.mod index 1a07214e0296..9a8be412bc85 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/elastic/beats/v7 +module github.com/elastic/beats/v9 go 1.24.5 diff --git a/heartbeat/autodiscover/builder/hints/monitors.go b/heartbeat/autodiscover/builder/hints/monitors.go index 94faea5fc4ef..25ed9a6f2131 100644 --- a/heartbeat/autodiscover/builder/hints/monitors.go +++ b/heartbeat/autodiscover/builder/hints/monitors.go @@ -26,9 +26,9 @@ import ( "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/utils" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/heartbeat/beater/heartbeat.go b/heartbeat/beater/heartbeat.go index f1df1b3c4b83..35de215ad9fc 100644 --- a/heartbeat/beater/heartbeat.go +++ b/heartbeat/beater/heartbeat.go @@ -29,21 +29,21 @@ import ( conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/hbregistry" - "github.com/elastic/beats/v7/heartbeat/monitors" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/heartbeat/scheduler" - _ "github.com/elastic/beats/v7/heartbeat/security" - "github.com/elastic/beats/v7/heartbeat/tracer" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/hbregistry" + "github.com/elastic/beats/v9/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/scheduler" + _ "github.com/elastic/beats/v9/heartbeat/security" + "github.com/elastic/beats/v9/heartbeat/tracer" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/management" ) // Heartbeat represents the root datastructure of this beat. diff --git a/heartbeat/cmd/root.go b/heartbeat/cmd/root.go index fd95013c6fe0..cb20cbfa7382 100644 --- a/heartbeat/cmd/root.go +++ b/heartbeat/cmd/root.go @@ -20,20 +20,20 @@ package cmd import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/beater" - "github.com/elastic/beats/v7/heartbeat/include" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v9/heartbeat/beater" + "github.com/elastic/beats/v9/heartbeat/include" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/publisher/processing" // Import packages that need to register themselves. - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/http" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/icmp" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/tcp" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/http" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/icmp" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/tcp" // include all heartbeat specific autodiscovery builders - _ "github.com/elastic/beats/v7/heartbeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v9/heartbeat/autodiscover/builder/hints" ) const ( diff --git a/heartbeat/cmd/root_test.go b/heartbeat/cmd/root_test.go index ec40aa0c7509..005e6b3aa28a 100644 --- a/heartbeat/cmd/root_test.go +++ b/heartbeat/cmd/root_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" ) // Test all required plugins are exported by this module, since it's the diff --git a/heartbeat/config/config.go b/heartbeat/config/config.go index 8a396d46fe8e..9e086d1e03cc 100644 --- a/heartbeat/config/config.go +++ b/heartbeat/config/config.go @@ -27,8 +27,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/processors/util" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/processors/util" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/heartbeat/eventext/eventext.go b/heartbeat/eventext/eventext.go index 68740ec3a6db..aadd4f63cd27 100644 --- a/heartbeat/eventext/eventext.go +++ b/heartbeat/eventext/eventext.go @@ -18,7 +18,7 @@ package eventext import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/hbtest/hbtestutil.go b/heartbeat/hbtest/hbtestutil.go index e73e1efe78fa..5b499dd83bd3 100644 --- a/heartbeat/hbtest/hbtestutil.go +++ b/heartbeat/hbtest/hbtestutil.go @@ -37,12 +37,12 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain/tlsmeta" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/summarizertesthelper" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/monitors/active/dialchain/tlsmeta" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/summarizertesthelper" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" - "github.com/elastic/beats/v7/heartbeat/hbtestllext" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" "github.com/stretchr/testify/require" @@ -50,7 +50,7 @@ import ( "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/validator" - "github.com/elastic/beats/v7/libbeat/common/x509util" + "github.com/elastic/beats/v9/libbeat/common/x509util" ) // HelloWorldBody is the body of the HelloWorldHandler. diff --git a/heartbeat/hbtestllext/isdefs.go b/heartbeat/hbtestllext/isdefs.go index eeb56e166311..ff376b37c918 100644 --- a/heartbeat/hbtestllext/isdefs.go +++ b/heartbeat/hbtestllext/isdefs.go @@ -27,8 +27,8 @@ import ( "github.com/elastic/go-lookslike/llpath" "github.com/elastic/go-lookslike/llresult" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" ) // IsTime checks that the value is a time.Time instance. diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go index 579a8a2f4462..61cc73da19e4 100644 --- a/heartbeat/include/fields.go +++ b/heartbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/heartbeat/include/list.go b/heartbeat/include/list.go index 14f4824803fc..caeb64b8eac9 100644 --- a/heartbeat/include/list.go +++ b/heartbeat/include/list.go @@ -21,14 +21,14 @@ package include import ( // Import packages to perform 'func InitializeModule()' when in-use. - m0 "github.com/elastic/beats/v7/heartbeat/autodiscover/builder/hints" - m1 "github.com/elastic/beats/v7/heartbeat/security" + m0 "github.com/elastic/beats/v9/heartbeat/autodiscover/builder/hints" + m1 "github.com/elastic/beats/v9/heartbeat/security" // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/http" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/icmp" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/tcp" - _ "github.com/elastic/beats/v7/heartbeat/monitors/plugin" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/http" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/icmp" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/tcp" + _ "github.com/elastic/beats/v9/heartbeat/monitors/plugin" ) // InitializeModules initialize all of the modules. diff --git a/heartbeat/look/look.go b/heartbeat/look/look.go index a3f37c8a220c..7a1bf8b061f5 100644 --- a/heartbeat/look/look.go +++ b/heartbeat/look/look.go @@ -24,7 +24,7 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v9/heartbeat/reason" ) // RTT formats a round-trip-time given as time.Duration into an diff --git a/heartbeat/look/look_test.go b/heartbeat/look/look_test.go index 10209cd95ffd..ba1290a07800 100644 --- a/heartbeat/look/look_test.go +++ b/heartbeat/look/look_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - reason2 "github.com/elastic/beats/v7/heartbeat/reason" + reason2 "github.com/elastic/beats/v9/heartbeat/reason" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/magefile.go b/heartbeat/magefile.go index 894c31480c6c..5020ee4203f5 100644 --- a/heartbeat/magefile.go +++ b/heartbeat/magefile.go @@ -27,19 +27,19 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - heartbeat "github.com/elastic/beats/v7/heartbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + heartbeat "github.com/elastic/beats/v9/heartbeat/scripts/mage" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/heartbeat/main.go b/heartbeat/main.go index a30277c84fe1..e4cb6075a487 100644 --- a/heartbeat/main.go +++ b/heartbeat/main.go @@ -21,9 +21,9 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/heartbeat/cmd" + "github.com/elastic/beats/v9/heartbeat/cmd" - _ "github.com/elastic/beats/v7/heartbeat/include" + _ "github.com/elastic/beats/v9/heartbeat/include" ) func main() { diff --git a/heartbeat/main_test.go b/heartbeat/main_test.go index a806e1588bd0..231d0b7f1658 100644 --- a/heartbeat/main_test.go +++ b/heartbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/heartbeat/cmd" - "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v9/heartbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" ) var systemTest *bool diff --git a/heartbeat/monitors/active/dialchain/dialchain.go b/heartbeat/monitors/active/dialchain/dialchain.go index f7c82aa0bec7..9afc7d8a3bfe 100644 --- a/heartbeat/monitors/active/dialchain/dialchain.go +++ b/heartbeat/monitors/active/dialchain/dialchain.go @@ -18,7 +18,7 @@ package dialchain import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/transport" ) diff --git a/heartbeat/monitors/active/dialchain/dialers.go b/heartbeat/monitors/active/dialchain/dialers.go index c43d4fac9c30..600c308cc8aa 100644 --- a/heartbeat/monitors/active/dialchain/dialers.go +++ b/heartbeat/monitors/active/dialchain/dialers.go @@ -27,10 +27,10 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/libbeat/beat" ) // TCPDialer creates a new NetDialer with constant event fields and default diff --git a/heartbeat/monitors/active/dialchain/socks5.go b/heartbeat/monitors/active/dialchain/socks5.go index 8d6dc00a0a8d..a77945413b6a 100644 --- a/heartbeat/monitors/active/dialchain/socks5.go +++ b/heartbeat/monitors/active/dialchain/socks5.go @@ -20,8 +20,8 @@ package dialchain import ( "net" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport" ) diff --git a/heartbeat/monitors/active/dialchain/tls.go b/heartbeat/monitors/active/dialchain/tls.go index da1d85748f4e..32133ec222b5 100644 --- a/heartbeat/monitors/active/dialchain/tls.go +++ b/heartbeat/monitors/active/dialchain/tls.go @@ -23,8 +23,8 @@ import ( "net" "time" - "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain/tlsmeta" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/monitors/active/dialchain/tlsmeta" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/transport" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta.go b/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta.go index a147d883ed1b..efdf12e29cc7 100644 --- a/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta.go +++ b/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta.go @@ -28,7 +28,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/look" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta_test.go b/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta_test.go index 4b717af74dd7..9d5d0802d890 100644 --- a/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta_test.go +++ b/heartbeat/monitors/active/dialchain/tlsmeta/tlsmeta_test.go @@ -33,7 +33,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/look" ) // Tests for the non-cert fields diff --git a/heartbeat/monitors/active/dialchain/util.go b/heartbeat/monitors/active/dialchain/util.go index 954224a9d228..18c3bc09c8b5 100644 --- a/heartbeat/monitors/active/dialchain/util.go +++ b/heartbeat/monitors/active/dialchain/util.go @@ -22,7 +22,7 @@ import ( "net" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/transport" ) diff --git a/heartbeat/monitors/active/http/check.go b/heartbeat/monitors/active/http/check.go index 5ec835645007..f8e0405ad400 100644 --- a/heartbeat/monitors/active/http/check.go +++ b/heartbeat/monitors/active/http/check.go @@ -22,9 +22,9 @@ import ( "fmt" "net/http" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/reason" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/reason" + "github.com/elastic/beats/v9/libbeat/common/match" ) const cfgPositive = "positive" diff --git a/heartbeat/monitors/active/http/check_test.go b/heartbeat/monitors/active/http/check_test.go index abd9e9252a3e..08078d6a6772 100644 --- a/heartbeat/monitors/active/http/check_test.go +++ b/heartbeat/monitors/active/http/check_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" ) func TestCheckBody(t *testing.T) { diff --git a/heartbeat/monitors/active/http/checkjson.go b/heartbeat/monitors/active/http/checkjson.go index 2f2fc71bedf2..a74563dfd982 100644 --- a/heartbeat/monitors/active/http/checkjson.go +++ b/heartbeat/monitors/active/http/checkjson.go @@ -27,9 +27,9 @@ import ( "github.com/PaesslerAG/gval" "github.com/PaesslerAG/jsonpath" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/conditions" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/active/http/checkjson_test.go b/heartbeat/monitors/active/http/checkjson_test.go index 9a197b427e68..da302ee6b8ed 100644 --- a/heartbeat/monitors/active/http/checkjson_test.go +++ b/heartbeat/monitors/active/http/checkjson_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/conditions" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/heartbeat/monitors/active/http/config.go b/heartbeat/monitors/active/http/config.go index 976e4612d876..c1102b0f68f0 100644 --- a/heartbeat/monitors/active/http/config.go +++ b/heartbeat/monitors/active/http/config.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/heartbeat/monitors" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/heartbeat/monitors" + "github.com/elastic/beats/v9/libbeat/conditions" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) diff --git a/heartbeat/monitors/active/http/http.go b/heartbeat/monitors/active/http/http.go index 919c59a5a2de..42a9efc6b1bc 100644 --- a/heartbeat/monitors/active/http/http.go +++ b/heartbeat/monitors/active/http/http.go @@ -22,13 +22,13 @@ import ( "net/http" "net/url" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/libbeat/version" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" "github.com/elastic/elastic-agent-libs/transport/httpcommon" "github.com/elastic/elastic-agent-libs/transport/tlscommon" "github.com/elastic/elastic-agent-libs/useragent" diff --git a/heartbeat/monitors/active/http/http_test.go b/heartbeat/monitors/active/http/http_test.go index 20575210ac96..ceba6ac20d1c 100644 --- a/heartbeat/monitors/active/http/http_test.go +++ b/heartbeat/monitors/active/http/http_test.go @@ -46,17 +46,17 @@ import ( "github.com/elastic/go-lookslike/testslike" "github.com/elastic/go-lookslike/validator" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/hbtest" - "github.com/elastic/beats/v7/heartbeat/hbtestllext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/file" - btesting "github.com/elastic/beats/v7/libbeat/testing" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/file" + btesting "github.com/elastic/beats/v9/libbeat/testing" ) func sendSimpleTLSRequest(t *testing.T, testURL string, useUrls bool) *beat.Event { diff --git a/heartbeat/monitors/active/http/respbody.go b/heartbeat/monitors/active/http/respbody.go index b6b57df19c87..cb4ea5a28abd 100644 --- a/heartbeat/monitors/active/http/respbody.go +++ b/heartbeat/monitors/active/http/respbody.go @@ -28,8 +28,8 @@ import ( "github.com/docker/go-units" - "github.com/elastic/beats/v7/heartbeat/reason" - "github.com/elastic/beats/v7/libbeat/mime" + "github.com/elastic/beats/v9/heartbeat/reason" + "github.com/elastic/beats/v9/libbeat/mime" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/active/http/respbody_test.go b/heartbeat/monitors/active/http/respbody_test.go index cd27e7621105..09121b7c7b93 100644 --- a/heartbeat/monitors/active/http/respbody_test.go +++ b/heartbeat/monitors/active/http/respbody_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" ) diff --git a/heartbeat/monitors/active/http/task.go b/heartbeat/monitors/active/http/task.go index 538f5f69615b..4cb4e6db2faf 100644 --- a/heartbeat/monitors/active/http/task.go +++ b/heartbeat/monitors/active/http/task.go @@ -35,19 +35,19 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain/tlsmeta" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/monitors/active/dialchain/tlsmeta" "github.com/elastic/elastic-agent-libs/transport/httpcommon" "github.com/elastic/elastic-agent-libs/transport/tlscommon" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors" - "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/reason" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/monitors/active/dialchain" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/reason" + "github.com/elastic/beats/v9/libbeat/beat" ) type requestFactory func() (*http.Request, error) diff --git a/heartbeat/monitors/active/icmp/config.go b/heartbeat/monitors/active/icmp/config.go index 331ff8f45f6c..bce2108160d2 100644 --- a/heartbeat/monitors/active/icmp/config.go +++ b/heartbeat/monitors/active/icmp/config.go @@ -20,7 +20,7 @@ package icmp import ( "time" - "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/monitors" ) type Config struct { diff --git a/heartbeat/monitors/active/icmp/icmp.go b/heartbeat/monitors/active/icmp/icmp.go index 5bb3504014ac..e112426047b1 100644 --- a/heartbeat/monitors/active/icmp/icmp.go +++ b/heartbeat/monitors/active/icmp/icmp.go @@ -22,16 +22,16 @@ import ( "net" "net/url" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/heartbeat/monitors/active/icmp/icmp_test.go b/heartbeat/monitors/active/icmp/icmp_test.go index 59ffc257505d..b2caff86b786 100644 --- a/heartbeat/monitors/active/icmp/icmp_test.go +++ b/heartbeat/monitors/active/icmp/icmp_test.go @@ -28,13 +28,13 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/v7/heartbeat/hbtest" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v9/libbeat/beat" ) func TestICMPFields(t *testing.T) { diff --git a/heartbeat/monitors/active/tcp/config.go b/heartbeat/monitors/active/tcp/config.go index b062947b6240..68330b779934 100644 --- a/heartbeat/monitors/active/tcp/config.go +++ b/heartbeat/monitors/active/tcp/config.go @@ -21,7 +21,7 @@ import ( "errors" "time" - "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/monitors" "github.com/elastic/elastic-agent-libs/transport" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/heartbeat/monitors/active/tcp/helpers_test.go b/heartbeat/monitors/active/tcp/helpers_test.go index aee494a91d71..9a45e29b7220 100644 --- a/heartbeat/monitors/active/tcp/helpers_test.go +++ b/heartbeat/monitors/active/tcp/helpers_test.go @@ -30,11 +30,11 @@ import ( conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/hbtest" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v9/libbeat/beat" ) func testTCPConfigCheck(t *testing.T, configMap mapstr.M) *beat.Event { diff --git a/heartbeat/monitors/active/tcp/socks5_test.go b/heartbeat/monitors/active/tcp/socks5_test.go index e9d1af359210..d484a9f5753d 100644 --- a/heartbeat/monitors/active/tcp/socks5_test.go +++ b/heartbeat/monitors/active/tcp/socks5_test.go @@ -28,8 +28,8 @@ import ( "github.com/armon/go-socks5" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/hbtest" - "github.com/elastic/beats/v7/heartbeat/hbtestllext" + "github.com/elastic/beats/v9/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/active/tcp/tcp.go b/heartbeat/monitors/active/tcp/tcp.go index b6a83c1dced1..2f699c03a178 100644 --- a/heartbeat/monitors/active/tcp/tcp.go +++ b/heartbeat/monitors/active/tcp/tcp.go @@ -24,16 +24,16 @@ import ( "net/url" "time" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors" - "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain" - "github.com/elastic/beats/v7/heartbeat/monitors/active/dialchain/tlsmeta" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" - "github.com/elastic/beats/v7/heartbeat/reason" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/monitors/active/dialchain" + "github.com/elastic/beats/v9/heartbeat/monitors/active/dialchain/tlsmeta" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/heartbeat/reason" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/heartbeat/monitors/active/tcp/tcp_test.go b/heartbeat/monitors/active/tcp/tcp_test.go index c5cc0dd614e6..334a15d1534f 100644 --- a/heartbeat/monitors/active/tcp/tcp_test.go +++ b/heartbeat/monitors/active/tcp/tcp_test.go @@ -33,11 +33,11 @@ import ( "github.com/elastic/go-lookslike/testslike" "github.com/elastic/go-lookslike/validator" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/hbtest" - "github.com/elastic/beats/v7/heartbeat/hbtestllext" - "github.com/elastic/beats/v7/libbeat/beat" - btesting "github.com/elastic/beats/v7/libbeat/testing" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" + "github.com/elastic/beats/v9/libbeat/beat" + btesting "github.com/elastic/beats/v9/libbeat/testing" ) func testTCPCheck(t *testing.T, host string, port uint16) *beat.Event { diff --git a/heartbeat/monitors/active/tcp/tls_test.go b/heartbeat/monitors/active/tcp/tls_test.go index 1a67a7945aea..9292fd9fcfaa 100644 --- a/heartbeat/monitors/active/tcp/tls_test.go +++ b/heartbeat/monitors/active/tcp/tls_test.go @@ -31,18 +31,18 @@ import ( conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/stretchr/testify/require" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/v7/heartbeat/hbtest" - "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/monitors" ) // Tests that we can check a TLS connection with a cert for a SAN IP diff --git a/heartbeat/monitors/factory.go b/heartbeat/monitors/factory.go index 0af168028d1a..ac09305035c5 100644 --- a/heartbeat/monitors/factory.go +++ b/heartbeat/monitors/factory.go @@ -25,20 +25,20 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/actions/addfields" - "github.com/elastic/beats/v7/libbeat/processors/add_data_stream" - "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" - "github.com/elastic/beats/v7/libbeat/processors/util" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/actions/addfields" + "github.com/elastic/beats/v9/libbeat/processors/add_data_stream" + "github.com/elastic/beats/v9/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v9/libbeat/processors/util" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" ) // RunnerFactory that can be used to create cfg.Runner cast versions of Monitor diff --git a/heartbeat/monitors/factory_test.go b/heartbeat/monitors/factory_test.go index 72db7cdf7312..8b972306b819 100644 --- a/heartbeat/monitors/factory_test.go +++ b/heartbeat/monitors/factory_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" - hbconfig "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/processors/add_data_stream" - "github.com/elastic/beats/v7/libbeat/processors/util" + hbconfig "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/processors/add_data_stream" + "github.com/elastic/beats/v9/libbeat/processors/util" ) var binfo = beat.Info{ diff --git a/heartbeat/monitors/jobs/job.go b/heartbeat/monitors/jobs/job.go index 70811478cb30..3ec268fd336c 100644 --- a/heartbeat/monitors/jobs/job.go +++ b/heartbeat/monitors/jobs/job.go @@ -18,7 +18,7 @@ package jobs import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) // A Job represents a unit of execution, and may return multiple continuation jobs. diff --git a/heartbeat/monitors/jobs/job_test.go b/heartbeat/monitors/jobs/job_test.go index c9ecf6d70c54..a0eb2cdf65f6 100644 --- a/heartbeat/monitors/jobs/job_test.go +++ b/heartbeat/monitors/jobs/job_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/jobs/testing.go b/heartbeat/monitors/jobs/testing.go index a28ca7a8002c..ad52fa0f6436 100644 --- a/heartbeat/monitors/jobs/testing.go +++ b/heartbeat/monitors/jobs/testing.go @@ -20,7 +20,7 @@ package jobs import ( "testing" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) // ExecJobsAndConts recursively executes multiple jobs. diff --git a/heartbeat/monitors/logger/logger.go b/heartbeat/monitors/logger/logger.go index 826490ae0845..a987677ca590 100644 --- a/heartbeat/monitors/logger/logger.go +++ b/heartbeat/monitors/logger/logger.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/jobsummary" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/jobsummary" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/heartbeat/monitors/logger/logger_test.go b/heartbeat/monitors/logger/logger_test.go index 18952f2652da..0c9d79ee8fe3 100644 --- a/heartbeat/monitors/logger/logger_test.go +++ b/heartbeat/monitors/logger/logger_test.go @@ -27,9 +27,9 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/jobsummary" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/jobsummary" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/mocks_test.go b/heartbeat/monitors/mocks_test.go index 103fda583a0f..9e5435723d1c 100644 --- a/heartbeat/monitors/mocks_test.go +++ b/heartbeat/monitors/mocks_test.go @@ -35,15 +35,15 @@ import ( "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/validator" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/hbtest" - "github.com/elastic/beats/v7/heartbeat/hbtestllext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/libbeat/beat" - beatversion "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/libbeat/beat" + beatversion "github.com/elastic/beats/v9/libbeat/version" ) func makeMockFactory(pluginsReg *plugin.PluginsReg) (factory *RunnerFactory, sched *scheduler.Scheduler, close func()) { diff --git a/heartbeat/monitors/monitor.go b/heartbeat/monitors/monitor.go index 2fdb64a966cf..b249b98ef2af 100644 --- a/heartbeat/monitors/monitor.go +++ b/heartbeat/monitors/monitor.go @@ -21,20 +21,20 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" "github.com/gohugoio/hashstructure" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" ) // ErrMonitorDisabled is returned when the monitor plugin is marked as disabled. diff --git a/heartbeat/monitors/monitor_test.go b/heartbeat/monitors/monitor_test.go index 7bb3b5d3fae6..db21cadc2494 100644 --- a/heartbeat/monitors/monitor_test.go +++ b/heartbeat/monitors/monitor_test.go @@ -33,9 +33,9 @@ import ( "github.com/elastic/go-lookslike/testslike" "github.com/elastic/go-lookslike/validator" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/libbeat/management/status" ) // TestMonitorBasic tests a basic config diff --git a/heartbeat/monitors/pipeline.go b/heartbeat/monitors/pipeline.go index cde1f8b9256d..24c09d76b33a 100644 --- a/heartbeat/monitors/pipeline.go +++ b/heartbeat/monitors/pipeline.go @@ -20,9 +20,9 @@ package monitors import ( "sync" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/heartbeat/monitors/pipeline_test.go b/heartbeat/monitors/pipeline_test.go index 2a7e6a24457f..3b4d9eadc89a 100644 --- a/heartbeat/monitors/pipeline_test.go +++ b/heartbeat/monitors/pipeline_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/heartbeat/monitors/plugin/plugin.go b/heartbeat/monitors/plugin/plugin.go index e8b4ab9f4a3a..300d7e5d58bd 100644 --- a/heartbeat/monitors/plugin/plugin.go +++ b/heartbeat/monitors/plugin/plugin.go @@ -25,12 +25,12 @@ import ( conf "github.com/elastic/elastic-agent-libs/config" - "github.com/elastic/beats/v7/heartbeat/hbregistry" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/heartbeat/hbregistry" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/plugin" ) // PluginFactory represents an uninstantiated plug in instance generated from a monitor config. Invoking the Make function creates a plug-in instance. diff --git a/heartbeat/monitors/stdfields/stdfields.go b/heartbeat/monitors/stdfields/stdfields.go index e83e23a7f0d5..4a3143030ae6 100644 --- a/heartbeat/monitors/stdfields/stdfields.go +++ b/heartbeat/monitors/stdfields/stdfields.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - hbconfig "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/monitors/maintwin" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + hbconfig "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/monitors/maintwin" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/heartbeat/monitors/task.go b/heartbeat/monitors/task.go index 44fa6dfa3a47..2f1f7352aab8 100644 --- a/heartbeat/monitors/task.go +++ b/heartbeat/monitors/task.go @@ -21,11 +21,11 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/task_test.go b/heartbeat/monitors/task_test.go index 37a7f4214428..35859ed3159c 100644 --- a/heartbeat/monitors/task_test.go +++ b/heartbeat/monitors/task_test.go @@ -29,9 +29,9 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/libbeat/beat" ) func Test_runPublishJob(t *testing.T) { diff --git a/heartbeat/monitors/util.go b/heartbeat/monitors/util.go index fe45e419af67..85fa50221890 100644 --- a/heartbeat/monitors/util.go +++ b/heartbeat/monitors/util.go @@ -23,11 +23,11 @@ import ( "net" "time" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/wrappers/monitorstate/esloader.go b/heartbeat/monitors/wrappers/monitorstate/esloader.go index 5705ec4b1468..fba8f04b13e1 100644 --- a/heartbeat/monitors/wrappers/monitorstate/esloader.go +++ b/heartbeat/monitors/wrappers/monitorstate/esloader.go @@ -25,9 +25,9 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" ) var DefaultDataStreams = "synthetics-*,heartbeat-*" diff --git a/heartbeat/monitors/wrappers/monitorstate/esloader_test.go b/heartbeat/monitors/wrappers/monitorstate/esloader_test.go index 88664f562c85..0d9b990501d7 100644 --- a/heartbeat/monitors/wrappers/monitorstate/esloader_test.go +++ b/heartbeat/monitors/wrappers/monitorstate/esloader_test.go @@ -33,11 +33,11 @@ import ( "github.com/elastic/go-elasticsearch/v8" "github.com/elastic/go-elasticsearch/v8/esapi" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/esutil" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/processors/util" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/esutil" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/processors/util" ) func TestStatesESLoader(t *testing.T) { diff --git a/heartbeat/monitors/wrappers/monitorstate/helpers_test.go b/heartbeat/monitors/wrappers/monitorstate/helpers_test.go index c30491c74dc4..a23e945c4408 100644 --- a/heartbeat/monitors/wrappers/monitorstate/helpers_test.go +++ b/heartbeat/monitors/wrappers/monitorstate/helpers_test.go @@ -17,6 +17,6 @@ package monitorstate -import "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" +import "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" var TestSf stdfields.StdMonitorFields = stdfields.StdMonitorFields{ID: "testID", Type: "testType"} diff --git a/heartbeat/monitors/wrappers/monitorstate/monitorstate.go b/heartbeat/monitors/wrappers/monitorstate/monitorstate.go index 56034d7ab4fd..e96a34b94dcb 100644 --- a/heartbeat/monitors/wrappers/monitorstate/monitorstate.go +++ b/heartbeat/monitors/wrappers/monitorstate/monitorstate.go @@ -22,7 +22,7 @@ import ( "regexp" "time" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" ) // FlappingThreshold defines how many consecutive checks with the same status diff --git a/heartbeat/monitors/wrappers/monitorstate/monitorstate_test.go b/heartbeat/monitors/wrappers/monitorstate/monitorstate_test.go index 5a7f4f2d6e1b..c3641e4998a9 100644 --- a/heartbeat/monitors/wrappers/monitorstate/monitorstate_test.go +++ b/heartbeat/monitors/wrappers/monitorstate/monitorstate_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" ) func TestRecordingAndFlapping(t *testing.T) { diff --git a/heartbeat/monitors/wrappers/monitorstate/testutil_test.go b/heartbeat/monitors/wrappers/monitorstate/testutil_test.go index edd0918eec9f..7ebe26577396 100644 --- a/heartbeat/monitors/wrappers/monitorstate/testutil_test.go +++ b/heartbeat/monitors/wrappers/monitorstate/testutil_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/esleg/eslegtest" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/esleg/eslegtest" "github.com/elastic/elastic-agent-libs/logp/logptest" - "github.com/elastic/beats/v7/heartbeat/esutil" + "github.com/elastic/beats/v9/heartbeat/esutil" "github.com/elastic/go-elasticsearch/v8" ) diff --git a/heartbeat/monitors/wrappers/monitorstate/tracker.go b/heartbeat/monitors/wrappers/monitorstate/tracker.go index 18a3b88753f3..d8581bfca638 100644 --- a/heartbeat/monitors/wrappers/monitorstate/tracker.go +++ b/heartbeat/monitors/wrappers/monitorstate/tracker.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/heartbeat/monitors/wrappers/monitorstate/tracker_test.go b/heartbeat/monitors/wrappers/monitorstate/tracker_test.go index fd34371ce810..6438453ee8b9 100644 --- a/heartbeat/monitors/wrappers/monitorstate/tracker_test.go +++ b/heartbeat/monitors/wrappers/monitorstate/tracker_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" ) func TestTrackerRecord(t *testing.T) { diff --git a/heartbeat/monitors/wrappers/summarizer/jobsummary/jobsummary.go b/heartbeat/monitors/wrappers/summarizer/jobsummary/jobsummary.go index 9264f33f0fac..d36685094b5f 100644 --- a/heartbeat/monitors/wrappers/summarizer/jobsummary/jobsummary.go +++ b/heartbeat/monitors/wrappers/summarizer/jobsummary/jobsummary.go @@ -20,7 +20,7 @@ package jobsummary import ( "fmt" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" ) // JobSummary is the struct that is serialized in the `summary` field in the emitted event. diff --git a/heartbeat/monitors/wrappers/summarizer/plugdrop.go b/heartbeat/monitors/wrappers/summarizer/plugdrop.go index a4ddc61abe7d..929fd3b8b29c 100644 --- a/heartbeat/monitors/wrappers/summarizer/plugdrop.go +++ b/heartbeat/monitors/wrappers/summarizer/plugdrop.go @@ -18,8 +18,8 @@ package summarizer import ( - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/libbeat/beat" ) type DropBrowserExtraEvents struct{} diff --git a/heartbeat/monitors/wrappers/summarizer/plugerr.go b/heartbeat/monitors/wrappers/summarizer/plugerr.go index 83ab6de4f5ab..e875b60d6ff9 100644 --- a/heartbeat/monitors/wrappers/summarizer/plugerr.go +++ b/heartbeat/monitors/wrappers/summarizer/plugerr.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors/logger" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors/logger" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/wrappers/summarizer/plugmondur.go b/heartbeat/monitors/wrappers/summarizer/plugmondur.go index d71cc96ff2c1..b3d389dae090 100644 --- a/heartbeat/monitors/wrappers/summarizer/plugmondur.go +++ b/heartbeat/monitors/wrappers/summarizer/plugmondur.go @@ -20,8 +20,8 @@ package summarizer import ( "time" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/libbeat/beat" ) // LightweightDurationPlugin handles the logic for writing the `monitor.duration.us` field diff --git a/heartbeat/monitors/wrappers/summarizer/plugstatestat.go b/heartbeat/monitors/wrappers/summarizer/plugstatestat.go index 1c3dc8876809..a031a9e48bb1 100644 --- a/heartbeat/monitors/wrappers/summarizer/plugstatestat.go +++ b/heartbeat/monitors/wrappers/summarizer/plugstatestat.go @@ -22,12 +22,12 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/jobsummary" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/jobsummary" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/wrappers/summarizer/plugurl.go b/heartbeat/monitors/wrappers/summarizer/plugurl.go index e47463575a31..cbaacccef6ef 100644 --- a/heartbeat/monitors/wrappers/summarizer/plugurl.go +++ b/heartbeat/monitors/wrappers/summarizer/plugurl.go @@ -18,7 +18,7 @@ package summarizer import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/wrappers/summarizer/summarizer.go b/heartbeat/monitors/wrappers/summarizer/summarizer.go index ad0902d45af7..fe3964939a1f 100644 --- a/heartbeat/monitors/wrappers/summarizer/summarizer.go +++ b/heartbeat/monitors/wrappers/summarizer/summarizer.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/logger" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/logger" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/libbeat/beat" ) // Summarizer produces summary events (with summary.* and other asssociated fields). diff --git a/heartbeat/monitors/wrappers/summarizer/summarizer_test.go b/heartbeat/monitors/wrappers/summarizer/summarizer_test.go index e579a649c8ef..a554cf1e9ebe 100644 --- a/heartbeat/monitors/wrappers/summarizer/summarizer_test.go +++ b/heartbeat/monitors/wrappers/summarizer/summarizer_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/look" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/jobsummary" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/look" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/jobsummary" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/monitors/wrappers/summarizer/summarizertesthelper/testhelper.go b/heartbeat/monitors/wrappers/summarizer/summarizertesthelper/testhelper.go index 7c8d5de23bc4..b801b4de4453 100644 --- a/heartbeat/monitors/wrappers/summarizer/summarizertesthelper/testhelper.go +++ b/heartbeat/monitors/wrappers/summarizer/summarizertesthelper/testhelper.go @@ -22,8 +22,8 @@ package summarizertesthelper // prevent import cycles. import ( - "github.com/elastic/beats/v7/heartbeat/hbtestllext" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/jobsummary" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/jobsummary" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/llpath" diff --git a/heartbeat/monitors/wrappers/summarizer/util.go b/heartbeat/monitors/wrappers/summarizer/util.go index 1fd76ffaeee0..e310a68d3670 100644 --- a/heartbeat/monitors/wrappers/summarizer/util.go +++ b/heartbeat/monitors/wrappers/summarizer/util.go @@ -17,7 +17,7 @@ package summarizer -import "github.com/elastic/beats/v7/libbeat/beat" +import "github.com/elastic/beats/v9/libbeat/beat" func synthType(event *beat.Event) string { synthType, err := event.GetValue("synthetics.type") diff --git a/heartbeat/monitors/wrappers/wrappers.go b/heartbeat/monitors/wrappers/wrappers.go index 0b5727717186..2801fd9746cf 100644 --- a/heartbeat/monitors/wrappers/wrappers.go +++ b/heartbeat/monitors/wrappers/wrappers.go @@ -26,13 +26,13 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v9/libbeat/beat" ) // WrapCommon applies the common wrappers that all monitor jobs get. diff --git a/heartbeat/monitors/wrappers/wrappers_test.go b/heartbeat/monitors/wrappers/wrappers_test.go index eb4565334342..6c62a3f44d18 100644 --- a/heartbeat/monitors/wrappers/wrappers_test.go +++ b/heartbeat/monitors/wrappers/wrappers_test.go @@ -37,16 +37,16 @@ import ( "github.com/elastic/go-lookslike/testslike" "github.com/elastic/go-lookslike/validator" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/hbtestllext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/logger" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/summarizertesthelper" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/logger" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/summarizertesthelper" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v9/libbeat/beat" ) type testDef struct { diff --git a/heartbeat/monitors/wrappers/wraputil/util.go b/heartbeat/monitors/wrappers/wraputil/util.go index fcdb1e52e423..283c6e84c3fa 100644 --- a/heartbeat/monitors/wrappers/wraputil/util.go +++ b/heartbeat/monitors/wrappers/wraputil/util.go @@ -21,9 +21,9 @@ import ( "net/url" "strconv" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/heartbeat/scheduler/schedjob_test.go b/heartbeat/scheduler/schedjob_test.go index f989014f467c..e30a732d8451 100644 --- a/heartbeat/scheduler/schedjob_test.go +++ b/heartbeat/scheduler/schedjob_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/config" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/heartbeat/scheduler/schedule/schedule.go b/heartbeat/scheduler/schedule/schedule.go index 543d0736c81f..a66cc64cb47e 100644 --- a/heartbeat/scheduler/schedule/schedule.go +++ b/heartbeat/scheduler/schedule/schedule.go @@ -22,8 +22,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule/cron" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule/cron" ) type Schedule struct { diff --git a/heartbeat/scheduler/schedule/schedule_test.go b/heartbeat/scheduler/schedule/schedule_test.go index 406dcfa77ea2..bb51d0d51e81 100644 --- a/heartbeat/scheduler/schedule/schedule_test.go +++ b/heartbeat/scheduler/schedule/schedule_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/heartbeat/scheduler/schedule/cron" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/heartbeat/scheduler/schedule/cron" ) func TestParse(t *testing.T) { diff --git a/heartbeat/scheduler/scheduler.go b/heartbeat/scheduler/scheduler.go index 354d81a82a27..fd9660e3efbf 100644 --- a/heartbeat/scheduler/scheduler.go +++ b/heartbeat/scheduler/scheduler.go @@ -27,9 +27,9 @@ import ( "golang.org/x/sync/semaphore" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/monitors/maintwin" - "github.com/elastic/beats/v7/heartbeat/scheduler/timerqueue" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/monitors/maintwin" + "github.com/elastic/beats/v9/heartbeat/scheduler/timerqueue" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/heartbeat/scheduler/scheduler_test.go b/heartbeat/scheduler/scheduler_test.go index 746518390fd5..88f2f31a3145 100644 --- a/heartbeat/scheduler/scheduler_test.go +++ b/heartbeat/scheduler/scheduler_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/monitors/maintwin" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/monitors/maintwin" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/heartbeat/scripts/mage/config.go b/heartbeat/scripts/mage/config.go index c1cc2e3f7aca..891a781b362f 100644 --- a/heartbeat/scripts/mage/config.go +++ b/heartbeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // ConfigFileParams returns the default ConfigFileParams for generating diff --git a/heartbeat/scripts/mage/package.go b/heartbeat/scripts/mage/package.go index d295fc657fa8..7a3d55838c14 100644 --- a/heartbeat/scripts/mage/package.go +++ b/heartbeat/scripts/mage/package.go @@ -22,7 +22,7 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) func init() { diff --git a/heartbeat/security/seccomp.go b/heartbeat/security/seccomp.go index 2d076b6b260e..366b8d9a18b2 100644 --- a/heartbeat/security/seccomp.go +++ b/heartbeat/security/seccomp.go @@ -20,7 +20,7 @@ package security import ( "runtime" - "github.com/elastic/beats/v7/libbeat/common/seccomp" + "github.com/elastic/beats/v9/libbeat/common/seccomp" seccomptypes "github.com/elastic/go-seccomp-bpf" ) diff --git a/libbeat/api/make_listener_posix.go b/libbeat/api/make_listener_posix.go index 5bfd17fa0b82..941d353fb6e2 100644 --- a/libbeat/api/make_listener_posix.go +++ b/libbeat/api/make_listener_posix.go @@ -25,7 +25,7 @@ import ( "net" "os" - "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v9/libbeat/api/npipe" ) func makeListener(cfg Config) (net.Listener, error) { diff --git a/libbeat/api/make_listener_windows.go b/libbeat/api/make_listener_windows.go index 3fb5a301da0e..bfa31131d6c5 100644 --- a/libbeat/api/make_listener_windows.go +++ b/libbeat/api/make_listener_windows.go @@ -24,7 +24,7 @@ import ( "fmt" "net" - "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v9/libbeat/api/npipe" ) func makeListener(cfg Config) (net.Listener, error) { diff --git a/libbeat/api/server_windows_test.go b/libbeat/api/server_windows_test.go index b40080176558..df9ce571a7b2 100644 --- a/libbeat/api/server_windows_test.go +++ b/libbeat/api/server_windows_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v9/libbeat/api/npipe" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/asset/gen/asset.go b/libbeat/asset/gen/asset.go index 4fb01d9c5357..2f7f81a6f4c6 100644 --- a/libbeat/asset/gen/asset.go +++ b/libbeat/asset/gen/asset.go @@ -27,7 +27,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) var Template = template.Must(template.New("normalizations").Parse(` @@ -38,7 +38,7 @@ var Template = template.Must(template.New("normalizations").Parse(` package {{ .Package }} import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/libbeat/autodiscover/appenders/config/config.go b/libbeat/autodiscover/appenders/config/config.go index 09e3b89b0bf0..97bf81ddc695 100644 --- a/libbeat/autodiscover/appenders/config/config.go +++ b/libbeat/autodiscover/appenders/config/config.go @@ -20,10 +20,10 @@ package config import ( "fmt" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/conditions" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/autodiscover/appenders/registry.go b/libbeat/autodiscover/appenders/registry.go index 8a3bbc2f9ab8..246a7f81f6c1 100644 --- a/libbeat/autodiscover/appenders/registry.go +++ b/libbeat/autodiscover/appenders/registry.go @@ -20,8 +20,8 @@ package appenders import ( "errors" - "github.com/elastic/beats/v7/libbeat/autodiscover" - p "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/autodiscover" + p "github.com/elastic/beats/v9/libbeat/plugin" ) type appenderPlugin struct { diff --git a/libbeat/autodiscover/autodiscover.go b/libbeat/autodiscover/autodiscover.go index 68b820e4f67b..491b565a5b38 100644 --- a/libbeat/autodiscover/autodiscover.go +++ b/libbeat/autodiscover/autodiscover.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/autodiscover/meta" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/autodiscover/meta" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/reload" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/libbeat/autodiscover/autodiscover_test.go b/libbeat/autodiscover/autodiscover_test.go index fd5723cc8a3b..914c36f8afe9 100644 --- a/libbeat/autodiscover/autodiscover_test.go +++ b/libbeat/autodiscover/autodiscover_test.go @@ -36,10 +36,10 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/libbeat/autodiscover/builder/plugin.go b/libbeat/autodiscover/builder/plugin.go index 8ad423da13fb..a2b1b2025e4e 100644 --- a/libbeat/autodiscover/builder/plugin.go +++ b/libbeat/autodiscover/builder/plugin.go @@ -20,8 +20,8 @@ package builder import ( "errors" - "github.com/elastic/beats/v7/libbeat/autodiscover" - p "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/autodiscover" + p "github.com/elastic/beats/v9/libbeat/plugin" ) type builderPlugin struct { diff --git a/libbeat/autodiscover/provider.go b/libbeat/autodiscover/provider.go index f2ca500e9b24..0357dd2558e6 100644 --- a/libbeat/autodiscover/provider.go +++ b/libbeat/autodiscover/provider.go @@ -23,7 +23,7 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cfgfile" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/libbeat/autodiscover/providers/docker/config.go b/libbeat/autodiscover/providers/docker/config.go index 86ab487a15a6..4eced37b182e 100644 --- a/libbeat/autodiscover/providers/docker/config.go +++ b/libbeat/autodiscover/providers/docker/config.go @@ -22,7 +22,7 @@ package docker import ( "time" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/autodiscover/providers/docker/docker.go b/libbeat/autodiscover/providers/docker/docker.go index dbaae875f454..db592678e9b8 100644 --- a/libbeat/autodiscover/providers/docker/docker.go +++ b/libbeat/autodiscover/providers/docker/docker.go @@ -27,9 +27,9 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/docker" diff --git a/libbeat/autodiscover/providers/docker/docker_integration_test.go b/libbeat/autodiscover/providers/docker/docker_integration_test.go index 432818dc3d9e..6d3a1badc69f 100644 --- a/libbeat/autodiscover/providers/docker/docker_integration_test.go +++ b/libbeat/autodiscover/providers/docker/docker_integration_test.go @@ -26,8 +26,8 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - dk "github.com/elastic/beats/v7/libbeat/tests/docker" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + dk "github.com/elastic/beats/v9/libbeat/tests/docker" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/libbeat/autodiscover/providers/jolokia/config.go b/libbeat/autodiscover/providers/jolokia/config.go index 57a4e31b1b26..d07cc03c4f44 100644 --- a/libbeat/autodiscover/providers/jolokia/config.go +++ b/libbeat/autodiscover/providers/jolokia/config.go @@ -20,7 +20,7 @@ package jolokia import ( "time" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/autodiscover/providers/jolokia/discovery.go b/libbeat/autodiscover/providers/jolokia/discovery.go index ac91b7004059..84aaeddc7c59 100644 --- a/libbeat/autodiscover/providers/jolokia/discovery.go +++ b/libbeat/autodiscover/providers/jolokia/discovery.go @@ -27,8 +27,8 @@ import ( "github.com/gofrs/uuid/v5" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/autodiscover/providers/jolokia/jolokia.go b/libbeat/autodiscover/providers/jolokia/jolokia.go index 6bc664dbf4ae..f607d0681010 100644 --- a/libbeat/autodiscover/providers/jolokia/jolokia.go +++ b/libbeat/autodiscover/providers/jolokia/jolokia.go @@ -22,8 +22,8 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/libbeat/autodiscover/providers/kubernetes/config.go b/libbeat/autodiscover/providers/kubernetes/config.go index 36dc117db50e..e30df8d0f56e 100644 --- a/libbeat/autodiscover/providers/kubernetes/config.go +++ b/libbeat/autodiscover/providers/kubernetes/config.go @@ -23,7 +23,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-autodiscover/kubernetes" "github.com/elastic/elastic-agent-autodiscover/kubernetes/metadata" "github.com/elastic/elastic-agent-libs/config" diff --git a/libbeat/autodiscover/providers/kubernetes/config_test.go b/libbeat/autodiscover/providers/kubernetes/config_test.go index 47469665352b..e0a7c0de0d81 100644 --- a/libbeat/autodiscover/providers/kubernetes/config_test.go +++ b/libbeat/autodiscover/providers/kubernetes/config_test.go @@ -30,7 +30,7 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-ucfg" - "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover" ) func TestConfigWithCustomBuilders(t *testing.T) { diff --git a/libbeat/autodiscover/providers/kubernetes/kubernetes.go b/libbeat/autodiscover/providers/kubernetes/kubernetes.go index dc290f6e2af1..15e8e7b35508 100644 --- a/libbeat/autodiscover/providers/kubernetes/kubernetes.go +++ b/libbeat/autodiscover/providers/kubernetes/kubernetes.go @@ -31,8 +31,8 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/kubernetes" "github.com/elastic/elastic-agent-autodiscover/kubernetes/k8skeystore" diff --git a/libbeat/autodiscover/providers/kubernetes/node_test.go b/libbeat/autodiscover/providers/kubernetes/node_test.go index f789f6849322..f9b42462604e 100644 --- a/libbeat/autodiscover/providers/kubernetes/node_test.go +++ b/libbeat/autodiscover/providers/kubernetes/node_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" k8sfake "k8s.io/client-go/kubernetes/fake" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/kubernetes" "github.com/elastic/elastic-agent-autodiscover/kubernetes/metadata" diff --git a/libbeat/autodiscover/providers/kubernetes/pod_test.go b/libbeat/autodiscover/providers/kubernetes/pod_test.go index 2d4a12a68ab0..aa24a97322a3 100644 --- a/libbeat/autodiscover/providers/kubernetes/pod_test.go +++ b/libbeat/autodiscover/providers/kubernetes/pod_test.go @@ -35,7 +35,7 @@ import ( interfaces "k8s.io/client-go/kubernetes" caches "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/kubernetes" "github.com/elastic/elastic-agent-autodiscover/kubernetes/metadata" diff --git a/libbeat/autodiscover/providers/kubernetes/service_test.go b/libbeat/autodiscover/providers/kubernetes/service_test.go index 6f2281de59e3..bfa636ca291d 100644 --- a/libbeat/autodiscover/providers/kubernetes/service_test.go +++ b/libbeat/autodiscover/providers/kubernetes/service_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" k8sfake "k8s.io/client-go/kubernetes/fake" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/kubernetes" "github.com/elastic/elastic-agent-autodiscover/kubernetes/metadata" diff --git a/libbeat/autodiscover/providers/plugin.go b/libbeat/autodiscover/providers/plugin.go index 2e413032400a..b505d5caf9de 100644 --- a/libbeat/autodiscover/providers/plugin.go +++ b/libbeat/autodiscover/providers/plugin.go @@ -20,8 +20,8 @@ package providers import ( "errors" - "github.com/elastic/beats/v7/libbeat/autodiscover" - p "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/autodiscover" + p "github.com/elastic/beats/v9/libbeat/plugin" ) type providerPlugin struct { diff --git a/libbeat/autodiscover/template/config.go b/libbeat/autodiscover/template/config.go index 2955fcc15139..a6f53db63141 100644 --- a/libbeat/autodiscover/template/config.go +++ b/libbeat/autodiscover/template/config.go @@ -25,7 +25,7 @@ import ( "github.com/elastic/go-ucfg" "github.com/elastic/go-ucfg/parse" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/conditions" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-libs/keystore" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/beat/beat.go b/libbeat/beat/beat.go index 6a30ab386dc0..3ced60443f53 100644 --- a/libbeat/beat/beat.go +++ b/libbeat/beat/beat.go @@ -18,11 +18,11 @@ package beat import ( - "github.com/elastic/beats/v7/libbeat/api" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/instrumentation" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/api" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/instrumentation" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-client/v7/pkg/proto" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/libbeat/beat/beat_test.go b/libbeat/beat/beat_test.go index d90db1123bc2..e9b60d121604 100644 --- a/libbeat/beat/beat_test.go +++ b/libbeat/beat/beat_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" "github.com/elastic/elastic-agent-libs/config" diff --git a/libbeat/beat/event.go b/libbeat/beat/event.go index f15a953493c2..1dc78c7496fa 100644 --- a/libbeat/beat/event.go +++ b/libbeat/beat/event.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/beat/events/util.go b/libbeat/beat/events/util.go index 2c2b9c201874..3b66845c354a 100644 --- a/libbeat/beat/events/util.go +++ b/libbeat/beat/events/util.go @@ -17,7 +17,7 @@ package events -import "github.com/elastic/beats/v7/libbeat/beat" +import "github.com/elastic/beats/v9/libbeat/beat" const ( // FieldMetaID defines the ID for the event. Also see FieldMetaOpType. diff --git a/libbeat/beat/events/util_test.go b/libbeat/beat/events/util_test.go index a4fbaba99572..c4d9761641f0 100644 --- a/libbeat/beat/events/util_test.go +++ b/libbeat/beat/events/util_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/cfgfile/cfgfile.go b/libbeat/cfgfile/cfgfile.go index 6870c9c57bbf..f91bc0bbd3d5 100644 --- a/libbeat/cfgfile/cfgfile.go +++ b/libbeat/cfgfile/cfgfile.go @@ -24,8 +24,8 @@ import ( "path/filepath" "sync" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/cfgfile/factories.go b/libbeat/cfgfile/factories.go index 40c9aafb2257..19f1a723ceb3 100644 --- a/libbeat/cfgfile/factories.go +++ b/libbeat/cfgfile/factories.go @@ -20,7 +20,7 @@ package cfgfile import ( "errors" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/cfgfile/list.go b/libbeat/cfgfile/list.go index f393fbdb33dc..2d1016e1dac3 100644 --- a/libbeat/cfgfile/list.go +++ b/libbeat/cfgfile/list.go @@ -24,12 +24,12 @@ import ( "github.com/gohugoio/hashstructure" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/cfgfile/list_test.go b/libbeat/cfgfile/list_test.go index e552c195ae38..651b6bae03a8 100644 --- a/libbeat/cfgfile/list_test.go +++ b/libbeat/cfgfile/list_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/libbeat/common/reload" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/libbeat/common/reload" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/cfgfile/reload.go b/libbeat/cfgfile/reload.go index 1a83e9c5a3f3..c55668079223 100644 --- a/libbeat/cfgfile/reload.go +++ b/libbeat/cfgfile/reload.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/reload" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/libbeat/cmd/completion.go b/libbeat/cmd/completion.go index 7c7ca31a0749..a30e8193f38e 100644 --- a/libbeat/cmd/completion.go +++ b/libbeat/cmd/completion.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/cmd/instance" "github.com/spf13/cobra" ) diff --git a/libbeat/cmd/export.go b/libbeat/cmd/export.go index 44bb95ab60fb..d073a4b1476b 100644 --- a/libbeat/cmd/export.go +++ b/libbeat/cmd/export.go @@ -20,8 +20,8 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/export" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/cmd/export" + "github.com/elastic/beats/v9/libbeat/cmd/instance" ) func genExportCmd(settings instance.Settings) *cobra.Command { diff --git a/libbeat/cmd/export/config.go b/libbeat/cmd/export/config.go index c89cd29d5dd5..cba601845a6a 100644 --- a/libbeat/cmd/export/config.go +++ b/libbeat/cmd/export/config.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/common/cli" ) // GenExportConfigCmd write to stdout the current configuration in the YAML format. diff --git a/libbeat/cmd/export/dashboard.go b/libbeat/cmd/export/dashboard.go index b9c1ee33e61c..5bb32ca0b4f1 100644 --- a/libbeat/cmd/export/dashboard.go +++ b/libbeat/cmd/export/dashboard.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/dashboards" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/dashboards" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/config" kbn "github.com/elastic/elastic-agent-libs/kibana" ) diff --git a/libbeat/cmd/export/export.go b/libbeat/cmd/export/export.go index e40ab32007fa..8a96c5e8482c 100644 --- a/libbeat/cmd/export/export.go +++ b/libbeat/cmd/export/export.go @@ -22,8 +22,8 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/version" libversion "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/cmd/export/ilm_policy.go b/libbeat/cmd/export/ilm_policy.go index 60c97920fd79..ad6f35863635 100644 --- a/libbeat/cmd/export/ilm_policy.go +++ b/libbeat/cmd/export/ilm_policy.go @@ -20,9 +20,9 @@ package export import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" ) // GenGetILMPolicyCmd is the command used to export the ilm policy. diff --git a/libbeat/cmd/export/index_pattern.go b/libbeat/cmd/export/index_pattern.go index 6b8b8c6839f6..4a95386df3eb 100644 --- a/libbeat/cmd/export/index_pattern.go +++ b/libbeat/cmd/export/index_pattern.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/kibana" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/kibana" libversion "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/cmd/export/template.go b/libbeat/cmd/export/template.go index ffd957961efe..950dc37f3c79 100644 --- a/libbeat/cmd/export/template.go +++ b/libbeat/cmd/export/template.go @@ -20,9 +20,9 @@ package export import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" ) // GenTemplateConfigCmd is the command used to export the elasticsearch template. diff --git a/libbeat/cmd/instance/beat.go b/libbeat/cmd/instance/beat.go index ab3ca2545127..b57dc2760c5e 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -37,34 +37,34 @@ import ( "github.com/gofrs/uuid/v5" "go.uber.org/zap" - "github.com/elastic/beats/v7/libbeat/api" - "github.com/elastic/beats/v7/libbeat/asset" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cloudid" - "github.com/elastic/beats/v7/libbeat/cmd/instance/locks" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/common/seccomp" - "github.com/elastic/beats/v7/libbeat/dashboards" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/features" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" - "github.com/elastic/beats/v7/libbeat/instrumentation" - "github.com/elastic/beats/v7/libbeat/kibana" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/monitoring/report" - "github.com/elastic/beats/v7/libbeat/monitoring/report/log" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/v7/libbeat/plugin" - "github.com/elastic/beats/v7/libbeat/pprof" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/libbeat/publisher/queue/diskqueue" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/api" + "github.com/elastic/beats/v9/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cloudid" + "github.com/elastic/beats/v9/libbeat/cmd/instance/locks" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/common/seccomp" + "github.com/elastic/beats/v9/libbeat/dashboards" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/features" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/instrumentation" + "github.com/elastic/beats/v9/libbeat/kibana" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/monitoring/report" + "github.com/elastic/beats/v9/libbeat/monitoring/report/log" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/pprof" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/publisher/queue/diskqueue" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/file" "github.com/elastic/elastic-agent-libs/filewatcher" @@ -345,7 +345,18 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) { reg := b.Monitoring.StatsRegistry().GetOrCreateRegistry("libbeat") - err = metricreport.SetupMetrics(b.Info.Logger.Named("metrics"), b.Info.Beat, version.GetDefaultVersion()) + ephemeralID, err := uuid.NewV4() + if err != nil { + return nil, err + } + err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{ + Name: b.Info.Beat, + Version: version.GetDefaultVersion(), + EphemeralID: ephemeralID.String(), + Logger: b.Info.Logger.Named("metrics"), + SystemMetrics: monitoring.Default.GetOrCreateRegistry("system"), + ProcessMetrics: monitoring.Default.GetOrCreateRegistry("beat"), + }) if err != nil { return nil, err } diff --git a/libbeat/cmd/instance/beat_integration_test.go b/libbeat/cmd/instance/beat_integration_test.go index 36fbc00fbae1..7a793d5f2cab 100644 --- a/libbeat/cmd/instance/beat_integration_test.go +++ b/libbeat/cmd/instance/beat_integration_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/mock" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/mock" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/cmd/instance/beat_test.go b/libbeat/cmd/instance/beat_test.go index 33bca3191888..815745abc240 100644 --- a/libbeat/cmd/instance/beat_test.go +++ b/libbeat/cmd/instance/beat_test.go @@ -25,12 +25,12 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/cmd/instance/imports_common.go b/libbeat/cmd/instance/imports_common.go index a5780f1b1eb3..c2e90f7eaec5 100644 --- a/libbeat/cmd/instance/imports_common.go +++ b/libbeat/cmd/instance/imports_common.go @@ -18,34 +18,34 @@ package instance import ( - _ "github.com/elastic/beats/v7/libbeat/autodiscover/appenders/config" // Register autodiscover appenders - _ "github.com/elastic/beats/v7/libbeat/autodiscover/providers/jolokia" - _ "github.com/elastic/beats/v7/libbeat/monitoring/report/elasticsearch" // Register default monitoring reporting - _ "github.com/elastic/beats/v7/libbeat/processors/actions" // Register default processors. - _ "github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" - _ "github.com/elastic/beats/v7/libbeat/processors/add_host_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_id" - _ "github.com/elastic/beats/v7/libbeat/processors/add_locale" - _ "github.com/elastic/beats/v7/libbeat/processors/add_observer_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_process_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/communityid" - _ "github.com/elastic/beats/v7/libbeat/processors/convert" - _ "github.com/elastic/beats/v7/libbeat/processors/decode_duration" - _ "github.com/elastic/beats/v7/libbeat/processors/decode_xml" - _ "github.com/elastic/beats/v7/libbeat/processors/decode_xml_wineventlog" - _ "github.com/elastic/beats/v7/libbeat/processors/dissect" - _ "github.com/elastic/beats/v7/libbeat/processors/dns" - _ "github.com/elastic/beats/v7/libbeat/processors/extract_array" - _ "github.com/elastic/beats/v7/libbeat/processors/fingerprint" - _ "github.com/elastic/beats/v7/libbeat/processors/move_fields" - _ "github.com/elastic/beats/v7/libbeat/processors/now" - _ "github.com/elastic/beats/v7/libbeat/processors/ratelimit" - _ "github.com/elastic/beats/v7/libbeat/processors/registered_domain" - _ "github.com/elastic/beats/v7/libbeat/processors/script" - _ "github.com/elastic/beats/v7/libbeat/processors/syslog" - _ "github.com/elastic/beats/v7/libbeat/processors/translate_ldap_attribute" - _ "github.com/elastic/beats/v7/libbeat/processors/translate_sid" - _ "github.com/elastic/beats/v7/libbeat/processors/urldecode" - _ "github.com/elastic/beats/v7/libbeat/publisher/includes" // Register publisher pipeline modules + _ "github.com/elastic/beats/v9/libbeat/autodiscover/appenders/config" // Register autodiscover appenders + _ "github.com/elastic/beats/v9/libbeat/autodiscover/providers/jolokia" + _ "github.com/elastic/beats/v9/libbeat/monitoring/report/elasticsearch" // Register default monitoring reporting + _ "github.com/elastic/beats/v9/libbeat/processors/actions" // Register default processors. + _ "github.com/elastic/beats/v9/libbeat/processors/add_cloud_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_formatted_index" + _ "github.com/elastic/beats/v9/libbeat/processors/add_host_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_id" + _ "github.com/elastic/beats/v9/libbeat/processors/add_locale" + _ "github.com/elastic/beats/v9/libbeat/processors/add_observer_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_process_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/communityid" + _ "github.com/elastic/beats/v9/libbeat/processors/convert" + _ "github.com/elastic/beats/v9/libbeat/processors/decode_duration" + _ "github.com/elastic/beats/v9/libbeat/processors/decode_xml" + _ "github.com/elastic/beats/v9/libbeat/processors/decode_xml_wineventlog" + _ "github.com/elastic/beats/v9/libbeat/processors/dissect" + _ "github.com/elastic/beats/v9/libbeat/processors/dns" + _ "github.com/elastic/beats/v9/libbeat/processors/extract_array" + _ "github.com/elastic/beats/v9/libbeat/processors/fingerprint" + _ "github.com/elastic/beats/v9/libbeat/processors/move_fields" + _ "github.com/elastic/beats/v9/libbeat/processors/now" + _ "github.com/elastic/beats/v9/libbeat/processors/ratelimit" + _ "github.com/elastic/beats/v9/libbeat/processors/registered_domain" + _ "github.com/elastic/beats/v9/libbeat/processors/script" + _ "github.com/elastic/beats/v9/libbeat/processors/syslog" + _ "github.com/elastic/beats/v9/libbeat/processors/translate_ldap_attribute" + _ "github.com/elastic/beats/v9/libbeat/processors/translate_sid" + _ "github.com/elastic/beats/v9/libbeat/processors/urldecode" + _ "github.com/elastic/beats/v9/libbeat/publisher/includes" // Register publisher pipeline modules ) diff --git a/libbeat/cmd/instance/imports_docker.go b/libbeat/cmd/instance/imports_docker.go index 95f317a72938..fea412935b73 100644 --- a/libbeat/cmd/instance/imports_docker.go +++ b/libbeat/cmd/instance/imports_docker.go @@ -20,8 +20,8 @@ package instance import ( - _ "github.com/elastic/beats/v7/libbeat/autodiscover/providers/docker" // Register autodiscover providers - _ "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - _ "github.com/elastic/beats/v7/libbeat/processors/add_docker_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" + _ "github.com/elastic/beats/v9/libbeat/autodiscover/providers/docker" // Register autodiscover providers + _ "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + _ "github.com/elastic/beats/v9/libbeat/processors/add_docker_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_kubernetes_metadata" ) diff --git a/libbeat/cmd/instance/keystore_nofips.go b/libbeat/cmd/instance/keystore_nofips.go index 44b7e6813c35..fd540e084b33 100644 --- a/libbeat/cmd/instance/keystore_nofips.go +++ b/libbeat/cmd/instance/keystore_nofips.go @@ -22,7 +22,7 @@ package instance import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" "github.com/elastic/elastic-agent-libs/paths" diff --git a/libbeat/cmd/instance/locks/lock.go b/libbeat/cmd/instance/locks/lock.go index 529d0cece0f6..4d9a53d6f8a3 100644 --- a/libbeat/cmd/instance/locks/lock.go +++ b/libbeat/cmd/instance/locks/lock.go @@ -23,7 +23,7 @@ import ( "github.com/gofrs/flock" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/libbeat/cmd/instance/locks/lock_test.go b/libbeat/cmd/instance/locks/lock_test.go index f2d5d77d2a8d..69d4cd1e445b 100644 --- a/libbeat/cmd/instance/locks/lock_test.go +++ b/libbeat/cmd/instance/locks/lock_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/libbeat/cmd/instance/settings.go b/libbeat/cmd/instance/settings.go index d73596105046..bd2e8d9aae74 100644 --- a/libbeat/cmd/instance/settings.go +++ b/libbeat/cmd/instance/settings.go @@ -20,11 +20,11 @@ package instance import ( "github.com/spf13/pflag" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" - "github.com/elastic/beats/v7/libbeat/monitoring/report" - "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/monitoring/report" + "github.com/elastic/beats/v9/libbeat/publisher/processing" ) // Settings contains basic settings for any beat to pass into GenRootCmd diff --git a/libbeat/cmd/keystore.go b/libbeat/cmd/keystore.go index f6ef52b80897..2b426d2715f7 100644 --- a/libbeat/cmd/keystore.go +++ b/libbeat/cmd/keystore.go @@ -29,9 +29,9 @@ import ( "github.com/spf13/cobra" "golang.org/x/term" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/common/cli" - "github.com/elastic/beats/v7/libbeat/common/terminal" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/common/cli" + "github.com/elastic/beats/v9/libbeat/common/terminal" "github.com/elastic/elastic-agent-libs/keystore" ) diff --git a/libbeat/cmd/keystore_fips.go b/libbeat/cmd/keystore_fips.go index 03c9df2211d6..320bd45bda6f 100644 --- a/libbeat/cmd/keystore_fips.go +++ b/libbeat/cmd/keystore_fips.go @@ -22,7 +22,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/cmd/instance" ) // genKeystoreCmd returns nil in fips mode as the keystore is disabled. diff --git a/libbeat/cmd/keystore_nofips.go b/libbeat/cmd/keystore_nofips.go index 0aa2fed6074a..556bf25311de 100644 --- a/libbeat/cmd/keystore_nofips.go +++ b/libbeat/cmd/keystore_nofips.go @@ -22,7 +22,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/cmd/instance" ) // genKeystoreCmd initialize the Keystore command to manage the Keystore diff --git a/libbeat/cmd/modules.go b/libbeat/cmd/modules.go index 2accdf7a46f6..007427345c69 100644 --- a/libbeat/cmd/modules.go +++ b/libbeat/cmd/modules.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cmd/instance" ) // ModulesManager interface provides all actions needed to implement modules command diff --git a/libbeat/cmd/root.go b/libbeat/cmd/root.go index 1bd4f694ddab..169eea7dbbda 100644 --- a/libbeat/cmd/root.go +++ b/libbeat/cmd/root.go @@ -23,11 +23,11 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/licenser" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/licenser" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" ) // BeatsRootCmd handles all application command line interface, parses user diff --git a/libbeat/cmd/run.go b/libbeat/cmd/run.go index b078aadaf89c..fc80a6d9cd31 100644 --- a/libbeat/cmd/run.go +++ b/libbeat/cmd/run.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cmd/instance" ) func genRunCmd(settings instance.Settings, beatCreator beat.Creator) *cobra.Command { diff --git a/libbeat/cmd/setup.go b/libbeat/cmd/setup.go index 64d1f41fdeaf..979873c9c30e 100644 --- a/libbeat/cmd/setup.go +++ b/libbeat/cmd/setup.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cmd/instance" ) const ( diff --git a/libbeat/cmd/test.go b/libbeat/cmd/test.go index 95b07ff4ac70..bbeee0243a2a 100644 --- a/libbeat/cmd/test.go +++ b/libbeat/cmd/test.go @@ -20,9 +20,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/cmd/test" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/cmd/test" ) func genTestCmd(settings instance.Settings, beatCreator beat.Creator) *cobra.Command { diff --git a/libbeat/cmd/test/config.go b/libbeat/cmd/test/config.go index 0adef4da1e40..324ebc6553bf 100644 --- a/libbeat/cmd/test/config.go +++ b/libbeat/cmd/test/config.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cmd/instance" ) func GenTestConfigCmd(settings instance.Settings, beatCreator beat.Creator) *cobra.Command { diff --git a/libbeat/cmd/test/output.go b/libbeat/cmd/test/output.go index dc29c71f5711..daee7ce386d7 100644 --- a/libbeat/cmd/test/output.go +++ b/libbeat/cmd/test/output.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/outputs" "github.com/elastic/elastic-agent-libs/testing" ) diff --git a/libbeat/cmd/version.go b/libbeat/cmd/version.go index 05246aa87532..bf8052acc66b 100644 --- a/libbeat/cmd/version.go +++ b/libbeat/cmd/version.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/common/cli" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/common/cli" + "github.com/elastic/beats/v9/libbeat/version" ) // GenVersionCmd generates the command version for a Beat. diff --git a/libbeat/common/acker/acker.go b/libbeat/common/acker/acker.go index 47c019a576f1..e0286ae8ea7f 100644 --- a/libbeat/common/acker/acker.go +++ b/libbeat/common/acker/acker.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) // Nil creates an ACKer that does nothing. diff --git a/libbeat/common/acker/acker_test.go b/libbeat/common/acker/acker_test.go index 6e1098198377..7654d7f5506c 100644 --- a/libbeat/common/acker/acker_test.go +++ b/libbeat/common/acker/acker_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type fakeACKer struct { diff --git a/libbeat/common/cfgtype/byte_size.go b/libbeat/common/cfgtype/byte_size.go index ff6e88dfd867..f99fce95c974 100644 --- a/libbeat/common/cfgtype/byte_size.go +++ b/libbeat/common/cfgtype/byte_size.go @@ -22,7 +22,7 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/common/cleanup/cleanup_test.go b/libbeat/common/cleanup/cleanup_test.go index 6b45b9de0f59..4ccefef77304 100644 --- a/libbeat/common/cleanup/cleanup_test.go +++ b/libbeat/common/cleanup/cleanup_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/cleanup" + "github.com/elastic/beats/v9/libbeat/common/cleanup" ) func TestIfBool(t *testing.T) { diff --git a/libbeat/common/datetime.go b/libbeat/common/datetime.go index f84705f24894..62a7b2cd728d 100644 --- a/libbeat/common/datetime.go +++ b/libbeat/common/datetime.go @@ -25,7 +25,7 @@ import ( "hash" "time" - "github.com/elastic/beats/v7/libbeat/common/dtfmt" + "github.com/elastic/beats/v9/libbeat/common/dtfmt" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/common/flowhash/examples/example.go b/libbeat/common/flowhash/examples/example.go index 7930f0ea4633..af2986f6066e 100644 --- a/libbeat/common/flowhash/examples/example.go +++ b/libbeat/common/flowhash/examples/example.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/elastic/beats/v7/libbeat/common/flowhash" + "github.com/elastic/beats/v9/libbeat/common/flowhash" ) // ExampleCommunityIDHash shows example usage for flowhash.CommunityID.Hash() diff --git a/libbeat/common/fmtstr/formatevents.go b/libbeat/common/fmtstr/formatevents.go index 52ae7b65057e..1032123b64f0 100644 --- a/libbeat/common/fmtstr/formatevents.go +++ b/libbeat/common/fmtstr/formatevents.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/dtfmt" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/dtfmt" ) // EventFormatString implements format string support on events diff --git a/libbeat/common/fmtstr/formatevents_test.go b/libbeat/common/fmtstr/formatevents_test.go index d9079001a20c..287e21274f19 100644 --- a/libbeat/common/fmtstr/formatevents_test.go +++ b/libbeat/common/fmtstr/formatevents_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/fmtstr/formattimestamp.go b/libbeat/common/fmtstr/formattimestamp.go index 30e6df8b35e6..c0d1b3a07d4b 100644 --- a/libbeat/common/fmtstr/formattimestamp.go +++ b/libbeat/common/fmtstr/formattimestamp.go @@ -20,7 +20,7 @@ package fmtstr import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/jsontransform/expand.go b/libbeat/common/jsontransform/expand.go index be07c4200740..ff1a2e5512fc 100644 --- a/libbeat/common/jsontransform/expand.go +++ b/libbeat/common/jsontransform/expand.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/jsontransform/jsonhelper.go b/libbeat/common/jsontransform/jsonhelper.go index 15d70ae929ac..fcede1abae96 100644 --- a/libbeat/common/jsontransform/jsonhelper.go +++ b/libbeat/common/jsontransform/jsonhelper.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/jsontransform/jsonhelper_test.go b/libbeat/common/jsontransform/jsonhelper_test.go index c8791b3c6107..797d6e873ede 100644 --- a/libbeat/common/jsontransform/jsonhelper_test.go +++ b/libbeat/common/jsontransform/jsonhelper_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/reload/reload.go b/libbeat/common/reload/reload.go index 66c716a5ddae..efd914e25409 100644 --- a/libbeat/common/reload/reload.go +++ b/libbeat/common/reload/reload.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/schema/mapstriface/mapstriface.go b/libbeat/common/schema/mapstriface/mapstriface.go index fc14e04cf42c..f50f36fd8b4a 100644 --- a/libbeat/common/schema/mapstriface/mapstriface.go +++ b/libbeat/common/schema/mapstriface/mapstriface.go @@ -76,8 +76,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/schema" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/schema/mapstriface/mapstriface_test.go b/libbeat/common/schema/mapstriface/mapstriface_test.go index 9a357a735f7e..915b46506729 100644 --- a/libbeat/common/schema/mapstriface/mapstriface_test.go +++ b/libbeat/common/schema/mapstriface/mapstriface_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v9/libbeat/common" + s "github.com/elastic/beats/v9/libbeat/common/schema" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/schema/mapstrstr/mapstrstr.go b/libbeat/common/schema/mapstrstr/mapstrstr.go index 8bde7d6f221c..90937da4d260 100644 --- a/libbeat/common/schema/mapstrstr/mapstrstr.go +++ b/libbeat/common/schema/mapstrstr/mapstrstr.go @@ -62,8 +62,8 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/schema" ) // toBool converts value to bool. In case of error, returns false diff --git a/libbeat/common/schema/mapstrstr/mapstrstr_test.go b/libbeat/common/schema/mapstrstr/mapstrstr_test.go index 1d2e58c57ff6..20ab77c41278 100644 --- a/libbeat/common/schema/mapstrstr/mapstrstr_test.go +++ b/libbeat/common/schema/mapstrstr/mapstrstr_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v9/libbeat/common" + s "github.com/elastic/beats/v9/libbeat/common/schema" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/common/seccomp/policy.go.tpl b/libbeat/common/seccomp/policy.go.tpl index 4c4667109def..16571b61b978 100644 --- a/libbeat/common/seccomp/policy.go.tpl +++ b/libbeat/common/seccomp/policy.go.tpl @@ -7,7 +7,7 @@ package {{.Package}} import ( "github.com/elastic/go-seccomp-bpf" - beat "github.com/elastic/beats/v7/libbeat/common/seccomp" + beat "github.com/elastic/beats/v9/libbeat/common/seccomp" ) func init() { diff --git a/libbeat/common/streambuf/net.go b/libbeat/common/streambuf/net.go index d6db9d4337d6..bb4b189e521a 100644 --- a/libbeat/common/streambuf/net.go +++ b/libbeat/common/streambuf/net.go @@ -20,7 +20,7 @@ package streambuf // read integers in network byte order import ( - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) // Parse 8bit binary value from Buffer. diff --git a/libbeat/conditions/conditions.go b/libbeat/conditions/conditions.go index 232a960cf075..cbf29e35c38f 100644 --- a/libbeat/conditions/conditions.go +++ b/libbeat/conditions/conditions.go @@ -20,7 +20,7 @@ package conditions import ( "errors" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/conditions/conditions_benchmarks_test.go b/libbeat/conditions/conditions_benchmarks_test.go index 4b2a1e785170..0b95421ffb18 100644 --- a/libbeat/conditions/conditions_benchmarks_test.go +++ b/libbeat/conditions/conditions_benchmarks_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/conditions/conditions_test.go b/libbeat/conditions/conditions_test.go index 2a31bb209d71..96ddbdf0faaf 100644 --- a/libbeat/conditions/conditions_test.go +++ b/libbeat/conditions/conditions_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/conditions/matcher.go b/libbeat/conditions/matcher.go index 9ef2f5a74531..8929c6716653 100644 --- a/libbeat/conditions/matcher.go +++ b/libbeat/conditions/matcher.go @@ -20,7 +20,7 @@ package conditions import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/conditions/matcher_test.go b/libbeat/conditions/matcher_test.go index fe770f28dfae..5416493eb780 100644 --- a/libbeat/conditions/matcher_test.go +++ b/libbeat/conditions/matcher_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/conditions/network_test.go b/libbeat/conditions/network_test.go index ded14a52b5b0..cd46d3ca2f9e 100644 --- a/libbeat/conditions/network_test.go +++ b/libbeat/conditions/network_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/conditions/range_test.go b/libbeat/conditions/range_test.go index d28451081b7e..e124f6497e75 100644 --- a/libbeat/conditions/range_test.go +++ b/libbeat/conditions/range_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/dashboards/dashboards.go b/libbeat/dashboards/dashboards.go index 3284d3a59e50..18e7efd71c43 100644 --- a/libbeat/dashboards/dashboards.go +++ b/libbeat/dashboards/dashboards.go @@ -23,7 +23,7 @@ import ( "fmt" "path/filepath" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" diff --git a/libbeat/dashboards/kibana_loader.go b/libbeat/dashboards/kibana_loader.go index b178adb88de0..5cd2d0b1e3a2 100644 --- a/libbeat/dashboards/kibana_loader.go +++ b/libbeat/dashboards/kibana_loader.go @@ -27,8 +27,8 @@ import ( "path/filepath" "time" - "github.com/elastic/beats/v7/libbeat/beat" - beatversion "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/beat" + beatversion "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/kibana" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/ebpf/seccomp_linux.go b/libbeat/ebpf/seccomp_linux.go index 9059eb0f6433..dc00d5150647 100644 --- a/libbeat/ebpf/seccomp_linux.go +++ b/libbeat/ebpf/seccomp_linux.go @@ -22,7 +22,7 @@ package ebpf import ( "runtime" - "github.com/elastic/beats/v7/libbeat/common/seccomp" + "github.com/elastic/beats/v9/libbeat/common/seccomp" ) func init() { diff --git a/libbeat/esleg/eslegclient/config.go b/libbeat/esleg/eslegclient/config.go index 11b9bd2e653a..5f476402af43 100644 --- a/libbeat/esleg/eslegclient/config.go +++ b/libbeat/esleg/eslegclient/config.go @@ -20,7 +20,7 @@ package eslegclient import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/transport/kerberos" + "github.com/elastic/beats/v9/libbeat/common/transport/kerberos" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) diff --git a/libbeat/esleg/eslegclient/connection.go b/libbeat/esleg/eslegclient/connection.go index 1d2116648a8d..3301485d6523 100644 --- a/libbeat/esleg/eslegclient/connection.go +++ b/libbeat/esleg/eslegclient/connection.go @@ -30,10 +30,10 @@ import ( "go.elastic.co/apm/module/apmelasticsearch/v2" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/productorigin" - "github.com/elastic/beats/v7/libbeat/common/transport/kerberos" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/productorigin" + "github.com/elastic/beats/v9/libbeat/common/transport/kerberos" + "github.com/elastic/beats/v9/libbeat/version" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/testing" diff --git a/libbeat/esleg/eslegclient/connection_integration_test.go b/libbeat/esleg/eslegclient/connection_integration_test.go index 6488b5b93155..b50faaf17791 100644 --- a/libbeat/esleg/eslegclient/connection_integration_test.go +++ b/libbeat/esleg/eslegclient/connection_integration_test.go @@ -32,7 +32,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/esleg/eslegtest" + "github.com/elastic/beats/v9/libbeat/esleg/eslegtest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/esleg/eslegclient/connection_test.go b/libbeat/esleg/eslegclient/connection_test.go index d08ff412ff60..d471b5d13431 100644 --- a/libbeat/esleg/eslegclient/connection_test.go +++ b/libbeat/esleg/eslegclient/connection_test.go @@ -37,8 +37,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/common/productorigin" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/common/productorigin" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/esleg/eslegclient/enc.go b/libbeat/esleg/eslegclient/enc.go index c8a3d0182bc6..032ff876df47 100644 --- a/libbeat/esleg/eslegclient/enc.go +++ b/libbeat/esleg/eslegclient/enc.go @@ -27,8 +27,8 @@ import ( "github.com/klauspost/compress/gzip" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs/codec" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-structform/gotype" "github.com/elastic/go-structform/json" diff --git a/libbeat/esleg/eslegclient/enc_test.go b/libbeat/esleg/eslegclient/enc_test.go index 4f1cb9055f01..fa7a8321b00e 100644 --- a/libbeat/esleg/eslegclient/enc_test.go +++ b/libbeat/esleg/eslegclient/enc_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/monitoring/report" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/idxmgmt/client_handler.go b/libbeat/idxmgmt/client_handler.go index b97bd1cc860e..9c9095408620 100644 --- a/libbeat/idxmgmt/client_handler.go +++ b/libbeat/idxmgmt/client_handler.go @@ -20,9 +20,9 @@ package idxmgmt import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" - "github.com/elastic/beats/v7/libbeat/template" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/template" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/idxmgmt/idxmgmt.go b/libbeat/idxmgmt/idxmgmt.go index 399a2b6cb408..cf8b44d410db 100644 --- a/libbeat/idxmgmt/idxmgmt.go +++ b/libbeat/idxmgmt/idxmgmt.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/template" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/template" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/idxmgmt/index_support.go b/libbeat/idxmgmt/index_support.go index 60d1b72364eb..02cf074233ac 100644 --- a/libbeat/idxmgmt/index_support.go +++ b/libbeat/idxmgmt/index_support.go @@ -23,12 +23,12 @@ import ( "strings" "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outil" - "github.com/elastic/beats/v7/libbeat/template" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/template" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/idxmgmt/lifecycle/client_handler.go b/libbeat/idxmgmt/lifecycle/client_handler.go index 12d860cef8bc..ed15ba2be88e 100644 --- a/libbeat/idxmgmt/lifecycle/client_handler.go +++ b/libbeat/idxmgmt/lifecycle/client_handler.go @@ -23,7 +23,7 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/idxmgmt/lifecycle/client_handler_integration_test.go b/libbeat/idxmgmt/lifecycle/client_handler_integration_test.go index 8e0c952314ad..a4c6727ca386 100644 --- a/libbeat/idxmgmt/lifecycle/client_handler_integration_test.go +++ b/libbeat/idxmgmt/lifecycle/client_handler_integration_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/idxmgmt/lifecycle/config.go b/libbeat/idxmgmt/lifecycle/config.go index 5d1f4e9435ba..00ea6ecd627c 100644 --- a/libbeat/idxmgmt/lifecycle/config.go +++ b/libbeat/idxmgmt/lifecycle/config.go @@ -18,8 +18,8 @@ package lifecycle import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/idxmgmt/lifecycle/es_client_handler.go b/libbeat/idxmgmt/lifecycle/es_client_handler.go index 84f2a4ac5cd7..1f9cf6141448 100644 --- a/libbeat/idxmgmt/lifecycle/es_client_handler.go +++ b/libbeat/idxmgmt/lifecycle/es_client_handler.go @@ -22,7 +22,7 @@ import ( "fmt" "net/http" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/idxmgmt/lifecycle/es_client_test.go b/libbeat/idxmgmt/lifecycle/es_client_test.go index 400285db2d6d..1d493838d5af 100644 --- a/libbeat/idxmgmt/lifecycle/es_client_test.go +++ b/libbeat/idxmgmt/lifecycle/es_client_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" diff --git a/libbeat/idxmgmt/lifecycle/file_client_handler.go b/libbeat/idxmgmt/lifecycle/file_client_handler.go index 699d60ba6383..e57f37e3e80e 100644 --- a/libbeat/idxmgmt/lifecycle/file_client_handler.go +++ b/libbeat/idxmgmt/lifecycle/file_client_handler.go @@ -20,7 +20,7 @@ package lifecycle import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/idxmgmt/lifecycle/ilm.go b/libbeat/idxmgmt/lifecycle/ilm.go index a231db2a6f35..89bdcd9827d0 100644 --- a/libbeat/idxmgmt/lifecycle/ilm.go +++ b/libbeat/idxmgmt/lifecycle/ilm.go @@ -20,8 +20,8 @@ package lifecycle import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/idxmgmt/lifecycle/ilm_test.go b/libbeat/idxmgmt/lifecycle/ilm_test.go index 24df5ae7bbe3..68aac6f155cb 100644 --- a/libbeat/idxmgmt/lifecycle/ilm_test.go +++ b/libbeat/idxmgmt/lifecycle/ilm_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) func TestDefaultSupport_Init(t *testing.T) { diff --git a/libbeat/idxmgmt/lifecycle/noop_manager.go b/libbeat/idxmgmt/lifecycle/noop_manager.go index 6311d0dd2bbc..05acbd650acf 100644 --- a/libbeat/idxmgmt/lifecycle/noop_manager.go +++ b/libbeat/idxmgmt/lifecycle/noop_manager.go @@ -18,7 +18,7 @@ package lifecycle import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type noopSupport struct{} diff --git a/libbeat/idxmgmt/mock_manager_test.go b/libbeat/idxmgmt/mock_manager_test.go index 34fc29d13af2..3e756ccd8411 100644 --- a/libbeat/idxmgmt/mock_manager_test.go +++ b/libbeat/idxmgmt/mock_manager_test.go @@ -20,8 +20,8 @@ package idxmgmt import ( "github.com/stretchr/testify/mock" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/idxmgmt/std_test.go b/libbeat/idxmgmt/std_test.go index 970fa51cda35..0ef14d987dce 100644 --- a/libbeat/idxmgmt/std_test.go +++ b/libbeat/idxmgmt/std_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" - "github.com/elastic/beats/v7/libbeat/mapping" - "github.com/elastic/beats/v7/libbeat/template" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/template" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/instrumentation/instrumentation_test.go b/libbeat/instrumentation/instrumentation_test.go index 3d8c2240d279..013f0cc9cfd9 100644 --- a/libbeat/instrumentation/instrumentation_test.go +++ b/libbeat/instrumentation/instrumentation_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/internal/testutil/util.go b/libbeat/internal/testutil/util.go index a44becb70081..70ba60c0d37c 100644 --- a/libbeat/internal/testutil/util.go +++ b/libbeat/internal/testutil/util.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/kibana/fields_transformer.go b/libbeat/kibana/fields_transformer.go index 92f821b668fe..23462eb5fde5 100644 --- a/libbeat/kibana/fields_transformer.go +++ b/libbeat/kibana/fields_transformer.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/mapping" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/kibana/fields_transformer_test.go b/libbeat/kibana/fields_transformer_test.go index b508facf558a..8b068dd26a66 100644 --- a/libbeat/kibana/fields_transformer_test.go +++ b/libbeat/kibana/fields_transformer_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/mapping" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/kibana/index_pattern_generator.go b/libbeat/kibana/index_pattern_generator.go index 98e5e3bb8dbe..1f20302c58e0 100644 --- a/libbeat/kibana/index_pattern_generator.go +++ b/libbeat/kibana/index_pattern_generator.go @@ -24,7 +24,7 @@ import ( "path/filepath" "regexp" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/mapping" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/libbeat.go b/libbeat/libbeat.go index 70ebf26a5160..05b73e5d9583 100644 --- a/libbeat/libbeat.go +++ b/libbeat/libbeat.go @@ -20,8 +20,8 @@ package main import ( "os" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/mock" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/mock" ) var RootCmd = cmd.GenRootCmdWithSettings(mock.New, mock.Settings) diff --git a/libbeat/libbeat_test.go b/libbeat/libbeat_test.go index e4bac5e309de..92d8a4038083 100644 --- a/libbeat/libbeat_test.go +++ b/libbeat/libbeat_test.go @@ -21,7 +21,7 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v9/libbeat/tests/system/template" ) var systemTest *bool diff --git a/libbeat/licenser/elastic_fetcher.go b/libbeat/licenser/elastic_fetcher.go index af4091348390..48c74a2db3ee 100644 --- a/libbeat/licenser/elastic_fetcher.go +++ b/libbeat/licenser/elastic_fetcher.go @@ -24,7 +24,7 @@ import ( "fmt" "net/http" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/licenser/elastic_fetcher_integration_test.go b/libbeat/licenser/elastic_fetcher_integration_test.go index 51c6d493f12c..cd6d92ca8f99 100644 --- a/libbeat/licenser/elastic_fetcher_integration_test.go +++ b/libbeat/licenser/elastic_fetcher_integration_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/cli" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/common/cli" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) diff --git a/libbeat/licenser/elastic_fetcher_test.go b/libbeat/licenser/elastic_fetcher_test.go index b006e06652ce..cd654c5a35d3 100644 --- a/libbeat/licenser/elastic_fetcher_test.go +++ b/libbeat/licenser/elastic_fetcher_test.go @@ -26,8 +26,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/stretchr/testify/assert" diff --git a/libbeat/licenser/es_callback.go b/libbeat/licenser/es_callback.go index 3af04a8ca841..9bfc339a4961 100644 --- a/libbeat/licenser/es_callback.go +++ b/libbeat/licenser/es_callback.go @@ -20,7 +20,7 @@ package licenser import ( "fmt" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/magefile.go b/libbeat/magefile.go index 5c4b7ada17ea..021a4c62ad11 100644 --- a/libbeat/magefile.go +++ b/libbeat/magefile.go @@ -24,17 +24,17 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/libbeat/management/management.go b/libbeat/management/management.go index 05ce7812734e..ef41888868fc 100644 --- a/libbeat/management/management.go +++ b/libbeat/management/management.go @@ -20,8 +20,8 @@ package management import ( "sync" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/mock/mockbeat.go b/libbeat/mock/mockbeat.go index c67468f86769..e18019bcf2da 100644 --- a/libbeat/mock/mockbeat.go +++ b/libbeat/mock/mockbeat.go @@ -20,8 +20,8 @@ package mock import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cmd/instance" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/monitoring/report/elasticsearch/client.go b/libbeat/monitoring/report/elasticsearch/client.go index c401aaf2a10a..76533493dd00 100644 --- a/libbeat/monitoring/report/elasticsearch/client.go +++ b/libbeat/monitoring/report/elasticsearch/client.go @@ -27,10 +27,10 @@ import ( "go.elastic.co/apm/v2" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/monitoring/report" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/monitoring/report" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/testing" diff --git a/libbeat/monitoring/report/elasticsearch/elasticsearch.go b/libbeat/monitoring/report/elasticsearch/elasticsearch.go index baab7cf85bf0..c3da1d0788e8 100644 --- a/libbeat/monitoring/report/elasticsearch/elasticsearch.go +++ b/libbeat/monitoring/report/elasticsearch/elasticsearch.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/monitoring/report" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/monitoring/report" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/publisher/processing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/monitoring/report/elasticsearch/elasticsearch_test.go b/libbeat/monitoring/report/elasticsearch/elasticsearch_test.go index a0b294253a59..0855cf7caf0a 100644 --- a/libbeat/monitoring/report/elasticsearch/elasticsearch_test.go +++ b/libbeat/monitoring/report/elasticsearch/elasticsearch_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/monitoring/report" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/monitoring/report/log/log.go b/libbeat/monitoring/report/log/log.go index 1e203bb30c03..2708aa9f2f54 100644 --- a/libbeat/monitoring/report/log/log.go +++ b/libbeat/monitoring/report/log/log.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/monitoring/report" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/monitoring/report/log/log_test.go b/libbeat/monitoring/report/log/log_test.go index 3063e9e068f6..24c21a974cef 100644 --- a/libbeat/monitoring/report/log/log_test.go +++ b/libbeat/monitoring/report/log/log_test.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/monitoring/report/report.go b/libbeat/monitoring/report/report.go index 1eed75998409..c505562005e6 100644 --- a/libbeat/monitoring/report/report.go +++ b/libbeat/monitoring/report/report.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/otelbeat/beatconverter/beatconverter.go b/libbeat/otelbeat/beatconverter/beatconverter.go index 8bd6f36d9dcc..b8fe31c440b3 100644 --- a/libbeat/otelbeat/beatconverter/beatconverter.go +++ b/libbeat/otelbeat/beatconverter/beatconverter.go @@ -23,8 +23,8 @@ import ( "go.opentelemetry.io/collector/confmap" - "github.com/elastic/beats/v7/libbeat/cloudid" - elasticsearchtranslate "github.com/elastic/beats/v7/libbeat/otelbeat/oteltranslate/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/cloudid" + elasticsearchtranslate "github.com/elastic/beats/v9/libbeat/otelbeat/oteltranslate/outputs/elasticsearch" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/otelbeat/helper.go b/libbeat/otelbeat/helper.go index dda3ca219828..da955083f689 100644 --- a/libbeat/otelbeat/helper.go +++ b/libbeat/otelbeat/helper.go @@ -20,8 +20,8 @@ package otelbeat import ( "fmt" - "github.com/elastic/beats/v7/libbeat/otelbeat/providers/fbprovider" - "github.com/elastic/beats/v7/libbeat/otelbeat/providers/mbprovider" + "github.com/elastic/beats/v9/libbeat/otelbeat/providers/fbprovider" + "github.com/elastic/beats/v9/libbeat/otelbeat/providers/mbprovider" "go.opentelemetry.io/collector/confmap" ) diff --git a/libbeat/otelbeat/otelmap/otelmap.go b/libbeat/otelbeat/otelmap/otelmap.go index 45e2e913f4e5..99ea7e3005ed 100644 --- a/libbeat/otelbeat/otelmap/otelmap.go +++ b/libbeat/otelbeat/otelmap/otelmap.go @@ -25,7 +25,7 @@ import ( "reflect" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/libbeat/otelbeat/otelmap/otelmap_test.go b/libbeat/otelbeat/otelmap/otelmap_test.go index b7cd618edfa3..c261d0e6207b 100644 --- a/libbeat/otelbeat/otelmap/otelmap_test.go +++ b/libbeat/otelbeat/otelmap/otelmap_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go b/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go index a5acf63c89ef..742e06f127fa 100644 --- a/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go +++ b/libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go @@ -27,11 +27,11 @@ import ( "github.com/go-viper/mapstructure/v2" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/transport/kerberos" - oteltranslate "github.com/elastic/beats/v7/libbeat/otelbeat/oteltranslate" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/transport/kerberos" + oteltranslate "github.com/elastic/beats/v9/libbeat/otelbeat/oteltranslate" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/otelbeat/oteltranslate/tls_otel.go b/libbeat/otelbeat/oteltranslate/tls_otel.go index 4dd5b40f3911..0008956ff13e 100644 --- a/libbeat/otelbeat/oteltranslate/tls_otel.go +++ b/libbeat/otelbeat/oteltranslate/tls_otel.go @@ -27,7 +27,7 @@ import ( "github.com/go-viper/mapstructure/v2" "go.opentelemetry.io/collector/config/configtls" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/tlscommon" diff --git a/libbeat/otelbeat/providers/fbprovider/fbprovider.go b/libbeat/otelbeat/providers/fbprovider/fbprovider.go index 3e677e868fae..608f83a91667 100644 --- a/libbeat/otelbeat/providers/fbprovider/fbprovider.go +++ b/libbeat/otelbeat/providers/fbprovider/fbprovider.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/confmap" - "github.com/elastic/beats/v7/libbeat/otelbeat/providers" + "github.com/elastic/beats/v9/libbeat/otelbeat/providers" ) const schemeName = "fb" diff --git a/libbeat/otelbeat/providers/mbprovider/mbprovider.go b/libbeat/otelbeat/providers/mbprovider/mbprovider.go index d1dbaecd328e..ec62e1898569 100644 --- a/libbeat/otelbeat/providers/mbprovider/mbprovider.go +++ b/libbeat/otelbeat/providers/mbprovider/mbprovider.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/confmap" - "github.com/elastic/beats/v7/libbeat/otelbeat/providers" + "github.com/elastic/beats/v9/libbeat/otelbeat/providers" ) const schemeName = "mb" diff --git a/libbeat/otelbeat/providers/providers.go b/libbeat/otelbeat/providers/providers.go index adef7052e090..97e8d06cd039 100644 --- a/libbeat/otelbeat/providers/providers.go +++ b/libbeat/otelbeat/providers/providers.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/confmap" - "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cfgfile" ) var schemeMap = map[string]string{ diff --git a/libbeat/outputs/backoff.go b/libbeat/outputs/backoff.go index 502d3d67d1af..ce816c56aff5 100644 --- a/libbeat/outputs/backoff.go +++ b/libbeat/outputs/backoff.go @@ -22,8 +22,8 @@ import ( "errors" "time" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/testing" ) diff --git a/libbeat/outputs/codec/codec.go b/libbeat/outputs/codec/codec.go index 347738d9c5a3..ba83350e8ea8 100644 --- a/libbeat/outputs/codec/codec.go +++ b/libbeat/outputs/codec/codec.go @@ -17,7 +17,7 @@ package codec -import "github.com/elastic/beats/v7/libbeat/beat" +import "github.com/elastic/beats/v9/libbeat/beat" type Codec interface { Encode(index string, event *beat.Event) ([]byte, error) diff --git a/libbeat/outputs/codec/codec_reg.go b/libbeat/outputs/codec/codec_reg.go index 86c42d028eee..9d37875b1952 100644 --- a/libbeat/outputs/codec/codec_reg.go +++ b/libbeat/outputs/codec/codec_reg.go @@ -20,7 +20,7 @@ package codec import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/outputs/codec/common.go b/libbeat/outputs/codec/common.go index 16a8d47a6d7f..5787d9501a22 100644 --- a/libbeat/outputs/codec/common.go +++ b/libbeat/outputs/codec/common.go @@ -20,8 +20,8 @@ package codec import ( "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/dtfmt" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/dtfmt" "github.com/elastic/go-structform" ) diff --git a/libbeat/outputs/codec/format/format.go b/libbeat/outputs/codec/format/format.go index 30ab2b4e6e5a..62a9ae2d5317 100644 --- a/libbeat/outputs/codec/format/format.go +++ b/libbeat/outputs/codec/format/format.go @@ -20,9 +20,9 @@ package format import ( "errors" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/outputs/codec" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/outputs/codec/format/format_test.go b/libbeat/outputs/codec/format/format_test.go index 96d4e1836c87..b454b3f11b51 100644 --- a/libbeat/outputs/codec/format/format_test.go +++ b/libbeat/outputs/codec/format/format_test.go @@ -20,8 +20,8 @@ package format import ( "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/outputs/codec/json/event.go b/libbeat/outputs/codec/json/event.go index c17a482e0653..0d1fa678bd0b 100644 --- a/libbeat/outputs/codec/json/event.go +++ b/libbeat/outputs/codec/json/event.go @@ -20,7 +20,7 @@ package json import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/outputs/codec/json/json.go b/libbeat/outputs/codec/json/json.go index 4af556133a41..8cd6132dc15e 100644 --- a/libbeat/outputs/codec/json/json.go +++ b/libbeat/outputs/codec/json/json.go @@ -21,8 +21,8 @@ import ( "bytes" stdjson "encoding/json" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs/codec" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/go-structform/gotype" "github.com/elastic/go-structform/json" diff --git a/libbeat/outputs/codec/json/json_bench_test.go b/libbeat/outputs/codec/json/json_bench_test.go index 9499897d8f9a..d8a7573e97e8 100644 --- a/libbeat/outputs/codec/json/json_bench_test.go +++ b/libbeat/outputs/codec/json/json_bench_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/outputs/codec/json/json_test.go b/libbeat/outputs/codec/json/json_test.go index 87da4ce65a46..71887b836e8a 100644 --- a/libbeat/outputs/codec/json/json_test.go +++ b/libbeat/outputs/codec/json/json_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/outputs/codec/plugin.go b/libbeat/outputs/codec/plugin.go index b99ba36e7ca0..f407540e0d02 100644 --- a/libbeat/outputs/codec/plugin.go +++ b/libbeat/outputs/codec/plugin.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/plugin" ) type codecPlugin struct { diff --git a/libbeat/outputs/console/config.go b/libbeat/outputs/console/config.go index e0a1cc9ff280..e4ab6587e63b 100644 --- a/libbeat/outputs/console/config.go +++ b/libbeat/outputs/console/config.go @@ -18,7 +18,7 @@ package console import ( - "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/codec" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/outputs/console/console.go b/libbeat/outputs/console/console.go index 7dad356eb6fe..5e444a7197ad 100644 --- a/libbeat/outputs/console/console.go +++ b/libbeat/outputs/console/console.go @@ -24,11 +24,11 @@ import ( "os" "runtime" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/codec/json" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/outputs/console/console_test.go b/libbeat/outputs/console/console_test.go index dcff60f4e959..eec62725649b 100644 --- a/libbeat/outputs/console/console_test.go +++ b/libbeat/outputs/console/console_test.go @@ -28,14 +28,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/codec/format" - "github.com/elastic/beats/v7/libbeat/outputs/codec/json" - "github.com/elastic/beats/v7/libbeat/outputs/outest" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/codec/format" + "github.com/elastic/beats/v9/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/discard/discard.go b/libbeat/outputs/discard/discard.go index 430ccf50ae26..9babb4d93ffa 100644 --- a/libbeat/outputs/discard/discard.go +++ b/libbeat/outputs/discard/discard.go @@ -20,9 +20,9 @@ package discard import ( "context" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/outputs/elasticsearch/callbacks.go b/libbeat/outputs/elasticsearch/callbacks.go index e1949ae9fa25..fe8fad9fb201 100644 --- a/libbeat/outputs/elasticsearch/callbacks.go +++ b/libbeat/outputs/elasticsearch/callbacks.go @@ -20,7 +20,7 @@ package elasticsearch import ( "sync" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/logp" "github.com/gofrs/uuid/v5" diff --git a/libbeat/outputs/elasticsearch/client.go b/libbeat/outputs/elasticsearch/client.go index 6579d6e27ec3..9daa1166c76d 100644 --- a/libbeat/outputs/elasticsearch/client.go +++ b/libbeat/outputs/elasticsearch/client.go @@ -28,12 +28,12 @@ import ( "go.elastic.co/apm/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outil" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/periodic" diff --git a/libbeat/outputs/elasticsearch/client_integration_test.go b/libbeat/outputs/elasticsearch/client_integration_test.go index 50cfdb1f4f90..a456ebeb928f 100644 --- a/libbeat/outputs/elasticsearch/client_integration_test.go +++ b/libbeat/outputs/elasticsearch/client_integration_test.go @@ -31,11 +31,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegtest" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegtest" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/outputs/elasticsearch/client_proxy_test.go b/libbeat/outputs/elasticsearch/client_proxy_test.go index a948f92e3d01..b75c042de463 100644 --- a/libbeat/outputs/elasticsearch/client_proxy_test.go +++ b/libbeat/outputs/elasticsearch/client_proxy_test.go @@ -35,8 +35,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/outputs/outil" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) diff --git a/libbeat/outputs/elasticsearch/client_test.go b/libbeat/outputs/elasticsearch/client_test.go index f5fa85e75a5d..2d321d115736 100644 --- a/libbeat/outputs/elasticsearch/client_test.go +++ b/libbeat/outputs/elasticsearch/client_test.go @@ -38,18 +38,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - e "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/internal/testutil" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outest" - "github.com/elastic/beats/v7/libbeat/outputs/outil" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/beat" + e "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/internal/testutil" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/version" c "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/outputs/elasticsearch/config.go b/libbeat/outputs/elasticsearch/config.go index f4e85e749cff..365f5b449aac 100644 --- a/libbeat/outputs/elasticsearch/config.go +++ b/libbeat/outputs/elasticsearch/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/transport/kerberos" + "github.com/elastic/beats/v9/libbeat/common/transport/kerberos" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) diff --git a/libbeat/outputs/elasticsearch/config_presets_test.go b/libbeat/outputs/elasticsearch/config_presets_test.go index 7cf183cdbe51..7f1370c3ecae 100644 --- a/libbeat/outputs/elasticsearch/config_presets_test.go +++ b/libbeat/outputs/elasticsearch/config_presets_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/outputs/elasticsearch/dead_letter_index.go b/libbeat/outputs/elasticsearch/dead_letter_index.go index 6403f0f0c95c..16dc201d45f9 100644 --- a/libbeat/outputs/elasticsearch/dead_letter_index.go +++ b/libbeat/outputs/elasticsearch/dead_letter_index.go @@ -20,7 +20,7 @@ package elasticsearch import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/outputs/elasticsearch/elasticsearch.go b/libbeat/outputs/elasticsearch/elasticsearch.go index 6213aec02f5c..e74dcfcecad6 100644 --- a/libbeat/outputs/elasticsearch/elasticsearch.go +++ b/libbeat/outputs/elasticsearch/elasticsearch.go @@ -18,11 +18,11 @@ package elasticsearch import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outil" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/outputs/elasticsearch/elasticsearch_test.go b/libbeat/outputs/elasticsearch/elasticsearch_test.go index 1f98ba300ed6..b0077df36cfe 100644 --- a/libbeat/outputs/elasticsearch/elasticsearch_test.go +++ b/libbeat/outputs/elasticsearch/elasticsearch_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/outputs/elasticsearch/event_encoder.go b/libbeat/outputs/elasticsearch/event_encoder.go index 2f32abe143a0..9f0d7c15bdcf 100644 --- a/libbeat/outputs/elasticsearch/event_encoder.go +++ b/libbeat/outputs/elasticsearch/event_encoder.go @@ -22,13 +22,13 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outil" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/outputs/elasticsearch/event_encoder_test.go b/libbeat/outputs/elasticsearch/event_encoder_test.go index 0a9fa5561e77..fb0a183e916a 100644 --- a/libbeat/outputs/elasticsearch/event_encoder_test.go +++ b/libbeat/outputs/elasticsearch/event_encoder_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/outputs/elasticsearch/json_read.go b/libbeat/outputs/elasticsearch/json_read.go index eb7d3c696ee8..744aa15d585d 100644 --- a/libbeat/outputs/elasticsearch/json_read.go +++ b/libbeat/outputs/elasticsearch/json_read.go @@ -20,7 +20,7 @@ package elasticsearch import ( "errors" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" ) // SAX like json parser. But instead of relying on callbacks, state machine diff --git a/libbeat/outputs/failover.go b/libbeat/outputs/failover.go index 7f880562d08b..ac0f6094521e 100644 --- a/libbeat/outputs/failover.go +++ b/libbeat/outputs/failover.go @@ -24,7 +24,7 @@ import ( "math/rand/v2" "strings" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/testing" ) diff --git a/libbeat/outputs/fileout/config.go b/libbeat/outputs/fileout/config.go index 9228430d6d9b..66028e9391f3 100644 --- a/libbeat/outputs/fileout/config.go +++ b/libbeat/outputs/fileout/config.go @@ -20,7 +20,7 @@ package fileout import ( "fmt" - "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/codec" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/file" ) diff --git a/libbeat/outputs/fileout/file.go b/libbeat/outputs/fileout/file.go index 5fc016a09fea..8186c5f7db1e 100644 --- a/libbeat/outputs/fileout/file.go +++ b/libbeat/outputs/fileout/file.go @@ -24,10 +24,10 @@ import ( "path/filepath" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/publisher" c "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/file" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/outputs/fileout/pathformatstring.go b/libbeat/outputs/fileout/pathformatstring.go index fdaff2177872..e1baba4dc328 100644 --- a/libbeat/outputs/fileout/pathformatstring.go +++ b/libbeat/outputs/fileout/pathformatstring.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) var isWindowsPath = os.PathSeparator == '\\' diff --git a/libbeat/outputs/kafka/client.go b/libbeat/outputs/kafka/client.go index 89293f7c599e..55fb9cf23808 100644 --- a/libbeat/outputs/kafka/client.go +++ b/libbeat/outputs/kafka/client.go @@ -30,11 +30,11 @@ import ( "github.com/elastic/sarama" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/outil" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/testing" "github.com/elastic/elastic-agent-libs/transport" diff --git a/libbeat/outputs/kafka/config.go b/libbeat/outputs/kafka/config.go index ec0099e43b67..6060bd677201 100644 --- a/libbeat/outputs/kafka/config.go +++ b/libbeat/outputs/kafka/config.go @@ -25,12 +25,12 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/common/kafka" - "github.com/elastic/beats/v7/libbeat/common/transport/kerberos" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/common/kafka" + "github.com/elastic/beats/v9/libbeat/common/transport/kerberos" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/outputs/codec" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/libbeat/outputs/kafka/config_test.go b/libbeat/outputs/kafka/config_test.go index 1fed3d86ac3a..f53941bf0931 100644 --- a/libbeat/outputs/kafka/config_test.go +++ b/libbeat/outputs/kafka/config_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/internal/testutil" - "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/internal/testutil" + "github.com/elastic/beats/v9/libbeat/management" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/kafka/kafka.go b/libbeat/outputs/kafka/kafka.go index 3012c32f8ac4..fdfd7337e95b 100644 --- a/libbeat/outputs/kafka/kafka.go +++ b/libbeat/outputs/kafka/kafka.go @@ -20,10 +20,10 @@ package kafka import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/outil" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/sarama" diff --git a/libbeat/outputs/kafka/kafka_integration_test.go b/libbeat/outputs/kafka/kafka_integration_test.go index 91f88eb6d326..7ca66581917a 100644 --- a/libbeat/outputs/kafka/kafka_integration_test.go +++ b/libbeat/outputs/kafka/kafka_integration_test.go @@ -37,12 +37,12 @@ import ( "github.com/elastic/sarama" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/outputs" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/outputs" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/outputs/outest" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/outputs/kafka/kafka_test.go b/libbeat/outputs/kafka/kafka_test.go index 0860ca2ee63f..7bb4d4b34607 100644 --- a/libbeat/outputs/kafka/kafka_test.go +++ b/libbeat/outputs/kafka/kafka_test.go @@ -20,8 +20,8 @@ package kafka import ( "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/kafka/message.go b/libbeat/outputs/kafka/message.go index af034736b666..1d2fc8be59b6 100644 --- a/libbeat/outputs/kafka/message.go +++ b/libbeat/outputs/kafka/message.go @@ -20,7 +20,7 @@ package kafka import ( "time" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/sarama" ) diff --git a/libbeat/outputs/kafka/partition_test.go b/libbeat/outputs/kafka/partition_test.go index 10400a387226..948c496e1a8b 100644 --- a/libbeat/outputs/kafka/partition_test.go +++ b/libbeat/outputs/kafka/partition_test.go @@ -29,9 +29,9 @@ import ( "github.com/elastic/sarama" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/logstash/async.go b/libbeat/outputs/logstash/async.go index a8d2415f9ee5..e716d1edbece 100644 --- a/libbeat/outputs/logstash/async.go +++ b/libbeat/outputs/logstash/async.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport" v2 "github.com/elastic/go-lumber/client/v2" diff --git a/libbeat/outputs/logstash/async_test.go b/libbeat/outputs/logstash/async_test.go index 483e11099438..82d3a022c6fc 100644 --- a/libbeat/outputs/logstash/async_test.go +++ b/libbeat/outputs/logstash/async_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport" ) diff --git a/libbeat/outputs/logstash/client_test.go b/libbeat/outputs/logstash/client_test.go index c39bf1fefa60..33160a38a0cf 100644 --- a/libbeat/outputs/logstash/client_test.go +++ b/libbeat/outputs/logstash/client_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/transport/transptest" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/transport/transptest" + "github.com/elastic/beats/v9/libbeat/outputs/outest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport" v2 "github.com/elastic/go-lumber/server/v2" diff --git a/libbeat/outputs/logstash/config.go b/libbeat/outputs/logstash/config.go index 42e9390bfd7c..bf8e93458c58 100644 --- a/libbeat/outputs/logstash/config.go +++ b/libbeat/outputs/logstash/config.go @@ -23,7 +23,7 @@ import ( "github.com/elastic/elastic-agent-libs/config" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/transport" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/libbeat/outputs/logstash/config_test.go b/libbeat/outputs/logstash/config_test.go index 2128e50d4fdc..aa0be4a303cb 100644 --- a/libbeat/outputs/logstash/config_test.go +++ b/libbeat/outputs/logstash/config_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/logstash/enc.go b/libbeat/outputs/logstash/enc.go index dddec52a70a8..df6161dbe285 100644 --- a/libbeat/outputs/logstash/enc.go +++ b/libbeat/outputs/logstash/enc.go @@ -21,8 +21,8 @@ import ( "errors" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs/codec/json" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/outputs/logstash/logstash.go b/libbeat/outputs/logstash/logstash.go index 04ae698c196a..137899e479fe 100644 --- a/libbeat/outputs/logstash/logstash.go +++ b/libbeat/outputs/logstash/logstash.go @@ -18,8 +18,8 @@ package logstash import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport" diff --git a/libbeat/outputs/logstash/logstash_integration_test.go b/libbeat/outputs/logstash/logstash_integration_test.go index fd8824a686a7..71b6b9f4443d 100644 --- a/libbeat/outputs/logstash/logstash_integration_test.go +++ b/libbeat/outputs/logstash/logstash_integration_test.go @@ -31,16 +31,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/outputs" - _ "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/v7/libbeat/outputs/outest" - "github.com/elastic/beats/v7/libbeat/outputs/outil" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/outputs" + _ "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/logstash/logstash_test.go b/libbeat/outputs/logstash/logstash_test.go index dcd615c1b039..167be910ecd6 100644 --- a/libbeat/outputs/logstash/logstash_test.go +++ b/libbeat/outputs/logstash/logstash_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/transport/transptest" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/transport/transptest" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/logstash/sync.go b/libbeat/outputs/logstash/sync.go index 0daaf0d18195..70f246715ef7 100644 --- a/libbeat/outputs/logstash/sync.go +++ b/libbeat/outputs/logstash/sync.go @@ -21,8 +21,8 @@ import ( "context" "time" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport" v2 "github.com/elastic/go-lumber/client/v2" diff --git a/libbeat/outputs/logstash/sync_test.go b/libbeat/outputs/logstash/sync_test.go index 7a4472b9b72f..f31ffbcf0d11 100644 --- a/libbeat/outputs/logstash/sync_test.go +++ b/libbeat/outputs/logstash/sync_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/common/transport/transptest" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/common/transport/transptest" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport" ) diff --git a/libbeat/outputs/outest/batch.go b/libbeat/outputs/outest/batch.go index f8106a9f5db3..f0e6763ccc74 100644 --- a/libbeat/outputs/outest/batch.go +++ b/libbeat/outputs/outest/batch.go @@ -18,8 +18,8 @@ package outest import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/publisher" ) type Batch struct { diff --git a/libbeat/outputs/outil/select.go b/libbeat/outputs/outil/select.go index 8d3104ed7ab9..c8b327609a15 100644 --- a/libbeat/outputs/outil/select.go +++ b/libbeat/outputs/outil/select.go @@ -20,9 +20,9 @@ package outil import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/conditions" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/outputs/outil/select_test.go b/libbeat/outputs/outil/select_test.go index 387f52cb2a3b..a4b474eb0210 100644 --- a/libbeat/outputs/outil/select_test.go +++ b/libbeat/outputs/outil/select_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/output_reg.go b/libbeat/outputs/output_reg.go index fdd8e22a6634..9893a9fac796 100644 --- a/libbeat/outputs/output_reg.go +++ b/libbeat/outputs/output_reg.go @@ -20,8 +20,8 @@ package outputs import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/outputs/outputs.go b/libbeat/outputs/outputs.go index 3cfdb5aef66b..597ff6cede08 100644 --- a/libbeat/outputs/outputs.go +++ b/libbeat/outputs/outputs.go @@ -23,7 +23,7 @@ package outputs import ( "context" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher" ) // Client provides the minimal interface an output must implement to be usable diff --git a/libbeat/outputs/plugin.go b/libbeat/outputs/plugin.go index b76afedd45a4..1b9699d28f70 100644 --- a/libbeat/outputs/plugin.go +++ b/libbeat/outputs/plugin.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - p "github.com/elastic/beats/v7/libbeat/plugin" + p "github.com/elastic/beats/v9/libbeat/plugin" ) type outputPlugin struct { diff --git a/libbeat/outputs/redis/backoff.go b/libbeat/outputs/redis/backoff.go index 42f9db1c2854..207f843ce2b0 100644 --- a/libbeat/outputs/redis/backoff.go +++ b/libbeat/outputs/redis/backoff.go @@ -24,8 +24,8 @@ import ( "github.com/gomodule/redigo/redis" - b "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/libbeat/publisher" + b "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/libbeat/publisher" ) type backoffClient struct { diff --git a/libbeat/outputs/redis/client.go b/libbeat/outputs/redis/client.go index b5bbbeb1b2b7..f780f3de09f8 100644 --- a/libbeat/outputs/redis/client.go +++ b/libbeat/outputs/redis/client.go @@ -28,11 +28,11 @@ import ( "github.com/gomodule/redigo/redis" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/outil" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport" diff --git a/libbeat/outputs/redis/config.go b/libbeat/outputs/redis/config.go index 4785af137f10..ed8d1c7e0b5b 100644 --- a/libbeat/outputs/redis/config.go +++ b/libbeat/outputs/redis/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/codec" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/transport" "github.com/elastic/elastic-agent-libs/transport/tlscommon" diff --git a/libbeat/outputs/redis/redis.go b/libbeat/outputs/redis/redis.go index a157290425e2..bcdbf32a660e 100644 --- a/libbeat/outputs/redis/redis.go +++ b/libbeat/outputs/redis/redis.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/outil" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport" diff --git a/libbeat/outputs/redis/redis_integration_test.go b/libbeat/outputs/redis/redis_integration_test.go index da1ff675fa03..b59eec7d3d6f 100644 --- a/libbeat/outputs/redis/redis_integration_test.go +++ b/libbeat/outputs/redis/redis_integration_test.go @@ -32,11 +32,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/outputs/outest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/redis/redis_test.go b/libbeat/outputs/redis/redis_test.go index 203f8a841185..adb0083569da 100644 --- a/libbeat/outputs/redis/redis_test.go +++ b/libbeat/outputs/redis/redis_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/json" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/outputs/util.go b/libbeat/outputs/util.go index 7875429f380a..05ff9c36a943 100644 --- a/libbeat/outputs/util.go +++ b/libbeat/outputs/util.go @@ -20,10 +20,10 @@ package outputs import ( "fmt" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/diskqueue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/diskqueue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/outputs/util_test.go b/libbeat/outputs/util_test.go index 92baecd6f026..7bbf709b7761 100644 --- a/libbeat/outputs/util_test.go +++ b/libbeat/outputs/util_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zapcore" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/plugin/cli.go b/libbeat/plugin/cli.go index 16d6f3612102..9a6c8856548a 100644 --- a/libbeat/plugin/cli.go +++ b/libbeat/plugin/cli.go @@ -23,7 +23,7 @@ import ( "flag" "strings" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/add_fields.go b/libbeat/processors/actions/add_fields.go index 1394de9ef106..f507548cc56f 100644 --- a/libbeat/processors/actions/add_fields.go +++ b/libbeat/processors/actions/add_fields.go @@ -18,10 +18,10 @@ package actions import ( - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/actions/addfields" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/actions/addfields" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" ) func init() { diff --git a/libbeat/processors/actions/add_labels.go b/libbeat/processors/actions/add_labels.go index 5170feb3dbf5..704020f24361 100644 --- a/libbeat/processors/actions/add_labels.go +++ b/libbeat/processors/actions/add_labels.go @@ -20,10 +20,10 @@ package actions import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/actions/addfields" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/actions/addfields" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/add_network_direction.go b/libbeat/processors/actions/add_network_direction.go index ed1219308961..5edfb2c1ddee 100644 --- a/libbeat/processors/actions/add_network_direction.go +++ b/libbeat/processors/actions/add_network_direction.go @@ -21,11 +21,11 @@ import ( "fmt" "net" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/conditions" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/add_network_direction_test.go b/libbeat/processors/actions/add_network_direction_test.go index 9aca89781bb4..b5c1b2a3d1b7 100644 --- a/libbeat/processors/actions/add_network_direction_test.go +++ b/libbeat/processors/actions/add_network_direction_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/add_tags.go b/libbeat/processors/actions/add_tags.go index c3bf7a89933d..1ff19a2c25f2 100644 --- a/libbeat/processors/actions/add_tags.go +++ b/libbeat/processors/actions/add_tags.go @@ -21,9 +21,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/addfields/add_fields.go b/libbeat/processors/actions/addfields/add_fields.go index 8c38c07e720e..615d4f308639 100644 --- a/libbeat/processors/actions/addfields/add_fields.go +++ b/libbeat/processors/actions/addfields/add_fields.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/alterFieldProcessor.go b/libbeat/processors/actions/alterFieldProcessor.go index ce525f108494..9e0c741f086b 100644 --- a/libbeat/processors/actions/alterFieldProcessor.go +++ b/libbeat/processors/actions/alterFieldProcessor.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/actions/append.go b/libbeat/processors/actions/append.go index bba068232caf..8f842b03b4cb 100644 --- a/libbeat/processors/actions/append.go +++ b/libbeat/processors/actions/append.go @@ -20,10 +20,10 @@ package actions import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/append_test.go b/libbeat/processors/actions/append_test.go index cf138b2ceb0b..f2df0e244a86 100644 --- a/libbeat/processors/actions/append_test.go +++ b/libbeat/processors/actions/append_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/common_test.go b/libbeat/processors/actions/common_test.go index d093c8b32f3a..db48acf8a88f 100644 --- a/libbeat/processors/actions/common_test.go +++ b/libbeat/processors/actions/common_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/copy_fields.go b/libbeat/processors/actions/copy_fields.go index 332880b7ea51..6428eccf2fb5 100644 --- a/libbeat/processors/actions/copy_fields.go +++ b/libbeat/processors/actions/copy_fields.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/copy_fields_test.go b/libbeat/processors/actions/copy_fields_test.go index 0e4422bb8401..5b29421fe915 100644 --- a/libbeat/processors/actions/copy_fields_test.go +++ b/libbeat/processors/actions/copy_fields_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) func TestCopyFields(t *testing.T) { diff --git a/libbeat/processors/actions/decode_base64_field.go b/libbeat/processors/actions/decode_base64_field.go index 46727a98cf3b..15dfb2050b0a 100644 --- a/libbeat/processors/actions/decode_base64_field.go +++ b/libbeat/processors/actions/decode_base64_field.go @@ -23,10 +23,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/decode_base64_field_test.go b/libbeat/processors/actions/decode_base64_field_test.go index ff7a64dd8b68..ad5a90f11d93 100644 --- a/libbeat/processors/actions/decode_base64_field_test.go +++ b/libbeat/processors/actions/decode_base64_field_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/actions/decode_json_fields.go b/libbeat/processors/actions/decode_json_fields.go index 0243299eb9a5..e02637344dd8 100644 --- a/libbeat/processors/actions/decode_json_fields.go +++ b/libbeat/processors/actions/decode_json_fields.go @@ -24,12 +24,12 @@ import ( "io" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/decode_json_fields_test.go b/libbeat/processors/actions/decode_json_fields_test.go index c173dcbef194..0ff4c6d9942c 100644 --- a/libbeat/processors/actions/decode_json_fields_test.go +++ b/libbeat/processors/actions/decode_json_fields_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/decompress_gzip_field.go b/libbeat/processors/actions/decompress_gzip_field.go index 68bb6d045364..84449ad071dc 100644 --- a/libbeat/processors/actions/decompress_gzip_field.go +++ b/libbeat/processors/actions/decompress_gzip_field.go @@ -24,9 +24,9 @@ import ( "fmt" "io" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/decompress_gzip_field_test.go b/libbeat/processors/actions/decompress_gzip_field_test.go index 1c542b54afd2..781f600fda1d 100644 --- a/libbeat/processors/actions/decompress_gzip_field_test.go +++ b/libbeat/processors/actions/decompress_gzip_field_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/actions/detect_mime_type.go b/libbeat/processors/actions/detect_mime_type.go index 169a43c8f307..dec6c36ee74c 100644 --- a/libbeat/processors/actions/detect_mime_type.go +++ b/libbeat/processors/actions/detect_mime_type.go @@ -20,10 +20,10 @@ package actions import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/mime" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/mime" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/detect_mime_type_test.go b/libbeat/processors/actions/detect_mime_type_test.go index 4add6169d45b..55dbc51e3e7a 100644 --- a/libbeat/processors/actions/detect_mime_type_test.go +++ b/libbeat/processors/actions/detect_mime_type_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/drop_event.go b/libbeat/processors/actions/drop_event.go index 5c803216c271..b8100a0cf583 100644 --- a/libbeat/processors/actions/drop_event.go +++ b/libbeat/processors/actions/drop_event.go @@ -18,9 +18,9 @@ package actions import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/drop_fields.go b/libbeat/processors/actions/drop_fields.go index 9171a2fc8a24..4103d9974fb0 100644 --- a/libbeat/processors/actions/drop_fields.go +++ b/libbeat/processors/actions/drop_fields.go @@ -26,12 +26,12 @@ import ( "go.uber.org/multierr" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/drop_fields_test.go b/libbeat/processors/actions/drop_fields_test.go index f03952e5aa9a..3e66b931d147 100644 --- a/libbeat/processors/actions/drop_fields_test.go +++ b/libbeat/processors/actions/drop_fields_test.go @@ -20,14 +20,14 @@ package actions import ( "testing" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" config2 "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/actions/extract_field.go b/libbeat/processors/actions/extract_field.go index 95403a822b6a..056ec48c8c21 100644 --- a/libbeat/processors/actions/extract_field.go +++ b/libbeat/processors/actions/extract_field.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/extract_field_test.go b/libbeat/processors/actions/extract_field_test.go index c6fa800f2a5f..b6d7a5bb1b36 100644 --- a/libbeat/processors/actions/extract_field_test.go +++ b/libbeat/processors/actions/extract_field_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/actions/include_fields.go b/libbeat/processors/actions/include_fields.go index c463c20a25c6..338e5b23a54c 100644 --- a/libbeat/processors/actions/include_fields.go +++ b/libbeat/processors/actions/include_fields.go @@ -22,9 +22,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/include_fields_test.go b/libbeat/processors/actions/include_fields_test.go index 9e5e6199feca..3a8fb66fdb5e 100644 --- a/libbeat/processors/actions/include_fields_test.go +++ b/libbeat/processors/actions/include_fields_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/actions/lowercase.go b/libbeat/processors/actions/lowercase.go index df8f99e79993..3fd7b22754b1 100644 --- a/libbeat/processors/actions/lowercase.go +++ b/libbeat/processors/actions/lowercase.go @@ -20,9 +20,9 @@ package actions import ( "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/lowercase_test.go b/libbeat/processors/actions/lowercase_test.go index a95f0c38ffcc..da39a1aed9fe 100644 --- a/libbeat/processors/actions/lowercase_test.go +++ b/libbeat/processors/actions/lowercase_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/internal/testutil" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/internal/testutil" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/rename.go b/libbeat/processors/actions/rename.go index 1c7bdccceaaa..f826f7c251ef 100644 --- a/libbeat/processors/actions/rename.go +++ b/libbeat/processors/actions/rename.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/rename_test.go b/libbeat/processors/actions/rename_test.go index b9e29bb00159..b15fce0b57f5 100644 --- a/libbeat/processors/actions/rename_test.go +++ b/libbeat/processors/actions/rename_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) func TestRenameRun(t *testing.T) { diff --git a/libbeat/processors/actions/replace.go b/libbeat/processors/actions/replace.go index aa9e749012da..006206733173 100644 --- a/libbeat/processors/actions/replace.go +++ b/libbeat/processors/actions/replace.go @@ -22,10 +22,10 @@ import ( "fmt" "regexp" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/replace_test.go b/libbeat/processors/actions/replace_test.go index 78bea7a9be7c..0a62e14dec43 100644 --- a/libbeat/processors/actions/replace_test.go +++ b/libbeat/processors/actions/replace_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/actions/truncate_fields.go b/libbeat/processors/actions/truncate_fields.go index 31258411d7ea..c473e956df92 100644 --- a/libbeat/processors/actions/truncate_fields.go +++ b/libbeat/processors/actions/truncate_fields.go @@ -24,10 +24,10 @@ import ( "strings" "unicode/utf8" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/actions/truncate_fields_test.go b/libbeat/processors/actions/truncate_fields_test.go index da1a7b2392db..ea83cdb6e1a8 100644 --- a/libbeat/processors/actions/truncate_fields_test.go +++ b/libbeat/processors/actions/truncate_fields_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) func TestTruncateFields(t *testing.T) { diff --git a/libbeat/processors/actions/uppercase.go b/libbeat/processors/actions/uppercase.go index 5b444079bf49..0f5ff2442de9 100644 --- a/libbeat/processors/actions/uppercase.go +++ b/libbeat/processors/actions/uppercase.go @@ -20,9 +20,9 @@ package actions import ( "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/actions/uppercase_test.go b/libbeat/processors/actions/uppercase_test.go index 44b899c31bb0..ae448a03212f 100644 --- a/libbeat/processors/actions/uppercase_test.go +++ b/libbeat/processors/actions/uppercase_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go b/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go index d21a6b3ca27d..4221abf97bc3 100644 --- a/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go +++ b/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go index 0395df716e7f..544d8daa1be0 100644 --- a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go b/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go index 525f082a91bb..834615d7ab73 100644 --- a/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go @@ -32,7 +32,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go index 173e8aab52f1..976160c2b508 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go @@ -29,8 +29,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go index c9e2581e9119..84e09989e0f1 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go @@ -37,7 +37,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go b/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go index afc8cd3020dc..bb258f057b57 100644 --- a/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go +++ b/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go @@ -18,8 +18,8 @@ package add_cloud_metadata import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go b/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go index b57fdcbcda1a..db6dc08191f9 100644 --- a/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_cloud_metadata/provider_google_gce.go b/libbeat/processors/add_cloud_metadata/provider_google_gce.go index cebfb747bfe5..b886cb3b1eda 100644 --- a/libbeat/processors/add_cloud_metadata/provider_google_gce.go +++ b/libbeat/processors/add_cloud_metadata/provider_google_gce.go @@ -23,8 +23,8 @@ import ( "gopkg.in/yaml.v2" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go b/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go index 744a34e32aa7..d4ba5f91f78b 100644 --- a/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_cloud_metadata/provider_hetzner_cloud_test.go b/libbeat/processors/add_cloud_metadata/provider_hetzner_cloud_test.go index 193bdfeaa5dd..1250cd146e9e 100644 --- a/libbeat/processors/add_cloud_metadata/provider_hetzner_cloud_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_hetzner_cloud_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go b/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go index adb4d7cd33d7..6dde35c167ba 100644 --- a/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go index 764e6bc76263..e7a35ea02545 100644 --- a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_data_stream/add_data_stream.go b/libbeat/processors/add_data_stream/add_data_stream.go index 8677763963b9..eba93a92308f 100644 --- a/libbeat/processors/add_data_stream/add_data_stream.go +++ b/libbeat/processors/add_data_stream/add_data_stream.go @@ -20,8 +20,8 @@ package add_data_stream import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/add_data_stream/add_data_stream_test.go b/libbeat/processors/add_data_stream/add_data_stream_test.go index a87795935e33..c74b38722fc9 100644 --- a/libbeat/processors/add_data_stream/add_data_stream_test.go +++ b/libbeat/processors/add_data_stream/add_data_stream_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/add_docker_metadata/add_docker_metadata.go b/libbeat/processors/add_docker_metadata/add_docker_metadata.go index c500674b90ad..120244381638 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata.go @@ -28,10 +28,10 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/actions" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/actions" "github.com/elastic/elastic-agent-autodiscover/docker" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/processors/add_docker_metadata/add_docker_metadata_integration_test.go b/libbeat/processors/add_docker_metadata/add_docker_metadata_integration_test.go index 3ab0177f284e..c1cdabf105a3 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata_integration_test.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata_integration_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - dockertest "github.com/elastic/beats/v7/libbeat/tests/docker" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + dockertest "github.com/elastic/beats/v9/libbeat/tests/docker" + "github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go b/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go index 6cbf85d235c6..75ba20566917 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/config" diff --git a/libbeat/processors/add_formatted_index/add_formatted_index.go b/libbeat/processors/add_formatted_index/add_formatted_index.go index 575a816a858d..765c1f728e47 100644 --- a/libbeat/processors/add_formatted_index/add_formatted_index.go +++ b/libbeat/processors/add_formatted_index/add_formatted_index.go @@ -20,10 +20,10 @@ package add_formatted_index import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_formatted_index/config.go b/libbeat/processors/add_formatted_index/config.go index 6b4e6c8f2b9f..cdc85b33dd93 100644 --- a/libbeat/processors/add_formatted_index/config.go +++ b/libbeat/processors/add_formatted_index/config.go @@ -20,7 +20,7 @@ package add_formatted_index import ( "errors" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" ) // configuration for AddFormattedIndex processor. diff --git a/libbeat/processors/add_host_metadata/add_host_metadata.go b/libbeat/processors/add_host_metadata/add_host_metadata.go index 8ce102a47895..887370395c87 100644 --- a/libbeat/processors/add_host_metadata/add_host_metadata.go +++ b/libbeat/processors/add_host_metadata/add_host_metadata.go @@ -28,11 +28,11 @@ import ( "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/go-sysinfo" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/features" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" - "github.com/elastic/beats/v7/libbeat/processors/util" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/features" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/processors/util" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_host_metadata/add_host_metadata_test.go b/libbeat/processors/add_host_metadata/add_host_metadata_test.go index ef88311bc129..49bd7021caf0 100644 --- a/libbeat/processors/add_host_metadata/add_host_metadata_test.go +++ b/libbeat/processors/add_host_metadata/add_host_metadata_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/features" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/features" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_host_metadata/config.go b/libbeat/processors/add_host_metadata/config.go index 453c3b2b5f74..9e82ca9b546a 100644 --- a/libbeat/processors/add_host_metadata/config.go +++ b/libbeat/processors/add_host_metadata/config.go @@ -21,7 +21,7 @@ import ( "os" "time" - "github.com/elastic/beats/v7/libbeat/processors/util" + "github.com/elastic/beats/v9/libbeat/processors/util" ) // Config for add_host_metadata processor. diff --git a/libbeat/processors/add_id/add_id.go b/libbeat/processors/add_id/add_id.go index badae307f772..3cdf4d52503f 100644 --- a/libbeat/processors/add_id/add_id.go +++ b/libbeat/processors/add_id/add_id.go @@ -20,10 +20,10 @@ package add_id import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/add_id/generator" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/add_id/generator" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/add_id/add_id_test.go b/libbeat/processors/add_id/add_id_test.go index 3bb7b6beca5f..dd83a010c227 100644 --- a/libbeat/processors/add_id/add_id_test.go +++ b/libbeat/processors/add_id/add_id_test.go @@ -24,7 +24,7 @@ import ( "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/stretchr/testify/assert" ) diff --git a/libbeat/processors/add_id/config.go b/libbeat/processors/add_id/config.go index 04a1c114219e..5b616f4e486c 100644 --- a/libbeat/processors/add_id/config.go +++ b/libbeat/processors/add_id/config.go @@ -18,7 +18,7 @@ package add_id import ( - "github.com/elastic/beats/v7/libbeat/processors/add_id/generator" + "github.com/elastic/beats/v9/libbeat/processors/add_id/generator" ) // configuration for Add ID processor. diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go index a4467ce875d5..4a2e6eddad5e 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes.go @@ -35,8 +35,8 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" ) const ( diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go b/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go index db82559e2fa4..c5d8d72ae6db 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_kubernetes_metadata/matchers.go b/libbeat/processors/add_kubernetes_metadata/matchers.go index 5bf407c2613f..3baf9322aee4 100644 --- a/libbeat/processors/add_kubernetes_metadata/matchers.go +++ b/libbeat/processors/add_kubernetes_metadata/matchers.go @@ -22,10 +22,10 @@ import ( "regexp" "slices" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/codec/format" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_kubernetes_metadata/registry.go b/libbeat/processors/add_kubernetes_metadata/registry.go index 417cb9e55334..0c8b4391d911 100644 --- a/libbeat/processors/add_kubernetes_metadata/registry.go +++ b/libbeat/processors/add_kubernetes_metadata/registry.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - p "github.com/elastic/beats/v7/libbeat/plugin" + p "github.com/elastic/beats/v9/libbeat/plugin" ) var ( diff --git a/libbeat/processors/add_locale/add_locale.go b/libbeat/processors/add_locale/add_locale.go index 76e05e5ec71e..dbefcf988d90 100644 --- a/libbeat/processors/add_locale/add_locale.go +++ b/libbeat/processors/add_locale/add_locale.go @@ -22,9 +22,9 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/add_locale/add_locale_test.go b/libbeat/processors/add_locale/add_locale_test.go index acd6260b01e2..fd2ffde63579 100644 --- a/libbeat/processors/add_locale/add_locale_test.go +++ b/libbeat/processors/add_locale/add_locale_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_observer_metadata/add_observer_metadata.go b/libbeat/processors/add_observer_metadata/add_observer_metadata.go index 292a10592a98..a5db1d0e2bdc 100644 --- a/libbeat/processors/add_observer_metadata/add_observer_metadata.go +++ b/libbeat/processors/add_observer_metadata/add_observer_metadata.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" - "github.com/elastic/beats/v7/libbeat/processors/util" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/processors/util" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go b/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go index 008a3a27c19d..6571eec790f1 100644 --- a/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go +++ b/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_observer_metadata/config.go b/libbeat/processors/add_observer_metadata/config.go index 91acdc9e6d28..42693605f894 100644 --- a/libbeat/processors/add_observer_metadata/config.go +++ b/libbeat/processors/add_observer_metadata/config.go @@ -20,7 +20,7 @@ package add_observer_metadata import ( "time" - "github.com/elastic/beats/v7/libbeat/processors/util" + "github.com/elastic/beats/v9/libbeat/processors/util" ) // Config for add_host_metadata processor. diff --git a/libbeat/processors/add_process_metadata/add_process_metadata.go b/libbeat/processors/add_process_metadata/add_process_metadata.go index a7def9589627..631dc7661dca 100644 --- a/libbeat/processors/add_process_metadata/add_process_metadata.go +++ b/libbeat/processors/add_process_metadata/add_process_metadata.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/add_process_metadata/add_process_metadata_test.go b/libbeat/processors/add_process_metadata/add_process_metadata_test.go index 45de2bd53d56..83e798efe991 100644 --- a/libbeat/processors/add_process_metadata/add_process_metadata_test.go +++ b/libbeat/processors/add_process_metadata/add_process_metadata_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/capabilities" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/capabilities" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/add_process_metadata/gosigar_cid_provider.go b/libbeat/processors/add_process_metadata/gosigar_cid_provider.go index c7e95bb0dc91..17c18399a321 100644 --- a/libbeat/processors/add_process_metadata/gosigar_cid_provider.go +++ b/libbeat/processors/add_process_metadata/gosigar_cid_provider.go @@ -23,8 +23,8 @@ import ( "regexp" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-system-metrics/metric/system/cgroup" ) diff --git a/libbeat/processors/add_process_metadata/gosysinfo_provider.go b/libbeat/processors/add_process_metadata/gosysinfo_provider.go index 350acc81000d..3b74d75d47fd 100644 --- a/libbeat/processors/add_process_metadata/gosysinfo_provider.go +++ b/libbeat/processors/add_process_metadata/gosysinfo_provider.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/common/capabilities" + "github.com/elastic/beats/v9/libbeat/common/capabilities" "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/types" ) diff --git a/libbeat/processors/cache/cache.go b/libbeat/processors/cache/cache.go index 603ea6be1ece..141b96eb55cc 100644 --- a/libbeat/processors/cache/cache.go +++ b/libbeat/processors/cache/cache.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/cache/cache_test.go b/libbeat/processors/cache/cache_test.go index f8297a52108a..ad820cd2db97 100644 --- a/libbeat/processors/cache/cache_test.go +++ b/libbeat/processors/cache/cache_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/checks/checks.go b/libbeat/processors/checks/checks.go index 2614e6df9c5f..0480854ed16c 100644 --- a/libbeat/processors/checks/checks.go +++ b/libbeat/processors/checks/checks.go @@ -20,8 +20,8 @@ package checks import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/checks/checks_test.go b/libbeat/processors/checks/checks_test.go index 0c1b74cee6ad..2bd6bc378668 100644 --- a/libbeat/processors/checks/checks_test.go +++ b/libbeat/processors/checks/checks_test.go @@ -20,7 +20,7 @@ package checks import ( "testing" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/communityid/communityid.go b/libbeat/processors/communityid/communityid.go index 95a8a050c65c..7bcf03d89996 100644 --- a/libbeat/processors/communityid/communityid.go +++ b/libbeat/processors/communityid/communityid.go @@ -24,10 +24,10 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/flowhash" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/flowhash" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/communityid/communityid_test.go b/libbeat/processors/communityid/communityid_test.go index f392d64f7458..d57c1538395c 100644 --- a/libbeat/processors/communityid/communityid_test.go +++ b/libbeat/processors/communityid/communityid_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/testing/testutils" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/testing/testutils" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/conditionals.go b/libbeat/processors/conditionals.go index 0e28020119c7..eac646c280ee 100644 --- a/libbeat/processors/conditionals.go +++ b/libbeat/processors/conditionals.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/conditions" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/conditionals_test.go b/libbeat/processors/conditionals_test.go index a26f87fa957c..94ec7918542a 100644 --- a/libbeat/processors/conditionals_test.go +++ b/libbeat/processors/conditionals_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/convert/convert.go b/libbeat/processors/convert/convert.go index 2ca27a7dda72..a7da4076ea38 100644 --- a/libbeat/processors/convert/convert.go +++ b/libbeat/processors/convert/convert.go @@ -25,9 +25,9 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/convert/convert_test.go b/libbeat/processors/convert/convert_test.go index 017ee896fec2..3cab0c1d2b28 100644 --- a/libbeat/processors/convert/convert_test.go +++ b/libbeat/processors/convert/convert_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/decode_csv_fields/decode_csv_fields.go b/libbeat/processors/decode_csv_fields/decode_csv_fields.go index bd1d04c64b8e..f4de8791c174 100644 --- a/libbeat/processors/decode_csv_fields/decode_csv_fields.go +++ b/libbeat/processors/decode_csv_fields/decode_csv_fields.go @@ -24,10 +24,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go b/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go index e47646a6633d..bed3bf2bc9e0 100644 --- a/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go +++ b/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/decode_duration/decode_duration.go b/libbeat/processors/decode_duration/decode_duration.go index b295d71b81f8..30b6c9bce2a6 100644 --- a/libbeat/processors/decode_duration/decode_duration.go +++ b/libbeat/processors/decode_duration/decode_duration.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/decode_duration/decode_duration_test.go b/libbeat/processors/decode_duration/decode_duration_test.go index e4945439863b..115639d19ac0 100644 --- a/libbeat/processors/decode_duration/decode_duration_test.go +++ b/libbeat/processors/decode_duration/decode_duration_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/decode_xml/decode_xml.go b/libbeat/processors/decode_xml/decode_xml.go index 4d5d576ec2e9..144208489809 100644 --- a/libbeat/processors/decode_xml/decode_xml.go +++ b/libbeat/processors/decode_xml/decode_xml.go @@ -23,12 +23,12 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/encoding/xml" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/encoding/xml" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/decode_xml/decode_xml_test.go b/libbeat/processors/decode_xml/decode_xml_test.go index b211c84c15db..e289a04a4f9e 100644 --- a/libbeat/processors/decode_xml/decode_xml_test.go +++ b/libbeat/processors/decode_xml/decode_xml_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/decode_xml_wineventlog/decoder.go b/libbeat/processors/decode_xml_wineventlog/decoder.go index b3032bfa2fa5..a0c3c3ca9964 100644 --- a/libbeat/processors/decode_xml_wineventlog/decoder.go +++ b/libbeat/processors/decode_xml_wineventlog/decoder.go @@ -20,7 +20,7 @@ package decode_xml_wineventlog import ( - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/decode_xml_wineventlog/decoder_windows.go b/libbeat/processors/decode_xml_wineventlog/decoder_windows.go index f813ebe4c669..3a703239049f 100644 --- a/libbeat/processors/decode_xml_wineventlog/decoder_windows.go +++ b/libbeat/processors/decode_xml_wineventlog/decoder_windows.go @@ -22,8 +22,8 @@ package decode_xml_wineventlog import ( "sync" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" - "github.com/elastic/beats/v7/winlogbeat/sys/wineventlog" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/winlogbeat/sys/wineventlog" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/decode_xml_wineventlog/processor.go b/libbeat/processors/decode_xml_wineventlog/processor.go index 627e173e4e09..cd5c4f57a673 100644 --- a/libbeat/processors/decode_xml_wineventlog/processor.go +++ b/libbeat/processors/decode_xml_wineventlog/processor.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/decode_xml_wineventlog/processor_test.go b/libbeat/processors/decode_xml_wineventlog/processor_test.go index 45b46b8eee7f..d7ee37442199 100644 --- a/libbeat/processors/decode_xml_wineventlog/processor_test.go +++ b/libbeat/processors/decode_xml_wineventlog/processor_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/dissect/processor.go b/libbeat/processors/dissect/processor.go index 582ee5bffdb3..e5fbb7805111 100644 --- a/libbeat/processors/dissect/processor.go +++ b/libbeat/processors/dissect/processor.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/dissect/processor_test.go b/libbeat/processors/dissect/processor_test.go index 160057978436..41f8637d6761 100644 --- a/libbeat/processors/dissect/processor_test.go +++ b/libbeat/processors/dissect/processor_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/dns/dns.go b/libbeat/processors/dns/dns.go index a4b4c867aacd..9c9db02f1fc7 100644 --- a/libbeat/processors/dns/dns.go +++ b/libbeat/processors/dns/dns.go @@ -24,9 +24,9 @@ import ( "sync" "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/dns/dns_test.go b/libbeat/processors/dns/dns_test.go index f68d7da9958c..d554982a6ebf 100644 --- a/libbeat/processors/dns/dns_test.go +++ b/libbeat/processors/dns/dns_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/libbeat/processors/extract_array/extract_array.go b/libbeat/processors/extract_array/extract_array.go index 2459995080c1..f053db3cb1cb 100644 --- a/libbeat/processors/extract_array/extract_array.go +++ b/libbeat/processors/extract_array/extract_array.go @@ -23,11 +23,11 @@ import ( "reflect" "sort" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/extract_array/extract_array_test.go b/libbeat/processors/extract_array/extract_array_test.go index 914a9e9d60f1..e1ff6eb87d42 100644 --- a/libbeat/processors/extract_array/extract_array_test.go +++ b/libbeat/processors/extract_array/extract_array_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/fingerprint/fingerprint.go b/libbeat/processors/fingerprint/fingerprint.go index f2db8be8cd1d..25f8ddb77c50 100644 --- a/libbeat/processors/fingerprint/fingerprint.go +++ b/libbeat/processors/fingerprint/fingerprint.go @@ -23,10 +23,10 @@ import ( "io" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/fingerprint/fingerprint_test.go b/libbeat/processors/fingerprint/fingerprint_test.go index 52490a4b2ebc..d7c3097c9936 100644 --- a/libbeat/processors/fingerprint/fingerprint_test.go +++ b/libbeat/processors/fingerprint/fingerprint_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/move_fields/move_fields.go b/libbeat/processors/move_fields/move_fields.go index 693556c7ded4..7eb19aefccd9 100644 --- a/libbeat/processors/move_fields/move_fields.go +++ b/libbeat/processors/move_fields/move_fields.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/move_fields/move_fields_test.go b/libbeat/processors/move_fields/move_fields_test.go index 58f48ad385c8..0d0e83d70d8b 100644 --- a/libbeat/processors/move_fields/move_fields_test.go +++ b/libbeat/processors/move_fields/move_fields_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/namespace.go b/libbeat/processors/namespace.go index 21d74f29ea27..53459fd0e506 100644 --- a/libbeat/processors/namespace.go +++ b/libbeat/processors/namespace.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/namespace_test.go b/libbeat/processors/namespace_test.go index 87f19a45970b..6fd95d39752b 100644 --- a/libbeat/processors/namespace_test.go +++ b/libbeat/processors/namespace_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/now/now.go b/libbeat/processors/now/now.go index a23904e999ff..1ffc84026b89 100644 --- a/libbeat/processors/now/now.go +++ b/libbeat/processors/now/now.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/now/now_test.go b/libbeat/processors/now/now_test.go index 422a6b9e4c58..6ac545e67303 100644 --- a/libbeat/processors/now/now_test.go +++ b/libbeat/processors/now/now_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/processor.go b/libbeat/processors/processor.go index 8d4b115abd5c..b2956630cea8 100644 --- a/libbeat/processors/processor.go +++ b/libbeat/processors/processor.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/processor_test.go b/libbeat/processors/processor_test.go index 973a62da6a1e..6fbd6644fb9f 100644 --- a/libbeat/processors/processor_test.go +++ b/libbeat/processors/processor_test.go @@ -25,16 +25,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - _ "github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_process_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/convert" - _ "github.com/elastic/beats/v7/libbeat/processors/decode_csv_fields" - _ "github.com/elastic/beats/v7/libbeat/processors/dissect" - _ "github.com/elastic/beats/v7/libbeat/processors/extract_array" - _ "github.com/elastic/beats/v7/libbeat/processors/urldecode" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + _ "github.com/elastic/beats/v9/libbeat/processors/add_cloud_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_process_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/convert" + _ "github.com/elastic/beats/v9/libbeat/processors/decode_csv_fields" + _ "github.com/elastic/beats/v9/libbeat/processors/dissect" + _ "github.com/elastic/beats/v9/libbeat/processors/extract_array" + _ "github.com/elastic/beats/v9/libbeat/processors/urldecode" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/ratelimit/rate_limit.go b/libbeat/processors/ratelimit/rate_limit.go index e96b5aba1ce3..6300d9574e81 100644 --- a/libbeat/processors/ratelimit/rate_limit.go +++ b/libbeat/processors/ratelimit/rate_limit.go @@ -27,8 +27,8 @@ import ( "github.com/gohugoio/hashstructure" "github.com/jonboulle/clockwork" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" c "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/ratelimit/rate_limit_test.go b/libbeat/processors/ratelimit/rate_limit_test.go index 8160c9b84e74..fa4cf51f164f 100644 --- a/libbeat/processors/ratelimit/rate_limit_test.go +++ b/libbeat/processors/ratelimit/rate_limit_test.go @@ -24,7 +24,7 @@ import ( "github.com/jonboulle/clockwork" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/registered_domain/registered_domain.go b/libbeat/processors/registered_domain/registered_domain.go index f93e7f57389a..48167d9f21ac 100644 --- a/libbeat/processors/registered_domain/registered_domain.go +++ b/libbeat/processors/registered_domain/registered_domain.go @@ -24,10 +24,10 @@ import ( "golang.org/x/net/publicsuffix" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/registered_domain/registered_domain_test.go b/libbeat/processors/registered_domain/registered_domain_test.go index 39dcba983529..265ac909526f 100644 --- a/libbeat/processors/registered_domain/registered_domain_test.go +++ b/libbeat/processors/registered_domain/registered_domain_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/registry.go b/libbeat/processors/registry.go index 7c6271c9dfcf..7b9553251109 100644 --- a/libbeat/processors/registry.go +++ b/libbeat/processors/registry.go @@ -20,8 +20,8 @@ package processors import ( "errors" - "github.com/elastic/beats/v7/libbeat/beat" - p "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/beat" + p "github.com/elastic/beats/v9/libbeat/plugin" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/safe_processor.go b/libbeat/processors/safe_processor.go index 2f31ad287ef8..e84e03c38d85 100644 --- a/libbeat/processors/safe_processor.go +++ b/libbeat/processors/safe_processor.go @@ -21,7 +21,7 @@ import ( "errors" "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/safe_processor_test.go b/libbeat/processors/safe_processor_test.go index e04d933dbb67..a7f1f64d08c9 100644 --- a/libbeat/processors/safe_processor_test.go +++ b/libbeat/processors/safe_processor_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/script/javascript/beatevent_v0.go b/libbeat/processors/script/javascript/beatevent_v0.go index 82b011fb991e..66ace60c9f31 100644 --- a/libbeat/processors/script/javascript/beatevent_v0.go +++ b/libbeat/processors/script/javascript/beatevent_v0.go @@ -23,7 +23,7 @@ import ( "github.com/dop251/goja" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/script/javascript/beatevent_v0_test.go b/libbeat/processors/script/javascript/beatevent_v0_test.go index b6064ed1d827..9abdb38f212d 100644 --- a/libbeat/processors/script/javascript/beatevent_v0_test.go +++ b/libbeat/processors/script/javascript/beatevent_v0_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/script/javascript/javascript.go b/libbeat/processors/script/javascript/javascript.go index 1c54b7289029..924a2681e44d 100644 --- a/libbeat/processors/script/javascript/javascript.go +++ b/libbeat/processors/script/javascript/javascript.go @@ -30,8 +30,8 @@ import ( "github.com/dop251/goja" "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/libbeat/processors/script/javascript/module/console/console_test.go b/libbeat/processors/script/javascript/module/console/console_test.go index 54f00356a3bf..40d013055f29 100644 --- a/libbeat/processors/script/javascript/module/console/console_test.go +++ b/libbeat/processors/script/javascript/module/console/console_test.go @@ -25,13 +25,13 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" // Register require module. - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/require" ) func TestConsole(t *testing.T) { diff --git a/libbeat/processors/script/javascript/module/include.go b/libbeat/processors/script/javascript/module/include.go index b498dc90e21f..baf5adb84e49 100644 --- a/libbeat/processors/script/javascript/module/include.go +++ b/libbeat/processors/script/javascript/module/include.go @@ -19,10 +19,10 @@ package module import ( // Register javascript modules. - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/console" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/net" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/path" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/windows" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/console" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/net" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/path" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/windows" ) diff --git a/libbeat/processors/script/javascript/module/net/net_test.go b/libbeat/processors/script/javascript/module/net/net_test.go index 9d4da925014b..91a86def0f82 100644 --- a/libbeat/processors/script/javascript/module/net/net_test.go +++ b/libbeat/processors/script/javascript/module/net/net_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/net" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/net" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/require" ) func TestNetIsIP(t *testing.T) { diff --git a/libbeat/processors/script/javascript/module/path/path_test.go b/libbeat/processors/script/javascript/module/path/path_test.go index d84bbb9e0d13..b31c3129844a 100644 --- a/libbeat/processors/script/javascript/module/path/path_test.go +++ b/libbeat/processors/script/javascript/module/path/path_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/path" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/path" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/require" ) func TestWin32(t *testing.T) { diff --git a/libbeat/processors/script/javascript/module/processor/chain.go b/libbeat/processors/script/javascript/module/processor/chain.go index e36583f48efa..5e2c7e7269a0 100644 --- a/libbeat/processors/script/javascript/module/processor/chain.go +++ b/libbeat/processors/script/javascript/module/processor/chain.go @@ -23,10 +23,10 @@ import ( "github.com/dop251/goja" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/script/javascript/module/processor/processor.go b/libbeat/processors/script/javascript/module/processor/processor.go index 76a7ba51393c..6eb083cd6528 100644 --- a/libbeat/processors/script/javascript/module/processor/processor.go +++ b/libbeat/processors/script/javascript/module/processor/processor.go @@ -23,9 +23,9 @@ import ( "errors" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" ) // beatProcessor wraps a processor for javascript. diff --git a/libbeat/processors/script/javascript/module/processor/processor_test.go b/libbeat/processors/script/javascript/module/processor/processor_test.go index 8697af94b127..f7117a5507f8 100644 --- a/libbeat/processors/script/javascript/module/processor/processor_test.go +++ b/libbeat/processors/script/javascript/module/processor/processor_test.go @@ -25,15 +25,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/require" ) func init() { diff --git a/libbeat/processors/script/javascript/module/processor/registry/registry.go b/libbeat/processors/script/javascript/module/processor/registry/registry.go index 5fc91f8e8153..6d23ab49f10a 100644 --- a/libbeat/processors/script/javascript/module/processor/registry/registry.go +++ b/libbeat/processors/script/javascript/module/processor/registry/registry.go @@ -18,7 +18,7 @@ package registry import ( - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/processors/script/javascript/module/require/require.go b/libbeat/processors/script/javascript/module/require/require.go index e081cac8e1d9..28fbbb99e855 100644 --- a/libbeat/processors/script/javascript/module/require/require.go +++ b/libbeat/processors/script/javascript/module/require/require.go @@ -22,7 +22,7 @@ import ( "github.com/dop251/goja_nodejs/require" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" ) func init() { diff --git a/libbeat/processors/script/javascript/session.go b/libbeat/processors/script/javascript/session.go index 0f2c07ebbd51..cad8464aad44 100644 --- a/libbeat/processors/script/javascript/session.go +++ b/libbeat/processors/script/javascript/session.go @@ -26,7 +26,7 @@ import ( "github.com/dop251/goja" "go.uber.org/zap" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/script/javascript/session_test.go b/libbeat/processors/script/javascript/session_test.go index ec0191c02b54..260d6357b409 100644 --- a/libbeat/processors/script/javascript/session_test.go +++ b/libbeat/processors/script/javascript/session_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" @@ -151,7 +151,7 @@ func TestSessionTestFunction(t *testing.T) { func TestSessionTimeout(t *testing.T) { const runawayLoop = ` while (!evt.fields.stop) { - evt.Put("hello", "world"); + evt.Put("hello", "world"); } ` @@ -190,7 +190,7 @@ func TestSessionTimeout(t *testing.T) { func TestSessionParallel(t *testing.T) { const script = ` - evt.Put("host.name", "workstation"); + evt.Put("host.name", "workstation"); ` p, err := NewFromConfig(Config{ diff --git a/libbeat/processors/script/processor.go b/libbeat/processors/script/processor.go index ee059e4ffc8b..93f8a6733a21 100644 --- a/libbeat/processors/script/processor.go +++ b/libbeat/processors/script/processor.go @@ -21,14 +21,14 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" // Register javascript modules with the processor. - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module" ) func init() { diff --git a/libbeat/processors/syslog/syslog.go b/libbeat/processors/syslog/syslog.go index fbcaceed9787..a29de3dc52c4 100644 --- a/libbeat/processors/syslog/syslog.go +++ b/libbeat/processors/syslog/syslog.go @@ -24,13 +24,13 @@ import ( "strconv" "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" - "github.com/elastic/beats/v7/libbeat/reader/syslog" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/reader/syslog" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/syslog/syslog_test.go b/libbeat/processors/syslog/syslog_test.go index 6a23b8b071e1..9abf90ba2c16 100644 --- a/libbeat/processors/syslog/syslog_test.go +++ b/libbeat/processors/syslog/syslog_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/timeseries/timeseries.go b/libbeat/processors/timeseries/timeseries.go index 3a273f777f1f..4fec552fc6a5 100644 --- a/libbeat/processors/timeseries/timeseries.go +++ b/libbeat/processors/timeseries/timeseries.go @@ -20,9 +20,9 @@ package timeseries import ( "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/mapping" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/timeseries/timeseries_test.go b/libbeat/processors/timeseries/timeseries_test.go index 7b057fc214a9..95d8d503ad19 100644 --- a/libbeat/processors/timeseries/timeseries_test.go +++ b/libbeat/processors/timeseries/timeseries_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/mapping" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/processors/timestamp/config.go b/libbeat/processors/timestamp/config.go index 7bfc5c04b984..c8e69bb18435 100644 --- a/libbeat/processors/timestamp/config.go +++ b/libbeat/processors/timestamp/config.go @@ -17,7 +17,7 @@ package timestamp -import "github.com/elastic/beats/v7/libbeat/common/cfgtype" +import "github.com/elastic/beats/v9/libbeat/common/cfgtype" type config struct { Field string `config:"field" validate:"required"` // Source field containing time time to be parsed. diff --git a/libbeat/processors/timestamp/timestamp.go b/libbeat/processors/timestamp/timestamp.go index 59671f7f244d..91dc8d845d6a 100644 --- a/libbeat/processors/timestamp/timestamp.go +++ b/libbeat/processors/timestamp/timestamp.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/timestamp/timestamp_test.go b/libbeat/processors/timestamp/timestamp_test.go index bfb677761c9c..d553ed8d5380 100644 --- a/libbeat/processors/timestamp/timestamp_test.go +++ b/libbeat/processors/timestamp/timestamp_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go b/libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go index 4b974211b91c..390f3344c19c 100644 --- a/libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go +++ b/libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/translate_sid/translatesid.go b/libbeat/processors/translate_sid/translatesid.go index fa418b004d91..41f09896d0a6 100644 --- a/libbeat/processors/translate_sid/translatesid.go +++ b/libbeat/processors/translate_sid/translatesid.go @@ -27,10 +27,10 @@ import ( "go.uber.org/multierr" "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/translate_sid/translatesid_test.go b/libbeat/processors/translate_sid/translatesid_test.go index 07eeaf466d7e..0a051de46f30 100644 --- a/libbeat/processors/translate_sid/translatesid_test.go +++ b/libbeat/processors/translate_sid/translatesid_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/urldecode/urldecode.go b/libbeat/processors/urldecode/urldecode.go index 0f0eacc91b5b..e4091232506a 100644 --- a/libbeat/processors/urldecode/urldecode.go +++ b/libbeat/processors/urldecode/urldecode.go @@ -22,10 +22,10 @@ import ( "fmt" "net/url" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/checks" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/libbeat/processors/urldecode/urldecode_test.go b/libbeat/processors/urldecode/urldecode_test.go index abd931db0a26..af9b8d08ae6e 100644 --- a/libbeat/processors/urldecode/urldecode_test.go +++ b/libbeat/processors/urldecode/urldecode_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/event.go b/libbeat/publisher/event.go index b80b12d6793d..33f0a0b14a78 100644 --- a/libbeat/publisher/event.go +++ b/libbeat/publisher/event.go @@ -18,7 +18,7 @@ package publisher import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/includes/includes.go b/libbeat/publisher/includes/includes.go index ccb69d8e475f..b374f16b9b6f 100644 --- a/libbeat/publisher/includes/includes.go +++ b/libbeat/publisher/includes/includes.go @@ -19,15 +19,15 @@ package includes import ( // import queue types - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" - _ "github.com/elastic/beats/v7/libbeat/outputs/console" - _ "github.com/elastic/beats/v7/libbeat/outputs/discard" - _ "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/v7/libbeat/outputs/fileout" - _ "github.com/elastic/beats/v7/libbeat/outputs/kafka" - _ "github.com/elastic/beats/v7/libbeat/outputs/logstash" - _ "github.com/elastic/beats/v7/libbeat/outputs/redis" - _ "github.com/elastic/beats/v7/libbeat/publisher/queue/diskqueue" - _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v9/libbeat/outputs/codec/json" + _ "github.com/elastic/beats/v9/libbeat/outputs/console" + _ "github.com/elastic/beats/v9/libbeat/outputs/discard" + _ "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" + _ "github.com/elastic/beats/v9/libbeat/outputs/fileout" + _ "github.com/elastic/beats/v9/libbeat/outputs/kafka" + _ "github.com/elastic/beats/v9/libbeat/outputs/logstash" + _ "github.com/elastic/beats/v9/libbeat/outputs/redis" + _ "github.com/elastic/beats/v9/libbeat/publisher/queue/diskqueue" + _ "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" ) diff --git a/libbeat/publisher/pipeline/client.go b/libbeat/publisher/pipeline/client.go index ea2a2c6d9947..b8614a089858 100644 --- a/libbeat/publisher/pipeline/client.go +++ b/libbeat/publisher/pipeline/client.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/pipeline/client_test.go b/libbeat/publisher/pipeline/client_test.go index 41dfdb17d31f..091f1db00652 100644 --- a/libbeat/publisher/pipeline/client_test.go +++ b/libbeat/publisher/pipeline/client_test.go @@ -28,14 +28,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/tests/resources" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/publisher/pipeline/client_worker.go b/libbeat/publisher/pipeline/client_worker.go index 3e6b8202dd21..b10a23a2b471 100644 --- a/libbeat/publisher/pipeline/client_worker.go +++ b/libbeat/publisher/pipeline/client_worker.go @@ -21,11 +21,11 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher" "go.elastic.co/apm/v2" - "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs" ) type worker struct { diff --git a/libbeat/publisher/pipeline/client_worker_test.go b/libbeat/publisher/pipeline/client_worker_test.go index ed97cd11ac83..c271f24e828e 100644 --- a/libbeat/publisher/pipeline/client_worker_test.go +++ b/libbeat/publisher/pipeline/client_worker_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/internal/testutil" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/internal/testutil" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" ) func TestMakeClientWorker(t *testing.T) { diff --git a/libbeat/publisher/pipeline/config.go b/libbeat/publisher/pipeline/config.go index cb5c81395c39..0b943b840e06 100644 --- a/libbeat/publisher/pipeline/config.go +++ b/libbeat/publisher/pipeline/config.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -30,7 +30,7 @@ import ( // Config object for loading a pipeline instance via Load. type Config struct { // Event processing configurations - mapstr.EventMetadata `config:",inline"` // Fields and tags to add to each event. + mapstr.EventMetadata `config:",inline"` // Fields and tags to add to each event. Processors processors.PluginConfig `config:"processors"` // Event queue diff --git a/libbeat/publisher/pipeline/consumer.go b/libbeat/publisher/pipeline/consumer.go index 08b3fe741b89..019721bcb2c9 100644 --- a/libbeat/publisher/pipeline/consumer.go +++ b/libbeat/publisher/pipeline/consumer.go @@ -20,8 +20,8 @@ package pipeline import ( "sync" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/pipeline/controller.go b/libbeat/publisher/pipeline/controller.go index df7ec818138a..87a93a844643 100644 --- a/libbeat/publisher/pipeline/controller.go +++ b/libbeat/publisher/pipeline/controller.go @@ -21,12 +21,12 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/libbeat/publisher/pipeline/controller_test.go b/libbeat/publisher/pipeline/controller_test.go index 65cdf5ad303e..93a6f7035e94 100644 --- a/libbeat/publisher/pipeline/controller_test.go +++ b/libbeat/publisher/pipeline/controller_test.go @@ -25,18 +25,18 @@ import ( "testing/quick" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/internal/testutil" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/internal/testutil" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/monitoring" - //"github.com/elastic/beats/v7/libbeat/tests/resources" + //"github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/libbeat/publisher/pipeline/module.go b/libbeat/publisher/pipeline/module.go index 4c8a5f0f8351..c5d85e9dc1f0 100644 --- a/libbeat/publisher/pipeline/module.go +++ b/libbeat/publisher/pipeline/module.go @@ -22,9 +22,9 @@ import ( "go.elastic.co/apm/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher/processing" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/libbeat/publisher/pipeline/nilpipeline.go b/libbeat/publisher/pipeline/nilpipeline.go index beb8267fabf9..98ebf34136e7 100644 --- a/libbeat/publisher/pipeline/nilpipeline.go +++ b/libbeat/publisher/pipeline/nilpipeline.go @@ -18,7 +18,7 @@ package pipeline import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type nilPipeline struct{} diff --git a/libbeat/publisher/pipeline/pipeline.go b/libbeat/publisher/pipeline/pipeline.go index 2fd9a7f1f986..bac0490ee31d 100644 --- a/libbeat/publisher/pipeline/pipeline.go +++ b/libbeat/publisher/pipeline/pipeline.go @@ -24,15 +24,15 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/diskqueue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/diskqueue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/pipeline/pipeline_test.go b/libbeat/publisher/pipeline/pipeline_test.go index bd374c3c87bd..41169cff0f0c 100644 --- a/libbeat/publisher/pipeline/pipeline_test.go +++ b/libbeat/publisher/pipeline/pipeline_test.go @@ -23,9 +23,9 @@ import ( "sync/atomic" "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/pipeline/queue_reader.go b/libbeat/publisher/pipeline/queue_reader.go index fa68b83739ce..7cb128c751bd 100644 --- a/libbeat/publisher/pipeline/queue_reader.go +++ b/libbeat/publisher/pipeline/queue_reader.go @@ -20,7 +20,7 @@ package pipeline import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" ) // queueReader is a standalone stateless helper goroutine to dispatch diff --git a/libbeat/publisher/pipeline/stress/gen.go b/libbeat/publisher/pipeline/stress/gen.go index c9cd9addd634..879828fc75ba 100644 --- a/libbeat/publisher/pipeline/stress/gen.go +++ b/libbeat/publisher/pipeline/stress/gen.go @@ -28,8 +28,8 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" ) type generateConfig struct { diff --git a/libbeat/publisher/pipeline/stress/out.go b/libbeat/publisher/pipeline/stress/out.go index 6e6a342b46c1..0ffcb1a630a2 100644 --- a/libbeat/publisher/pipeline/stress/out.go +++ b/libbeat/publisher/pipeline/stress/out.go @@ -22,9 +22,9 @@ import ( "math/rand/v2" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/libbeat/publisher/pipeline/stress/run.go b/libbeat/publisher/pipeline/stress/run.go index 14ac9435656e..952a3e373486 100644 --- a/libbeat/publisher/pipeline/stress/run.go +++ b/libbeat/publisher/pipeline/stress/run.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/publisher/processing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/pipeline/stress/stress_test.go b/libbeat/publisher/pipeline/stress/stress_test.go index 838c34c562ad..f59a34fd5e13 100644 --- a/libbeat/publisher/pipeline/stress/stress_test.go +++ b/libbeat/publisher/pipeline/stress/stress_test.go @@ -29,10 +29,10 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline/stress" - _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline/stress" + _ "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/publisher/pipeline/testing.go b/libbeat/publisher/pipeline/testing.go index 253ff3df57d7..26585e0d7fd6 100644 --- a/libbeat/publisher/pipeline/testing.go +++ b/libbeat/publisher/pipeline/testing.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" ) type mockPublishFn func(publisher.Batch) error diff --git a/libbeat/publisher/pipeline/ttl_batch.go b/libbeat/publisher/pipeline/ttl_batch.go index 0ef4408b6136..25974d2a4631 100644 --- a/libbeat/publisher/pipeline/ttl_batch.go +++ b/libbeat/publisher/pipeline/ttl_batch.go @@ -20,8 +20,8 @@ package pipeline import ( "sync/atomic" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" ) type retryer interface { diff --git a/libbeat/publisher/pipeline/ttl_batch_test.go b/libbeat/publisher/pipeline/ttl_batch_test.go index 4c5207acbb07..593c901ac0da 100644 --- a/libbeat/publisher/pipeline/ttl_batch_test.go +++ b/libbeat/publisher/pipeline/ttl_batch_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" ) func TestBatchSplitRetry(t *testing.T) { diff --git a/libbeat/publisher/pipetool/pipetool.go b/libbeat/publisher/pipetool/pipetool.go index 709fa3f68e12..bf4b28b30f6c 100644 --- a/libbeat/publisher/pipetool/pipetool.go +++ b/libbeat/publisher/pipetool/pipetool.go @@ -18,8 +18,8 @@ package pipetool import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/processing/default.go b/libbeat/publisher/processing/default.go index 761bdfa03bd3..3f3738ded638 100644 --- a/libbeat/publisher/processing/default.go +++ b/libbeat/publisher/processing/default.go @@ -20,16 +20,16 @@ package processing import ( "fmt" - "github.com/elastic/beats/v7/libbeat/asset" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/features" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/mapping" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/actions/addfields" - "github.com/elastic/beats/v7/libbeat/processors/timeseries" + "github.com/elastic/beats/v9/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/features" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/actions/addfields" + "github.com/elastic/beats/v9/libbeat/processors/timeseries" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" @@ -104,7 +104,7 @@ func MakeDefaultSupport( ) SupportFactory { return func(info beat.Info, log *logp.Logger, beatCfg *config.C) (Supporter, error) { cfg := struct { - mapstr.EventMetadata `config:",inline"` // Fields and tags to add to each event. + mapstr.EventMetadata `config:",inline"` // Fields and tags to add to each event. Processors processors.PluginConfig `config:"processors"` TimeSeries bool `config:"timeseries.enabled"` }{} diff --git a/libbeat/publisher/processing/default_test.go b/libbeat/publisher/processing/default_test.go index 90bd190712f0..65daa8295001 100644 --- a/libbeat/publisher/processing/default_test.go +++ b/libbeat/publisher/processing/default_test.go @@ -26,19 +26,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/actions/addfields" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/actions/addfields" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" - _ "github.com/elastic/beats/v7/libbeat/processors/add_cloud_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_docker_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_host_metadata" - _ "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_cloud_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_docker_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_host_metadata" + _ "github.com/elastic/beats/v9/libbeat/processors/add_kubernetes_metadata" ) func TestGenerateProcessorList(t *testing.T) { diff --git a/libbeat/publisher/processing/processing.go b/libbeat/publisher/processing/processing.go index e5d6be9581ba..2e1f3594d18c 100644 --- a/libbeat/publisher/processing/processing.go +++ b/libbeat/publisher/processing/processing.go @@ -18,7 +18,7 @@ package processing import ( - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/processing/processors.go b/libbeat/publisher/processing/processors.go index 710af841e234..5b80e448d367 100644 --- a/libbeat/publisher/processing/processors.go +++ b/libbeat/publisher/processing/processors.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/outputs/codec/json" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/queue/diskqueue/benchmark_test.go b/libbeat/publisher/queue/diskqueue/benchmark_test.go index e2630724e4c4..d8065104cabc 100644 --- a/libbeat/publisher/queue/diskqueue/benchmark_test.go +++ b/libbeat/publisher/queue/diskqueue/benchmark_test.go @@ -34,9 +34,9 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/queue/diskqueue/config.go b/libbeat/publisher/queue/diskqueue/config.go index 309292e025c4..daeec1e80497 100644 --- a/libbeat/publisher/queue/diskqueue/config.go +++ b/libbeat/publisher/queue/diskqueue/config.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/libbeat/publisher/queue/diskqueue/consumer.go b/libbeat/publisher/queue/diskqueue/consumer.go index a0e5e944df31..c9e3f4793a13 100644 --- a/libbeat/publisher/queue/diskqueue/consumer.go +++ b/libbeat/publisher/queue/diskqueue/consumer.go @@ -20,7 +20,7 @@ package diskqueue import ( "fmt" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" ) type diskQueueBatch struct { diff --git a/libbeat/publisher/queue/diskqueue/consumer_test.go b/libbeat/publisher/queue/diskqueue/consumer_test.go index 80378029be23..2c29881a7caa 100644 --- a/libbeat/publisher/queue/diskqueue/consumer_test.go +++ b/libbeat/publisher/queue/diskqueue/consumer_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/libbeat/publisher/queue/diskqueue/core_loop_test.go b/libbeat/publisher/queue/diskqueue/core_loop_test.go index 08ac2cbc0082..ecf5b79ccbd2 100644 --- a/libbeat/publisher/queue/diskqueue/core_loop_test.go +++ b/libbeat/publisher/queue/diskqueue/core_loop_test.go @@ -22,7 +22,7 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/libbeat/publisher/queue/diskqueue/frames.go b/libbeat/publisher/queue/diskqueue/frames.go index 2043c5b649b8..6e4d12ca8641 100644 --- a/libbeat/publisher/queue/diskqueue/frames.go +++ b/libbeat/publisher/queue/diskqueue/frames.go @@ -17,7 +17,7 @@ package diskqueue -import "github.com/elastic/beats/v7/libbeat/publisher/queue" +import "github.com/elastic/beats/v9/libbeat/publisher/queue" // Every data frame read from the queue is assigned a unique sequential // integer, which is used to keep track of which frames have been diff --git a/libbeat/publisher/queue/diskqueue/producer.go b/libbeat/publisher/queue/diskqueue/producer.go index c379ac40637d..d5ba5c9cdf94 100644 --- a/libbeat/publisher/queue/diskqueue/producer.go +++ b/libbeat/publisher/queue/diskqueue/producer.go @@ -18,7 +18,7 @@ package diskqueue import ( - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" ) type diskQueueProducer struct { diff --git a/libbeat/publisher/queue/diskqueue/queue.go b/libbeat/publisher/queue/diskqueue/queue.go index e07c0185ade4..a676ed496af3 100644 --- a/libbeat/publisher/queue/diskqueue/queue.go +++ b/libbeat/publisher/queue/diskqueue/queue.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/queue/diskqueue/queue_test.go b/libbeat/publisher/queue/diskqueue/queue_test.go index bcffc14d1852..05f286deae49 100644 --- a/libbeat/publisher/queue/diskqueue/queue_test.go +++ b/libbeat/publisher/queue/diskqueue/queue_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/queuetest" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/queuetest" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/publisher/queue/diskqueue/reader_loop.go b/libbeat/publisher/queue/diskqueue/reader_loop.go index 6fc7df572c42..c3a24eb26cf0 100644 --- a/libbeat/publisher/queue/diskqueue/reader_loop.go +++ b/libbeat/publisher/queue/diskqueue/reader_loop.go @@ -22,7 +22,7 @@ import ( "fmt" "io" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" ) // startPosition and endPosition are absolute byte offsets into the segment diff --git a/libbeat/publisher/queue/diskqueue/serialize.go b/libbeat/publisher/queue/diskqueue/serialize.go index d7e50b8f850a..8b6c1e74c189 100644 --- a/libbeat/publisher/queue/diskqueue/serialize.go +++ b/libbeat/publisher/queue/diskqueue/serialize.go @@ -25,9 +25,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-structform/cborl" "github.com/elastic/go-structform/gotype" diff --git a/libbeat/publisher/queue/memqueue/broker.go b/libbeat/publisher/queue/memqueue/broker.go index c5e98fedcc41..f35d1a58f97a 100644 --- a/libbeat/publisher/queue/memqueue/broker.go +++ b/libbeat/publisher/queue/memqueue/broker.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/queue/memqueue/internal_api.go b/libbeat/publisher/queue/memqueue/internal_api.go index 0d983de65200..af993c40a16a 100644 --- a/libbeat/publisher/queue/memqueue/internal_api.go +++ b/libbeat/publisher/queue/memqueue/internal_api.go @@ -17,7 +17,7 @@ package memqueue -import "github.com/elastic/beats/v7/libbeat/publisher/queue" +import "github.com/elastic/beats/v9/libbeat/publisher/queue" // producer -> broker API diff --git a/libbeat/publisher/queue/memqueue/produce.go b/libbeat/publisher/queue/memqueue/produce.go index 0ecabfe77f09..1f6eac6af620 100644 --- a/libbeat/publisher/queue/memqueue/produce.go +++ b/libbeat/publisher/queue/memqueue/produce.go @@ -18,7 +18,7 @@ package memqueue import ( - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/publisher/queue/memqueue/queue_test.go b/libbeat/publisher/queue/memqueue/queue_test.go index ca46f1130fad..fd46baf1495d 100644 --- a/libbeat/publisher/queue/memqueue/queue_test.go +++ b/libbeat/publisher/queue/memqueue/queue_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/publisher/queue" - "github.com/elastic/beats/v7/libbeat/publisher/queue/queuetest" + "github.com/elastic/beats/v9/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue/queuetest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/publisher/queue/memqueue/runloop.go b/libbeat/publisher/queue/memqueue/runloop.go index 4668aecb0302..8a6cc7d71723 100644 --- a/libbeat/publisher/queue/memqueue/runloop.go +++ b/libbeat/publisher/queue/memqueue/runloop.go @@ -20,7 +20,7 @@ package memqueue import ( "time" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" ) // runLoop internal state. These fields could mostly be local variables diff --git a/libbeat/publisher/queue/memqueue/runloop_test.go b/libbeat/publisher/queue/memqueue/runloop_test.go index 7b8ba7dcb183..454033ff0914 100644 --- a/libbeat/publisher/queue/memqueue/runloop_test.go +++ b/libbeat/publisher/queue/memqueue/runloop_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/publisher" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/libbeat/publisher/queue/queuetest/event.go b/libbeat/publisher/queue/queuetest/event.go index 9cfc0de11bd0..99fdc8fc6209 100644 --- a/libbeat/publisher/queue/queuetest/event.go +++ b/libbeat/publisher/queue/queuetest/event.go @@ -20,8 +20,8 @@ package queuetest import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/queue/queuetest/queuetest.go b/libbeat/publisher/queue/queuetest/queuetest.go index 96b2310d2223..6a8367010358 100644 --- a/libbeat/publisher/queue/queuetest/queuetest.go +++ b/libbeat/publisher/queue/queuetest/queuetest.go @@ -21,7 +21,7 @@ import ( "sync" "testing" - "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v9/libbeat/publisher/queue" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/publisher/testing/connector.go b/libbeat/publisher/testing/connector.go index 967f86ebe28a..0fa3ddef053c 100644 --- a/libbeat/publisher/testing/connector.go +++ b/libbeat/publisher/testing/connector.go @@ -20,7 +20,7 @@ package testing import ( "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) // ClientCounter can be used to create a beat.PipelineConnector that count diff --git a/libbeat/publisher/testing/testing.go b/libbeat/publisher/testing/testing.go index 09c1fdb6b116..1e357a31ad4f 100644 --- a/libbeat/publisher/testing/testing.go +++ b/libbeat/publisher/testing/testing.go @@ -21,7 +21,7 @@ package testing import ( "sync" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type TestPublisher struct { diff --git a/libbeat/publisher/testing/testing_test.go b/libbeat/publisher/testing/testing_test.go index 2098306b096f..0b719c3122cb 100644 --- a/libbeat/publisher/testing/testing_test.go +++ b/libbeat/publisher/testing/testing_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/debug/debug_test.go b/libbeat/reader/debug/debug_test.go index 1ae268cce830..f5372bd94895 100644 --- a/libbeat/reader/debug/debug_test.go +++ b/libbeat/reader/debug/debug_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/reader/filter/filter.go b/libbeat/reader/filter/filter.go index f14aa0d2353b..493db41a3c92 100644 --- a/libbeat/reader/filter/filter.go +++ b/libbeat/reader/filter/filter.go @@ -21,7 +21,7 @@ import ( "context" "io" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/match" "github.com/elastic/go-concert/ctxtool" diff --git a/libbeat/reader/filter/filter_test.go b/libbeat/reader/filter/filter_test.go index ac1a86455514..5dc5a00b8b46 100644 --- a/libbeat/reader/filter/filter_test.go +++ b/libbeat/reader/filter/filter_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/reader/message.go b/libbeat/reader/message.go index 9cb7e25bb085..3fef0922e652 100644 --- a/libbeat/reader/message.go +++ b/libbeat/reader/message.go @@ -20,7 +20,7 @@ package reader import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/message_test.go b/libbeat/reader/message_test.go index fd62a3a687e8..a5b520453a2b 100644 --- a/libbeat/reader/message_test.go +++ b/libbeat/reader/message_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/multiline/counter.go b/libbeat/reader/multiline/counter.go index 602ac2658857..3d4d450a3921 100644 --- a/libbeat/reader/multiline/counter.go +++ b/libbeat/reader/multiline/counter.go @@ -20,7 +20,7 @@ package multiline import ( "io" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) type counterReader struct { diff --git a/libbeat/reader/multiline/message_buffer.go b/libbeat/reader/multiline/message_buffer.go index 064dbc4fce79..256b44071238 100644 --- a/libbeat/reader/multiline/message_buffer.go +++ b/libbeat/reader/multiline/message_buffer.go @@ -18,7 +18,7 @@ package multiline import ( - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) type messageBuffer struct { diff --git a/libbeat/reader/multiline/message_buffer_test.go b/libbeat/reader/multiline/message_buffer_test.go index fff9c61b6d81..c569332e629d 100644 --- a/libbeat/reader/multiline/message_buffer_test.go +++ b/libbeat/reader/multiline/message_buffer_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/multiline/multiline.go b/libbeat/reader/multiline/multiline.go index 9cb33f29e949..a3c0a5bc894e 100644 --- a/libbeat/reader/multiline/multiline.go +++ b/libbeat/reader/multiline/multiline.go @@ -20,7 +20,7 @@ package multiline import ( "fmt" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/reader/multiline/multiline_config.go b/libbeat/reader/multiline/multiline_config.go index 13897bf54b72..7541ccf5d547 100644 --- a/libbeat/reader/multiline/multiline_config.go +++ b/libbeat/reader/multiline/multiline_config.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" ) type multilineType uint8 diff --git a/libbeat/reader/multiline/multiline_test.go b/libbeat/reader/multiline/multiline_test.go index 5e6513baff08..d1a1e37869f5 100644 --- a/libbeat/reader/multiline/multiline_test.go +++ b/libbeat/reader/multiline/multiline_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/reader/multiline/pattern.go b/libbeat/reader/multiline/pattern.go index 20efc7851bc8..dcc75f34b8b8 100644 --- a/libbeat/reader/multiline/pattern.go +++ b/libbeat/reader/multiline/pattern.go @@ -23,9 +23,9 @@ import ( "io" "time" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/readfile" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/reader/multiline/while.go b/libbeat/reader/multiline/while.go index 50d80fe848c7..9050dd19eb51 100644 --- a/libbeat/reader/multiline/while.go +++ b/libbeat/reader/multiline/while.go @@ -20,9 +20,9 @@ package multiline import ( "io" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/readfile" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/reader/parser/parser.go b/libbeat/reader/parser/parser.go index 07e8b1c0f8d5..f7aa8927a4a6 100644 --- a/libbeat/reader/parser/parser.go +++ b/libbeat/reader/parser/parser.go @@ -24,13 +24,13 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/filter" - "github.com/elastic/beats/v7/libbeat/reader/multiline" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readjson" - "github.com/elastic/beats/v7/libbeat/reader/syslog" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/filter" + "github.com/elastic/beats/v9/libbeat/reader/multiline" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readjson" + "github.com/elastic/beats/v9/libbeat/reader/syslog" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/reader/parser/parser_example_test.go b/libbeat/reader/parser/parser_example_test.go index d4a9c69a79a6..c6aa5cff48b0 100644 --- a/libbeat/reader/parser/parser_example_test.go +++ b/libbeat/reader/parser/parser_example_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" - "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/reader/readfile" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/reader/parser/parser_test.go b/libbeat/reader/parser/parser_test.go index f07f66b636b7..4e09e3ae0d05 100644 --- a/libbeat/reader/parser/parser_test.go +++ b/libbeat/reader/parser/parser_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/multiline" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/multiline" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/libbeat/reader/readfile/encode.go b/libbeat/reader/readfile/encode.go index 6f5c5acf499a..49f95479b8d5 100644 --- a/libbeat/reader/readfile/encode.go +++ b/libbeat/reader/readfile/encode.go @@ -22,8 +22,8 @@ import ( "io" "time" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readfile/encode_test.go b/libbeat/reader/readfile/encode_test.go index dca9099facd3..f2855abc3817 100644 --- a/libbeat/reader/readfile/encode_test.go +++ b/libbeat/reader/readfile/encode_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/reader/readfile/fs_metafields_other.go b/libbeat/reader/readfile/fs_metafields_other.go index 1c1bcb8a24b8..a9d95f554862 100644 --- a/libbeat/reader/readfile/fs_metafields_other.go +++ b/libbeat/reader/readfile/fs_metafields_other.go @@ -23,7 +23,7 @@ import ( "fmt" "strconv" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readfile/fs_metafields_windows.go b/libbeat/reader/readfile/fs_metafields_windows.go index 0a928ba10474..9751ee52da93 100644 --- a/libbeat/reader/readfile/fs_metafields_windows.go +++ b/libbeat/reader/readfile/fs_metafields_windows.go @@ -21,7 +21,7 @@ import ( "fmt" "strconv" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readfile/limit.go b/libbeat/reader/readfile/limit.go index fb907ba06a34..196709de1da1 100644 --- a/libbeat/reader/readfile/limit.go +++ b/libbeat/reader/readfile/limit.go @@ -20,7 +20,7 @@ package readfile import ( "fmt" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) // Reader sets an upper limited on line length. Lines longer diff --git a/libbeat/reader/readfile/limit_test.go b/libbeat/reader/readfile/limit_test.go index bee1e2c7919d..cf85ed0a6bc3 100644 --- a/libbeat/reader/readfile/limit_test.go +++ b/libbeat/reader/readfile/limit_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) type mockReader struct { diff --git a/libbeat/reader/readfile/line.go b/libbeat/reader/readfile/line.go index 9fe4da3e0eb6..7192f075ecf6 100644 --- a/libbeat/reader/readfile/line.go +++ b/libbeat/reader/readfile/line.go @@ -26,7 +26,7 @@ import ( "golang.org/x/text/transform" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/reader/readfile/line_test.go b/libbeat/reader/readfile/line_test.go index e29875a41ea5..c679dc6ae255 100644 --- a/libbeat/reader/readfile/line_test.go +++ b/libbeat/reader/readfile/line_test.go @@ -35,7 +35,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/text/transform" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/reader/readfile/metafields.go b/libbeat/reader/readfile/metafields.go index be74a9e07a57..f3f26ce31267 100644 --- a/libbeat/reader/readfile/metafields.go +++ b/libbeat/reader/readfile/metafields.go @@ -20,8 +20,8 @@ package readfile import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/file" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readfile/metafields_other_test.go b/libbeat/reader/readfile/metafields_other_test.go index 351d175156f3..9636b48db135 100644 --- a/libbeat/reader/readfile/metafields_other_test.go +++ b/libbeat/reader/readfile/metafields_other_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readfile/metafields_test.go b/libbeat/reader/readfile/metafields_test.go index e759368c2683..c56b3104e981 100644 --- a/libbeat/reader/readfile/metafields_test.go +++ b/libbeat/reader/readfile/metafields_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readfile/metafields_windows_test.go b/libbeat/reader/readfile/metafields_windows_test.go index fb4cf2a5160a..38461b819ebf 100644 --- a/libbeat/reader/readfile/metafields_windows_test.go +++ b/libbeat/reader/readfile/metafields_windows_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v9/libbeat/common/file" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readfile/strip_newline.go b/libbeat/reader/readfile/strip_newline.go index 6c5e5c513d27..998d059822b6 100644 --- a/libbeat/reader/readfile/strip_newline.go +++ b/libbeat/reader/readfile/strip_newline.go @@ -20,7 +20,7 @@ package readfile import ( "bytes" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) // StripNewline reader removes the last trailing newline characters from diff --git a/libbeat/reader/readfile/timeout.go b/libbeat/reader/readfile/timeout.go index 8e6f7f06023d..756e6724e4bc 100644 --- a/libbeat/reader/readfile/timeout.go +++ b/libbeat/reader/readfile/timeout.go @@ -22,7 +22,7 @@ import ( "io" "time" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" ) var ( diff --git a/libbeat/reader/readjson/docker_json.go b/libbeat/reader/readjson/docker_json.go index 1148e6afcafe..1dc132949017 100644 --- a/libbeat/reader/readjson/docker_json.go +++ b/libbeat/reader/readjson/docker_json.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readjson/docker_json_test.go b/libbeat/reader/readjson/docker_json_test.go index 0d49ebaf5907..8c15566d730b 100644 --- a/libbeat/reader/readjson/docker_json_test.go +++ b/libbeat/reader/readjson/docker_json_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readjson/json.go b/libbeat/reader/readjson/json.go index 48b8c10e580c..c8563e7fbae6 100644 --- a/libbeat/reader/readjson/json.go +++ b/libbeat/reader/readjson/json.go @@ -23,10 +23,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/readjson/json_test.go b/libbeat/reader/readjson/json_test.go index a49c63d399d8..5ea90743f846 100644 --- a/libbeat/reader/readjson/json_test.go +++ b/libbeat/reader/readjson/json_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) func TestUnmarshal(t *testing.T) { diff --git a/libbeat/reader/syslog/syslog.go b/libbeat/reader/syslog/syslog.go index b33c1ddd0587..1275bd6fa7cd 100644 --- a/libbeat/reader/syslog/syslog.go +++ b/libbeat/reader/syslog/syslog.go @@ -22,8 +22,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/reader/syslog/syslog_test.go b/libbeat/reader/syslog/syslog_test.go index 45214a6a55ca..5dc596b057fe 100644 --- a/libbeat/reader/syslog/syslog_test.go +++ b/libbeat/reader/syslog/syslog_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/scripts/cmd/global_fields/main.go b/libbeat/scripts/cmd/global_fields/main.go index 914556e350ac..e8c3e58bf59c 100644 --- a/libbeat/scripts/cmd/global_fields/main.go +++ b/libbeat/scripts/cmd/global_fields/main.go @@ -25,8 +25,8 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/v7/libbeat/generator/fields" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/generator/fields" + "github.com/elastic/beats/v9/libbeat/mapping" ) func main() { diff --git a/libbeat/scripts/cmd/global_fields/main_test.go b/libbeat/scripts/cmd/global_fields/main_test.go index 9c1e0b633f93..c88de537b76c 100644 --- a/libbeat/scripts/cmd/global_fields/main_test.go +++ b/libbeat/scripts/cmd/global_fields/main_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/generator/fields" + "github.com/elastic/beats/v9/libbeat/generator/fields" ) type testcase struct { diff --git a/libbeat/scripts/cmd/stress_pipeline/main.go b/libbeat/scripts/cmd/stress_pipeline/main.go index dd425413efa4..03ddfada2c0e 100644 --- a/libbeat/scripts/cmd/stress_pipeline/main.go +++ b/libbeat/scripts/cmd/stress_pipeline/main.go @@ -23,14 +23,14 @@ import ( _ "net/http/pprof" //nolint:gosec //Keep behavior "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - _ "github.com/elastic/beats/v7/libbeat/outputs/console" - _ "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/v7/libbeat/outputs/fileout" - _ "github.com/elastic/beats/v7/libbeat/outputs/logstash" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline/stress" - _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + _ "github.com/elastic/beats/v9/libbeat/outputs/console" + _ "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" + _ "github.com/elastic/beats/v9/libbeat/outputs/fileout" + _ "github.com/elastic/beats/v9/libbeat/outputs/logstash" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline/stress" + _ "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" diff --git a/libbeat/statestore/backend/es/registry.go b/libbeat/statestore/backend/es/registry.go index 42ef973a2bbf..3ceae72e6371 100644 --- a/libbeat/statestore/backend/es/registry.go +++ b/libbeat/statestore/backend/es/registry.go @@ -21,7 +21,7 @@ import ( "context" "sync" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/statestore/backend/es/store.go b/libbeat/statestore/backend/es/store.go index 790b81518594..06f5abd79cf1 100644 --- a/libbeat/statestore/backend/es/store.go +++ b/libbeat/statestore/backend/es/store.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/statestore/backend" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/statestore/backend/memlog/diskstore.go b/libbeat/statestore/backend/memlog/diskstore.go index 39ac216b0d40..57ad8630991e 100644 --- a/libbeat/statestore/backend/memlog/diskstore.go +++ b/libbeat/statestore/backend/memlog/diskstore.go @@ -28,7 +28,7 @@ import ( "sort" "strconv" - "github.com/elastic/beats/v7/libbeat/common/cleanup" + "github.com/elastic/beats/v9/libbeat/common/cleanup" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/statestore/backend/memlog/memlog.go b/libbeat/statestore/backend/memlog/memlog.go index 8864d9c9fd61..474ad3afcd10 100644 --- a/libbeat/statestore/backend/memlog/memlog.go +++ b/libbeat/statestore/backend/memlog/memlog.go @@ -22,7 +22,7 @@ import ( "path/filepath" "sync" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/libbeat/statestore/backend/memlog/memlog_test.go b/libbeat/statestore/backend/memlog/memlog_test.go index 1086e26fcb30..1491d456b5b6 100644 --- a/libbeat/statestore/backend/memlog/memlog_test.go +++ b/libbeat/statestore/backend/memlog/memlog_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/backend" - "github.com/elastic/beats/v7/libbeat/statestore/internal/storecompliance" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/internal/storecompliance" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/libbeat/statestore/backend/memlog/store.go b/libbeat/statestore/backend/memlog/store.go index 164c1024f456..31e735abd7b2 100644 --- a/libbeat/statestore/backend/memlog/store.go +++ b/libbeat/statestore/backend/memlog/store.go @@ -24,8 +24,8 @@ import ( "path/filepath" "sync" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/statestore/backend" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/libbeat/statestore/internal/storecompliance/reg.go b/libbeat/statestore/internal/storecompliance/reg.go index e5af8166b34c..02eb67fc7875 100644 --- a/libbeat/statestore/internal/storecompliance/reg.go +++ b/libbeat/statestore/internal/storecompliance/reg.go @@ -20,7 +20,7 @@ package storecompliance import ( "testing" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend" ) // Registry helper for writing tests. diff --git a/libbeat/statestore/internal/storecompliance/storecompliance.go b/libbeat/statestore/internal/storecompliance/storecompliance.go index da200a40bf62..9c4cd9a5f213 100644 --- a/libbeat/statestore/internal/storecompliance/storecompliance.go +++ b/libbeat/statestore/internal/storecompliance/storecompliance.go @@ -34,7 +34,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend" ) // BackendFactory is used by TestBackendCompliance to create diff --git a/libbeat/statestore/internal/storecompliance/util.go b/libbeat/statestore/internal/storecompliance/util.go index 68ddf20182d0..f043eb1e7dd3 100644 --- a/libbeat/statestore/internal/storecompliance/util.go +++ b/libbeat/statestore/internal/storecompliance/util.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/libbeat/common/cleanup" + "github.com/elastic/beats/v9/libbeat/common/cleanup" ) // RunWithPath uses the factory to create and configure a registry with a diff --git a/libbeat/statestore/mock_test.go b/libbeat/statestore/mock_test.go index 9cc220df3ddd..0ac555b9d5ed 100644 --- a/libbeat/statestore/mock_test.go +++ b/libbeat/statestore/mock_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/mock" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend" ) type mockRegistry struct { diff --git a/libbeat/statestore/registry.go b/libbeat/statestore/registry.go index aca20c7d91e1..22d87fff63cf 100644 --- a/libbeat/statestore/registry.go +++ b/libbeat/statestore/registry.go @@ -20,7 +20,7 @@ package statestore import ( "sync" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend" ) // Registry manages multiple key-value stores. diff --git a/libbeat/statestore/store.go b/libbeat/statestore/store.go index bc52c3e6610e..f5e39bef0c4b 100644 --- a/libbeat/statestore/store.go +++ b/libbeat/statestore/store.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "time" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/backend" "github.com/elastic/go-concert/unison" ) diff --git a/libbeat/statestore/store_test.go b/libbeat/statestore/store_test.go index 7a7833b49390..4c9cfe7c868f 100644 --- a/libbeat/statestore/store_test.go +++ b/libbeat/statestore/store_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" ) func TestStore_Close(t *testing.T) { diff --git a/libbeat/statestore/storetest/storetest.go b/libbeat/statestore/storetest/storetest.go index d43ce9bd1e42..d0bdae1993d7 100644 --- a/libbeat/statestore/storetest/storetest.go +++ b/libbeat/statestore/storetest/storetest.go @@ -22,8 +22,8 @@ import ( "errors" "sync" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/statestore/backend" ) // MemoryStore provides a dummy backend store that holds all access stores and diff --git a/libbeat/statestore/storetest/storetest_test.go b/libbeat/statestore/storetest/storetest_test.go index a96f2e5855d8..db14cb65cbbf 100644 --- a/libbeat/statestore/storetest/storetest_test.go +++ b/libbeat/statestore/storetest/storetest_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/statestore/backend" - "github.com/elastic/beats/v7/libbeat/statestore/internal/storecompliance" + "github.com/elastic/beats/v9/libbeat/statestore/backend" + "github.com/elastic/beats/v9/libbeat/statestore/internal/storecompliance" ) func TestCompliance(t *testing.T) { diff --git a/libbeat/template/config.go b/libbeat/template/config.go index db2c688d1c1f..4c3562a1a7ba 100644 --- a/libbeat/template/config.go +++ b/libbeat/template/config.go @@ -18,8 +18,8 @@ package template import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/mapping" ) // TemplateConfig holds config information about the Elasticsearch template diff --git a/libbeat/template/load.go b/libbeat/template/load.go index 7e5f32fa97d4..00a3b7222ad2 100644 --- a/libbeat/template/load.go +++ b/libbeat/template/load.go @@ -24,8 +24,8 @@ import ( "net/http" "os" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/paths" diff --git a/libbeat/template/load_integration_test.go b/libbeat/template/load_integration_test.go index 39cde51e6ff8..43f8e1b9c030 100644 --- a/libbeat/template/load_integration_test.go +++ b/libbeat/template/load_integration_test.go @@ -36,11 +36,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/esleg/eslegtest" - "github.com/elastic/beats/v7/libbeat/idxmgmt/lifecycle" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/esleg/eslegtest" + "github.com/elastic/beats/v9/libbeat/idxmgmt/lifecycle" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport/httpcommon" diff --git a/libbeat/template/load_test.go b/libbeat/template/load_test.go index 8fb59486d7f9..34395babff57 100644 --- a/libbeat/template/load_test.go +++ b/libbeat/template/load_test.go @@ -22,7 +22,7 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" diff --git a/libbeat/template/processor.go b/libbeat/template/processor.go index 05dc7cdc4fa8..973ab9a8afd3 100644 --- a/libbeat/template/processor.go +++ b/libbeat/template/processor.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/mapping" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/template/processor_test.go b/libbeat/template/processor_test.go index efd9547b7fad..e0c40a76eee7 100644 --- a/libbeat/template/processor_test.go +++ b/libbeat/template/processor_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/mapping" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/libbeat/template/template.go b/libbeat/template/template.go index 05f768b181fe..e16e10d19edd 100644 --- a/libbeat/template/template.go +++ b/libbeat/template/template.go @@ -27,9 +27,9 @@ import ( "github.com/elastic/elastic-agent-libs/version" "github.com/elastic/go-ucfg/yaml" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/mapping" ) var ( diff --git a/libbeat/template/template_test.go b/libbeat/template/template_test.go index 043e21cf39c2..8621513384b8 100644 --- a/libbeat/template/template_test.go +++ b/libbeat/template/template_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" libversion "github.com/elastic/elastic-agent-libs/version" diff --git a/libbeat/testing/integration/run_beat.go b/libbeat/testing/integration/run_beat.go index de339d64e0aa..4298c9bf08c2 100644 --- a/libbeat/testing/integration/run_beat.go +++ b/libbeat/testing/integration/run_beat.go @@ -33,7 +33,7 @@ import ( "sync" "testing" - "github.com/elastic/beats/v7/libbeat/common/proc" + "github.com/elastic/beats/v9/libbeat/common/proc" ) var ( diff --git a/libbeat/tests/integration/disablingproxy_test.go b/libbeat/tests/integration/disablingproxy_test.go index eb9a31c199f3..3959704913f0 100644 --- a/libbeat/tests/integration/disablingproxy_test.go +++ b/libbeat/tests/integration/disablingproxy_test.go @@ -25,7 +25,7 @@ import ( "net/http/httptest" "testing" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) func TestDisablingProxy(t *testing.T) { diff --git a/libbeat/tests/integration/framework.go b/libbeat/tests/integration/framework.go index 1f17cda1d6e1..8bc8d4204d86 100644 --- a/libbeat/tests/integration/framework.go +++ b/libbeat/tests/integration/framework.go @@ -52,7 +52,7 @@ import ( "github.com/stretchr/testify/require" sdkmetric "go.opentelemetry.io/otel/sdk/metric" - "github.com/elastic/beats/v7/libbeat/common/proc" + "github.com/elastic/beats/v9/libbeat/common/proc" "github.com/elastic/go-elasticsearch/v8" "github.com/elastic/mock-es/pkg/api" ) diff --git a/libbeat/tests/system/template/template.go b/libbeat/tests/system/template/template.go index 2e29793cbf8d..88084e8dd309 100644 --- a/libbeat/tests/system/template/template.go +++ b/libbeat/tests/system/template/template.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/libbeat/asset" - "github.com/elastic/beats/v7/libbeat/template" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/template" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/logp/logptest" libversion "github.com/elastic/elastic-agent-libs/version" ) diff --git a/magefile.go b/magefile.go index d2259f50403a..ded9d31abfbe 100644 --- a/magefile.go +++ b/magefile.go @@ -30,12 +30,12 @@ import ( "github.com/magefile/mage/sh" "go.uber.org/multierr" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" //mage:import "github.com/elastic/elastic-agent-libs/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v9/dev-tools/mage/gotool" ) var ( diff --git a/metricbeat/autodiscover/appender/kubernetes/token/config.go b/metricbeat/autodiscover/appender/kubernetes/token/config.go index 7363c600b07c..c8b1279294f3 100644 --- a/metricbeat/autodiscover/appender/kubernetes/token/config.go +++ b/metricbeat/autodiscover/appender/kubernetes/token/config.go @@ -18,7 +18,7 @@ package token import ( - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/conditions" ) type config struct { diff --git a/metricbeat/autodiscover/appender/kubernetes/token/token.go b/metricbeat/autodiscover/appender/kubernetes/token/token.go index dd46d1be601e..d9b148bf0f7b 100644 --- a/metricbeat/autodiscover/appender/kubernetes/token/token.go +++ b/metricbeat/autodiscover/appender/kubernetes/token/token.go @@ -21,9 +21,9 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/conditions" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/metricbeat/autodiscover/builder/hints/config.go b/metricbeat/autodiscover/builder/hints/config.go index 957ec278d7d0..b5b19384b162 100644 --- a/metricbeat/autodiscover/builder/hints/config.go +++ b/metricbeat/autodiscover/builder/hints/config.go @@ -17,7 +17,7 @@ package hints -import "github.com/elastic/beats/v7/metricbeat/mb" +import "github.com/elastic/beats/v9/metricbeat/mb" type config struct { Key string `config:"key"` diff --git a/metricbeat/autodiscover/builder/hints/metrics.go b/metricbeat/autodiscover/builder/hints/metrics.go index 3dc5958e8592..d556a849041b 100644 --- a/metricbeat/autodiscover/builder/hints/metrics.go +++ b/metricbeat/autodiscover/builder/hints/metrics.go @@ -31,10 +31,10 @@ import ( "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-autodiscover/utils" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" ) const ( diff --git a/metricbeat/autodiscover/builder/hints/metrics_test.go b/metricbeat/autodiscover/builder/hints/metrics_test.go index e4958633e4a3..795d980f962f 100644 --- a/metricbeat/autodiscover/builder/hints/metrics_test.go +++ b/metricbeat/autodiscover/builder/hints/metrics_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/testing/testutils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/testing/testutils" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-libs/keystore" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/metricbeat/beater/config.go b/metricbeat/beater/config.go index 2b430fe42683..203c4e808a8d 100644 --- a/metricbeat/beater/config.go +++ b/metricbeat/beater/config.go @@ -20,7 +20,7 @@ package beater import ( "time" - "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/metricbeat/beater/doc.go b/metricbeat/beater/doc.go index 936356326a85..774408b70e34 100644 --- a/metricbeat/beater/doc.go +++ b/metricbeat/beater/doc.go @@ -25,7 +25,7 @@ called a Module. Each Module has one or more MetricSet implementations which do the work of collecting a particular set of metrics from the service. The public interfaces used in implementing Modules and MetricSets are defined in -the github.com/elastic/beats/v7/metricbeat/mb package. +the github.com/elastic/beats/v9/metricbeat/mb package. # Event Format diff --git a/metricbeat/beater/metricbeat.go b/metricbeat/beater/metricbeat.go index b0d4f3e4c536..e9efc008301c 100644 --- a/metricbeat/beater/metricbeat.go +++ b/metricbeat/beater/metricbeat.go @@ -21,13 +21,13 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/module" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/module" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" @@ -35,13 +35,13 @@ import ( "github.com/gohugoio/hashstructure" // include all metricbeat specific builders - _ "github.com/elastic/beats/v7/metricbeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v9/metricbeat/autodiscover/builder/hints" // include all metricbeat specific appenders - _ "github.com/elastic/beats/v7/metricbeat/autodiscover/appender/kubernetes/token" + _ "github.com/elastic/beats/v9/metricbeat/autodiscover/appender/kubernetes/token" // Add metricbeat default processors - _ "github.com/elastic/beats/v7/metricbeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v9/metricbeat/processor/add_kubernetes_metadata" ) // Metricbeat implements the Beater interface for metricbeat. diff --git a/metricbeat/cmd/modules.go b/metricbeat/cmd/modules.go index a5d5717f0862..63cab08326df 100644 --- a/metricbeat/cmd/modules.go +++ b/metricbeat/cmd/modules.go @@ -21,9 +21,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cmd" ) // BuildModulesManager adds support for modules management to a beat diff --git a/metricbeat/cmd/root.go b/metricbeat/cmd/root.go index 2431f3d52795..d8c67d2c34e9 100644 --- a/metricbeat/cmd/root.go +++ b/metricbeat/cmd/root.go @@ -24,17 +24,17 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/metricbeat/beater" - "github.com/elastic/beats/v7/metricbeat/cmd/test" - "github.com/elastic/beats/v7/metricbeat/include" - "github.com/elastic/beats/v7/metricbeat/mb/module" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/metricbeat/beater" + "github.com/elastic/beats/v9/metricbeat/cmd/test" + "github.com/elastic/beats/v9/metricbeat/include" + "github.com/elastic/beats/v9/metricbeat/mb/module" // import modules - _ "github.com/elastic/beats/v7/metricbeat/include/fields" + _ "github.com/elastic/beats/v9/metricbeat/include/fields" ) const ( diff --git a/metricbeat/cmd/test/modules.go b/metricbeat/cmd/test/modules.go index 7dc7dd3a963e..aee74d825e08 100644 --- a/metricbeat/cmd/test/modules.go +++ b/metricbeat/cmd/test/modules.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/metricbeat/beater" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/metricbeat/beater" "github.com/elastic/elastic-agent-libs/testing" ) diff --git a/metricbeat/helper/dialer/dialer_windows.go b/metricbeat/helper/dialer/dialer_windows.go index 94e383e4cb6c..43485f3c053b 100644 --- a/metricbeat/helper/dialer/dialer_windows.go +++ b/metricbeat/helper/dialer/dialer_windows.go @@ -28,7 +28,7 @@ import ( winio "github.com/Microsoft/go-winio" - "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v9/libbeat/api/npipe" "github.com/elastic/elastic-agent-libs/transport" ) diff --git a/metricbeat/helper/elastic/elastic.go b/metricbeat/helper/elastic/elastic.go index 59626c6e8219..ed8495cd98d2 100644 --- a/metricbeat/helper/elastic/elastic.go +++ b/metricbeat/helper/elastic/elastic.go @@ -28,7 +28,7 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/metricbeat/helper/elastic/elastic_test.go b/metricbeat/helper/elastic/elastic_test.go index 5503fff8aa4b..a0137852ffa8 100644 --- a/metricbeat/helper/elastic/elastic_test.go +++ b/metricbeat/helper/elastic/elastic_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/helper/http.go b/metricbeat/helper/http.go index 432e94f97afb..909a9e163c9f 100644 --- a/metricbeat/helper/http.go +++ b/metricbeat/helper/http.go @@ -32,9 +32,9 @@ import ( "k8s.io/client-go/transport" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/metricbeat/helper/dialer" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/metricbeat/helper/dialer" + "github.com/elastic/beats/v9/metricbeat/mb" ) var userAgent = useragent.UserAgent("Metricbeat", version.GetDefaultVersion(), version.Commit(), version.BuildTime().String()) diff --git a/metricbeat/helper/http_test.go b/metricbeat/helper/http_test.go index ec5f364a08a0..5882572abb15 100644 --- a/metricbeat/helper/http_test.go +++ b/metricbeat/helper/http_test.go @@ -32,10 +32,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/metricbeat/helper/dialer" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/metricbeat/helper/dialer" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/helper/http_windows_test.go b/metricbeat/helper/http_windows_test.go index a905c3ffb334..bba1000aaa6e 100644 --- a/metricbeat/helper/http_windows_test.go +++ b/metricbeat/helper/http_windows_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/api/npipe" - "github.com/elastic/beats/v7/metricbeat/helper/dialer" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/api/npipe" + "github.com/elastic/beats/v9/metricbeat/helper/dialer" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/helper/kubernetes/ktest/ktest.go b/metricbeat/helper/kubernetes/ktest/ktest.go index d4066820ea13..93b35d2beb79 100644 --- a/metricbeat/helper/kubernetes/ktest/ktest.go +++ b/metricbeat/helper/kubernetes/ktest/ktest.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" ) func getFiles(folder string) ([]string, error) { diff --git a/metricbeat/helper/kubernetes/state_metricset.go b/metricbeat/helper/kubernetes/state_metricset.go index aad813e0099b..d3dce241c467 100644 --- a/metricbeat/helper/kubernetes/state_metricset.go +++ b/metricbeat/helper/kubernetes/state_metricset.go @@ -22,11 +22,11 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) /* diff --git a/metricbeat/helper/openmetrics/metric.go b/metricbeat/helper/openmetrics/metric.go index b02436178fb6..82953c2408c5 100644 --- a/metricbeat/helper/openmetrics/metric.go +++ b/metricbeat/helper/openmetrics/metric.go @@ -26,8 +26,8 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" ) // MetricMap defines the mapping from Openmetrics metric to a Metricbeat field diff --git a/metricbeat/helper/openmetrics/module.go b/metricbeat/helper/openmetrics/module.go index fac374ee1b42..64741587a5e1 100644 --- a/metricbeat/helper/openmetrics/module.go +++ b/metricbeat/helper/openmetrics/module.go @@ -18,8 +18,8 @@ package openmetrics import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/helper/openmetrics/openmetrics.go b/metricbeat/helper/openmetrics/openmetrics.go index 49f608c2f8a0..307ea42007cb 100644 --- a/metricbeat/helper/openmetrics/openmetrics.go +++ b/metricbeat/helper/openmetrics/openmetrics.go @@ -25,9 +25,9 @@ import ( "regexp" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/helper/openmetrics/openmetrics_test.go b/metricbeat/helper/openmetrics/openmetrics_test.go index 043960f15d9b..138f57d0db8d 100644 --- a/metricbeat/helper/openmetrics/openmetrics_test.go +++ b/metricbeat/helper/openmetrics/openmetrics_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/helper/prometheus/metric.go b/metricbeat/helper/prometheus/metric.go index b115072b28ac..3fd821549735 100644 --- a/metricbeat/helper/prometheus/metric.go +++ b/metricbeat/helper/prometheus/metric.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/helper/prometheus/module.go b/metricbeat/helper/prometheus/module.go index cc6b7d2a068c..18e6cffeac02 100644 --- a/metricbeat/helper/prometheus/module.go +++ b/metricbeat/helper/prometheus/module.go @@ -18,8 +18,8 @@ package prometheus import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/helper/prometheus/prometheus.go b/metricbeat/helper/prometheus/prometheus.go index 50929c128c37..227633868407 100644 --- a/metricbeat/helper/prometheus/prometheus.go +++ b/metricbeat/helper/prometheus/prometheus.go @@ -25,8 +25,8 @@ import ( "regexp" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/helper/prometheus/prometheus_test.go b/metricbeat/helper/prometheus/prometheus_test.go index dc3daec1623a..49987c182aaf 100644 --- a/metricbeat/helper/prometheus/prometheus_test.go +++ b/metricbeat/helper/prometheus/prometheus_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/helper/prometheus/ptest/ptest.go b/metricbeat/helper/prometheus/ptest/ptest.go index 9294300b97bb..f12624b7b9b2 100644 --- a/metricbeat/helper/prometheus/ptest/ptest.go +++ b/metricbeat/helper/prometheus/ptest/ptest.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" - "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" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" ) // TestCase represents a single test case for testing a metricset diff --git a/metricbeat/helper/server/http/http.go b/metricbeat/helper/server/http/http.go index 31d2683d6936..bb460b26c4f9 100644 --- a/metricbeat/helper/server/http/http.go +++ b/metricbeat/helper/server/http/http.go @@ -25,8 +25,8 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport/tlscommon" diff --git a/metricbeat/helper/server/http/http_test.go b/metricbeat/helper/server/http/http_test.go index eac36b055b46..01e68775384b 100644 --- a/metricbeat/helper/server/http/http_test.go +++ b/metricbeat/helper/server/http/http_test.go @@ -35,7 +35,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/helper/server" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/helper/server/tcp/tcp.go b/metricbeat/helper/server/tcp/tcp.go index afd23e093973..2b88c4a15d82 100644 --- a/metricbeat/helper/server/tcp/tcp.go +++ b/metricbeat/helper/server/tcp/tcp.go @@ -23,8 +23,8 @@ import ( "net" "strconv" - "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/helper/server/tcp/tcp_test.go b/metricbeat/helper/server/tcp/tcp_test.go index 07dcfea13f3c..b81c80cdfc10 100644 --- a/metricbeat/helper/server/tcp/tcp_test.go +++ b/metricbeat/helper/server/tcp/tcp_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/helper/server" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/helper/server/udp/udp.go b/metricbeat/helper/server/udp/udp.go index 446e766e95ac..5b718db410c8 100644 --- a/metricbeat/helper/server/udp/udp.go +++ b/metricbeat/helper/server/udp/udp.go @@ -22,8 +22,8 @@ import ( "net" "strconv" - "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/helper/server/udp/udp_test.go b/metricbeat/helper/server/udp/udp_test.go index 8ffa88f0ca9f..1fc5dde97b81 100644 --- a/metricbeat/helper/server/udp/udp_test.go +++ b/metricbeat/helper/server/udp/udp_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/helper/server" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/helper/sql/sql_test.go b/metricbeat/helper/sql/sql_test.go index 1612b86c9f37..88a938396c23 100644 --- a/metricbeat/helper/sql/sql_test.go +++ b/metricbeat/helper/sql/sql_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go index fd17140c6a6b..a505249cd738 100644 --- a/metricbeat/include/fields/fields.go +++ b/metricbeat/include/fields/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/include/list_common.go b/metricbeat/include/list_common.go index 6e0de6c14dcb..63affb692716 100644 --- a/metricbeat/include/list_common.go +++ b/metricbeat/include/list_common.go @@ -21,180 +21,180 @@ package include import ( // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/metricbeat/module/aerospike" - _ "github.com/elastic/beats/v7/metricbeat/module/aerospike/namespace" - _ "github.com/elastic/beats/v7/metricbeat/module/apache" - _ "github.com/elastic/beats/v7/metricbeat/module/apache/status" - _ "github.com/elastic/beats/v7/metricbeat/module/beat" - _ "github.com/elastic/beats/v7/metricbeat/module/beat/state" - _ "github.com/elastic/beats/v7/metricbeat/module/beat/stats" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/cluster_disk" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/cluster_health" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/cluster_status" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_cluster_disk" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_cluster_health" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_osd_perf" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_osd_pool_stats" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_osd_tree" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr_pool_disk" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/monitor_health" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/osd_df" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/osd_tree" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph/pool_disk" - _ "github.com/elastic/beats/v7/metricbeat/module/consul" - _ "github.com/elastic/beats/v7/metricbeat/module/consul/agent" - _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" - _ "github.com/elastic/beats/v7/metricbeat/module/couchbase/bucket" - _ "github.com/elastic/beats/v7/metricbeat/module/couchbase/cluster" - _ "github.com/elastic/beats/v7/metricbeat/module/couchbase/node" - _ "github.com/elastic/beats/v7/metricbeat/module/couchdb" - _ "github.com/elastic/beats/v7/metricbeat/module/couchdb/server" - _ "github.com/elastic/beats/v7/metricbeat/module/dropwizard" - _ "github.com/elastic/beats/v7/metricbeat/module/dropwizard/collector" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ccr" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/cluster_stats" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/enrich" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_recovery" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_summary" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ingest_pipeline" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ml_job" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node_stats" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/pending_tasks" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/shard" - _ "github.com/elastic/beats/v7/metricbeat/module/envoyproxy" - _ "github.com/elastic/beats/v7/metricbeat/module/envoyproxy/server" - _ "github.com/elastic/beats/v7/metricbeat/module/etcd" - _ "github.com/elastic/beats/v7/metricbeat/module/etcd/leader" - _ "github.com/elastic/beats/v7/metricbeat/module/etcd/metrics" - _ "github.com/elastic/beats/v7/metricbeat/module/etcd/self" - _ "github.com/elastic/beats/v7/metricbeat/module/etcd/store" - _ "github.com/elastic/beats/v7/metricbeat/module/golang" - _ "github.com/elastic/beats/v7/metricbeat/module/golang/expvar" - _ "github.com/elastic/beats/v7/metricbeat/module/golang/heap" - _ "github.com/elastic/beats/v7/metricbeat/module/graphite" - _ "github.com/elastic/beats/v7/metricbeat/module/graphite/server" - _ "github.com/elastic/beats/v7/metricbeat/module/haproxy" - _ "github.com/elastic/beats/v7/metricbeat/module/haproxy/info" - _ "github.com/elastic/beats/v7/metricbeat/module/haproxy/stat" - _ "github.com/elastic/beats/v7/metricbeat/module/http" - _ "github.com/elastic/beats/v7/metricbeat/module/http/json" - _ "github.com/elastic/beats/v7/metricbeat/module/http/server" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" - _ "github.com/elastic/beats/v7/metricbeat/module/kafka" - _ "github.com/elastic/beats/v7/metricbeat/module/kafka/consumergroup" - _ "github.com/elastic/beats/v7/metricbeat/module/kafka/partition" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana/cluster_actions" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana/cluster_rules" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana/node_actions" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana/node_rules" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana/stats" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana/status" - _ "github.com/elastic/beats/v7/metricbeat/module/kvm" - _ "github.com/elastic/beats/v7/metricbeat/module/kvm/dommemstat" - _ "github.com/elastic/beats/v7/metricbeat/module/kvm/status" - _ "github.com/elastic/beats/v7/metricbeat/module/linux" - _ "github.com/elastic/beats/v7/metricbeat/module/linux/conntrack" - _ "github.com/elastic/beats/v7/metricbeat/module/linux/iostat" - _ "github.com/elastic/beats/v7/metricbeat/module/linux/ksm" - _ "github.com/elastic/beats/v7/metricbeat/module/linux/memory" - _ "github.com/elastic/beats/v7/metricbeat/module/linux/pageinfo" - _ "github.com/elastic/beats/v7/metricbeat/module/linux/pressure" - _ "github.com/elastic/beats/v7/metricbeat/module/linux/rapl" - _ "github.com/elastic/beats/v7/metricbeat/module/logstash" - _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node" - _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node_stats" - _ "github.com/elastic/beats/v7/metricbeat/module/memcached" - _ "github.com/elastic/beats/v7/metricbeat/module/memcached/stats" - _ "github.com/elastic/beats/v7/metricbeat/module/mongodb" - _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/collstats" - _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/dbstats" - _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/metrics" - _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/replstatus" - _ "github.com/elastic/beats/v7/metricbeat/module/mongodb/status" - _ "github.com/elastic/beats/v7/metricbeat/module/munin" - _ "github.com/elastic/beats/v7/metricbeat/module/munin/node" - _ "github.com/elastic/beats/v7/metricbeat/module/mysql" - _ "github.com/elastic/beats/v7/metricbeat/module/mysql/galera_status" - _ "github.com/elastic/beats/v7/metricbeat/module/mysql/query" - _ "github.com/elastic/beats/v7/metricbeat/module/mysql/status" - _ "github.com/elastic/beats/v7/metricbeat/module/nats" - _ "github.com/elastic/beats/v7/metricbeat/module/nats/connection" - _ "github.com/elastic/beats/v7/metricbeat/module/nats/connections" - _ "github.com/elastic/beats/v7/metricbeat/module/nats/jetstream" - _ "github.com/elastic/beats/v7/metricbeat/module/nats/route" - _ "github.com/elastic/beats/v7/metricbeat/module/nats/routes" - _ "github.com/elastic/beats/v7/metricbeat/module/nats/stats" - _ "github.com/elastic/beats/v7/metricbeat/module/nats/subscriptions" - _ "github.com/elastic/beats/v7/metricbeat/module/nginx" - _ "github.com/elastic/beats/v7/metricbeat/module/nginx/stubstatus" - _ "github.com/elastic/beats/v7/metricbeat/module/openmetrics" - _ "github.com/elastic/beats/v7/metricbeat/module/openmetrics/collector" - _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm" - _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm/pool" - _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm/process" - _ "github.com/elastic/beats/v7/metricbeat/module/postgresql" - _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/activity" - _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/bgwriter" - _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/database" - _ "github.com/elastic/beats/v7/metricbeat/module/postgresql/statement" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/query" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/remote_write" - _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" - _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/connection" - _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/exchange" - _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/node" - _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/queue" - _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/shovel" - _ "github.com/elastic/beats/v7/metricbeat/module/redis" - _ "github.com/elastic/beats/v7/metricbeat/module/redis/info" - _ "github.com/elastic/beats/v7/metricbeat/module/redis/key" - _ "github.com/elastic/beats/v7/metricbeat/module/redis/keyspace" - _ "github.com/elastic/beats/v7/metricbeat/module/system" - _ "github.com/elastic/beats/v7/metricbeat/module/system/core" - _ "github.com/elastic/beats/v7/metricbeat/module/system/cpu" - _ "github.com/elastic/beats/v7/metricbeat/module/system/diskio" - _ "github.com/elastic/beats/v7/metricbeat/module/system/entropy" - _ "github.com/elastic/beats/v7/metricbeat/module/system/filesystem" - _ "github.com/elastic/beats/v7/metricbeat/module/system/fsstat" - _ "github.com/elastic/beats/v7/metricbeat/module/system/load" - _ "github.com/elastic/beats/v7/metricbeat/module/system/memory" - _ "github.com/elastic/beats/v7/metricbeat/module/system/network" - _ "github.com/elastic/beats/v7/metricbeat/module/system/network_summary" - _ "github.com/elastic/beats/v7/metricbeat/module/system/ntp" - _ "github.com/elastic/beats/v7/metricbeat/module/system/process" - _ "github.com/elastic/beats/v7/metricbeat/module/system/process_summary" - _ "github.com/elastic/beats/v7/metricbeat/module/system/raid" - _ "github.com/elastic/beats/v7/metricbeat/module/system/service" - _ "github.com/elastic/beats/v7/metricbeat/module/system/socket" - _ "github.com/elastic/beats/v7/metricbeat/module/system/socket_summary" - _ "github.com/elastic/beats/v7/metricbeat/module/system/uptime" - _ "github.com/elastic/beats/v7/metricbeat/module/system/users" - _ "github.com/elastic/beats/v7/metricbeat/module/traefik" - _ "github.com/elastic/beats/v7/metricbeat/module/traefik/health" - _ "github.com/elastic/beats/v7/metricbeat/module/uwsgi" - _ "github.com/elastic/beats/v7/metricbeat/module/uwsgi/status" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/cluster" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/datastore" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/datastorecluster" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/host" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/network" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/resourcepool" - _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/virtualmachine" - _ "github.com/elastic/beats/v7/metricbeat/module/windows" - _ "github.com/elastic/beats/v7/metricbeat/module/windows/perfmon" - _ "github.com/elastic/beats/v7/metricbeat/module/windows/service" - _ "github.com/elastic/beats/v7/metricbeat/module/windows/wmi" - _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper" - _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper/connection" - _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper/mntr" - _ "github.com/elastic/beats/v7/metricbeat/module/zookeeper/server" + _ "github.com/elastic/beats/v9/metricbeat/module/aerospike" + _ "github.com/elastic/beats/v9/metricbeat/module/aerospike/namespace" + _ "github.com/elastic/beats/v9/metricbeat/module/apache" + _ "github.com/elastic/beats/v9/metricbeat/module/apache/status" + _ "github.com/elastic/beats/v9/metricbeat/module/beat" + _ "github.com/elastic/beats/v9/metricbeat/module/beat/state" + _ "github.com/elastic/beats/v9/metricbeat/module/beat/stats" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/cluster_disk" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/cluster_health" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/cluster_status" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr_cluster_disk" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr_cluster_health" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr_osd_perf" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr_osd_pool_stats" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr_osd_tree" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr_pool_disk" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/monitor_health" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/osd_df" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/osd_tree" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph/pool_disk" + _ "github.com/elastic/beats/v9/metricbeat/module/consul" + _ "github.com/elastic/beats/v9/metricbeat/module/consul/agent" + _ "github.com/elastic/beats/v9/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v9/metricbeat/module/couchbase/bucket" + _ "github.com/elastic/beats/v9/metricbeat/module/couchbase/cluster" + _ "github.com/elastic/beats/v9/metricbeat/module/couchbase/node" + _ "github.com/elastic/beats/v9/metricbeat/module/couchdb" + _ "github.com/elastic/beats/v9/metricbeat/module/couchdb/server" + _ "github.com/elastic/beats/v9/metricbeat/module/dropwizard" + _ "github.com/elastic/beats/v9/metricbeat/module/dropwizard/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/ccr" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/cluster_stats" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/enrich" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/index" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/index_recovery" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/index_summary" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/ingest_pipeline" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/ml_job" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/node" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/node_stats" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/pending_tasks" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/shard" + _ "github.com/elastic/beats/v9/metricbeat/module/envoyproxy" + _ "github.com/elastic/beats/v9/metricbeat/module/envoyproxy/server" + _ "github.com/elastic/beats/v9/metricbeat/module/etcd" + _ "github.com/elastic/beats/v9/metricbeat/module/etcd/leader" + _ "github.com/elastic/beats/v9/metricbeat/module/etcd/metrics" + _ "github.com/elastic/beats/v9/metricbeat/module/etcd/self" + _ "github.com/elastic/beats/v9/metricbeat/module/etcd/store" + _ "github.com/elastic/beats/v9/metricbeat/module/golang" + _ "github.com/elastic/beats/v9/metricbeat/module/golang/expvar" + _ "github.com/elastic/beats/v9/metricbeat/module/golang/heap" + _ "github.com/elastic/beats/v9/metricbeat/module/graphite" + _ "github.com/elastic/beats/v9/metricbeat/module/graphite/server" + _ "github.com/elastic/beats/v9/metricbeat/module/haproxy" + _ "github.com/elastic/beats/v9/metricbeat/module/haproxy/info" + _ "github.com/elastic/beats/v9/metricbeat/module/haproxy/stat" + _ "github.com/elastic/beats/v9/metricbeat/module/http" + _ "github.com/elastic/beats/v9/metricbeat/module/http/json" + _ "github.com/elastic/beats/v9/metricbeat/module/http/server" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v9/metricbeat/module/kafka" + _ "github.com/elastic/beats/v9/metricbeat/module/kafka/consumergroup" + _ "github.com/elastic/beats/v9/metricbeat/module/kafka/partition" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana/cluster_actions" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana/cluster_rules" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana/node_actions" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana/node_rules" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana/stats" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana/status" + _ "github.com/elastic/beats/v9/metricbeat/module/kvm" + _ "github.com/elastic/beats/v9/metricbeat/module/kvm/dommemstat" + _ "github.com/elastic/beats/v9/metricbeat/module/kvm/status" + _ "github.com/elastic/beats/v9/metricbeat/module/linux" + _ "github.com/elastic/beats/v9/metricbeat/module/linux/conntrack" + _ "github.com/elastic/beats/v9/metricbeat/module/linux/iostat" + _ "github.com/elastic/beats/v9/metricbeat/module/linux/ksm" + _ "github.com/elastic/beats/v9/metricbeat/module/linux/memory" + _ "github.com/elastic/beats/v9/metricbeat/module/linux/pageinfo" + _ "github.com/elastic/beats/v9/metricbeat/module/linux/pressure" + _ "github.com/elastic/beats/v9/metricbeat/module/linux/rapl" + _ "github.com/elastic/beats/v9/metricbeat/module/logstash" + _ "github.com/elastic/beats/v9/metricbeat/module/logstash/node" + _ "github.com/elastic/beats/v9/metricbeat/module/logstash/node_stats" + _ "github.com/elastic/beats/v9/metricbeat/module/memcached" + _ "github.com/elastic/beats/v9/metricbeat/module/memcached/stats" + _ "github.com/elastic/beats/v9/metricbeat/module/mongodb" + _ "github.com/elastic/beats/v9/metricbeat/module/mongodb/collstats" + _ "github.com/elastic/beats/v9/metricbeat/module/mongodb/dbstats" + _ "github.com/elastic/beats/v9/metricbeat/module/mongodb/metrics" + _ "github.com/elastic/beats/v9/metricbeat/module/mongodb/replstatus" + _ "github.com/elastic/beats/v9/metricbeat/module/mongodb/status" + _ "github.com/elastic/beats/v9/metricbeat/module/munin" + _ "github.com/elastic/beats/v9/metricbeat/module/munin/node" + _ "github.com/elastic/beats/v9/metricbeat/module/mysql" + _ "github.com/elastic/beats/v9/metricbeat/module/mysql/galera_status" + _ "github.com/elastic/beats/v9/metricbeat/module/mysql/query" + _ "github.com/elastic/beats/v9/metricbeat/module/mysql/status" + _ "github.com/elastic/beats/v9/metricbeat/module/nats" + _ "github.com/elastic/beats/v9/metricbeat/module/nats/connection" + _ "github.com/elastic/beats/v9/metricbeat/module/nats/connections" + _ "github.com/elastic/beats/v9/metricbeat/module/nats/jetstream" + _ "github.com/elastic/beats/v9/metricbeat/module/nats/route" + _ "github.com/elastic/beats/v9/metricbeat/module/nats/routes" + _ "github.com/elastic/beats/v9/metricbeat/module/nats/stats" + _ "github.com/elastic/beats/v9/metricbeat/module/nats/subscriptions" + _ "github.com/elastic/beats/v9/metricbeat/module/nginx" + _ "github.com/elastic/beats/v9/metricbeat/module/nginx/stubstatus" + _ "github.com/elastic/beats/v9/metricbeat/module/openmetrics" + _ "github.com/elastic/beats/v9/metricbeat/module/openmetrics/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v9/metricbeat/module/php_fpm/pool" + _ "github.com/elastic/beats/v9/metricbeat/module/php_fpm/process" + _ "github.com/elastic/beats/v9/metricbeat/module/postgresql" + _ "github.com/elastic/beats/v9/metricbeat/module/postgresql/activity" + _ "github.com/elastic/beats/v9/metricbeat/module/postgresql/bgwriter" + _ "github.com/elastic/beats/v9/metricbeat/module/postgresql/database" + _ "github.com/elastic/beats/v9/metricbeat/module/postgresql/statement" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/query" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/remote_write" + _ "github.com/elastic/beats/v9/metricbeat/module/rabbitmq" + _ "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/connection" + _ "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/exchange" + _ "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/node" + _ "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/queue" + _ "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/shovel" + _ "github.com/elastic/beats/v9/metricbeat/module/redis" + _ "github.com/elastic/beats/v9/metricbeat/module/redis/info" + _ "github.com/elastic/beats/v9/metricbeat/module/redis/key" + _ "github.com/elastic/beats/v9/metricbeat/module/redis/keyspace" + _ "github.com/elastic/beats/v9/metricbeat/module/system" + _ "github.com/elastic/beats/v9/metricbeat/module/system/core" + _ "github.com/elastic/beats/v9/metricbeat/module/system/cpu" + _ "github.com/elastic/beats/v9/metricbeat/module/system/diskio" + _ "github.com/elastic/beats/v9/metricbeat/module/system/entropy" + _ "github.com/elastic/beats/v9/metricbeat/module/system/filesystem" + _ "github.com/elastic/beats/v9/metricbeat/module/system/fsstat" + _ "github.com/elastic/beats/v9/metricbeat/module/system/load" + _ "github.com/elastic/beats/v9/metricbeat/module/system/memory" + _ "github.com/elastic/beats/v9/metricbeat/module/system/network" + _ "github.com/elastic/beats/v9/metricbeat/module/system/network_summary" + _ "github.com/elastic/beats/v9/metricbeat/module/system/ntp" + _ "github.com/elastic/beats/v9/metricbeat/module/system/process" + _ "github.com/elastic/beats/v9/metricbeat/module/system/process_summary" + _ "github.com/elastic/beats/v9/metricbeat/module/system/raid" + _ "github.com/elastic/beats/v9/metricbeat/module/system/service" + _ "github.com/elastic/beats/v9/metricbeat/module/system/socket" + _ "github.com/elastic/beats/v9/metricbeat/module/system/socket_summary" + _ "github.com/elastic/beats/v9/metricbeat/module/system/uptime" + _ "github.com/elastic/beats/v9/metricbeat/module/system/users" + _ "github.com/elastic/beats/v9/metricbeat/module/traefik" + _ "github.com/elastic/beats/v9/metricbeat/module/traefik/health" + _ "github.com/elastic/beats/v9/metricbeat/module/uwsgi" + _ "github.com/elastic/beats/v9/metricbeat/module/uwsgi/status" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere/cluster" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere/datastore" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere/datastorecluster" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere/host" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere/network" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere/resourcepool" + _ "github.com/elastic/beats/v9/metricbeat/module/vsphere/virtualmachine" + _ "github.com/elastic/beats/v9/metricbeat/module/windows" + _ "github.com/elastic/beats/v9/metricbeat/module/windows/perfmon" + _ "github.com/elastic/beats/v9/metricbeat/module/windows/service" + _ "github.com/elastic/beats/v9/metricbeat/module/windows/wmi" + _ "github.com/elastic/beats/v9/metricbeat/module/zookeeper" + _ "github.com/elastic/beats/v9/metricbeat/module/zookeeper/connection" + _ "github.com/elastic/beats/v9/metricbeat/module/zookeeper/mntr" + _ "github.com/elastic/beats/v9/metricbeat/module/zookeeper/server" ) diff --git a/metricbeat/include/list_docker.go b/metricbeat/include/list_docker.go index c61266a1ff93..8b4180908d26 100644 --- a/metricbeat/include/list_docker.go +++ b/metricbeat/include/list_docker.go @@ -23,40 +23,40 @@ package include import ( // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/metricbeat/module/docker/container" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/cpu" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/diskio" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/event" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/healthcheck" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/image" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/info" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/memory" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/network" - _ "github.com/elastic/beats/v7/metricbeat/module/docker/network_summary" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/apiserver" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/container" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/controllermanager" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/event" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/node" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/pod" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/proxy" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/scheduler" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_container" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_cronjob" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_daemonset" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_deployment" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_horizontalpodautoscaler" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_job" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_namespace" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_node" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_persistentvolume" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_persistentvolumeclaim" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_pod" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_replicaset" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_resourcequota" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_service" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_statefulset" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/state_storageclass" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/system" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes/volume" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/container" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/cpu" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/diskio" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/event" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/healthcheck" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/image" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/info" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/memory" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/network" + _ "github.com/elastic/beats/v9/metricbeat/module/docker/network_summary" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/apiserver" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/container" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/controllermanager" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/event" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/node" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/pod" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/proxy" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/scheduler" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_container" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_cronjob" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_daemonset" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_deployment" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_horizontalpodautoscaler" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_job" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_namespace" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_node" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_persistentvolume" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_persistentvolumeclaim" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_pod" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_replicaset" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_resourcequota" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_service" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_statefulset" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/state_storageclass" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/system" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes/volume" ) diff --git a/metricbeat/include/list_init.go b/metricbeat/include/list_init.go index 037e00b28915..e1b917e16ea2 100644 --- a/metricbeat/include/list_init.go +++ b/metricbeat/include/list_init.go @@ -21,9 +21,9 @@ package include import ( // Import packages to perform 'func InitializeModule()' when in-use. - m0 "github.com/elastic/beats/v7/metricbeat/autodiscover/builder/hints" - m1 "github.com/elastic/beats/v7/metricbeat/autodiscover/appender/kubernetes/token" - m2 "github.com/elastic/beats/v7/metricbeat/processor/add_kubernetes_metadata" + m0 "github.com/elastic/beats/v9/metricbeat/autodiscover/builder/hints" + m1 "github.com/elastic/beats/v9/metricbeat/autodiscover/appender/kubernetes/token" + m2 "github.com/elastic/beats/v9/metricbeat/processor/add_kubernetes_metadata" // Import packages that perform 'func init()'. ) diff --git a/metricbeat/internal/sysinit/init.go b/metricbeat/internal/sysinit/init.go index 4a4a2d17b000..50ac0f5d32ba 100644 --- a/metricbeat/internal/sysinit/init.go +++ b/metricbeat/internal/sysinit/init.go @@ -22,9 +22,9 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/metricbeat/mb" ) var hostfsCLI = flag.String("system.hostfs", "", "Mount point of the host's filesystem for use in monitoring a host from within a container") diff --git a/metricbeat/internal/sysinit/module.go b/metricbeat/internal/sysinit/module.go index a09a7e27eb70..70dd5cfe8571 100644 --- a/metricbeat/internal/sysinit/module.go +++ b/metricbeat/internal/sysinit/module.go @@ -20,7 +20,7 @@ package sysinit import ( "path/filepath" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // Module represents the system/linux module diff --git a/metricbeat/internal/sysinit/system_windows.go b/metricbeat/internal/sysinit/system_windows.go index 0b7ab6f81261..a5c835ae0497 100644 --- a/metricbeat/internal/sysinit/system_windows.go +++ b/metricbeat/internal/sysinit/system_windows.go @@ -18,7 +18,7 @@ package sysinit import ( - "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go index 36c1f9770c85..185629c42aa8 100644 --- a/metricbeat/magefile.go +++ b/metricbeat/magefile.go @@ -28,30 +28,30 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + metricbeat "github.com/elastic/beats/v9/metricbeat/scripts/mage" // register kubernetes runner - _ "github.com/elastic/beats/v7/dev-tools/mage/kubernetes" + _ "github.com/elastic/beats/v9/dev-tools/mage/kubernetes" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/dashboards" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/docs" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/docs" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/pkg" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" //mage:import - _ "github.com/elastic/beats/v7/metricbeat/scripts/mage/target/metricset" + _ "github.com/elastic/beats/v9/metricbeat/scripts/mage/target/metricset" ) func init() { @@ -129,7 +129,7 @@ func configYML() error { func MockedTests(ctx context.Context) error { params := devtools.DefaultGoTestUnitArgs() - params.ExtraFlags = []string{"github.com/elastic/beats/v7/metricbeat/mb/testing/data/."} + params.ExtraFlags = []string{"github.com/elastic/beats/v9/metricbeat/mb/testing/data/."} if module := os.Getenv("MODULE"); module != "" { params.ExtraFlags = append(params.ExtraFlags, "-module="+module) diff --git a/metricbeat/main.go b/metricbeat/main.go index 8515bca79d80..6b669f78e334 100644 --- a/metricbeat/main.go +++ b/metricbeat/main.go @@ -28,7 +28,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/metricbeat/cmd" + "github.com/elastic/beats/v9/metricbeat/cmd" ) func main() { diff --git a/metricbeat/main_test.go b/metricbeat/main_test.go index f2b585d56cab..34743ba96ed2 100644 --- a/metricbeat/main_test.go +++ b/metricbeat/main_test.go @@ -24,9 +24,9 @@ import ( "os" "testing" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - mbcmd "github.com/elastic/beats/v7/metricbeat/cmd" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + mbcmd "github.com/elastic/beats/v9/metricbeat/cmd" ) var ( diff --git a/metricbeat/mb/event.go b/metricbeat/mb/event.go index ebd0af668e94..efb600f5d752 100644 --- a/metricbeat/mb/event.go +++ b/metricbeat/mb/event.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/mb/event_test.go b/metricbeat/mb/event_test.go index 7974598bbcfa..968cca034751 100644 --- a/metricbeat/mb/event_test.go +++ b/metricbeat/mb/event_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/beat/events" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/mb/example_metricset_test.go b/metricbeat/mb/example_metricset_test.go index 10be7b75861c..34be20cfa4e5 100644 --- a/metricbeat/mb/example_metricset_test.go +++ b/metricbeat/mb/example_metricset_test.go @@ -20,8 +20,8 @@ package mb_test import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/mb/example_module_test.go b/metricbeat/mb/example_module_test.go index b4520f719714..8422d1f521ba 100644 --- a/metricbeat/mb/example_module_test.go +++ b/metricbeat/mb/example_module_test.go @@ -18,7 +18,7 @@ package mb_test import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) func init() { diff --git a/metricbeat/mb/lightmetricset.go b/metricbeat/mb/lightmetricset.go index cdcef0d20aff..9e2e80c2cc0d 100644 --- a/metricbeat/mb/lightmetricset.go +++ b/metricbeat/mb/lightmetricset.go @@ -20,7 +20,7 @@ package mb import ( "fmt" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/metricbeat/mb/lightmodules.go b/metricbeat/mb/lightmodules.go index 3705665b0fc9..1e927dac90e7 100644 --- a/metricbeat/mb/lightmodules.go +++ b/metricbeat/mb/lightmodules.go @@ -24,8 +24,8 @@ import ( "path/filepath" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/mb/lightmodules_test.go b/metricbeat/mb/lightmodules_test.go index 82d50ef1dbff..fa032fd53924 100644 --- a/metricbeat/mb/lightmodules_test.go +++ b/metricbeat/mb/lightmodules_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - _ "github.com/elastic/beats/v7/libbeat/processors/add_id" + _ "github.com/elastic/beats/v9/libbeat/processors/add_id" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/metricbeat/mb/main_test.go b/metricbeat/mb/main_test.go index e030d305f008..c2ea6f7cc797 100644 --- a/metricbeat/mb/main_test.go +++ b/metricbeat/mb/main_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/testing/testflag" + "github.com/elastic/beats/v9/testing/testflag" ) func TestMain(m *testing.M) { diff --git a/metricbeat/mb/mb.go b/metricbeat/mb/mb.go index e29eb23de6df..a9a11ee1691f 100644 --- a/metricbeat/mb/mb.go +++ b/metricbeat/mb/mb.go @@ -27,8 +27,8 @@ import ( "net/url" "time" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/metricbeat/helper/dialer" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/metricbeat/mb/module/configuration.go b/metricbeat/mb/module/configuration.go index 575989c18eec..8bbd551e4a19 100644 --- a/metricbeat/mb/module/configuration.go +++ b/metricbeat/mb/module/configuration.go @@ -20,9 +20,9 @@ package module import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/mb/module/connector.go b/metricbeat/mb/module/connector.go index c9a7a983326f..7ef1f72cdf10 100644 --- a/metricbeat/mb/module/connector.go +++ b/metricbeat/mb/module/connector.go @@ -20,10 +20,10 @@ package module import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/add_formatted_index" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/metricbeat/mb/module/connector_test.go b/metricbeat/mb/module/connector_test.go index 5079fbb23f91..406f3fe65fcb 100644 --- a/metricbeat/mb/module/connector_test.go +++ b/metricbeat/mb/module/connector_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/mb/module/doc.go b/metricbeat/mb/module/doc.go index c67256697371..9fbdb026a268 100644 --- a/metricbeat/mb/module/doc.go +++ b/metricbeat/mb/module/doc.go @@ -18,7 +18,7 @@ // Package module contains the low-level utilities for running Metricbeat // modules and metricsets. This is useful for building your own tool that // has a module and sub-module concept. If you want to reuse the whole -// Metricbeat framework see the github.com/elastic/beats/v7/metricbeat/beater +// Metricbeat framework see the github.com/elastic/beats/v9/metricbeat/beater // package that provides a higher level interface. // // This contains the tools for instantiating modules, running them, and diff --git a/metricbeat/mb/module/example_test.go b/metricbeat/mb/module/example_test.go index 315139f7cc1e..0df3b2174300 100644 --- a/metricbeat/mb/module/example_test.go +++ b/metricbeat/mb/module/example_test.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs/codec/json" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/module" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/module" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/mb/module/factory.go b/metricbeat/mb/module/factory.go index 4dbbcd167d47..21feb041f7dd 100644 --- a/metricbeat/mb/module/factory.go +++ b/metricbeat/mb/module/factory.go @@ -18,9 +18,9 @@ package module import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/metricbeat/mb/module/options.go b/metricbeat/mb/module/options.go index a1a36cf2770d..21bc1f78c7aa 100644 --- a/metricbeat/mb/module/options.go +++ b/metricbeat/mb/module/options.go @@ -20,7 +20,7 @@ package module import ( "time" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/mb/module/options_test.go b/metricbeat/mb/module/options_test.go index 5cc0f17be98e..9d27e91a564b 100644 --- a/metricbeat/mb/module/options_test.go +++ b/metricbeat/mb/module/options_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) func TestWithMaxStartDelay(t *testing.T) { diff --git a/metricbeat/mb/module/publish.go b/metricbeat/mb/module/publish.go index 6f9c200eac6c..097dbd64bb1b 100644 --- a/metricbeat/mb/module/publish.go +++ b/metricbeat/mb/module/publish.go @@ -20,7 +20,7 @@ package module import ( "sync" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) // PublishChannels publishes the events read from each channel to the given diff --git a/metricbeat/mb/module/runner.go b/metricbeat/mb/module/runner.go index 3ced7cfd56b2..23223909950f 100644 --- a/metricbeat/mb/module/runner.go +++ b/metricbeat/mb/module/runner.go @@ -22,10 +22,10 @@ import ( "path/filepath" "sync" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/metricbeat/mb/module/runner_group.go b/metricbeat/mb/module/runner_group.go index b4d92d29f561..4b242872b4f2 100644 --- a/metricbeat/mb/module/runner_group.go +++ b/metricbeat/mb/module/runner_group.go @@ -21,9 +21,9 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/libbeat/management/status" ) type runnerGroup struct { diff --git a/metricbeat/mb/module/runner_group_test.go b/metricbeat/mb/module/runner_group_test.go index 2cd6e6cc8b5c..c9edf7136763 100644 --- a/metricbeat/mb/module/runner_group_test.go +++ b/metricbeat/mb/module/runner_group_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" ) const ( diff --git a/metricbeat/mb/module/runner_test.go b/metricbeat/mb/module/runner_test.go index 6dc6c2456642..5e25db0ebb2a 100644 --- a/metricbeat/mb/module/runner_test.go +++ b/metricbeat/mb/module/runner_test.go @@ -23,13 +23,13 @@ import ( "runtime" "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/module" - _ "github.com/elastic/beats/v7/metricbeat/module/system" - _ "github.com/elastic/beats/v7/metricbeat/module/system/cpu" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/module" + _ "github.com/elastic/beats/v9/metricbeat/module/system" + _ "github.com/elastic/beats/v9/metricbeat/module/system/cpu" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/metricbeat/mb/module/testing.go b/metricbeat/mb/module/testing.go index 779a630dd969..9767d9f2486d 100644 --- a/metricbeat/mb/module/testing.go +++ b/metricbeat/mb/module/testing.go @@ -22,8 +22,8 @@ import ( "errors" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/testing" ) diff --git a/metricbeat/mb/module/wrapper.go b/metricbeat/mb/module/wrapper.go index 8f1bb61162d5..d481af8ef5d9 100644 --- a/metricbeat/mb/module/wrapper.go +++ b/metricbeat/mb/module/wrapper.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/metricbeat/mb/module/wrapper_internal_test.go b/metricbeat/mb/module/wrapper_internal_test.go index 1b016d57f134..98902031b169 100644 --- a/metricbeat/mb/module/wrapper_internal_test.go +++ b/metricbeat/mb/module/wrapper_internal_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/metricbeat/mb/module/wrapper_test.go b/metricbeat/mb/module/wrapper_test.go index e178721edf84..9f4830f5662c 100644 --- a/metricbeat/mb/module/wrapper_test.go +++ b/metricbeat/mb/module/wrapper_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/module" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/module" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/metricbeat/mb/parse/hostparsers.go b/metricbeat/mb/parse/hostparsers.go index 4fca7e99aa90..3a74d90ea671 100644 --- a/metricbeat/mb/parse/hostparsers.go +++ b/metricbeat/mb/parse/hostparsers.go @@ -20,7 +20,7 @@ package parse import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // PassThruHostParser is a HostParser that sets the HostData URI, SanitizedURI, diff --git a/metricbeat/mb/parse/url.go b/metricbeat/mb/parse/url.go index 703d211e57d6..36b8f29050ce 100644 --- a/metricbeat/mb/parse/url.go +++ b/metricbeat/mb/parse/url.go @@ -24,8 +24,8 @@ import ( p "path" "strings" - "github.com/elastic/beats/v7/metricbeat/helper/dialer" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/dialer" + "github.com/elastic/beats/v9/metricbeat/mb" ) // URLHostParserBuilder builds a tailored HostParser for used with host strings diff --git a/metricbeat/mb/parse/url_test.go b/metricbeat/mb/parse/url_test.go index 5119cbd1e84c..309c00cba01c 100644 --- a/metricbeat/mb/parse/url_test.go +++ b/metricbeat/mb/parse/url_test.go @@ -20,10 +20,10 @@ package parse import ( "testing" - "github.com/elastic/beats/v7/metricbeat/helper/dialer" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/dialer" + "github.com/elastic/beats/v9/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/mb/registry.go b/metricbeat/mb/registry.go index 148e8e0ab2ce..fb9dc710cbf9 100644 --- a/metricbeat/mb/registry.go +++ b/metricbeat/mb/registry.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/mb/testing/data/data_test.go b/metricbeat/mb/testing/data/data_test.go index 13fbf42b2326..0fce7bcfed3f 100644 --- a/metricbeat/mb/testing/data/data_test.go +++ b/metricbeat/mb/testing/data/data_test.go @@ -28,8 +28,8 @@ import ( "strings" "testing" - _ "github.com/elastic/beats/v7/metricbeat/include" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/include" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestAll(t *testing.T) { diff --git a/metricbeat/mb/testing/data_generator.go b/metricbeat/mb/testing/data_generator.go index 00dce1ea7f05..bcbd8f23e261 100644 --- a/metricbeat/mb/testing/data_generator.go +++ b/metricbeat/mb/testing/data_generator.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/mb/testing/fetcher.go b/metricbeat/mb/testing/fetcher.go index f02dc8d8dd78..9d5f1cf53217 100644 --- a/metricbeat/mb/testing/fetcher.go +++ b/metricbeat/mb/testing/fetcher.go @@ -20,8 +20,8 @@ package testing import ( "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/mb/testing/lightmodules_test.go b/metricbeat/mb/testing/lightmodules_test.go index 7e2f1dfb39c6..28ead77ec0e7 100644 --- a/metricbeat/mb/testing/lightmodules_test.go +++ b/metricbeat/mb/testing/lightmodules_test.go @@ -32,15 +32,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" // Processor in the light module - _ "github.com/elastic/beats/v7/libbeat/processors/actions" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" // Input used in the light module - _ "github.com/elastic/beats/v7/metricbeat/module/http/json" + _ "github.com/elastic/beats/v9/metricbeat/module/http/json" ) func init() { diff --git a/metricbeat/mb/testing/modules.go b/metricbeat/mb/testing/modules.go index 2b0465f3b3b3..43731960673c 100644 --- a/metricbeat/mb/testing/modules.go +++ b/metricbeat/mb/testing/modules.go @@ -30,7 +30,7 @@ that Metricbeat does it and with the same validations. import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { @@ -61,10 +61,10 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/go-concert/timed" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/mb/testing/testdata.go b/metricbeat/mb/testing/testdata.go index e5bb4a9f8fc2..93346c373343 100644 --- a/metricbeat/mb/testing/testdata.go +++ b/metricbeat/mb/testing/testdata.go @@ -32,13 +32,13 @@ import ( "github.com/gohugoio/hashstructure" "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/libbeat/asset" - "github.com/elastic/beats/v7/libbeat/mapping" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v9/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/mapping" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" "github.com/elastic/elastic-agent-libs/mapstr" - _ "github.com/elastic/beats/v7/metricbeat/include/fields" + _ "github.com/elastic/beats/v9/metricbeat/include/fields" ) const ( diff --git a/metricbeat/module/aerospike/fields.go b/metricbeat/module/aerospike/fields.go index d7ac01c32831..a40fe62472cf 100644 --- a/metricbeat/module/aerospike/fields.go +++ b/metricbeat/module/aerospike/fields.go @@ -20,7 +20,7 @@ package aerospike import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/aerospike/namespace/data.go b/metricbeat/module/aerospike/namespace/data.go index e774d2e9ec94..5170c21bb9b1 100644 --- a/metricbeat/module/aerospike/namespace/data.go +++ b/metricbeat/module/aerospike/namespace/data.go @@ -18,8 +18,8 @@ package namespace import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" ) var schema = s.Schema{ diff --git a/metricbeat/module/aerospike/namespace/namespace.go b/metricbeat/module/aerospike/namespace/namespace.go index e82425ec4128..433971540729 100644 --- a/metricbeat/module/aerospike/namespace/namespace.go +++ b/metricbeat/module/aerospike/namespace/namespace.go @@ -23,8 +23,8 @@ import ( as "github.com/aerospike/aerospike-client-go/v7" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/aerospike" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/aerospike" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/aerospike/namespace/namespace_integration_test.go b/metricbeat/module/aerospike/namespace/namespace_integration_test.go index ca92f46bd598..3f8b9c29cb1c 100644 --- a/metricbeat/module/aerospike/namespace/namespace_integration_test.go +++ b/metricbeat/module/aerospike/namespace/namespace_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/apache/fields.go b/metricbeat/module/apache/fields.go index 248ef43d23eb..2a64d81a6c4b 100644 --- a/metricbeat/module/apache/fields.go +++ b/metricbeat/module/apache/fields.go @@ -20,7 +20,7 @@ package apache import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/apache/status/data.go b/metricbeat/module/apache/status/data.go index 6c3581714160..245f94ad378c 100644 --- a/metricbeat/module/apache/status/data.go +++ b/metricbeat/module/apache/status/data.go @@ -23,8 +23,8 @@ import ( "regexp" "strings" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/apache/status/status.go b/metricbeat/module/apache/status/status.go index ea51521b6610..240df5a31363 100644 --- a/metricbeat/module/apache/status/status.go +++ b/metricbeat/module/apache/status/status.go @@ -21,10 +21,10 @@ package status import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/fleetmode" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/fleetmode" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/apache/status/status_integration_test.go b/metricbeat/module/apache/status/status_integration_test.go index 44495dba753b..60c947dff821 100644 --- a/metricbeat/module/apache/status/status_integration_test.go +++ b/metricbeat/module/apache/status/status_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/apache/status/status_test.go b/metricbeat/module/apache/status/status_test.go index 67cc96d0a2d5..1917c2f3659c 100644 --- a/metricbeat/module/apache/status/status_test.go +++ b/metricbeat/module/apache/status/status_test.go @@ -31,13 +31,13 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/v7/metricbeat/module/apache" + _ "github.com/elastic/beats/v9/metricbeat/module/apache" ) // response is a raw response copied from an Apache web server. diff --git a/metricbeat/module/beat/beat.go b/metricbeat/module/beat/beat.go index 5f7bf5cac702..978d6e93ca82 100644 --- a/metricbeat/module/beat/beat.go +++ b/metricbeat/module/beat/beat.go @@ -24,9 +24,9 @@ import ( "path" "strings" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/beat/beat_integration_test.go b/metricbeat/module/beat/beat_integration_test.go index 49d2a48a363a..ccd19837feff 100644 --- a/metricbeat/module/beat/beat_integration_test.go +++ b/metricbeat/module/beat/beat_integration_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/beat" - _ "github.com/elastic/beats/v7/metricbeat/module/beat/state" - _ "github.com/elastic/beats/v7/metricbeat/module/beat/stats" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/beat" + _ "github.com/elastic/beats/v9/metricbeat/module/beat/state" + _ "github.com/elastic/beats/v9/metricbeat/module/beat/stats" ) var metricSets = []string{ diff --git a/metricbeat/module/beat/fields.go b/metricbeat/module/beat/fields.go index 146a920a0289..3a90cd4e6d4b 100644 --- a/metricbeat/module/beat/fields.go +++ b/metricbeat/module/beat/fields.go @@ -20,7 +20,7 @@ package beat import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/beat/metricset.go b/metricbeat/module/beat/metricset.go index fe0d2d9acf8e..a67660318388 100644 --- a/metricbeat/module/beat/metricset.go +++ b/metricbeat/module/beat/metricset.go @@ -18,8 +18,8 @@ package beat import ( - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" ) // MetricSet can be used to build other metricsets within the Beat module. diff --git a/metricbeat/module/beat/state/data.go b/metricbeat/module/beat/state/data.go index 5d8231046043..7d11461bd930 100644 --- a/metricbeat/module/beat/state/data.go +++ b/metricbeat/module/beat/state/data.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/beat" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/beat" ) var ( diff --git a/metricbeat/module/beat/state/data_test.go b/metricbeat/module/beat/state/data_test.go index 4d94a3f24da9..b0b5395700de 100644 --- a/metricbeat/module/beat/state/data_test.go +++ b/metricbeat/module/beat/state/data_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/module/beat" + "github.com/elastic/beats/v9/metricbeat/module/beat" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/beat/state/state.go b/metricbeat/module/beat/state/state.go index a103790a02b2..b207421371b6 100644 --- a/metricbeat/module/beat/state/state.go +++ b/metricbeat/module/beat/state/state.go @@ -18,9 +18,9 @@ package state import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/beat" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/beat" ) func init() { diff --git a/metricbeat/module/beat/stats/data.go b/metricbeat/module/beat/stats/data.go index b6500903c9e7..6a1ca0ef8cf6 100644 --- a/metricbeat/module/beat/stats/data.go +++ b/metricbeat/module/beat/stats/data.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/beat" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/beat" ) var ( diff --git a/metricbeat/module/beat/stats/data_test.go b/metricbeat/module/beat/stats/data_test.go index c1e764890732..f833025d2a28 100644 --- a/metricbeat/module/beat/stats/data_test.go +++ b/metricbeat/module/beat/stats/data_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/module/beat" + "github.com/elastic/beats/v9/metricbeat/module/beat" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/beat/stats/stats.go b/metricbeat/module/beat/stats/stats.go index ae78e53ff30f..5d25a34b466b 100644 --- a/metricbeat/module/beat/stats/stats.go +++ b/metricbeat/module/beat/stats/stats.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/beat" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/beat" ) func init() { diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk.go b/metricbeat/module/ceph/cluster_disk/cluster_disk.go index 8f33d0e847b1..2833774e3d58 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk.go @@ -18,9 +18,9 @@ package cluster_disk import ( - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go b/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go index 275e21275366..e4fcaabd1be7 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go @@ -22,9 +22,9 @@ package cluster_disk import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go b/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go index 3848c2b7024a..c18cfdd503d6 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/ceph/cluster_health/cluster_health.go b/metricbeat/module/ceph/cluster_health/cluster_health.go index bc3971721e28..9e5287359f7d 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health.go @@ -20,9 +20,9 @@ package cluster_health import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go b/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go index 50cf1c9084bd..11cfbe9798c2 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go @@ -22,9 +22,9 @@ package cluster_health import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/cluster_health/cluster_health_test.go b/metricbeat/module/ceph/cluster_health/cluster_health_test.go index 73f0dadc7276..8cfd14748fed 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health_test.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/ceph/cluster_status/cluster_status.go b/metricbeat/module/ceph/cluster_status/cluster_status.go index 786bde0c9a50..5a34d9d7d478 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status.go @@ -20,9 +20,9 @@ package cluster_status import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go b/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go index 1147fbaabe21..19064b19e567 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go @@ -22,9 +22,9 @@ package cluster_status import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/cluster_status/cluster_status_test.go b/metricbeat/module/ceph/cluster_status/cluster_status_test.go index 38b4968c498e..9727208d75c4 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status_test.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/ceph/fields.go b/metricbeat/module/ceph/fields.go index 83e1c175fea6..5234b8dd402c 100644 --- a/metricbeat/module/ceph/fields.go +++ b/metricbeat/module/ceph/fields.go @@ -20,7 +20,7 @@ package ceph import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/ceph/mgr/metricset.go b/metricbeat/module/ceph/mgr/metricset.go index a8e84100dcc1..4be4ff267037 100644 --- a/metricbeat/module/ceph/mgr/metricset.go +++ b/metricbeat/module/ceph/mgr/metricset.go @@ -20,8 +20,8 @@ package mgr import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" ) type MetricSet struct { diff --git a/metricbeat/module/ceph/mgr_cluster_disk/data.go b/metricbeat/module/ceph/mgr_cluster_disk/data.go index 4f41ba05d790..0b15a2673026 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/data.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/data.go @@ -20,7 +20,7 @@ package mgr_cluster_disk import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go index b6b1fb1de3d7..0db49110840e 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk.go @@ -18,9 +18,9 @@ package mgr_cluster_disk import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go index 49adc9184b78..1fb22322f214 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go index d658fa6b7048..55b34990598d 100644 --- a/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go +++ b/metricbeat/module/ceph/mgr_cluster_disk/mgr_cluster_disk_test.go @@ -20,8 +20,8 @@ package mgr_cluster_disk import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_cluster_health/data.go b/metricbeat/module/ceph/mgr_cluster_health/data.go index 0a0b95059026..060212a9f40e 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/data.go +++ b/metricbeat/module/ceph/mgr_cluster_health/data.go @@ -20,7 +20,7 @@ package mgr_cluster_health import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go index 72e1ca249d30..462f515ba22e 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go +++ b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health.go @@ -20,9 +20,9 @@ package mgr_cluster_health import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go index 89bbf267894c..ffbe0418c8df 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go +++ b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go index 9da0c6f276d1..543089040625 100644 --- a/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go +++ b/metricbeat/module/ceph/mgr_cluster_health/mgr_cluster_health_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_osd_perf/data.go b/metricbeat/module/ceph/mgr_osd_perf/data.go index 59ba21393e82..f878919d68c3 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/data.go +++ b/metricbeat/module/ceph/mgr_osd_perf/data.go @@ -20,7 +20,7 @@ package mgr_osd_perf import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go index 239afd61ed37..1ea01ec18246 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go +++ b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf.go @@ -18,9 +18,9 @@ package mgr_osd_perf import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go index 3a74d27c8a53..58abf892b960 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go +++ b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go index 500d812c4689..2ad526bd6a68 100644 --- a/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go +++ b/metricbeat/module/ceph/mgr_osd_perf/mgr_osd_perf_test.go @@ -20,8 +20,8 @@ package mgr_osd_perf import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/data.go b/metricbeat/module/ceph/mgr_osd_pool_stats/data.go index 6c7dc960dd28..aa0688f06666 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/data.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/data.go @@ -20,7 +20,7 @@ package mgr_osd_pool_stats import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go index 1ce58e3a06d9..9659c9a561dc 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats.go @@ -18,9 +18,9 @@ package mgr_osd_pool_stats import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" ) const ( diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go index 8f08e3318b5c..27990fb57f5a 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go index 8b84f192f59f..77842051f1fe 100644 --- a/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go +++ b/metricbeat/module/ceph/mgr_osd_pool_stats/mgr_osd_pool_stats_test.go @@ -20,8 +20,8 @@ package mgr_osd_pool_stats import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_osd_tree/data.go b/metricbeat/module/ceph/mgr_osd_tree/data.go index 85c467b2b263..4b7dc1d1c95e 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/data.go +++ b/metricbeat/module/ceph/mgr_osd_tree/data.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go index 084879539e55..0338cb3815b1 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go +++ b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree.go @@ -18,9 +18,9 @@ package mgr_osd_tree import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go index 99db89db3336..fe7b7d97f735 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go +++ b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go index 7547285046ce..e6b31861fa7d 100644 --- a/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go +++ b/metricbeat/module/ceph/mgr_osd_tree/mgr_osd_tree_test.go @@ -20,8 +20,8 @@ package mgr_osd_tree import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/mgr_pool_disk/data.go b/metricbeat/module/ceph/mgr_pool_disk/data.go index 7daab9b8c0e7..e407988b4f19 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/data.go +++ b/metricbeat/module/ceph/mgr_pool_disk/data.go @@ -20,7 +20,7 @@ package mgr_pool_disk import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go index 610282c9d8bb..30ac862f5f9f 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go +++ b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk.go @@ -18,9 +18,9 @@ package mgr_pool_disk import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go index e1e360e6143d..8f4b3fa770a9 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go +++ b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/ceph/mgrtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/ceph/mgrtest" ) const user = "demo" diff --git a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go index 43dc8f7cbaa9..f09389359590 100644 --- a/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go +++ b/metricbeat/module/ceph/mgr_pool_disk/mgr_pool_disk_test.go @@ -20,8 +20,8 @@ package mgr_pool_disk import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph" ) func TestDataFiles(t *testing.T) { diff --git a/metricbeat/module/ceph/monitor_health/monitor_health.go b/metricbeat/module/ceph/monitor_health/monitor_health.go index f726969da9ee..69a3392b1c2f 100644 --- a/metricbeat/module/ceph/monitor_health/monitor_health.go +++ b/metricbeat/module/ceph/monitor_health/monitor_health.go @@ -18,9 +18,9 @@ package monitor_health import ( - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/monitor_health/monitor_health_test.go b/metricbeat/module/ceph/monitor_health/monitor_health_test.go index b58ad8389a0c..5a24ba3a1fa8 100644 --- a/metricbeat/module/ceph/monitor_health/monitor_health_test.go +++ b/metricbeat/module/ceph/monitor_health/monitor_health_test.go @@ -24,12 +24,12 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/v7/metricbeat/module/ceph" + _ "github.com/elastic/beats/v9/metricbeat/module/ceph" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/ceph/osd_df/osd_df.go b/metricbeat/module/ceph/osd_df/osd_df.go index 5675061999b1..26813fcf1304 100644 --- a/metricbeat/module/ceph/osd_df/osd_df.go +++ b/metricbeat/module/ceph/osd_df/osd_df.go @@ -20,9 +20,9 @@ package osd_df import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/osd_df/osd_df_integration_test.go b/metricbeat/module/ceph/osd_df/osd_df_integration_test.go index 1c80a8a36fb7..1ffac39bf793 100644 --- a/metricbeat/module/ceph/osd_df/osd_df_integration_test.go +++ b/metricbeat/module/ceph/osd_df/osd_df_integration_test.go @@ -22,8 +22,8 @@ package osd_df import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/osd_df/osd_df_test.go b/metricbeat/module/ceph/osd_df/osd_df_test.go index bef039597dd5..1496ee5d50b7 100644 --- a/metricbeat/module/ceph/osd_df/osd_df_test.go +++ b/metricbeat/module/ceph/osd_df/osd_df_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/osd_tree/osd_tree.go b/metricbeat/module/ceph/osd_tree/osd_tree.go index 80fed3d1ac3b..787f222dd2df 100644 --- a/metricbeat/module/ceph/osd_tree/osd_tree.go +++ b/metricbeat/module/ceph/osd_tree/osd_tree.go @@ -20,9 +20,9 @@ package osd_tree import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go b/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go index 549f13375ad7..ce959bc6eb96 100644 --- a/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go +++ b/metricbeat/module/ceph/osd_tree/osd_tree_integration_test.go @@ -22,8 +22,8 @@ package osd_tree import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/osd_tree/osd_tree_test.go b/metricbeat/module/ceph/osd_tree/osd_tree_test.go index 872da2d32c91..a7c447c08948 100644 --- a/metricbeat/module/ceph/osd_tree/osd_tree_test.go +++ b/metricbeat/module/ceph/osd_tree/osd_tree_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/pool_disk/pool_disk.go b/metricbeat/module/ceph/pool_disk/pool_disk.go index f1ed28d5feae..43fab9ca2378 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk.go @@ -20,9 +20,9 @@ package pool_disk import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go b/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go index 19e39cb8c38a..225620575127 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk_integration_test.go @@ -22,8 +22,8 @@ package pool_disk import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/ceph/pool_disk/pool_disk_test.go b/metricbeat/module/ceph/pool_disk/pool_disk_test.go index d28aadd54c3d..df95eb3d3365 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk_test.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/consul/agent/agent.go b/metricbeat/module/consul/agent/agent.go index 1993662b9f31..22ff17e27459 100644 --- a/metricbeat/module/consul/agent/agent.go +++ b/metricbeat/module/consul/agent/agent.go @@ -20,10 +20,10 @@ package agent import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) var ( diff --git a/metricbeat/module/consul/agent/agent_integration_test.go b/metricbeat/module/consul/agent/agent_integration_test.go index b148a9b4140c..4d9e22b89da1 100644 --- a/metricbeat/module/consul/agent/agent_integration_test.go +++ b/metricbeat/module/consul/agent/agent_integration_test.go @@ -22,15 +22,15 @@ package agent import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/module/consul" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/module/consul" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/logp" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/consul/agent/data_integration_test.go b/metricbeat/module/consul/agent/data_integration_test.go index cd756451cbd3..cb315a092f69 100644 --- a/metricbeat/module/consul/agent/data_integration_test.go +++ b/metricbeat/module/consul/agent/data_integration_test.go @@ -24,9 +24,9 @@ import ( _ "github.com/microsoft/go-mssqldb" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/consul" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/consul" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/consul/fields.go b/metricbeat/module/consul/fields.go index 3ab9442eed6f..e6001c840c6a 100644 --- a/metricbeat/module/consul/fields.go +++ b/metricbeat/module/consul/fields.go @@ -20,7 +20,7 @@ package consul import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchbase/bucket/bucket.go b/metricbeat/module/couchbase/bucket/bucket.go index e86d6846e633..8b57dde43108 100644 --- a/metricbeat/module/couchbase/bucket/bucket.go +++ b/metricbeat/module/couchbase/bucket/bucket.go @@ -20,9 +20,9 @@ package bucket import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchbase/bucket/bucket_integration_test.go b/metricbeat/module/couchbase/bucket/bucket_integration_test.go index ce68b436f3f6..e74b3119bc44 100644 --- a/metricbeat/module/couchbase/bucket/bucket_integration_test.go +++ b/metricbeat/module/couchbase/bucket/bucket_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/couchbase" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/couchbase" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/bucket/bucket_test.go b/metricbeat/module/couchbase/bucket/bucket_test.go index 44bde0ca928e..4192cd42fb70 100644 --- a/metricbeat/module/couchbase/bucket/bucket_test.go +++ b/metricbeat/module/couchbase/bucket/bucket_test.go @@ -26,7 +26,7 @@ import ( "path/filepath" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/couchbase/cluster/cluster.go b/metricbeat/module/couchbase/cluster/cluster.go index f09066acd8e4..1c7ce0945ddb 100644 --- a/metricbeat/module/couchbase/cluster/cluster.go +++ b/metricbeat/module/couchbase/cluster/cluster.go @@ -20,9 +20,9 @@ package cluster import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchbase/cluster/cluster_integration_test.go b/metricbeat/module/couchbase/cluster/cluster_integration_test.go index aeb101c1f7e7..59fbfe32408b 100644 --- a/metricbeat/module/couchbase/cluster/cluster_integration_test.go +++ b/metricbeat/module/couchbase/cluster/cluster_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/couchbase" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/couchbase" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/cluster/cluster_test.go b/metricbeat/module/couchbase/cluster/cluster_test.go index 0c6460b1d151..83896acad55e 100644 --- a/metricbeat/module/couchbase/cluster/cluster_test.go +++ b/metricbeat/module/couchbase/cluster/cluster_test.go @@ -22,9 +22,9 @@ package cluster import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v9/metricbeat/module/couchbase" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/couchbase/fields.go b/metricbeat/module/couchbase/fields.go index a712d4bb304b..e2a9596f336e 100644 --- a/metricbeat/module/couchbase/fields.go +++ b/metricbeat/module/couchbase/fields.go @@ -20,7 +20,7 @@ package couchbase import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchbase/node/node.go b/metricbeat/module/couchbase/node/node.go index 8fa535c85a07..fdda9fa6487c 100644 --- a/metricbeat/module/couchbase/node/node.go +++ b/metricbeat/module/couchbase/node/node.go @@ -20,9 +20,9 @@ package node import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchbase/node/node_integration_test.go b/metricbeat/module/couchbase/node/node_integration_test.go index 21476e71b93c..4e5ce58a6bff 100644 --- a/metricbeat/module/couchbase/node/node_integration_test.go +++ b/metricbeat/module/couchbase/node/node_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/couchbase" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/couchbase" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/node/node_test.go b/metricbeat/module/couchbase/node/node_test.go index 532d96fa8d13..eb1d515c25fc 100644 --- a/metricbeat/module/couchbase/node/node_test.go +++ b/metricbeat/module/couchbase/node/node_test.go @@ -22,9 +22,9 @@ package node import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v9/metricbeat/module/couchbase" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/couchdb/fields.go b/metricbeat/module/couchdb/fields.go index 0e9f5a8ee3d1..f9c9353ded08 100644 --- a/metricbeat/module/couchdb/fields.go +++ b/metricbeat/module/couchdb/fields.go @@ -20,7 +20,7 @@ package couchdb import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchdb/server/server.go b/metricbeat/module/couchdb/server/server.go index 8193b0171c7d..5e04b7dfc0b3 100644 --- a/metricbeat/module/couchdb/server/server.go +++ b/metricbeat/module/couchdb/server/server.go @@ -23,9 +23,9 @@ import ( "net/http" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/couchdb/server/server_integration_test.go b/metricbeat/module/couchdb/server/server_integration_test.go index 2ca2eedb5b9f..12a49d342859 100644 --- a/metricbeat/module/couchdb/server/server_integration_test.go +++ b/metricbeat/module/couchdb/server/server_integration_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchdb/server/v1.go b/metricbeat/module/couchdb/server/v1.go index e9652ecca3a9..243f2d3433b0 100644 --- a/metricbeat/module/couchdb/server/v1.go +++ b/metricbeat/module/couchdb/server/v1.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/couchdb/server/v2.go b/metricbeat/module/couchdb/server/v2.go index a5be3390db2c..3caa8ca4eeb8 100644 --- a/metricbeat/module/couchdb/server/v2.go +++ b/metricbeat/module/couchdb/server/v2.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/container/container.go b/metricbeat/module/docker/container/container.go index c6def5bf61d6..51c3d0156185 100644 --- a/metricbeat/module/docker/container/container.go +++ b/metricbeat/module/docker/container/container.go @@ -26,8 +26,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/container/container_integration_test.go b/metricbeat/module/docker/container/container_integration_test.go index 558bf6cc89d2..85e212074677 100644 --- a/metricbeat/module/docker/container/container_integration_test.go +++ b/metricbeat/module/docker/container/container_integration_test.go @@ -22,7 +22,7 @@ package container import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/container/data.go b/metricbeat/module/docker/container/data.go index f7786f5e47dc..db5f141964e0 100644 --- a/metricbeat/module/docker/container/data.go +++ b/metricbeat/module/docker/container/data.go @@ -23,9 +23,9 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" - "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/metricbeat/module/docker/cpu/cpu.go b/metricbeat/module/docker/cpu/cpu.go index eee97528a2f0..f5f8e8688cd5 100644 --- a/metricbeat/module/docker/cpu/cpu.go +++ b/metricbeat/module/docker/cpu/cpu.go @@ -24,8 +24,8 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/cpu/cpu_integration_test.go b/metricbeat/module/docker/cpu/cpu_integration_test.go index 6c2812f813c3..b49c585aec28 100644 --- a/metricbeat/module/docker/cpu/cpu_integration_test.go +++ b/metricbeat/module/docker/cpu/cpu_integration_test.go @@ -22,7 +22,7 @@ package cpu import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/cpu/cpu_test.go b/metricbeat/module/docker/cpu/cpu_test.go index 4b054d9cf596..a90940a38737 100644 --- a/metricbeat/module/docker/cpu/cpu_test.go +++ b/metricbeat/module/docker/cpu/cpu_test.go @@ -23,7 +23,7 @@ import ( "github.com/docker/docker/api/types/container" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/module/docker" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/cpu/data.go b/metricbeat/module/docker/cpu/data.go index fc77a7a30a8a..1c08d37afab6 100644 --- a/metricbeat/module/docker/cpu/data.go +++ b/metricbeat/module/docker/cpu/data.go @@ -18,7 +18,7 @@ package cpu import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/cpu/helper.go b/metricbeat/module/docker/cpu/helper.go index f4252475c780..e650034245bd 100644 --- a/metricbeat/module/docker/cpu/helper.go +++ b/metricbeat/module/docker/cpu/helper.go @@ -20,8 +20,8 @@ package cpu import ( "strconv" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/module/docker" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/diskio/data.go b/metricbeat/module/docker/diskio/data.go index 27d4c9c86695..9ed3683370b5 100644 --- a/metricbeat/module/docker/diskio/data.go +++ b/metricbeat/module/docker/diskio/data.go @@ -18,7 +18,7 @@ package diskio import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/diskio/diskio.go b/metricbeat/module/docker/diskio/diskio.go index 7eb39bfbc6a9..586dadca4b10 100644 --- a/metricbeat/module/docker/diskio/diskio.go +++ b/metricbeat/module/docker/diskio/diskio.go @@ -24,8 +24,8 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/diskio/diskio_integration_test.go b/metricbeat/module/docker/diskio/diskio_integration_test.go index 098193793d26..8962f3aafc06 100644 --- a/metricbeat/module/docker/diskio/diskio_integration_test.go +++ b/metricbeat/module/docker/diskio/diskio_integration_test.go @@ -22,7 +22,7 @@ package diskio import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/diskio/diskio_test.go b/metricbeat/module/docker/diskio/diskio_test.go index 148bcce5b880..172fde783909 100644 --- a/metricbeat/module/docker/diskio/diskio_test.go +++ b/metricbeat/module/docker/diskio/diskio_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) var blkioService BlkioService diff --git a/metricbeat/module/docker/diskio/helper.go b/metricbeat/module/docker/diskio/helper.go index 5239923e5d50..863162634f66 100644 --- a/metricbeat/module/docker/diskio/helper.go +++ b/metricbeat/module/docker/diskio/helper.go @@ -23,7 +23,7 @@ import ( "github.com/docker/docker/api/types/container" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) // BlkioStats contains all formatted blkio stats diff --git a/metricbeat/module/docker/docker.go b/metricbeat/module/docker/docker.go index 94d4734f617e..4683bb10c2cf 100644 --- a/metricbeat/module/docker/docker.go +++ b/metricbeat/module/docker/docker.go @@ -30,8 +30,8 @@ import ( "github.com/docker/docker/client" "github.com/docker/go-connections/tlsconfig" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/docker/event/event.go b/metricbeat/module/docker/event/event.go index f030cb4d390d..e995009afdd6 100644 --- a/metricbeat/module/docker/event/event.go +++ b/metricbeat/module/docker/event/event.go @@ -27,9 +27,9 @@ import ( "github.com/docker/docker/api/types/events" "github.com/docker/docker/client" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/event/event_integration_test.go b/metricbeat/module/docker/event/event_integration_test.go index 26801c84e082..946faaaca427 100644 --- a/metricbeat/module/docker/event/event_integration_test.go +++ b/metricbeat/module/docker/event/event_integration_test.go @@ -30,9 +30,9 @@ import ( "github.com/docker/docker/api/types/image" "github.com/docker/docker/client" - "github.com/elastic/beats/v7/auditbeat/core" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/auditbeat/core" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go index a18cbb5c6a98..c68bfc6d0666 100644 --- a/metricbeat/module/docker/fields.go +++ b/metricbeat/module/docker/fields.go @@ -20,7 +20,7 @@ package docker import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/docker/healthcheck/data.go b/metricbeat/module/docker/healthcheck/data.go index 9ca8dd2be962..1f50db2867f9 100644 --- a/metricbeat/module/docker/healthcheck/data.go +++ b/metricbeat/module/docker/healthcheck/data.go @@ -23,9 +23,9 @@ import ( "github.com/docker/docker/api/types/container" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/healthcheck/healthcheck.go b/metricbeat/module/docker/healthcheck/healthcheck.go index 67e19df334e4..21e7b7e34330 100644 --- a/metricbeat/module/docker/healthcheck/healthcheck.go +++ b/metricbeat/module/docker/healthcheck/healthcheck.go @@ -26,8 +26,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go b/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go index f59d3438db91..48c8616072b4 100644 --- a/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go +++ b/metricbeat/module/docker/healthcheck/healthcheck_integration_test.go @@ -22,7 +22,7 @@ package healthcheck import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/image/data.go b/metricbeat/module/docker/image/data.go index 3b2c01b0b498..689e0455fd76 100644 --- a/metricbeat/module/docker/image/data.go +++ b/metricbeat/module/docker/image/data.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types/image" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/image/image.go b/metricbeat/module/docker/image/image.go index b54167a164f8..7c18b91fb8ca 100644 --- a/metricbeat/module/docker/image/image.go +++ b/metricbeat/module/docker/image/image.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/api/types/image" "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/docker/image/image_integration_test.go b/metricbeat/module/docker/image/image_integration_test.go index 3b2e3031de39..289eca502b55 100644 --- a/metricbeat/module/docker/image/image_integration_test.go +++ b/metricbeat/module/docker/image/image_integration_test.go @@ -22,7 +22,7 @@ package image import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/info/info.go b/metricbeat/module/docker/info/info.go index 0e378f6d9a36..f64361659869 100644 --- a/metricbeat/module/docker/info/info.go +++ b/metricbeat/module/docker/info/info.go @@ -22,8 +22,8 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/info/info_integration_test.go b/metricbeat/module/docker/info/info_integration_test.go index 4a6e3adc6996..c2d191a4e232 100644 --- a/metricbeat/module/docker/info/info_integration_test.go +++ b/metricbeat/module/docker/info/info_integration_test.go @@ -22,7 +22,7 @@ package info import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/memory/data.go b/metricbeat/module/docker/memory/data.go index 48afe7d6ed6e..35c7a96911d4 100644 --- a/metricbeat/module/docker/memory/data.go +++ b/metricbeat/module/docker/memory/data.go @@ -18,7 +18,7 @@ package memory import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/memory/helper.go b/metricbeat/module/docker/memory/helper.go index 7f7f8b917fd8..1b6ce295556e 100644 --- a/metricbeat/module/docker/memory/helper.go +++ b/metricbeat/module/docker/memory/helper.go @@ -18,8 +18,8 @@ package memory import ( - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/module/docker" "github.com/elastic/elastic-agent-libs/opt" ) diff --git a/metricbeat/module/docker/memory/memory.go b/metricbeat/module/docker/memory/memory.go index e7cdc2fc52d6..f6b56fbc9217 100644 --- a/metricbeat/module/docker/memory/memory.go +++ b/metricbeat/module/docker/memory/memory.go @@ -26,8 +26,8 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/memory/memory_integration_test.go b/metricbeat/module/docker/memory/memory_integration_test.go index ac7a4a4db66d..ad233046d974 100644 --- a/metricbeat/module/docker/memory/memory_integration_test.go +++ b/metricbeat/module/docker/memory/memory_integration_test.go @@ -22,7 +22,7 @@ package memory import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/memory/memory_test.go b/metricbeat/module/docker/memory/memory_test.go index d8174fc0dd51..8508b886eb2a 100644 --- a/metricbeat/module/docker/memory/memory_test.go +++ b/metricbeat/module/docker/memory/memory_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/docker" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/docker" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/network/data.go b/metricbeat/module/docker/network/data.go index 736a19553abd..22a10cbe47ef 100644 --- a/metricbeat/module/docker/network/data.go +++ b/metricbeat/module/docker/network/data.go @@ -18,7 +18,7 @@ package network import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/docker/network/helper.go b/metricbeat/module/docker/network/helper.go index 81de3d31627d..1bafe060d53a 100644 --- a/metricbeat/module/docker/network/helper.go +++ b/metricbeat/module/docker/network/helper.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types/container" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) type NetService struct { diff --git a/metricbeat/module/docker/network/network.go b/metricbeat/module/docker/network/network.go index c57e70341d36..efb1e8d057e2 100644 --- a/metricbeat/module/docker/network/network.go +++ b/metricbeat/module/docker/network/network.go @@ -24,8 +24,8 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" ) func init() { diff --git a/metricbeat/module/docker/network/network_integration_test.go b/metricbeat/module/docker/network/network_integration_test.go index 41290819f5fb..746c3be6d36d 100644 --- a/metricbeat/module/docker/network/network_integration_test.go +++ b/metricbeat/module/docker/network/network_integration_test.go @@ -22,7 +22,7 @@ package network import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/network_summary/config.go b/metricbeat/module/docker/network_summary/config.go index 030ed62bddfb..38eed5d7ec7b 100644 --- a/metricbeat/module/docker/network_summary/config.go +++ b/metricbeat/module/docker/network_summary/config.go @@ -19,7 +19,7 @@ package network_summary -import "github.com/elastic/beats/v7/metricbeat/module/docker" +import "github.com/elastic/beats/v9/metricbeat/module/docker" // Config is the config object for docker/network type Config struct { diff --git a/metricbeat/module/docker/network_summary/network_summary.go b/metricbeat/module/docker/network_summary/network_summary.go index 0540fe500962..b34b519e67dc 100644 --- a/metricbeat/module/docker/network_summary/network_summary.go +++ b/metricbeat/module/docker/network_summary/network_summary.go @@ -26,9 +26,9 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/network" ) diff --git a/metricbeat/module/docker/network_summary/network_summary_test.go b/metricbeat/module/docker/network_summary/network_summary_test.go index bb25c98e7f3f..705a6103c823 100644 --- a/metricbeat/module/docker/network_summary/network_summary_test.go +++ b/metricbeat/module/docker/network_summary/network_summary_test.go @@ -22,7 +22,7 @@ package network_summary import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/dropwizard/collector/collector.go b/metricbeat/module/dropwizard/collector/collector.go index eb1f6439abaf..c5bd14fc05ef 100644 --- a/metricbeat/module/dropwizard/collector/collector.go +++ b/metricbeat/module/dropwizard/collector/collector.go @@ -21,9 +21,9 @@ import ( "encoding/json" "strings" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/dropwizard/collector/collector_integration_test.go b/metricbeat/module/dropwizard/collector/collector_integration_test.go index a2ff5e5c25ef..244cf4641872 100644 --- a/metricbeat/module/dropwizard/collector/collector_integration_test.go +++ b/metricbeat/module/dropwizard/collector/collector_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/dropwizard/collector/collector_test.go b/metricbeat/module/dropwizard/collector/collector_test.go index c48e056bf83a..2e142031ccdb 100644 --- a/metricbeat/module/dropwizard/collector/collector_test.go +++ b/metricbeat/module/dropwizard/collector/collector_test.go @@ -22,9 +22,9 @@ package collector import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/dropwizard" + _ "github.com/elastic/beats/v9/metricbeat/module/dropwizard" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/dropwizard/fields.go b/metricbeat/module/dropwizard/fields.go index d7d009648306..f30da7282e19 100644 --- a/metricbeat/module/dropwizard/fields.go +++ b/metricbeat/module/dropwizard/fields.go @@ -20,7 +20,7 @@ package dropwizard import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/elasticsearch/ccr/ccr.go b/metricbeat/module/elasticsearch/ccr/ccr.go index 05fa2071da39..de9abcda7869 100644 --- a/metricbeat/module/elasticsearch/ccr/ccr.go +++ b/metricbeat/module/elasticsearch/ccr/ccr.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/elasticsearch/ccr/ccr_test.go b/metricbeat/module/elasticsearch/ccr/ccr_test.go index 4890637de1b7..32049edeaa62 100644 --- a/metricbeat/module/elasticsearch/ccr/ccr_test.go +++ b/metricbeat/module/elasticsearch/ccr/ccr_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func createEsMuxer(esVersion, license string, ccrEnabled bool) *http.ServeMux { diff --git a/metricbeat/module/elasticsearch/ccr/data.go b/metricbeat/module/elasticsearch/ccr/data.go index c4ab21d87138..b64664f54050 100644 --- a/metricbeat/module/elasticsearch/ccr/data.go +++ b/metricbeat/module/elasticsearch/ccr/data.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/ccr/data_test.go b/metricbeat/module/elasticsearch/ccr/data_test.go index d6181ed24ead..c9d1c6b402f4 100644 --- a/metricbeat/module/elasticsearch/ccr/data_test.go +++ b/metricbeat/module/elasticsearch/ccr/data_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go b/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go index a27adb0a9c36..c5f937b76245 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go +++ b/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go @@ -18,8 +18,8 @@ package cluster_stats import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/cluster_stats/data.go b/metricbeat/module/elasticsearch/cluster_stats/data.go index edb103a31f22..a98c43a53190 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data.go @@ -24,12 +24,12 @@ import ( "sort" "strings" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/elasticsearch/cluster_stats/data_test.go b/metricbeat/module/elasticsearch/cluster_stats/data_test.go index 9474cd175442..d9da2ce7b4ac 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data_test.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index af173da35446..6f207112859a 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -26,9 +26,9 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index 4a7ddc978c4d..f3f30e10c4bf 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -35,20 +35,20 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ccr" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/cluster_stats" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/enrich" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_recovery" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/index_summary" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/ml_job" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/node_stats" - _ "github.com/elastic/beats/v7/metricbeat/module/elasticsearch/shard" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/ccr" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/cluster_stats" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/enrich" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/index" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/index_recovery" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/index_summary" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/ml_job" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/node" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/node_stats" + _ "github.com/elastic/beats/v9/metricbeat/module/elasticsearch/shard" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/elasticsearch/enrich/data.go b/metricbeat/module/elasticsearch/enrich/data.go index 4722ec830066..f21e2edc52eb 100644 --- a/metricbeat/module/elasticsearch/enrich/data.go +++ b/metricbeat/module/elasticsearch/enrich/data.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/enrich/data_test.go b/metricbeat/module/elasticsearch/enrich/data_test.go index f2dbaaacc224..b6f0a228ca18 100644 --- a/metricbeat/module/elasticsearch/enrich/data_test.go +++ b/metricbeat/module/elasticsearch/enrich/data_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/enrich/enrich.go b/metricbeat/module/elasticsearch/enrich/enrich.go index e13dcd1cad95..5e2a16f42e36 100644 --- a/metricbeat/module/elasticsearch/enrich/enrich.go +++ b/metricbeat/module/elasticsearch/enrich/enrich.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index 735e49cb202b..2d82a99f1145 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -20,7 +20,7 @@ package elasticsearch import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/elasticsearch/index/data.go b/metricbeat/module/elasticsearch/index/data.go index e6291ecd4988..73659fb68bfa 100644 --- a/metricbeat/module/elasticsearch/index/data.go +++ b/metricbeat/module/elasticsearch/index/data.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/elasticsearch/index/data_test.go b/metricbeat/module/elasticsearch/index/data_test.go index 57552da648cf..bb8e667bbbd3 100644 --- a/metricbeat/module/elasticsearch/index/data_test.go +++ b/metricbeat/module/elasticsearch/index/data_test.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) diff --git a/metricbeat/module/elasticsearch/index/index.go b/metricbeat/module/elasticsearch/index/index.go index f64beb1ca7c5..e23878168328 100644 --- a/metricbeat/module/elasticsearch/index/index.go +++ b/metricbeat/module/elasticsearch/index/index.go @@ -22,8 +22,8 @@ import ( "net/url" "strings" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/elasticsearch/index_recovery/data.go b/metricbeat/module/elasticsearch/index_recovery/data.go index 67bc2c90cc49..10c7d5034f70 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data.go +++ b/metricbeat/module/elasticsearch/index_recovery/data.go @@ -23,11 +23,11 @@ import ( "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/elasticsearch/index_recovery/data_test.go b/metricbeat/module/elasticsearch/index_recovery/data_test.go index 5a2f07221ce6..ad14d4081b56 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_test.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_test.go @@ -25,9 +25,9 @@ import ( "net/http/httptest" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go index 8a0b471892de..177c061c7f4f 100644 --- a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go +++ b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go @@ -18,8 +18,8 @@ package index_recovery import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/index_summary/data.go b/metricbeat/module/elasticsearch/index_summary/data.go index e4a26d5e5488..8b81ee0e13f7 100644 --- a/metricbeat/module/elasticsearch/index_summary/data.go +++ b/metricbeat/module/elasticsearch/index_summary/data.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) type nodeStatsWrapper struct { diff --git a/metricbeat/module/elasticsearch/index_summary/data_test.go b/metricbeat/module/elasticsearch/index_summary/data_test.go index a43e151493bc..011c67ceac31 100644 --- a/metricbeat/module/elasticsearch/index_summary/data_test.go +++ b/metricbeat/module/elasticsearch/index_summary/data_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/index_summary/index_summary.go b/metricbeat/module/elasticsearch/index_summary/index_summary.go index 105c179b1b17..dfcb3c46f634 100644 --- a/metricbeat/module/elasticsearch/index_summary/index_summary.go +++ b/metricbeat/module/elasticsearch/index_summary/index_summary.go @@ -21,9 +21,9 @@ import ( "fmt" "net/url" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/ingest_pipeline/data.go b/metricbeat/module/elasticsearch/ingest_pipeline/data.go index 6cd660f040d7..589c13b98a71 100644 --- a/metricbeat/module/elasticsearch/ingest_pipeline/data.go +++ b/metricbeat/module/elasticsearch/ingest_pipeline/data.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/elasticsearch/ingest_pipeline/data_test.go b/metricbeat/module/elasticsearch/ingest_pipeline/data_test.go index 5ae9ad6def5b..bc99e4c762bc 100644 --- a/metricbeat/module/elasticsearch/ingest_pipeline/data_test.go +++ b/metricbeat/module/elasticsearch/ingest_pipeline/data_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/ingest_pipeline/ingest_pipeline.go b/metricbeat/module/elasticsearch/ingest_pipeline/ingest_pipeline.go index 0726a4d38acb..43d93800be50 100644 --- a/metricbeat/module/elasticsearch/ingest_pipeline/ingest_pipeline.go +++ b/metricbeat/module/elasticsearch/ingest_pipeline/ingest_pipeline.go @@ -22,9 +22,9 @@ import ( "math" "net/url" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/elasticsearch/metricset.go b/metricbeat/module/elasticsearch/metricset.go index ae36cf991367..86588bcea689 100644 --- a/metricbeat/module/elasticsearch/metricset.go +++ b/metricbeat/module/elasticsearch/metricset.go @@ -24,10 +24,10 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/libbeat/common/productorigin" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/productorigin" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) var ( diff --git a/metricbeat/module/elasticsearch/ml_job/data.go b/metricbeat/module/elasticsearch/ml_job/data.go index c70647dc7a27..ed1b70d2a84a 100644 --- a/metricbeat/module/elasticsearch/ml_job/data.go +++ b/metricbeat/module/elasticsearch/ml_job/data.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/ml_job/data_test.go b/metricbeat/module/elasticsearch/ml_job/data_test.go index f566c4d9f06b..26bab0fbfcbd 100644 --- a/metricbeat/module/elasticsearch/ml_job/data_test.go +++ b/metricbeat/module/elasticsearch/ml_job/data_test.go @@ -27,9 +27,9 @@ import ( "strings" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/ml_job/ml_job.go b/metricbeat/module/elasticsearch/ml_job/ml_job.go index a0473328f66c..96e2f4c359ff 100644 --- a/metricbeat/module/elasticsearch/ml_job/ml_job.go +++ b/metricbeat/module/elasticsearch/ml_job/ml_job.go @@ -20,8 +20,8 @@ package ml_job import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/ml_job/ml_job_test.go b/metricbeat/module/elasticsearch/ml_job/ml_job_test.go index a5ecf0f488be..200de3d684f1 100644 --- a/metricbeat/module/elasticsearch/ml_job/ml_job_test.go +++ b/metricbeat/module/elasticsearch/ml_job/ml_job_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func createEsMuxer(mlEnabled bool) *http.ServeMux { diff --git a/metricbeat/module/elasticsearch/node/data.go b/metricbeat/module/elasticsearch/node/data.go index 78fea5cfe435..74065e66e3bf 100644 --- a/metricbeat/module/elasticsearch/node/data.go +++ b/metricbeat/module/elasticsearch/node/data.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/node/data_test.go b/metricbeat/module/elasticsearch/node/data_test.go index 46c62f77ffac..b088b0b8e11f 100644 --- a/metricbeat/module/elasticsearch/node/data_test.go +++ b/metricbeat/module/elasticsearch/node/data_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/node/node.go b/metricbeat/module/elasticsearch/node/node.go index c9fa0b86d062..03be93fca332 100644 --- a/metricbeat/module/elasticsearch/node/node.go +++ b/metricbeat/module/elasticsearch/node/node.go @@ -20,9 +20,9 @@ package node import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/node/node_test.go b/metricbeat/module/elasticsearch/node/node_test.go index 32f91bc8c609..216b7623d73d 100644 --- a/metricbeat/module/elasticsearch/node/node_test.go +++ b/metricbeat/module/elasticsearch/node/node_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/node_stats/data.go b/metricbeat/module/elasticsearch/node_stats/data.go index fd238f5bd2c1..e5874e50e7a2 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -22,13 +22,13 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/node_stats/data_test.go b/metricbeat/module/elasticsearch/node_stats/data_test.go index 2317418eeaf8..b91da9f0f6c7 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_test.go +++ b/metricbeat/module/elasticsearch/node_stats/data_test.go @@ -22,9 +22,9 @@ package node_stats import ( "testing" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func TestStats(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats.go b/metricbeat/module/elasticsearch/node_stats/node_stats.go index 1f7e5b0b5c14..88759ca8e9e8 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats.go @@ -20,8 +20,8 @@ package node_stats import ( "net/url" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats_test.go b/metricbeat/module/elasticsearch/node_stats/node_stats_test.go index 28dea0a45d6a..70f78743687c 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats_test.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats_test.go @@ -21,7 +21,7 @@ import ( "strconv" "testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/stretchr/testify/require" ) diff --git a/metricbeat/module/elasticsearch/pending_tasks/data.go b/metricbeat/module/elasticsearch/pending_tasks/data.go index ba22f0123027..07f6faf3a1a4 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/data.go +++ b/metricbeat/module/elasticsearch/pending_tasks/data.go @@ -22,11 +22,11 @@ import ( "errors" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/elasticsearch/pending_tasks/data_test.go b/metricbeat/module/elasticsearch/pending_tasks/data_test.go index c863800ba8a1..c18855b4511f 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/data_test.go +++ b/metricbeat/module/elasticsearch/pending_tasks/data_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -192,7 +192,7 @@ func TestEventsMappedMatchToContentReceived(t *testing.T) { "time_in_queue.ms": int64(858), "insert_order": int64(45), }, Timestamp: time.Time{}, - Took: 0, + Took: 0, }, }}, } diff --git a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go index 8d64ff20def2..99fdd1926349 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go +++ b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go @@ -18,8 +18,8 @@ package pending_tasks import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/shard/data.go b/metricbeat/module/elasticsearch/shard/data.go index 65b38b31277c..ed07351338d3 100644 --- a/metricbeat/module/elasticsearch/shard/data.go +++ b/metricbeat/module/elasticsearch/shard/data.go @@ -22,15 +22,15 @@ import ( "errors" "strconv" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/shard/data_test.go b/metricbeat/module/elasticsearch/shard/data_test.go index 9abb100484b3..104749f932e4 100644 --- a/metricbeat/module/elasticsearch/shard/data_test.go +++ b/metricbeat/module/elasticsearch/shard/data_test.go @@ -24,11 +24,11 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestStats(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/shard/shard.go b/metricbeat/module/elasticsearch/shard/shard.go index fe0094ad8a51..852667719831 100644 --- a/metricbeat/module/elasticsearch/shard/shard.go +++ b/metricbeat/module/elasticsearch/shard/shard.go @@ -18,8 +18,8 @@ package shard import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/testing.go b/metricbeat/module/elasticsearch/testing.go index 84d95a09130c..7cbebddaf3c9 100644 --- a/metricbeat/module/elasticsearch/testing.go +++ b/metricbeat/module/elasticsearch/testing.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/version" diff --git a/metricbeat/module/envoyproxy/fields.go b/metricbeat/module/envoyproxy/fields.go index f8fd4356d720..4070d884bdee 100644 --- a/metricbeat/module/envoyproxy/fields.go +++ b/metricbeat/module/envoyproxy/fields.go @@ -20,7 +20,7 @@ package envoyproxy import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/envoyproxy/server/data.go b/metricbeat/module/envoyproxy/server/data.go index ba54ba79f45e..2416183af70d 100644 --- a/metricbeat/module/envoyproxy/server/data.go +++ b/metricbeat/module/envoyproxy/server/data.go @@ -21,8 +21,8 @@ import ( "regexp" "strings" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/envoyproxy/server/server.go b/metricbeat/module/envoyproxy/server/server.go index 76659531bce3..05ca31ff0515 100644 --- a/metricbeat/module/envoyproxy/server/server.go +++ b/metricbeat/module/envoyproxy/server/server.go @@ -20,9 +20,9 @@ package server import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/envoyproxy/server/server_integration_test.go b/metricbeat/module/envoyproxy/server/server_integration_test.go index f70e041ce8bb..9423ca38a0a9 100644 --- a/metricbeat/module/envoyproxy/server/server_integration_test.go +++ b/metricbeat/module/envoyproxy/server/server_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/envoyproxy/server/server_test.go b/metricbeat/module/envoyproxy/server/server_test.go index d5786e18c35f..330ea629f0bc 100644 --- a/metricbeat/module/envoyproxy/server/server_test.go +++ b/metricbeat/module/envoyproxy/server/server_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/etcd/fields.go b/metricbeat/module/etcd/fields.go index e3cf28509c9c..7316cff53ccc 100644 --- a/metricbeat/module/etcd/fields.go +++ b/metricbeat/module/etcd/fields.go @@ -20,7 +20,7 @@ package etcd import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/etcd/leader/data.go b/metricbeat/module/etcd/leader/data.go index 81dfdfb00d6a..fe4d4599f149 100644 --- a/metricbeat/module/etcd/leader/data.go +++ b/metricbeat/module/etcd/leader/data.go @@ -20,7 +20,7 @@ package leader import ( "encoding/json" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/etcd/leader/leader.go b/metricbeat/module/etcd/leader/leader.go index 5c49fc1f68f1..2f3120fb1b61 100644 --- a/metricbeat/module/etcd/leader/leader.go +++ b/metricbeat/module/etcd/leader/leader.go @@ -25,9 +25,9 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/etcd/leader/leader_integration_test.go b/metricbeat/module/etcd/leader/leader_integration_test.go index 4cc090cdaa85..12ff033ffb1e 100644 --- a/metricbeat/module/etcd/leader/leader_integration_test.go +++ b/metricbeat/module/etcd/leader/leader_integration_test.go @@ -22,8 +22,8 @@ package leader import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/leader/leader_test.go b/metricbeat/module/etcd/leader/leader_test.go index 3119b6bb0f05..4a8105680cc5 100644 --- a/metricbeat/module/etcd/leader/leader_test.go +++ b/metricbeat/module/etcd/leader/leader_test.go @@ -29,7 +29,7 @@ import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/etcd/metrics/metrics.go b/metricbeat/module/etcd/metrics/metrics.go index e6c2c1fe96be..3933f55e22ae 100644 --- a/metricbeat/module/etcd/metrics/metrics.go +++ b/metricbeat/module/etcd/metrics/metrics.go @@ -18,8 +18,8 @@ package metrics import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/etcd/metrics/metrics_integration_test.go b/metricbeat/module/etcd/metrics/metrics_integration_test.go index e4fc667d5d08..636e2deba634 100644 --- a/metricbeat/module/etcd/metrics/metrics_integration_test.go +++ b/metricbeat/module/etcd/metrics/metrics_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/metrics/metrics_test.go b/metricbeat/module/etcd/metrics/metrics_test.go index 9e2d63ae2e64..f5d8a03ceb51 100644 --- a/metricbeat/module/etcd/metrics/metrics_test.go +++ b/metricbeat/module/etcd/metrics/metrics_test.go @@ -23,10 +23,10 @@ package metrics import ( "testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/etcd" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/etcd" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/etcd/self/self.go b/metricbeat/module/etcd/self/self.go index b42e7287cde3..4e0c54395b95 100644 --- a/metricbeat/module/etcd/self/self.go +++ b/metricbeat/module/etcd/self/self.go @@ -20,9 +20,9 @@ package self import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/etcd/self/self_integration_test.go b/metricbeat/module/etcd/self/self_integration_test.go index 71f8beaade6d..1a4c7010ecb4 100644 --- a/metricbeat/module/etcd/self/self_integration_test.go +++ b/metricbeat/module/etcd/self/self_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/self/self_test.go b/metricbeat/module/etcd/self/self_test.go index 9d1b8f2d2664..a5b1f716ab33 100644 --- a/metricbeat/module/etcd/self/self_test.go +++ b/metricbeat/module/etcd/self/self_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "testing" ) diff --git a/metricbeat/module/etcd/store/data.go b/metricbeat/module/etcd/store/data.go index 8c0a2249dc43..ebb444c16711 100644 --- a/metricbeat/module/etcd/store/data.go +++ b/metricbeat/module/etcd/store/data.go @@ -20,8 +20,8 @@ package store import ( "encoding/json" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/etcd/store/store.go b/metricbeat/module/etcd/store/store.go index 6234806a6b18..9f1f199baf65 100644 --- a/metricbeat/module/etcd/store/store.go +++ b/metricbeat/module/etcd/store/store.go @@ -20,9 +20,9 @@ package store import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/etcd/store/store_integration_test.go b/metricbeat/module/etcd/store/store_integration_test.go index 7efda6537764..b830980ba97b 100644 --- a/metricbeat/module/etcd/store/store_integration_test.go +++ b/metricbeat/module/etcd/store/store_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/etcd/store/store_test.go b/metricbeat/module/etcd/store/store_test.go index a3a72ec6a139..ef5fec66ea0e 100644 --- a/metricbeat/module/etcd/store/store_test.go +++ b/metricbeat/module/etcd/store/store_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "testing" diff --git a/metricbeat/module/golang/expvar/expvar.go b/metricbeat/module/golang/expvar/expvar.go index 94bb5049ad01..d3e7531e0780 100644 --- a/metricbeat/module/golang/expvar/expvar.go +++ b/metricbeat/module/golang/expvar/expvar.go @@ -20,10 +20,10 @@ package expvar import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/golang" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/golang" ) const ( diff --git a/metricbeat/module/golang/expvar/expvar_integration_test.go b/metricbeat/module/golang/expvar/expvar_integration_test.go index 73b8b2b5d6fc..2a7c9f5ff384 100644 --- a/metricbeat/module/golang/expvar/expvar_integration_test.go +++ b/metricbeat/module/golang/expvar/expvar_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/golang/fields.go b/metricbeat/module/golang/fields.go index 31ac73c93fb0..333d2f607e8e 100644 --- a/metricbeat/module/golang/fields.go +++ b/metricbeat/module/golang/fields.go @@ -20,7 +20,7 @@ package golang import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/golang/heap/data.go b/metricbeat/module/golang/heap/data.go index 74e3923dbcde..fdb61310e570 100644 --- a/metricbeat/module/golang/heap/data.go +++ b/metricbeat/module/golang/heap/data.go @@ -20,7 +20,7 @@ package heap import ( "runtime" - "github.com/elastic/beats/v7/metricbeat/module/golang" + "github.com/elastic/beats/v9/metricbeat/module/golang" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/golang/heap/heap.go b/metricbeat/module/golang/heap/heap.go index 28682d2dcf36..c0e8b04496d0 100644 --- a/metricbeat/module/golang/heap/heap.go +++ b/metricbeat/module/golang/heap/heap.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/golang/heap/heap_integration_test.go b/metricbeat/module/golang/heap/heap_integration_test.go index 00e8358798ba..dadc537025a6 100644 --- a/metricbeat/module/golang/heap/heap_integration_test.go +++ b/metricbeat/module/golang/heap/heap_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/graphite/fields.go b/metricbeat/module/graphite/fields.go index c7de21855d37..1bb32bc52c7c 100644 --- a/metricbeat/module/graphite/fields.go +++ b/metricbeat/module/graphite/fields.go @@ -20,7 +20,7 @@ package graphite import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/graphite/server/data.go b/metricbeat/module/graphite/server/data.go index 202cb11c0e7d..4de923f10910 100644 --- a/metricbeat/module/graphite/server/data.go +++ b/metricbeat/module/graphite/server/data.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/graphite/server/data_test.go b/metricbeat/module/graphite/server/data_test.go index 84824e7307e4..1f117fad49de 100644 --- a/metricbeat/module/graphite/server/data_test.go +++ b/metricbeat/module/graphite/server/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/graphite/server/server.go b/metricbeat/module/graphite/server/server.go index 223657500d37..b9d3b45344a7 100644 --- a/metricbeat/module/graphite/server/server.go +++ b/metricbeat/module/graphite/server/server.go @@ -20,10 +20,10 @@ package server import ( "fmt" - serverhelper "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/helper/server/tcp" - "github.com/elastic/beats/v7/metricbeat/helper/server/udp" - "github.com/elastic/beats/v7/metricbeat/mb" + serverhelper "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/helper/server/tcp" + "github.com/elastic/beats/v9/metricbeat/helper/server/udp" + "github.com/elastic/beats/v9/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/haproxy/fields.go b/metricbeat/module/haproxy/fields.go index af01193c99c3..739d40504da7 100644 --- a/metricbeat/module/haproxy/fields.go +++ b/metricbeat/module/haproxy/fields.go @@ -20,7 +20,7 @@ package haproxy import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/haproxy/haproxy.go b/metricbeat/module/haproxy/haproxy.go index 16691cd0a055..360e29eef0ec 100644 --- a/metricbeat/module/haproxy/haproxy.go +++ b/metricbeat/module/haproxy/haproxy.go @@ -31,9 +31,9 @@ import ( "github.com/go-viper/mapstructure/v2" "github.com/gocarina/gocsv" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) // HostParser is used for parsing the configured HAProxy hosts. diff --git a/metricbeat/module/haproxy/haproxy_test.go b/metricbeat/module/haproxy/haproxy_test.go index 0eb921ccd3b6..919d8dbcc081 100644 --- a/metricbeat/module/haproxy/haproxy_test.go +++ b/metricbeat/module/haproxy/haproxy_test.go @@ -20,7 +20,7 @@ package haproxy import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/haproxy/info/data.go b/metricbeat/module/haproxy/info/data.go index d4cf97002691..810427259117 100644 --- a/metricbeat/module/haproxy/info/data.go +++ b/metricbeat/module/haproxy/info/data.go @@ -20,10 +20,10 @@ package info import ( "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/haproxy" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/haproxy" "github.com/elastic/elastic-agent-libs/mapstr" "reflect" diff --git a/metricbeat/module/haproxy/info/info.go b/metricbeat/module/haproxy/info/info.go index 8723cc405941..076ceca63f83 100644 --- a/metricbeat/module/haproxy/info/info.go +++ b/metricbeat/module/haproxy/info/info.go @@ -20,9 +20,9 @@ package info import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/haproxy" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/haproxy" ) const ( diff --git a/metricbeat/module/haproxy/info/info_integration_test.go b/metricbeat/module/haproxy/info/info_integration_test.go index 1f09609e8613..24680a3a827e 100644 --- a/metricbeat/module/haproxy/info/info_integration_test.go +++ b/metricbeat/module/haproxy/info/info_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/haproxy/stat/data.go b/metricbeat/module/haproxy/stat/data.go index 964e029c81a3..200e7f4c42ae 100644 --- a/metricbeat/module/haproxy/stat/data.go +++ b/metricbeat/module/haproxy/stat/data.go @@ -20,10 +20,10 @@ package stat import ( "reflect" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/haproxy" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/haproxy" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/haproxy/stat/stat.go b/metricbeat/module/haproxy/stat/stat.go index 30be19afa45e..b2a321be46cd 100644 --- a/metricbeat/module/haproxy/stat/stat.go +++ b/metricbeat/module/haproxy/stat/stat.go @@ -20,8 +20,8 @@ package stat import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/haproxy" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/haproxy" ) const ( diff --git a/metricbeat/module/haproxy/stat/stat_integration_test.go b/metricbeat/module/haproxy/stat/stat_integration_test.go index 65455bd8be45..e78c919fb443 100644 --- a/metricbeat/module/haproxy/stat/stat_integration_test.go +++ b/metricbeat/module/haproxy/stat/stat_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/http/fields.go b/metricbeat/module/http/fields.go index b4e6bdaa39b9..dcbf3024165d 100644 --- a/metricbeat/module/http/fields.go +++ b/metricbeat/module/http/fields.go @@ -20,7 +20,7 @@ package http import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/http/json/data.go b/metricbeat/module/http/json/data.go index 341fa4b310fb..e4054fe06a70 100644 --- a/metricbeat/module/http/json/data.go +++ b/metricbeat/module/http/json/data.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/http/json/json.go b/metricbeat/module/http/json/json.go index e312a950caee..2f465a42cbf3 100644 --- a/metricbeat/module/http/json/json.go +++ b/metricbeat/module/http/json/json.go @@ -22,9 +22,9 @@ import ( "fmt" "io/ioutil" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/http/json/json_integration_test.go b/metricbeat/module/http/json/json_integration_test.go index 176012b2e076..362e3315e4e5 100644 --- a/metricbeat/module/http/json/json_integration_test.go +++ b/metricbeat/module/http/json/json_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetchObject(t *testing.T) { diff --git a/metricbeat/module/http/json/json_test.go b/metricbeat/module/http/json/json_test.go index 1f744ec08ce1..0f807acfd4aa 100644 --- a/metricbeat/module/http/json/json_test.go +++ b/metricbeat/module/http/json/json_test.go @@ -22,9 +22,9 @@ package json import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/http" + _ "github.com/elastic/beats/v9/metricbeat/module/http" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/http/server/data.go b/metricbeat/module/http/server/data.go index f202a2fe32af..0f1832d15804 100644 --- a/metricbeat/module/http/server/data.go +++ b/metricbeat/module/http/server/data.go @@ -24,8 +24,8 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/http/server/server.go b/metricbeat/module/http/server/server.go index 6fe118e282fe..3190f4538117 100644 --- a/metricbeat/module/http/server/server.go +++ b/metricbeat/module/http/server/server.go @@ -20,9 +20,9 @@ package server import ( "fmt" - serverhelper "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/helper/server/http" - "github.com/elastic/beats/v7/metricbeat/mb" + serverhelper "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/helper/server/http" + "github.com/elastic/beats/v9/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/jolokia/fields.go b/metricbeat/module/jolokia/fields.go index 125f13abcf2e..bdb8e89c4402 100644 --- a/metricbeat/module/jolokia/fields.go +++ b/metricbeat/module/jolokia/fields.go @@ -20,7 +20,7 @@ package jolokia import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/jolokia/jmx/data.go b/metricbeat/module/jolokia/jmx/data.go index bdc97b4252d2..75d0d94435e1 100644 --- a/metricbeat/module/jolokia/jmx/data.go +++ b/metricbeat/module/jolokia/jmx/data.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/jolokia/jmx/jmx.go b/metricbeat/module/jolokia/jmx/jmx.go index d73d90835a1b..4dd410fa333b 100644 --- a/metricbeat/module/jolokia/jmx/jmx.go +++ b/metricbeat/module/jolokia/jmx/jmx.go @@ -18,11 +18,11 @@ package jmx import ( - "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/jolokia/jmx/jmx_integration_test.go b/metricbeat/module/jolokia/jmx/jmx_integration_test.go index 24fc38d3baa2..7ee6e3d59e5c 100644 --- a/metricbeat/module/jolokia/jmx/jmx_integration_test.go +++ b/metricbeat/module/jolokia/jmx/jmx_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kafka/broker.go b/metricbeat/module/kafka/broker.go index ea5f66041696..8bb2c6097e21 100644 --- a/metricbeat/module/kafka/broker.go +++ b/metricbeat/module/kafka/broker.go @@ -27,8 +27,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/kafka" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/sarama" ) diff --git a/metricbeat/module/kafka/broker/broker_integration_test.go b/metricbeat/module/kafka/broker/broker_integration_test.go index ca81693cf65e..dde186923a4e 100644 --- a/metricbeat/module/kafka/broker/broker_integration_test.go +++ b/metricbeat/module/kafka/broker/broker_integration_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia/jmx" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kafka/broker/broker_test.go b/metricbeat/module/kafka/broker/broker_test.go index 86161cd34207..02a312791c22 100644 --- a/metricbeat/module/kafka/broker/broker_test.go +++ b/metricbeat/module/kafka/broker/broker_test.go @@ -20,12 +20,12 @@ package broker import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kafka/config.go b/metricbeat/module/kafka/config.go index 8730e3546aba..3ae93fa688b3 100644 --- a/metricbeat/module/kafka/config.go +++ b/metricbeat/module/kafka/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v9/libbeat/common/kafka" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/metricbeat/module/kafka/consumer/consumer_integration_test.go b/metricbeat/module/kafka/consumer/consumer_integration_test.go index 7b95d60db0a6..73ef2be17194 100644 --- a/metricbeat/module/kafka/consumer/consumer_integration_test.go +++ b/metricbeat/module/kafka/consumer/consumer_integration_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia/jmx" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kafka/consumer/consumer_test.go b/metricbeat/module/kafka/consumer/consumer_test.go index 691248c389b5..4908492f4ad7 100644 --- a/metricbeat/module/kafka/consumer/consumer_test.go +++ b/metricbeat/module/kafka/consumer/consumer_test.go @@ -20,12 +20,12 @@ package consumer import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kafka/consumergroup/consumergroup.go b/metricbeat/module/kafka/consumergroup/consumergroup.go index 23e63b5d5016..c5f61b3c9301 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup.go @@ -20,8 +20,8 @@ package consumergroup import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kafka" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kafka" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go b/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go index 167b73d0e6d2..70c24aed406e 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go @@ -27,9 +27,9 @@ import ( "github.com/elastic/sarama" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) const ( diff --git a/metricbeat/module/kafka/consumergroup/mock_test.go b/metricbeat/module/kafka/consumergroup/mock_test.go index bf8a133ccb15..edea100c2882 100644 --- a/metricbeat/module/kafka/consumergroup/mock_test.go +++ b/metricbeat/module/kafka/consumergroup/mock_test.go @@ -21,7 +21,7 @@ import ( "fmt" "math/rand" - "github.com/elastic/beats/v7/metricbeat/module/kafka" + "github.com/elastic/beats/v9/metricbeat/module/kafka" "github.com/elastic/sarama" ) diff --git a/metricbeat/module/kafka/consumergroup/query.go b/metricbeat/module/kafka/consumergroup/query.go index 11022b929672..52e3f889a1c3 100644 --- a/metricbeat/module/kafka/consumergroup/query.go +++ b/metricbeat/module/kafka/consumergroup/query.go @@ -18,7 +18,7 @@ package consumergroup import ( - "github.com/elastic/beats/v7/metricbeat/module/kafka" + "github.com/elastic/beats/v9/metricbeat/module/kafka" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/sarama" diff --git a/metricbeat/module/kafka/fields.go b/metricbeat/module/kafka/fields.go index 4915906dbebb..46f9a89f2927 100644 --- a/metricbeat/module/kafka/fields.go +++ b/metricbeat/module/kafka/fields.go @@ -20,7 +20,7 @@ package kafka import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kafka/metricset.go b/metricbeat/module/kafka/metricset.go index 9fcbcc398117..00b1c12d69ad 100644 --- a/metricbeat/module/kafka/metricset.go +++ b/metricbeat/module/kafka/metricset.go @@ -20,7 +20,7 @@ package kafka import ( "crypto/tls" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/metricbeat/module/kafka/partition/partition.go b/metricbeat/module/kafka/partition/partition.go index 2a5b03768226..a1238c4c9c63 100644 --- a/metricbeat/module/kafka/partition/partition.go +++ b/metricbeat/module/kafka/partition/partition.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/kafka" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/kafka" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/sarama" ) diff --git a/metricbeat/module/kafka/partition/partition_integration_test.go b/metricbeat/module/kafka/partition/partition_integration_test.go index 46754c34a380..5f5b99648cec 100644 --- a/metricbeat/module/kafka/partition/partition_integration_test.go +++ b/metricbeat/module/kafka/partition/partition_integration_test.go @@ -30,8 +30,8 @@ import ( "github.com/elastic/sarama" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kafka/producer/producer_integration_test.go b/metricbeat/module/kafka/producer/producer_integration_test.go index bcc6dd2c739d..e4e6a4282739 100644 --- a/metricbeat/module/kafka/producer/producer_integration_test.go +++ b/metricbeat/module/kafka/producer/producer_integration_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia/jmx" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kafka/producer/producer_test.go b/metricbeat/module/kafka/producer/producer_test.go index 94b3dc83eba0..1226603db0f4 100644 --- a/metricbeat/module/kafka/producer/producer_test.go +++ b/metricbeat/module/kafka/producer/producer_test.go @@ -20,12 +20,12 @@ package producer import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" - _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v9/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kibana/cluster_actions/cluster_actions.go b/metricbeat/module/kibana/cluster_actions/cluster_actions.go index b4e1e6e4fe70..4d9f0f2afd85 100644 --- a/metricbeat/module/kibana/cluster_actions/cluster_actions.go +++ b/metricbeat/module/kibana/cluster_actions/cluster_actions.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/cluster_actions/data.go b/metricbeat/module/kibana/cluster_actions/data.go index 0cbb839e7517..8940621cb17d 100644 --- a/metricbeat/module/kibana/cluster_actions/data.go +++ b/metricbeat/module/kibana/cluster_actions/data.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kibana" ) var ( diff --git a/metricbeat/module/kibana/cluster_rules/cluster_rules.go b/metricbeat/module/kibana/cluster_rules/cluster_rules.go index bbb9b182cc46..653b2b257325 100644 --- a/metricbeat/module/kibana/cluster_rules/cluster_rules.go +++ b/metricbeat/module/kibana/cluster_rules/cluster_rules.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/cluster_rules/data.go b/metricbeat/module/kibana/cluster_rules/data.go index 5cc159d6546f..476a59830b75 100644 --- a/metricbeat/module/kibana/cluster_rules/data.go +++ b/metricbeat/module/kibana/cluster_rules/data.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/module/kibana" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/metricbeat/module/kibana/fields.go b/metricbeat/module/kibana/fields.go index 2d38a0cae6fd..9f47df2b5e24 100644 --- a/metricbeat/module/kibana/fields.go +++ b/metricbeat/module/kibana/fields.go @@ -20,7 +20,7 @@ package kibana import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kibana/kibana.go b/metricbeat/module/kibana/kibana.go index e9a6fcbf44f0..0436ff9b0999 100644 --- a/metricbeat/module/kibana/kibana.go +++ b/metricbeat/module/kibana/kibana.go @@ -22,12 +22,12 @@ import ( "net/url" "strings" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/kibana/kibana_test.go b/metricbeat/module/kibana/kibana_test.go index 101a39f92564..368b04245cfa 100644 --- a/metricbeat/module/kibana/kibana_test.go +++ b/metricbeat/module/kibana/kibana_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/module/kibana" "github.com/elastic/elastic-agent-libs/version" // Make sure metricsets are registered in mb.Registry - _ "github.com/elastic/beats/v7/metricbeat/module/kibana/stats" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana/stats" ) func TestIsStatsAPIAvailable(t *testing.T) { diff --git a/metricbeat/module/kibana/metricset.go b/metricbeat/module/kibana/metricset.go index f547373cb6b8..3c0c52aaa57c 100644 --- a/metricbeat/module/kibana/metricset.go +++ b/metricbeat/module/kibana/metricset.go @@ -21,7 +21,7 @@ import ( "encoding/base64" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // MetricSet can be used to build other metricsets within the Kibana module. diff --git a/metricbeat/module/kibana/node_actions/data.go b/metricbeat/module/kibana/node_actions/data.go index 4423288d952c..67f0d03a8c7b 100644 --- a/metricbeat/module/kibana/node_actions/data.go +++ b/metricbeat/module/kibana/node_actions/data.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/module/kibana" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/metricbeat/module/kibana/node_actions/node_actions.go b/metricbeat/module/kibana/node_actions/node_actions.go index 83d8b97d4df4..2fc1f588805b 100644 --- a/metricbeat/module/kibana/node_actions/node_actions.go +++ b/metricbeat/module/kibana/node_actions/node_actions.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/node_rules/data.go b/metricbeat/module/kibana/node_rules/data.go index 2aa889cc3ed7..713e31afb2e0 100644 --- a/metricbeat/module/kibana/node_rules/data.go +++ b/metricbeat/module/kibana/node_rules/data.go @@ -21,13 +21,13 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/module/kibana" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/metricbeat/module/kibana/node_rules/node_rules.go b/metricbeat/module/kibana/node_rules/node_rules.go index 34fe0f912682..6671adb044ae 100644 --- a/metricbeat/module/kibana/node_rules/node_rules.go +++ b/metricbeat/module/kibana/node_rules/node_rules.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/stats/data.go b/metricbeat/module/kibana/stats/data.go index 9adc6b7802c5..4cf9d6f1f2a0 100644 --- a/metricbeat/module/kibana/stats/data.go +++ b/metricbeat/module/kibana/stats/data.go @@ -21,12 +21,12 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/metricbeat/module/kibana/stats/data_test.go b/metricbeat/module/kibana/stats/data_test.go index 7bf59ef0efc1..eb9808c09e89 100644 --- a/metricbeat/module/kibana/stats/data_test.go +++ b/metricbeat/module/kibana/stats/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go index 6659bf6eddff..0991309957db 100644 --- a/metricbeat/module/kibana/stats/stats.go +++ b/metricbeat/module/kibana/stats/stats.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common/productorigin" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/libbeat/common/productorigin" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/stats/stats_integration_test.go b/metricbeat/module/kibana/stats/stats_integration_test.go index 0e51253b0914..a68e64323ae7 100644 --- a/metricbeat/module/kibana/stats/stats_integration_test.go +++ b/metricbeat/module/kibana/stats/stats_integration_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v9/libbeat/tests/compose" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kibana" - "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kibana" + "github.com/elastic/beats/v9/metricbeat/module/kibana/mtest" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/stats_test.go b/metricbeat/module/kibana/stats/stats_test.go index b8dadade5802..40fcc4461d5c 100644 --- a/metricbeat/module/kibana/stats/stats_test.go +++ b/metricbeat/module/kibana/stats/stats_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kibana/mtest" ) func TestFetchExcludeUsage(t *testing.T) { diff --git a/metricbeat/module/kibana/status/data.go b/metricbeat/module/kibana/status/data.go index e033a7412103..39cb648ae553 100644 --- a/metricbeat/module/kibana/status/data.go +++ b/metricbeat/module/kibana/status/data.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kibana" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kibana/status/data_test.go b/metricbeat/module/kibana/status/data_test.go index 3ec2ceb3bb6f..a5d5b597f9f6 100644 --- a/metricbeat/module/kibana/status/data_test.go +++ b/metricbeat/module/kibana/status/data_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kibana/status/status.go b/metricbeat/module/kibana/status/status.go index 62a1a0b0e4d6..82769b7f903b 100644 --- a/metricbeat/module/kibana/status/status.go +++ b/metricbeat/module/kibana/status/status.go @@ -18,11 +18,11 @@ package status import ( - "github.com/elastic/beats/v7/libbeat/common/productorigin" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/kibana" + "github.com/elastic/beats/v9/libbeat/common/productorigin" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/kibana" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kibana/status/status_integration_test.go b/metricbeat/module/kibana/status/status_integration_test.go index 4feb7b3da69c..9d0931f39517 100644 --- a/metricbeat/module/kibana/status/status_integration_test.go +++ b/metricbeat/module/kibana/status/status_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kibana/mtest" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kibana/status/status_test.go b/metricbeat/module/kibana/status/status_test.go index 610d0e81d329..e878c8477ff5 100644 --- a/metricbeat/module/kibana/status/status_test.go +++ b/metricbeat/module/kibana/status/status_test.go @@ -22,9 +22,9 @@ package status import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kibana" + _ "github.com/elastic/beats/v9/metricbeat/module/kibana" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kubernetes/apiserver/apiserver.go b/metricbeat/module/kubernetes/apiserver/apiserver.go index 1db54b1c7366..80da0614dfea 100644 --- a/metricbeat/module/kubernetes/apiserver/apiserver.go +++ b/metricbeat/module/kubernetes/apiserver/apiserver.go @@ -18,8 +18,8 @@ package apiserver import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" ) var mapping = &prometheus.MetricsMapping{ diff --git a/metricbeat/module/kubernetes/apiserver/apiserver_integration_test.go b/metricbeat/module/kubernetes/apiserver/apiserver_integration_test.go index fd0354adc9a9..e7aeef18caec 100644 --- a/metricbeat/module/kubernetes/apiserver/apiserver_integration_test.go +++ b/metricbeat/module/kubernetes/apiserver/apiserver_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/apiserver/apiserver_test.go b/metricbeat/module/kubernetes/apiserver/apiserver_test.go index e9f8879ca36a..4448880ff3ce 100644 --- a/metricbeat/module/kubernetes/apiserver/apiserver_test.go +++ b/metricbeat/module/kubernetes/apiserver/apiserver_test.go @@ -23,10 +23,10 @@ package apiserver import ( "testing" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/apiserver/metricset.go b/metricbeat/module/kubernetes/apiserver/metricset.go index 9191db36dbc6..67a421b3652c 100644 --- a/metricbeat/module/kubernetes/apiserver/metricset.go +++ b/metricbeat/module/kubernetes/apiserver/metricset.go @@ -20,10 +20,10 @@ package apiserver import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/container/container.go b/metricbeat/module/kubernetes/container/container.go index e48926215483..29af213c8741 100644 --- a/metricbeat/module/kubernetes/container/container.go +++ b/metricbeat/module/kubernetes/container/container.go @@ -22,11 +22,11 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/container/container_integration_test.go b/metricbeat/module/kubernetes/container/container_integration_test.go index dae75466b270..67be1de50cf1 100644 --- a/metricbeat/module/kubernetes/container/container_integration_test.go +++ b/metricbeat/module/kubernetes/container/container_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/container/container_test.go b/metricbeat/module/kubernetes/container/container_test.go index a444e83c6cc2..a627fab4568b 100644 --- a/metricbeat/module/kubernetes/container/container_test.go +++ b/metricbeat/module/kubernetes/container/container_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/container/data.go b/metricbeat/module/kubernetes/container/data.go index 1fd0f44e85f9..28fd69d98d7c 100644 --- a/metricbeat/module/kubernetes/container/data.go +++ b/metricbeat/module/kubernetes/container/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager.go b/metricbeat/module/kubernetes/controllermanager/controllermanager.go index 3b875e0081a3..92e5c8ccae34 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager.go @@ -20,10 +20,10 @@ package controllermanager import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager_integration_test.go b/metricbeat/module/kubernetes/controllermanager/controllermanager_integration_test.go index d6cc6f522b7f..5a27a2d37f26 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager_integration_test.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go b/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go index 7c7e2a4f7469..f66dccd633ac 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go @@ -22,10 +22,10 @@ package controllermanager import ( "testing" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/event/event.go b/metricbeat/module/kubernetes/event/event.go index 97f2deb23f56..0fd5c4d50076 100644 --- a/metricbeat/module/kubernetes/event/event.go +++ b/metricbeat/module/kubernetes/event/event.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-autodiscover/kubernetes" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go index 7195312511bd..635e0933632d 100644 --- a/metricbeat/module/kubernetes/fields.go +++ b/metricbeat/module/kubernetes/fields.go @@ -20,7 +20,7 @@ package kubernetes import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kubernetes/kubernetes.go b/metricbeat/module/kubernetes/kubernetes.go index fe51341fc674..ed0d2a02de36 100644 --- a/metricbeat/module/kubernetes/kubernetes.go +++ b/metricbeat/module/kubernetes/kubernetes.go @@ -24,10 +24,10 @@ import ( "github.com/gohugoio/hashstructure" - "github.com/elastic/beats/v7/metricbeat/helper" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) func init() { diff --git a/metricbeat/module/kubernetes/node/data.go b/metricbeat/module/kubernetes/node/data.go index a313b022a009..efaea680c5b0 100644 --- a/metricbeat/module/kubernetes/node/data.go +++ b/metricbeat/module/kubernetes/node/data.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/node/node.go b/metricbeat/module/kubernetes/node/node.go index e862d83e92a5..a21d3bb36d76 100644 --- a/metricbeat/module/kubernetes/node/node.go +++ b/metricbeat/module/kubernetes/node/node.go @@ -20,11 +20,11 @@ package node import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/node/node_integration_test.go b/metricbeat/module/kubernetes/node/node_integration_test.go index 85fcccf60e5f..f4b1ec2c348b 100644 --- a/metricbeat/module/kubernetes/node/node_integration_test.go +++ b/metricbeat/module/kubernetes/node/node_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/pod/data.go b/metricbeat/module/kubernetes/pod/data.go index c06cbb4860a7..e2670f4defbf 100644 --- a/metricbeat/module/kubernetes/pod/data.go +++ b/metricbeat/module/kubernetes/pod/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/pod/pod.go b/metricbeat/module/kubernetes/pod/pod.go index fe20641b432a..36a2e2cfff51 100644 --- a/metricbeat/module/kubernetes/pod/pod.go +++ b/metricbeat/module/kubernetes/pod/pod.go @@ -20,11 +20,11 @@ package pod import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/pod/pod_integration_test.go b/metricbeat/module/kubernetes/pod/pod_integration_test.go index 0966ad66b7ba..7b4da379a58e 100644 --- a/metricbeat/module/kubernetes/pod/pod_integration_test.go +++ b/metricbeat/module/kubernetes/pod/pod_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/pod/pod_test.go b/metricbeat/module/kubernetes/pod/pod_test.go index 7b46e5a272bc..b72a949da51b 100644 --- a/metricbeat/module/kubernetes/pod/pod_test.go +++ b/metricbeat/module/kubernetes/pod/pod_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/metricbeat/module/kubernetes/proxy/proxy.go b/metricbeat/module/kubernetes/proxy/proxy.go index 4b4bc678292a..6c95fb56703f 100644 --- a/metricbeat/module/kubernetes/proxy/proxy.go +++ b/metricbeat/module/kubernetes/proxy/proxy.go @@ -20,9 +20,9 @@ package proxy import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/proxy/proxy_integration_test.go b/metricbeat/module/kubernetes/proxy/proxy_integration_test.go index 1bf958439e9d..175566599618 100644 --- a/metricbeat/module/kubernetes/proxy/proxy_integration_test.go +++ b/metricbeat/module/kubernetes/proxy/proxy_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/proxy/proxy_test.go b/metricbeat/module/kubernetes/proxy/proxy_test.go index d5b9beefab9e..8f8b9bfbbfba 100644 --- a/metricbeat/module/kubernetes/proxy/proxy_test.go +++ b/metricbeat/module/kubernetes/proxy/proxy_test.go @@ -23,10 +23,10 @@ package proxy import ( "testing" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/scheduler/scheduler.go b/metricbeat/module/kubernetes/scheduler/scheduler.go index 29dbba1e9a35..29bb4dfaf9d5 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler.go @@ -20,10 +20,10 @@ package scheduler import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go b/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go index 81e530628612..9ba5ad3f88a6 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/scheduler/scheduler_test.go b/metricbeat/module/kubernetes/scheduler/scheduler_test.go index f6842d8254ac..519fafb4197f 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler_test.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler_test.go @@ -23,10 +23,10 @@ package scheduler import ( "testing" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_container/state_container.go b/metricbeat/module/kubernetes/state_container/state_container.go index 085bdb5e285e..b8f9ca0cb3e5 100644 --- a/metricbeat/module/kubernetes/state_container/state_container.go +++ b/metricbeat/module/kubernetes/state_container/state_container.go @@ -21,12 +21,12 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/state_container/state_container_integration_test.go b/metricbeat/module/kubernetes/state_container/state_container_integration_test.go index c52610d72248..42864899d995 100644 --- a/metricbeat/module/kubernetes/state_container/state_container_integration_test.go +++ b/metricbeat/module/kubernetes/state_container/state_container_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_container/state_container_test.go b/metricbeat/module/kubernetes/state_container/state_container_test.go index 40876a85c810..678a1ce0a60e 100644 --- a/metricbeat/module/kubernetes/state_container/state_container_test.go +++ b/metricbeat/module/kubernetes/state_container/state_container_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go b/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go index c49937ae044a..7d8725103313 100644 --- a/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go +++ b/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go @@ -18,10 +18,10 @@ package state_cronjob import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_integration_test.go b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_integration_test.go index 6a2c930532dc..860092e98120 100644 --- a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_integration_test.go +++ b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go index 55ba461ff599..59beeeb8ff0f 100644 --- a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go +++ b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_daemonset/state_daemonset.go b/metricbeat/module/kubernetes/state_daemonset/state_daemonset.go index 4cc3e2f9be4f..8b3635b1adc5 100644 --- a/metricbeat/module/kubernetes/state_daemonset/state_daemonset.go +++ b/metricbeat/module/kubernetes/state_daemonset/state_daemonset.go @@ -18,10 +18,10 @@ package state_daemonset import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_daemonset/state_daemonset_integration_test.go b/metricbeat/module/kubernetes/state_daemonset/state_daemonset_integration_test.go index 24b9f4081b85..2bb8b099cd20 100644 --- a/metricbeat/module/kubernetes/state_daemonset/state_daemonset_integration_test.go +++ b/metricbeat/module/kubernetes/state_daemonset/state_daemonset_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_daemonset/state_daemonset_test.go b/metricbeat/module/kubernetes/state_daemonset/state_daemonset_test.go index 546e4559cdbd..4ed256731026 100644 --- a/metricbeat/module/kubernetes/state_daemonset/state_daemonset_test.go +++ b/metricbeat/module/kubernetes/state_daemonset/state_daemonset_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment.go b/metricbeat/module/kubernetes/state_deployment/state_deployment.go index 31bb53f9e338..210589fd867a 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment.go @@ -18,10 +18,10 @@ package state_deployment import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment_integration_test.go b/metricbeat/module/kubernetes/state_deployment/state_deployment_integration_test.go index aa67a1be6bd5..d3a00f4aa6dd 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment_integration_test.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go b/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go index 499c3a64915a..ccfcd510165d 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler.go b/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler.go index c81aaa5faa6f..d261baabc961 100644 --- a/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler.go +++ b/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler.go @@ -18,10 +18,10 @@ package state_horizontalpodautoscaler import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_integration_test.go b/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_integration_test.go index 2c1b7f5fe37e..b90332a3da86 100644 --- a/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_integration_test.go +++ b/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_test.go b/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_test.go index e6198792e91b..67183a20c354 100644 --- a/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_test.go +++ b/metricbeat/module/kubernetes/state_horizontalpodautoscaler/state_horizontalpodautoscaler_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_job/state_job.go b/metricbeat/module/kubernetes/state_job/state_job.go index 53b3952946f2..33844787683e 100644 --- a/metricbeat/module/kubernetes/state_job/state_job.go +++ b/metricbeat/module/kubernetes/state_job/state_job.go @@ -18,10 +18,10 @@ package state_job import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_job/state_job_integration_test.go b/metricbeat/module/kubernetes/state_job/state_job_integration_test.go index 61b3cb575a6a..633ebb2cefd5 100644 --- a/metricbeat/module/kubernetes/state_job/state_job_integration_test.go +++ b/metricbeat/module/kubernetes/state_job/state_job_integration_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_job/state_job_test.go b/metricbeat/module/kubernetes/state_job/state_job_test.go index 8aa33a3cfd4f..48eb1db19164 100644 --- a/metricbeat/module/kubernetes/state_job/state_job_test.go +++ b/metricbeat/module/kubernetes/state_job/state_job_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_namespace/state_namespace.go b/metricbeat/module/kubernetes/state_namespace/state_namespace.go index 8459f446d430..d748ac89fc94 100644 --- a/metricbeat/module/kubernetes/state_namespace/state_namespace.go +++ b/metricbeat/module/kubernetes/state_namespace/state_namespace.go @@ -18,10 +18,10 @@ package state_namespace import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_namespace/state_namespace_integration_test.go b/metricbeat/module/kubernetes/state_namespace/state_namespace_integration_test.go index 138b15fde073..e573065e8842 100644 --- a/metricbeat/module/kubernetes/state_namespace/state_namespace_integration_test.go +++ b/metricbeat/module/kubernetes/state_namespace/state_namespace_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_namespace/state_namespace_test.go b/metricbeat/module/kubernetes/state_namespace/state_namespace_test.go index 902950c6d915..4de814b72ec2 100644 --- a/metricbeat/module/kubernetes/state_namespace/state_namespace_test.go +++ b/metricbeat/module/kubernetes/state_namespace/state_namespace_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_node/state_node.go b/metricbeat/module/kubernetes/state_node/state_node.go index 919b41bb5f00..11ab6a8d4535 100644 --- a/metricbeat/module/kubernetes/state_node/state_node.go +++ b/metricbeat/module/kubernetes/state_node/state_node.go @@ -18,9 +18,9 @@ package state_node import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_node/state_node_integration_test.go b/metricbeat/module/kubernetes/state_node/state_node_integration_test.go index a8b66feac6d7..8c1bb5a52fcb 100644 --- a/metricbeat/module/kubernetes/state_node/state_node_integration_test.go +++ b/metricbeat/module/kubernetes/state_node/state_node_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_node/state_node_test.go b/metricbeat/module/kubernetes/state_node/state_node_test.go index 5d95614c8ec7..cfb60fc20969 100644 --- a/metricbeat/module/kubernetes/state_node/state_node_test.go +++ b/metricbeat/module/kubernetes/state_node/state_node_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go index 5e113491c8ef..c73c8a7b2d48 100644 --- a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go +++ b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go @@ -18,10 +18,10 @@ package state_persistentvolume import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_integration_test.go b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_integration_test.go index ae2fde5193c8..1d2fa1fa73ce 100644 --- a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_integration_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go index 80a6ce5f8f66..8559b7515100 100644 --- a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go index 66f11a0fbf7c..86249ed1ff00 100644 --- a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go +++ b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go @@ -18,10 +18,10 @@ package state_persistentvolumeclaim import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_integration_test.go b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_integration_test.go index 689d3d08cc5f..e02aed75b2c5 100644 --- a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_integration_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go index a4d3d5fbe486..cf59c16ee2a2 100644 --- a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_pod/state_pod.go b/metricbeat/module/kubernetes/state_pod/state_pod.go index 7f6fb13eeca6..829d89e38a02 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod.go @@ -18,10 +18,10 @@ package state_pod import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_pod/state_pod_integration_test.go b/metricbeat/module/kubernetes/state_pod/state_pod_integration_test.go index e27aea80423b..b259facd5237 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod_integration_test.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_pod/state_pod_test.go b/metricbeat/module/kubernetes/state_pod/state_pod_test.go index 51e30ec99035..3ecfc97a8cc2 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod_test.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go index 0f20c84c7f65..3f5139aa0a8c 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go @@ -18,10 +18,10 @@ package state_replicaset import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_integration_test.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_integration_test.go index 8f82b79f2c25..1ec6955f7050 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_integration_test.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go index db9de50ed098..b79f42c40f91 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go index 465e9ad15536..ae301c053929 100644 --- a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go +++ b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go @@ -20,9 +20,9 @@ package state_resourcequota import ( "fmt" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var mapping = &p.MetricsMapping{ diff --git a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_integration_test.go b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_integration_test.go index c8b0e0256d27..63f7b06ca8e3 100644 --- a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_integration_test.go +++ b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go index 102aa590ae03..840d588f1718 100644 --- a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go +++ b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_service/state_service.go b/metricbeat/module/kubernetes/state_service/state_service.go index 05dfd5e87e1d..b473259467ca 100644 --- a/metricbeat/module/kubernetes/state_service/state_service.go +++ b/metricbeat/module/kubernetes/state_service/state_service.go @@ -18,10 +18,10 @@ package state_service import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_service/state_service_integration_test.go b/metricbeat/module/kubernetes/state_service/state_service_integration_test.go index 6d876e5315d5..80a37bcc4616 100644 --- a/metricbeat/module/kubernetes/state_service/state_service_integration_test.go +++ b/metricbeat/module/kubernetes/state_service/state_service_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_service/state_service_test.go b/metricbeat/module/kubernetes/state_service/state_service_test.go index 96e7e052254a..314471e38351 100644 --- a/metricbeat/module/kubernetes/state_service/state_service_test.go +++ b/metricbeat/module/kubernetes/state_service/state_service_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go b/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go index 9ecba0f3cff6..ff8e07b393d2 100644 --- a/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go +++ b/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go @@ -18,10 +18,10 @@ package state_statefulset import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_integration_test.go b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_integration_test.go index 1f0f5b044693..4a7159dd9198 100644 --- a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_integration_test.go +++ b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go index 20c7c37ebd08..c4fd28abd5e6 100644 --- a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go +++ b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v9/metricbeat/module/kubernetes" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go b/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go index 2812b4c76875..65c144ae03ac 100644 --- a/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go +++ b/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go @@ -18,10 +18,10 @@ package state_storageclass import ( - "github.com/elastic/beats/v7/metricbeat/helper/kubernetes" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper/kubernetes" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" ) // mapping stores the state metrics we want to fetch and will be used by this metricset diff --git a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_integration_test.go b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_integration_test.go index 8541b23ed3e1..a23903200e6d 100644 --- a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_integration_test.go +++ b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go index 7e9e0d807803..a6bce06c0f4f 100644 --- a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go +++ b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - k "github.com/elastic/beats/v7/metricbeat/helper/kubernetes/ktest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + k "github.com/elastic/beats/v9/metricbeat/helper/kubernetes/ktest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" ) var filesFolder = "../_meta/test/KSM" diff --git a/metricbeat/module/kubernetes/system/data.go b/metricbeat/module/kubernetes/system/data.go index 381606a3558f..5d34a30ce62e 100644 --- a/metricbeat/module/kubernetes/system/data.go +++ b/metricbeat/module/kubernetes/system/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/system/system.go b/metricbeat/module/kubernetes/system/system.go index c5e1c4d119d3..a3b8770f911e 100644 --- a/metricbeat/module/kubernetes/system/system.go +++ b/metricbeat/module/kubernetes/system/system.go @@ -20,11 +20,11 @@ package system import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/system/system_integration_test.go b/metricbeat/module/kubernetes/system/system_integration_test.go index d6c7f3275c40..66370ec8c223 100644 --- a/metricbeat/module/kubernetes/system/system_integration_test.go +++ b/metricbeat/module/kubernetes/system/system_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go index 1ce70b180972..1bfb095bcbf3 100644 --- a/metricbeat/module/kubernetes/util/kubernetes.go +++ b/metricbeat/module/kubernetes/util/kubernetes.go @@ -41,8 +41,8 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/metricbeat/mb" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/metricbeat/mb" ) // Resource metadata keys are composed of multiple parts - usually just the namespace and name. This string is the diff --git a/metricbeat/module/kubernetes/util/kubernetes_test.go b/metricbeat/module/kubernetes/util/kubernetes_test.go index 0b94d4d90e30..0015d62740f3 100644 --- a/metricbeat/module/kubernetes/util/kubernetes_test.go +++ b/metricbeat/module/kubernetes/util/kubernetes_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/stretchr/testify/assert" @@ -37,7 +37,7 @@ import ( k8s "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" "github.com/elastic/elastic-agent-autodiscover/kubernetes/metadata" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/metricbeat/module/kubernetes/volume/data.go b/metricbeat/module/kubernetes/volume/data.go index c6b9983f7770..0df396b3fe82 100644 --- a/metricbeat/module/kubernetes/volume/data.go +++ b/metricbeat/module/kubernetes/volume/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - kubernetes2 "github.com/elastic/beats/v7/libbeat/autodiscover/providers/kubernetes" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + kubernetes2 "github.com/elastic/beats/v9/libbeat/autodiscover/providers/kubernetes" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/volume/volume.go b/metricbeat/module/kubernetes/volume/volume.go index e376138fb550..3a9da5bd83d2 100644 --- a/metricbeat/module/kubernetes/volume/volume.go +++ b/metricbeat/module/kubernetes/volume/volume.go @@ -20,11 +20,11 @@ package volume import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - k8smod "github.com/elastic/beats/v7/metricbeat/module/kubernetes" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + k8smod "github.com/elastic/beats/v9/metricbeat/module/kubernetes" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kubernetes/volume/volume_integration_test.go b/metricbeat/module/kubernetes/volume/volume_integration_test.go index e2d5dec90eff..b59fb71d937a 100644 --- a/metricbeat/module/kubernetes/volume/volume_integration_test.go +++ b/metricbeat/module/kubernetes/volume/volume_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/kubernetes/test" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/kubernetes/test" ) func TestFetchMetricset(t *testing.T) { diff --git a/metricbeat/module/kubernetes/volume/volume_test.go b/metricbeat/module/kubernetes/volume/volume_test.go index 75bd86e6e412..aa2480079f6c 100644 --- a/metricbeat/module/kubernetes/volume/volume_test.go +++ b/metricbeat/module/kubernetes/volume/volume_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kvm/dommemstat/dommemstat.go b/metricbeat/module/kvm/dommemstat/dommemstat.go index 725562d5ede2..2c8adbb52f11 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat.go @@ -26,7 +26,7 @@ import ( "net/url" "time" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/digitalocean/go-libvirt" @@ -34,7 +34,7 @@ import ( "github.com/digitalocean/go-libvirt/socket" "github.com/digitalocean/go-libvirt/socket/dialers" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) const ( diff --git a/metricbeat/module/kvm/dommemstat/dommemstat_test.go b/metricbeat/module/kvm/dommemstat/dommemstat_test.go index e0026e5e34a1..df6df6bb348a 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat_test.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/digitalocean/go-libvirt/libvirttest" ) diff --git a/metricbeat/module/kvm/fields.go b/metricbeat/module/kvm/fields.go index 7419a024ea72..17d2accc0fb2 100644 --- a/metricbeat/module/kvm/fields.go +++ b/metricbeat/module/kvm/fields.go @@ -20,7 +20,7 @@ package kvm import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kvm/status/status.go b/metricbeat/module/kvm/status/status.go index 183ca4547863..3034e4398cdb 100644 --- a/metricbeat/module/kvm/status/status.go +++ b/metricbeat/module/kvm/status/status.go @@ -30,8 +30,8 @@ import ( "github.com/digitalocean/go-libvirt/socket" "github.com/digitalocean/go-libvirt/socket/dialers" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/kvm/status/status_integration_test.go b/metricbeat/module/kvm/status/status_integration_test.go index 53e93a184e40..bcef7c889f4a 100644 --- a/metricbeat/module/kvm/status/status_integration_test.go +++ b/metricbeat/module/kvm/status/status_integration_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/kvm/status/status_test.go b/metricbeat/module/kvm/status/status_test.go index 4d492851cbc0..b1110539b380 100644 --- a/metricbeat/module/kvm/status/status_test.go +++ b/metricbeat/module/kvm/status/status_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/linux/conntrack/conntrack.go b/metricbeat/module/linux/conntrack/conntrack.go index ec523e10a066..d7e38e1d7c6e 100644 --- a/metricbeat/module/linux/conntrack/conntrack.go +++ b/metricbeat/module/linux/conntrack/conntrack.go @@ -23,8 +23,8 @@ import ( "github.com/prometheus/procfs" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/linux/conntrack/conntrack_test.go b/metricbeat/module/linux/conntrack/conntrack_test.go index be929a9d15ae..b2e3f9147032 100644 --- a/metricbeat/module/linux/conntrack/conntrack_test.go +++ b/metricbeat/module/linux/conntrack/conntrack_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/linux" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/linux" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/linux/fields.go b/metricbeat/module/linux/fields.go index c498df72b00b..d3292cc4eeab 100644 --- a/metricbeat/module/linux/fields.go +++ b/metricbeat/module/linux/fields.go @@ -20,7 +20,7 @@ package linux import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/linux/iostat/iostat.go b/metricbeat/module/linux/iostat/iostat.go index 2ae8a14a1bde..2db5f7cff4aa 100644 --- a/metricbeat/module/linux/iostat/iostat.go +++ b/metricbeat/module/linux/iostat/iostat.go @@ -22,8 +22,8 @@ package iostat import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/diskio" ) diff --git a/metricbeat/module/linux/iostat/iostat_test.go b/metricbeat/module/linux/iostat/iostat_test.go index 7f6888f114df..231d7548e9b4 100644 --- a/metricbeat/module/linux/iostat/iostat_test.go +++ b/metricbeat/module/linux/iostat/iostat_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/linux" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/linux" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/linux/ksm/data.go b/metricbeat/module/linux/ksm/data.go index 94055224ca0d..b1d4b1269571 100644 --- a/metricbeat/module/linux/ksm/data.go +++ b/metricbeat/module/linux/ksm/data.go @@ -21,7 +21,7 @@ import ( "fmt" "path/filepath" - "github.com/elastic/beats/v7/metricbeat/module/linux" + "github.com/elastic/beats/v9/metricbeat/module/linux" ) type ksmData struct { diff --git a/metricbeat/module/linux/ksm/ksm.go b/metricbeat/module/linux/ksm/ksm.go index ad1af2e15d94..e43f3875556a 100644 --- a/metricbeat/module/linux/ksm/ksm.go +++ b/metricbeat/module/linux/ksm/ksm.go @@ -20,8 +20,8 @@ package ksm import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/linux/ksm/ksm_test.go b/metricbeat/module/linux/ksm/ksm_test.go index 5a6b9562e948..35d2caf4360a 100644 --- a/metricbeat/module/linux/ksm/ksm_test.go +++ b/metricbeat/module/linux/ksm/ksm_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/linux" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/linux" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/linux/linux.go b/metricbeat/module/linux/linux.go index a86b41f3c8fe..ca61264f9a2c 100644 --- a/metricbeat/module/linux/linux.go +++ b/metricbeat/module/linux/linux.go @@ -18,8 +18,8 @@ package linux import ( - "github.com/elastic/beats/v7/metricbeat/internal/sysinit" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/internal/sysinit" + "github.com/elastic/beats/v9/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/linux/memory/memory.go b/metricbeat/module/linux/memory/memory.go index 287277e59193..88d739371dd9 100644 --- a/metricbeat/module/linux/memory/memory.go +++ b/metricbeat/module/linux/memory/memory.go @@ -20,8 +20,8 @@ package memory import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/linux/memory/memory_linux_test.go b/metricbeat/module/linux/memory/memory_linux_test.go index 2815231ea815..7883eea86955 100644 --- a/metricbeat/module/linux/memory/memory_linux_test.go +++ b/metricbeat/module/linux/memory/memory_linux_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/linux" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/linux" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/linux/pageinfo/pageinfo.go b/metricbeat/module/linux/pageinfo/pageinfo.go index c75738864557..4d01c04d3e80 100644 --- a/metricbeat/module/linux/pageinfo/pageinfo.go +++ b/metricbeat/module/linux/pageinfo/pageinfo.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/linux/pageinfo/pageinfo_test.go b/metricbeat/module/linux/pageinfo/pageinfo_test.go index cb4915ebea6f..af3eec83bfbd 100644 --- a/metricbeat/module/linux/pageinfo/pageinfo_test.go +++ b/metricbeat/module/linux/pageinfo/pageinfo_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/linux" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/linux" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/linux/pressure/pressure.go b/metricbeat/module/linux/pressure/pressure.go index fa8766de4899..6d3968fae9b6 100644 --- a/metricbeat/module/linux/pressure/pressure.go +++ b/metricbeat/module/linux/pressure/pressure.go @@ -23,8 +23,8 @@ import ( "github.com/prometheus/procfs" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/linux/pressure/pressure_test.go b/metricbeat/module/linux/pressure/pressure_test.go index c6cd2402d62d..e585306bc0f9 100644 --- a/metricbeat/module/linux/pressure/pressure_test.go +++ b/metricbeat/module/linux/pressure/pressure_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/linux" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/linux" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/linux/rapl/rapl.go b/metricbeat/module/linux/rapl/rapl.go index 594befe945d7..0910aaebf0f7 100644 --- a/metricbeat/module/linux/rapl/rapl.go +++ b/metricbeat/module/linux/rapl/rapl.go @@ -33,9 +33,9 @@ import ( "github.com/fearful-symmetry/gorapl/rapl" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/logstash/fields.go b/metricbeat/module/logstash/fields.go index d1550b9555c7..d429de779e45 100644 --- a/metricbeat/module/logstash/fields.go +++ b/metricbeat/module/logstash/fields.go @@ -20,7 +20,7 @@ package logstash import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/logstash/logstash.go b/metricbeat/module/logstash/logstash.go index d41e87d9e998..1e3a3f22f5fc 100644 --- a/metricbeat/module/logstash/logstash.go +++ b/metricbeat/module/logstash/logstash.go @@ -22,9 +22,9 @@ import ( "fmt" "net/url" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/metricbeat/module/logstash/logstash_integration_test.go b/metricbeat/module/logstash/logstash_integration_test.go index 5865867cf1f9..e2a010bdb3f6 100644 --- a/metricbeat/module/logstash/logstash_integration_test.go +++ b/metricbeat/module/logstash/logstash_integration_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/logstash" - _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node" - _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node_stats" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/logstash" + _ "github.com/elastic/beats/v9/metricbeat/module/logstash/node" + _ "github.com/elastic/beats/v9/metricbeat/module/logstash/node_stats" ) var metricSets = []string{ diff --git a/metricbeat/module/logstash/logstash_test.go b/metricbeat/module/logstash/logstash_test.go index 63c1f443bd22..382a7ff379af 100644 --- a/metricbeat/module/logstash/logstash_test.go +++ b/metricbeat/module/logstash/logstash_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/logstash" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/logstash" // Make sure metricsets are registered in mb.Registry - _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node" - _ "github.com/elastic/beats/v7/metricbeat/module/logstash/node_stats" + _ "github.com/elastic/beats/v9/metricbeat/module/logstash/node" + _ "github.com/elastic/beats/v9/metricbeat/module/logstash/node_stats" ) func TestGetVertexClusterUUID(t *testing.T) { diff --git a/metricbeat/module/logstash/node/data.go b/metricbeat/module/logstash/node/data.go index 49c17b732751..78bcc295590d 100644 --- a/metricbeat/module/logstash/node/data.go +++ b/metricbeat/module/logstash/node/data.go @@ -21,12 +21,12 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/logstash" + "github.com/elastic/beats/v9/libbeat/common" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/logstash" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/logstash/node/data_test.go b/metricbeat/module/logstash/node/data_test.go index 9591137f6f98..23c9aade5a1c 100644 --- a/metricbeat/module/logstash/node/data_test.go +++ b/metricbeat/module/logstash/node/data_test.go @@ -25,11 +25,11 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/module/logstash" + "github.com/elastic/beats/v9/metricbeat/module/logstash" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/logstash/node/node.go b/metricbeat/module/logstash/node/node.go index e209a6c8918c..7cae14563284 100644 --- a/metricbeat/module/logstash/node/node.go +++ b/metricbeat/module/logstash/node/node.go @@ -18,9 +18,9 @@ package node import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/logstash" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/logstash" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/logstash/node_stats/data.go b/metricbeat/module/logstash/node_stats/data.go index dbe6dad098ce..11435b03e769 100644 --- a/metricbeat/module/logstash/node_stats/data.go +++ b/metricbeat/module/logstash/node_stats/data.go @@ -22,15 +22,15 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v9/metricbeat/helper/elastic" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" - "github.com/elastic/beats/v7/metricbeat/module/logstash" + "github.com/elastic/beats/v9/metricbeat/module/logstash" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" ) type jvm struct { diff --git a/metricbeat/module/logstash/node_stats/data_test.go b/metricbeat/module/logstash/node_stats/data_test.go index fecf6cbff736..60275b315261 100644 --- a/metricbeat/module/logstash/node_stats/data_test.go +++ b/metricbeat/module/logstash/node_stats/data_test.go @@ -26,12 +26,12 @@ import ( "net/http/httptest" "testing" - "github.com/elastic/beats/v7/metricbeat/module/logstash" + "github.com/elastic/beats/v9/metricbeat/module/logstash" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/logstash/node_stats/node_stats.go b/metricbeat/module/logstash/node_stats/node_stats.go index 6f935ace9557..80ef58f80638 100644 --- a/metricbeat/module/logstash/node_stats/node_stats.go +++ b/metricbeat/module/logstash/node_stats/node_stats.go @@ -20,9 +20,9 @@ package node_stats import ( "net/url" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/logstash" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/logstash" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/memcached/fields.go b/metricbeat/module/memcached/fields.go index b2da1dbbf63b..284e358fd009 100644 --- a/metricbeat/module/memcached/fields.go +++ b/metricbeat/module/memcached/fields.go @@ -20,7 +20,7 @@ package memcached import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/memcached/stats/data.go b/metricbeat/module/memcached/stats/data.go index 9d7bf9fac6d7..a796800c792e 100644 --- a/metricbeat/module/memcached/stats/data.go +++ b/metricbeat/module/memcached/stats/data.go @@ -18,8 +18,8 @@ package stats import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" ) var ( diff --git a/metricbeat/module/memcached/stats/stats.go b/metricbeat/module/memcached/stats/stats.go index 890a8c701f70..8213d2fc53a5 100644 --- a/metricbeat/module/memcached/stats/stats.go +++ b/metricbeat/module/memcached/stats/stats.go @@ -24,8 +24,8 @@ import ( "net/url" "strings" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "tcp"}.Build() diff --git a/metricbeat/module/memcached/stats/stats_integration_test.go b/metricbeat/module/memcached/stats/stats_integration_test.go index 4ea8d5392bcc..2d6c33790dde 100644 --- a/metricbeat/module/memcached/stats/stats_integration_test.go +++ b/metricbeat/module/memcached/stats/stats_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/memcached/stats/stats_test.go b/metricbeat/module/memcached/stats/stats_test.go index 39868b0b5cbe..f0f58f502ead 100644 --- a/metricbeat/module/memcached/stats/stats_test.go +++ b/metricbeat/module/memcached/stats/stats_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) func TestGetNetworkAddress_URL(t *testing.T) { diff --git a/metricbeat/module/mongodb/collstats/collstats.go b/metricbeat/module/mongodb/collstats/collstats.go index 93df4a5e5e14..101509d15e1c 100644 --- a/metricbeat/module/mongodb/collstats/collstats.go +++ b/metricbeat/module/mongodb/collstats/collstats.go @@ -26,8 +26,8 @@ import ( "golang.org/x/sync/errgroup" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mongodb" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mongodb" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/metricbeat/module/mongodb/collstats/collstats_integration_test.go b/metricbeat/module/mongodb/collstats/collstats_integration_test.go index 499a715cfbeb..c65155f04b7c 100644 --- a/metricbeat/module/mongodb/collstats/collstats_integration_test.go +++ b/metricbeat/module/mongodb/collstats/collstats_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/dbstats/data.go b/metricbeat/module/mongodb/dbstats/data.go index 1d50a06593b8..8c390aace6b4 100644 --- a/metricbeat/module/mongodb/dbstats/data.go +++ b/metricbeat/module/mongodb/dbstats/data.go @@ -18,8 +18,8 @@ package dbstats import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" ) var schema = s.Schema{ diff --git a/metricbeat/module/mongodb/dbstats/dbstats.go b/metricbeat/module/mongodb/dbstats/dbstats.go index 3ab74a072c60..4f6d930f14d1 100644 --- a/metricbeat/module/mongodb/dbstats/dbstats.go +++ b/metricbeat/module/mongodb/dbstats/dbstats.go @@ -26,8 +26,8 @@ import ( "go.mongodb.org/mongo-driver/bson" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mongodb" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mongodb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go b/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go index b10f627deafd..592ecdff9a8a 100644 --- a/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go +++ b/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/fields.go b/metricbeat/module/mongodb/fields.go index 99e278155b0f..a72dfda41d2d 100644 --- a/metricbeat/module/mongodb/fields.go +++ b/metricbeat/module/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/mongodb/metrics/data.go b/metricbeat/module/mongodb/metrics/data.go index 9f3314dd2c99..fc3e87307f95 100644 --- a/metricbeat/module/mongodb/metrics/data.go +++ b/metricbeat/module/mongodb/metrics/data.go @@ -18,8 +18,8 @@ package metrics import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" ) var schemaMetrics = s.Schema{ diff --git a/metricbeat/module/mongodb/metrics/metrics.go b/metricbeat/module/mongodb/metrics/metrics.go index 7110f3aec13a..e0328494b89f 100644 --- a/metricbeat/module/mongodb/metrics/metrics.go +++ b/metricbeat/module/mongodb/metrics/metrics.go @@ -25,9 +25,9 @@ import ( "go.mongodb.org/mongo-driver/bson" - "github.com/elastic/beats/v7/libbeat/common/schema" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mongodb" + "github.com/elastic/beats/v9/libbeat/common/schema" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mongodb" ) func init() { diff --git a/metricbeat/module/mongodb/metrics/metrics_intergration_test.go b/metricbeat/module/mongodb/metrics/metrics_intergration_test.go index b49bd367a66d..354dfc17e127 100644 --- a/metricbeat/module/mongodb/metrics/metrics_intergration_test.go +++ b/metricbeat/module/mongodb/metrics/metrics_intergration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/mongodb.go b/metricbeat/module/mongodb/mongodb.go index 6250312b71b3..02bf84f95ecf 100644 --- a/metricbeat/module/mongodb/mongodb.go +++ b/metricbeat/module/mongodb/mongodb.go @@ -30,8 +30,8 @@ import ( "go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/readpref" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/tlscommon" diff --git a/metricbeat/module/mongodb/mongodb_test.go b/metricbeat/module/mongodb/mongodb_test.go index a2a7338fb212..bcdfe79be7ee 100644 --- a/metricbeat/module/mongodb/mongodb_test.go +++ b/metricbeat/module/mongodb/mongodb_test.go @@ -22,7 +22,7 @@ package mongodb import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mongodb/replstatus/replstatus.go b/metricbeat/module/mongodb/replstatus/replstatus.go index bd362cdae9e3..76f9e5c74453 100644 --- a/metricbeat/module/mongodb/replstatus/replstatus.go +++ b/metricbeat/module/mongodb/replstatus/replstatus.go @@ -25,8 +25,8 @@ import ( "go.mongodb.org/mongo-driver/mongo/readpref" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mongodb" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mongodb" ) func init() { diff --git a/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go b/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go index 1575d8a6639e..7c62fa748476 100644 --- a/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go +++ b/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go @@ -31,9 +31,9 @@ import ( "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo/readpref" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/mongodb" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/mongodb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/metricbeat/module/mongodb/status/data.go b/metricbeat/module/mongodb/status/data.go index 1768197d548f..51db21f0805d 100644 --- a/metricbeat/module/mongodb/status/data.go +++ b/metricbeat/module/mongodb/status/data.go @@ -18,8 +18,8 @@ package status import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" ) var schema = s.Schema{ diff --git a/metricbeat/module/mongodb/status/status.go b/metricbeat/module/mongodb/status/status.go index ea232d898837..139d0d3b95fe 100644 --- a/metricbeat/module/mongodb/status/status.go +++ b/metricbeat/module/mongodb/status/status.go @@ -27,8 +27,8 @@ import ( "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo/readpref" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mongodb" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mongodb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/mongodb/status/status_integration_test.go b/metricbeat/module/mongodb/status/status_integration_test.go index c213b956c17d..f9e865436ba5 100644 --- a/metricbeat/module/mongodb/status/status_integration_test.go +++ b/metricbeat/module/mongodb/status/status_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/munin/fields.go b/metricbeat/module/munin/fields.go index 3afade1a7aab..79f308347c44 100644 --- a/metricbeat/module/munin/fields.go +++ b/metricbeat/module/munin/fields.go @@ -20,7 +20,7 @@ package munin import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/munin/node/node.go b/metricbeat/module/munin/node/node.go index e5922eed8381..d54066adacdd 100644 --- a/metricbeat/module/munin/node/node.go +++ b/metricbeat/module/munin/node/node.go @@ -22,8 +22,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/munin" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/munin" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/munin/node/node_integration_test.go b/metricbeat/module/munin/node/node_integration_test.go index c72e1a882349..bf959b054c14 100644 --- a/metricbeat/module/munin/node/node_integration_test.go +++ b/metricbeat/module/munin/node/node_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mysql/fields.go b/metricbeat/module/mysql/fields.go index b304521eb4b8..2c2c425f4c14 100644 --- a/metricbeat/module/mysql/fields.go +++ b/metricbeat/module/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/mysql/galera_status/data.go b/metricbeat/module/mysql/galera_status/data.go index 643576d3d754..77bef42deae1 100644 --- a/metricbeat/module/mysql/galera_status/data.go +++ b/metricbeat/module/mysql/galera_status/data.go @@ -18,8 +18,8 @@ package galera_status import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/mysql/galera_status/status.go b/metricbeat/module/mysql/galera_status/status.go index 5b4f8c078dca..1344d56b4c6a 100644 --- a/metricbeat/module/mysql/galera_status/status.go +++ b/metricbeat/module/mysql/galera_status/status.go @@ -30,9 +30,9 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mysql" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mysql" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/mysql/mysql.go b/metricbeat/module/mysql/mysql.go index 7f1072c6cc12..da4d86c943bc 100644 --- a/metricbeat/module/mysql/mysql.go +++ b/metricbeat/module/mysql/mysql.go @@ -27,7 +27,7 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/transport/tlscommon" "github.com/go-sql-driver/mysql" diff --git a/metricbeat/module/mysql/mysql_integration_test.go b/metricbeat/module/mysql/mysql_integration_test.go index 7da99247ec37..af387e9dd418 100644 --- a/metricbeat/module/mysql/mysql_integration_test.go +++ b/metricbeat/module/mysql/mysql_integration_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - _ "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + _ "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestNewDB(t *testing.T) { diff --git a/metricbeat/module/mysql/mysql_test.go b/metricbeat/module/mysql/mysql_test.go index 1ecab7f6f440..24120b0e0565 100644 --- a/metricbeat/module/mysql/mysql_test.go +++ b/metricbeat/module/mysql/mysql_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mysql/query/query.go b/metricbeat/module/mysql/query/query.go index 7fea2594c970..965ec2d3e745 100644 --- a/metricbeat/module/mysql/query/query.go +++ b/metricbeat/module/mysql/query/query.go @@ -33,10 +33,10 @@ import ( mysqlDriver "github.com/go-sql-driver/mysql" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/helper/sql" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mysql" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/helper/sql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mysql" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/metricbeat/module/mysql/status/data.go b/metricbeat/module/mysql/status/data.go index 52e1709bf53b..6a595994dac5 100644 --- a/metricbeat/module/mysql/status/data.go +++ b/metricbeat/module/mysql/status/data.go @@ -18,8 +18,8 @@ package status import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/mysql/status/status.go b/metricbeat/module/mysql/status/status.go index f4a97f71c342..0487406bdeee 100644 --- a/metricbeat/module/mysql/status/status.go +++ b/metricbeat/module/mysql/status/status.go @@ -29,8 +29,8 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/mysql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/mysql" ) func init() { diff --git a/metricbeat/module/mysql/status/status_integration_test.go b/metricbeat/module/mysql/status/status_integration_test.go index c1020d44131d..f762b652f6cf 100644 --- a/metricbeat/module/mysql/status/status_integration_test.go +++ b/metricbeat/module/mysql/status/status_integration_test.go @@ -22,9 +22,9 @@ package status import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/mysql" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/mysql" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/mysql/status/status_test.go b/metricbeat/module/mysql/status/status_test.go index da58155d4066..d993571637c8 100644 --- a/metricbeat/module/mysql/status/status_test.go +++ b/metricbeat/module/mysql/status/status_test.go @@ -22,7 +22,7 @@ package status import ( "testing" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/metricbeat/module/nats/connection/connection.go b/metricbeat/module/nats/connection/connection.go index 68413d76706c..16ebab26e5f5 100644 --- a/metricbeat/module/nats/connection/connection.go +++ b/metricbeat/module/nats/connection/connection.go @@ -20,9 +20,9 @@ package connection import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/nats/connection/connection_integration_test.go b/metricbeat/module/nats/connection/connection_integration_test.go index 803aab158b2b..39380bc1a721 100644 --- a/metricbeat/module/nats/connection/connection_integration_test.go +++ b/metricbeat/module/nats/connection/connection_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/connection/connection_test.go b/metricbeat/module/nats/connection/connection_test.go index d6b95960aeff..420fa477df43 100644 --- a/metricbeat/module/nats/connection/connection_test.go +++ b/metricbeat/module/nats/connection/connection_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/connection/data.go b/metricbeat/module/nats/connection/data.go index ae62a2fa520d..0ee7f66493f8 100644 --- a/metricbeat/module/nats/connection/data.go +++ b/metricbeat/module/nats/connection/data.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/nats/util" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/nats/util" ) var ( diff --git a/metricbeat/module/nats/connections/connections.go b/metricbeat/module/nats/connections/connections.go index 530dd6cd484d..19db822fe45b 100644 --- a/metricbeat/module/nats/connections/connections.go +++ b/metricbeat/module/nats/connections/connections.go @@ -20,9 +20,9 @@ package connections import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/nats/connections/connections_integration_test.go b/metricbeat/module/nats/connections/connections_integration_test.go index fa5f0f161d1e..48087086e606 100644 --- a/metricbeat/module/nats/connections/connections_integration_test.go +++ b/metricbeat/module/nats/connections/connections_integration_test.go @@ -22,8 +22,8 @@ package connections import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/connections/connections_test.go b/metricbeat/module/nats/connections/connections_test.go index e55bf1730717..44efec7fa159 100644 --- a/metricbeat/module/nats/connections/connections_test.go +++ b/metricbeat/module/nats/connections/connections_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/connections/data.go b/metricbeat/module/nats/connections/data.go index 200bb32c8add..3a004b058f70 100644 --- a/metricbeat/module/nats/connections/data.go +++ b/metricbeat/module/nats/connections/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/nats/util" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/nats/util" ) var ( diff --git a/metricbeat/module/nats/fields.go b/metricbeat/module/nats/fields.go index 2d1e69b3aa17..8e7c36c3fca4 100644 --- a/metricbeat/module/nats/fields.go +++ b/metricbeat/module/nats/fields.go @@ -20,7 +20,7 @@ package nats import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/nats/jetstream/data.go b/metricbeat/module/nats/jetstream/data.go index 1c46298ac593..a4462846df79 100644 --- a/metricbeat/module/nats/jetstream/data.go +++ b/metricbeat/module/nats/jetstream/data.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/nats/jetstream/jetstream.go b/metricbeat/module/nats/jetstream/jetstream.go index 2ec57473c3b5..8e12c1c7e3a4 100644 --- a/metricbeat/module/nats/jetstream/jetstream.go +++ b/metricbeat/module/nats/jetstream/jetstream.go @@ -20,10 +20,10 @@ package jetstream import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/nats/jetstream/jetstream_integration_test.go b/metricbeat/module/nats/jetstream/jetstream_integration_test.go index c90d6709d5fe..f1c42d0c5a7b 100644 --- a/metricbeat/module/nats/jetstream/jetstream_integration_test.go +++ b/metricbeat/module/nats/jetstream/jetstream_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/jetstream/jetstream_test.go b/metricbeat/module/nats/jetstream/jetstream_test.go index 3a0282000511..8c0909021532 100644 --- a/metricbeat/module/nats/jetstream/jetstream_test.go +++ b/metricbeat/module/nats/jetstream/jetstream_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMappingForErrors(t *testing.T) { diff --git a/metricbeat/module/nats/route/data.go b/metricbeat/module/nats/route/data.go index 853c7a9cb832..7213a5db0bdd 100644 --- a/metricbeat/module/nats/route/data.go +++ b/metricbeat/module/nats/route/data.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/metricbeat/module/nats/route/route.go b/metricbeat/module/nats/route/route.go index bd7fb3b4d9df..22ffe1ebee8c 100644 --- a/metricbeat/module/nats/route/route.go +++ b/metricbeat/module/nats/route/route.go @@ -20,9 +20,9 @@ package route import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/nats/route/route_integration_test.go b/metricbeat/module/nats/route/route_integration_test.go index e684aee76de3..804f39c7b04a 100644 --- a/metricbeat/module/nats/route/route_integration_test.go +++ b/metricbeat/module/nats/route/route_integration_test.go @@ -22,8 +22,8 @@ package route import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/route/route_test.go b/metricbeat/module/nats/route/route_test.go index 72f5f2f37944..f38d223fa9d2 100644 --- a/metricbeat/module/nats/route/route_test.go +++ b/metricbeat/module/nats/route/route_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/routes/data.go b/metricbeat/module/nats/routes/data.go index 78c7cb10c308..0ca45e032134 100644 --- a/metricbeat/module/nats/routes/data.go +++ b/metricbeat/module/nats/routes/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/nats/util" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/nats/util" ) var ( diff --git a/metricbeat/module/nats/routes/routes.go b/metricbeat/module/nats/routes/routes.go index 4fa22bda6e7b..0a8603c7f47c 100644 --- a/metricbeat/module/nats/routes/routes.go +++ b/metricbeat/module/nats/routes/routes.go @@ -20,9 +20,9 @@ package routes import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/nats/routes/routes_integration_test.go b/metricbeat/module/nats/routes/routes_integration_test.go index 61edd1bb5e11..611c28bbd309 100644 --- a/metricbeat/module/nats/routes/routes_integration_test.go +++ b/metricbeat/module/nats/routes/routes_integration_test.go @@ -22,8 +22,8 @@ package routes import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/routes/routes_test.go b/metricbeat/module/nats/routes/routes_test.go index bf9870198856..44767ac28923 100644 --- a/metricbeat/module/nats/routes/routes_test.go +++ b/metricbeat/module/nats/routes/routes_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/stats/data.go b/metricbeat/module/nats/stats/data.go index c571bb4abd15..4e9462cd5294 100644 --- a/metricbeat/module/nats/stats/data.go +++ b/metricbeat/module/nats/stats/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/nats/util" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/nats/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/nats/stats/stats.go b/metricbeat/module/nats/stats/stats.go index 45b7117bd666..be795338a5f5 100644 --- a/metricbeat/module/nats/stats/stats.go +++ b/metricbeat/module/nats/stats/stats.go @@ -20,9 +20,9 @@ package stats import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/nats/stats/stats_integration_test.go b/metricbeat/module/nats/stats/stats_integration_test.go index 1f0e0d6cf77a..dc6d511d437a 100644 --- a/metricbeat/module/nats/stats/stats_integration_test.go +++ b/metricbeat/module/nats/stats/stats_integration_test.go @@ -22,8 +22,8 @@ package stats import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/stats/stats_test.go b/metricbeat/module/nats/stats/stats_test.go index 922ccaf65f40..b30a89b57778 100644 --- a/metricbeat/module/nats/stats/stats_test.go +++ b/metricbeat/module/nats/stats/stats_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nats/subscriptions/data.go b/metricbeat/module/nats/subscriptions/data.go index e06a39e913b4..2e814f80d856 100644 --- a/metricbeat/module/nats/subscriptions/data.go +++ b/metricbeat/module/nats/subscriptions/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/metricbeat/module/nats/subscriptions/subscriptions.go b/metricbeat/module/nats/subscriptions/subscriptions.go index fceef37cf5ac..f80a8081560f 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions.go +++ b/metricbeat/module/nats/subscriptions/subscriptions.go @@ -20,9 +20,9 @@ package subscriptions import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go b/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go index 844187d4bc13..3483e239315f 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go +++ b/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go @@ -22,8 +22,8 @@ package subscriptions import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/nats/subscriptions/subscriptions_test.go b/metricbeat/module/nats/subscriptions/subscriptions_test.go index d0b7e567b4e3..c4c20913ae72 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions_test.go +++ b/metricbeat/module/nats/subscriptions/subscriptions_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nginx/fields.go b/metricbeat/module/nginx/fields.go index d181ddf6d11b..07281b2efe9c 100644 --- a/metricbeat/module/nginx/fields.go +++ b/metricbeat/module/nginx/fields.go @@ -20,7 +20,7 @@ package nginx import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/nginx/stubstatus/stubstatus.go b/metricbeat/module/nginx/stubstatus/stubstatus.go index f8d764753f3f..7f9f6d696e1b 100644 --- a/metricbeat/module/nginx/stubstatus/stubstatus.go +++ b/metricbeat/module/nginx/stubstatus/stubstatus.go @@ -21,9 +21,9 @@ package stubstatus import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go b/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go index b144782a5257..282386f735ed 100644 --- a/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go +++ b/metricbeat/module/nginx/stubstatus/stubstatus_integration_test.go @@ -22,8 +22,8 @@ package stubstatus import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/openmetrics/collector/collector.go b/metricbeat/module/openmetrics/collector/collector.go index 30119d2df9e1..c2b3c93c201b 100644 --- a/metricbeat/module/openmetrics/collector/collector.go +++ b/metricbeat/module/openmetrics/collector/collector.go @@ -24,10 +24,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - p "github.com/elastic/beats/v7/metricbeat/helper/openmetrics" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + p "github.com/elastic/beats/v9/metricbeat/helper/openmetrics" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/openmetrics/collector/collector_test.go b/metricbeat/module/openmetrics/collector/collector_test.go index 6c19e0c07799..23f0a7682469 100644 --- a/metricbeat/module/openmetrics/collector/collector_test.go +++ b/metricbeat/module/openmetrics/collector/collector_test.go @@ -27,14 +27,14 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/proto" - "github.com/elastic/beats/v7/metricbeat/helper/openmetrics" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/openmetrics" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/openmetrics" + _ "github.com/elastic/beats/v9/metricbeat/module/openmetrics" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/openmetrics/collector/data.go b/metricbeat/module/openmetrics/collector/data.go index a8073c6a05a2..731a8876d213 100644 --- a/metricbeat/module/openmetrics/collector/data.go +++ b/metricbeat/module/openmetrics/collector/data.go @@ -26,9 +26,9 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/metricbeat/helper/labelhash" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/labelhash" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" ) // OpenMetricEvent stores a set of one or more metrics with the same labels diff --git a/metricbeat/module/openmetrics/fields.go b/metricbeat/module/openmetrics/fields.go index 27c738406f98..8753904f5fae 100644 --- a/metricbeat/module/openmetrics/fields.go +++ b/metricbeat/module/openmetrics/fields.go @@ -20,7 +20,7 @@ package openmetrics import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/php_fpm/fields.go b/metricbeat/module/php_fpm/fields.go index a39e0ed7aa4a..5f36600a696a 100644 --- a/metricbeat/module/php_fpm/fields.go +++ b/metricbeat/module/php_fpm/fields.go @@ -20,7 +20,7 @@ package php_fpm import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/php_fpm/pool/data.go b/metricbeat/module/php_fpm/pool/data.go index a2d6c29a9dac..f7b05dcd4a7f 100644 --- a/metricbeat/module/php_fpm/pool/data.go +++ b/metricbeat/module/php_fpm/pool/data.go @@ -18,8 +18,8 @@ package pool import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/php_fpm/pool/pool.go b/metricbeat/module/php_fpm/pool/pool.go index cc3225298638..23f06fb76bed 100644 --- a/metricbeat/module/php_fpm/pool/pool.go +++ b/metricbeat/module/php_fpm/pool/pool.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/php_fpm" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/php_fpm" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/php_fpm/pool/pool_integration_test.go b/metricbeat/module/php_fpm/pool/pool_integration_test.go index fc2fa9a553cd..1dc979cbe58b 100644 --- a/metricbeat/module/php_fpm/pool/pool_integration_test.go +++ b/metricbeat/module/php_fpm/pool/pool_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/php_fpm/pool/pool_test.go b/metricbeat/module/php_fpm/pool/pool_test.go index fab333d37708..44a5513f0534 100644 --- a/metricbeat/module/php_fpm/pool/pool_test.go +++ b/metricbeat/module/php_fpm/pool/pool_test.go @@ -22,9 +22,9 @@ package pool import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v9/metricbeat/module/php_fpm" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/php_fpm/process/data.go b/metricbeat/module/php_fpm/process/data.go index ef09cc74b2fe..c745b00e6776 100644 --- a/metricbeat/module/php_fpm/process/data.go +++ b/metricbeat/module/php_fpm/process/data.go @@ -21,7 +21,7 @@ import ( "encoding/json" "strings" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/php_fpm/process/process.go b/metricbeat/module/php_fpm/process/process.go index 9db11f67c3ac..d6f614f38667 100644 --- a/metricbeat/module/php_fpm/process/process.go +++ b/metricbeat/module/php_fpm/process/process.go @@ -20,10 +20,10 @@ package process import ( "net/url" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/php_fpm" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/php_fpm" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/php_fpm/process/process_integration_test.go b/metricbeat/module/php_fpm/process/process_integration_test.go index 15a38b8ec814..9c1f7a02cd3f 100644 --- a/metricbeat/module/php_fpm/process/process_integration_test.go +++ b/metricbeat/module/php_fpm/process/process_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/php_fpm/process/process_test.go b/metricbeat/module/php_fpm/process/process_test.go index f79bb2b69c4a..0abeba444098 100644 --- a/metricbeat/module/php_fpm/process/process_test.go +++ b/metricbeat/module/php_fpm/process/process_test.go @@ -22,9 +22,9 @@ package process import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v9/metricbeat/module/php_fpm" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/php_fpm/url.go b/metricbeat/module/php_fpm/url.go index 544f18a089a1..5bfdc46e3605 100644 --- a/metricbeat/module/php_fpm/url.go +++ b/metricbeat/module/php_fpm/url.go @@ -18,7 +18,7 @@ package php_fpm import ( - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/plugin.go b/metricbeat/module/plugin.go index a1c408a2388f..ecc3bfc50201 100644 --- a/metricbeat/module/plugin.go +++ b/metricbeat/module/plugin.go @@ -20,9 +20,9 @@ package module import ( "errors" - "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/plugin" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) type modulePlugin struct { diff --git a/metricbeat/module/postgresql/activity/activity.go b/metricbeat/module/postgresql/activity/activity.go index 611f3a95744d..ef2acab0d698 100644 --- a/metricbeat/module/postgresql/activity/activity.go +++ b/metricbeat/module/postgresql/activity/activity.go @@ -23,8 +23,8 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/postgresql/activity/activity_integration_test.go b/metricbeat/module/postgresql/activity/activity_integration_test.go index 09113ea6f03c..a27e74c4364a 100644 --- a/metricbeat/module/postgresql/activity/activity_integration_test.go +++ b/metricbeat/module/postgresql/activity/activity_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/postgresql/activity/data.go b/metricbeat/module/postgresql/activity/data.go index 6275917e5ccf..f572d2d1382a 100644 --- a/metricbeat/module/postgresql/activity/data.go +++ b/metricbeat/module/postgresql/activity/data.go @@ -20,8 +20,8 @@ package activity import ( "time" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" ) // Based on: https://www.postgresql.org/docs/9.2/static/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW diff --git a/metricbeat/module/postgresql/bgwriter/bgwriter.go b/metricbeat/module/postgresql/bgwriter/bgwriter.go index e1b6c6354c04..36e71bfac139 100644 --- a/metricbeat/module/postgresql/bgwriter/bgwriter.go +++ b/metricbeat/module/postgresql/bgwriter/bgwriter.go @@ -23,8 +23,8 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go b/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go index 2c7b8f02bf74..67e7b7a940e0 100644 --- a/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go +++ b/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go @@ -22,9 +22,9 @@ package bgwriter import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/postgresql/bgwriter/data.go b/metricbeat/module/postgresql/bgwriter/data.go index 998a558ecc5d..05d728ebab87 100644 --- a/metricbeat/module/postgresql/bgwriter/data.go +++ b/metricbeat/module/postgresql/bgwriter/data.go @@ -20,8 +20,8 @@ package bgwriter import ( "time" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" ) var schema = s.Schema{ diff --git a/metricbeat/module/postgresql/database/data.go b/metricbeat/module/postgresql/database/data.go index 5a662a8aedbb..9a2f029def88 100644 --- a/metricbeat/module/postgresql/database/data.go +++ b/metricbeat/module/postgresql/database/data.go @@ -20,8 +20,8 @@ package database import ( "time" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" ) // Based on https://www.postgresql.org/docs/9.2/static/monitoring-stats.html#PG-STAT-DATABASE-VIEW diff --git a/metricbeat/module/postgresql/database/database.go b/metricbeat/module/postgresql/database/database.go index 10bfe656ae9b..a10f7656fd8b 100644 --- a/metricbeat/module/postgresql/database/database.go +++ b/metricbeat/module/postgresql/database/database.go @@ -23,8 +23,8 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" // Register postgresql database/sql driver _ "github.com/lib/pq" diff --git a/metricbeat/module/postgresql/database/database_integration_test.go b/metricbeat/module/postgresql/database/database_integration_test.go index 8787cd906bfb..420be773860c 100644 --- a/metricbeat/module/postgresql/database/database_integration_test.go +++ b/metricbeat/module/postgresql/database/database_integration_test.go @@ -22,9 +22,9 @@ package database import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/postgresql/fields.go b/metricbeat/module/postgresql/fields.go index 2962ab237f21..904267991e7a 100644 --- a/metricbeat/module/postgresql/fields.go +++ b/metricbeat/module/postgresql/fields.go @@ -20,7 +20,7 @@ package postgresql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/postgresql/metricset.go b/metricbeat/module/postgresql/metricset.go index 3ef9c97bd330..055c1e686a39 100644 --- a/metricbeat/module/postgresql/metricset.go +++ b/metricbeat/module/postgresql/metricset.go @@ -24,7 +24,7 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" // Register postgresql database/sql driver _ "github.com/lib/pq" diff --git a/metricbeat/module/postgresql/postgresql.go b/metricbeat/module/postgresql/postgresql.go index 80d8cb45af16..f759b5ba5d43 100644 --- a/metricbeat/module/postgresql/postgresql.go +++ b/metricbeat/module/postgresql/postgresql.go @@ -30,8 +30,8 @@ import ( "github.com/lib/pq" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/postgresql/postgresql_test.go b/metricbeat/module/postgresql/postgresql_test.go index 9e3e5947158b..9f4751bbc7ec 100644 --- a/metricbeat/module/postgresql/postgresql_test.go +++ b/metricbeat/module/postgresql/postgresql_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/statement/data.go b/metricbeat/module/postgresql/statement/data.go index 9206de59a3ab..1d1eb88282f0 100644 --- a/metricbeat/module/postgresql/statement/data.go +++ b/metricbeat/module/postgresql/statement/data.go @@ -18,8 +18,8 @@ package statement import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" ) // Based on: https://www.postgresql.org/docs/13/pgstatstatements.html diff --git a/metricbeat/module/postgresql/statement/statement.go b/metricbeat/module/postgresql/statement/statement.go index 2e7f46e01cd2..448b4e4deb6d 100644 --- a/metricbeat/module/postgresql/statement/statement.go +++ b/metricbeat/module/postgresql/statement/statement.go @@ -23,8 +23,8 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/postgresql/statement/statement_integration_test.go b/metricbeat/module/postgresql/statement/statement_integration_test.go index 08182e3b8419..21351a715546 100644 --- a/metricbeat/module/postgresql/statement/statement_integration_test.go +++ b/metricbeat/module/postgresql/statement/statement_integration_test.go @@ -22,9 +22,9 @@ package statement import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/prometheus/collector/collector.go b/metricbeat/module/prometheus/collector/collector.go index 8c110ee19db9..f3e4ce681c8f 100644 --- a/metricbeat/module/prometheus/collector/collector.go +++ b/metricbeat/module/prometheus/collector/collector.go @@ -24,9 +24,9 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/prometheus/collector/collector_test.go b/metricbeat/module/prometheus/collector/collector_test.go index 6c755f6ac1df..cf88edbc3ca6 100644 --- a/metricbeat/module/prometheus/collector/collector_test.go +++ b/metricbeat/module/prometheus/collector/collector_test.go @@ -33,11 +33,11 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" ) func TestGetPromEventsFromMetricFamily(t *testing.T) { diff --git a/metricbeat/module/prometheus/collector/data.go b/metricbeat/module/prometheus/collector/data.go index faa87f2df28f..2b52a09a2032 100644 --- a/metricbeat/module/prometheus/collector/data.go +++ b/metricbeat/module/prometheus/collector/data.go @@ -21,11 +21,11 @@ import ( "math" "strconv" - "github.com/elastic/beats/v7/metricbeat/helper/labelhash" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/labelhash" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" ) // PromEvent stores a set of one or more metrics with the same labels diff --git a/metricbeat/module/prometheus/fields.go b/metricbeat/module/prometheus/fields.go index 9aafe6079ff8..0277c89992d0 100644 --- a/metricbeat/module/prometheus/fields.go +++ b/metricbeat/module/prometheus/fields.go @@ -20,7 +20,7 @@ package prometheus import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/prometheus/query/data.go b/metricbeat/module/prometheus/query/data.go index fbd535df1379..d7a80c95f3b7 100644 --- a/metricbeat/module/prometheus/query/data.go +++ b/metricbeat/module/prometheus/query/data.go @@ -25,7 +25,7 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/prometheus/query/query.go b/metricbeat/module/prometheus/query/query.go index e2551ce0f9cc..bed61861b853 100644 --- a/metricbeat/module/prometheus/query/query.go +++ b/metricbeat/module/prometheus/query/query.go @@ -21,9 +21,9 @@ import ( "fmt" "io" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/prometheus/query/query_integration_test.go b/metricbeat/module/prometheus/query/query_integration_test.go index 5323c978617a..9fce4581a043 100644 --- a/metricbeat/module/prometheus/query/query_integration_test.go +++ b/metricbeat/module/prometheus/query/query_integration_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/prometheus/query/query_test.go b/metricbeat/module/prometheus/query/query_test.go index dd89759609c9..6ea5848b7f2f 100644 --- a/metricbeat/module/prometheus/query/query_test.go +++ b/metricbeat/module/prometheus/query/query_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/prometheus/remote_write/data.go b/metricbeat/module/prometheus/remote_write/data.go index 7b6758a32e9c..77008701386d 100644 --- a/metricbeat/module/prometheus/remote_write/data.go +++ b/metricbeat/module/prometheus/remote_write/data.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/common/model" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/prometheus/remote_write/remote_write.go b/metricbeat/module/prometheus/remote_write/remote_write.go index 95048f05263b..77b80890c398 100644 --- a/metricbeat/module/prometheus/remote_write/remote_write.go +++ b/metricbeat/module/prometheus/remote_write/remote_write.go @@ -26,10 +26,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/prompb" - serverhelper "github.com/elastic/beats/v7/metricbeat/helper/server" - httpserver "github.com/elastic/beats/v7/metricbeat/helper/server/http" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + serverhelper "github.com/elastic/beats/v9/metricbeat/helper/server" + httpserver "github.com/elastic/beats/v9/metricbeat/helper/server/http" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/rabbitmq/connection/connection.go b/metricbeat/module/rabbitmq/connection/connection.go index d23c492be6cf..2a734f935abf 100644 --- a/metricbeat/module/rabbitmq/connection/connection.go +++ b/metricbeat/module/rabbitmq/connection/connection.go @@ -20,8 +20,8 @@ package connection import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/connection/connection_test.go b/metricbeat/module/rabbitmq/connection/connection_test.go index ed2c2678b0e4..aad429316a19 100644 --- a/metricbeat/module/rabbitmq/connection/connection_test.go +++ b/metricbeat/module/rabbitmq/connection/connection_test.go @@ -20,13 +20,13 @@ package connection import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/mtest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" + _ "github.com/elastic/beats/v9/metricbeat/module/rabbitmq" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/rabbitmq/connection/data.go b/metricbeat/module/rabbitmq/connection/data.go index 7aaa0ad04db8..78b01fb04df5 100644 --- a/metricbeat/module/rabbitmq/connection/data.go +++ b/metricbeat/module/rabbitmq/connection/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/rabbitmq/exchange/data.go b/metricbeat/module/rabbitmq/exchange/data.go index 77d43fcab1db..19506859662d 100644 --- a/metricbeat/module/rabbitmq/exchange/data.go +++ b/metricbeat/module/rabbitmq/exchange/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/rabbitmq/exchange/exchange.go b/metricbeat/module/rabbitmq/exchange/exchange.go index 1e1779b18caa..8229aedd6533 100644 --- a/metricbeat/module/rabbitmq/exchange/exchange.go +++ b/metricbeat/module/rabbitmq/exchange/exchange.go @@ -20,8 +20,8 @@ package exchange import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/exchange/exchange_test.go b/metricbeat/module/rabbitmq/exchange/exchange_test.go index 6a5718499f08..5189ce11a992 100644 --- a/metricbeat/module/rabbitmq/exchange/exchange_test.go +++ b/metricbeat/module/rabbitmq/exchange/exchange_test.go @@ -20,8 +20,8 @@ package exchange import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/mtest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/rabbitmq/fields.go b/metricbeat/module/rabbitmq/fields.go index a2d590d8109c..14e3480e59e7 100644 --- a/metricbeat/module/rabbitmq/fields.go +++ b/metricbeat/module/rabbitmq/fields.go @@ -20,7 +20,7 @@ package rabbitmq import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/rabbitmq/metricset.go b/metricbeat/module/rabbitmq/metricset.go index ab747dbc673e..657efba76935 100644 --- a/metricbeat/module/rabbitmq/metricset.go +++ b/metricbeat/module/rabbitmq/metricset.go @@ -18,8 +18,8 @@ package rabbitmq import ( - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" ) // MetricSet can be used to build other metric sets that query RabbitMQ diff --git a/metricbeat/module/rabbitmq/metricset_test.go b/metricbeat/module/rabbitmq/metricset_test.go index d9948a42cba8..55e6e6daed7e 100644 --- a/metricbeat/module/rabbitmq/metricset_test.go +++ b/metricbeat/module/rabbitmq/metricset_test.go @@ -20,9 +20,9 @@ package rabbitmq import ( "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/mtest" ) func init() { diff --git a/metricbeat/module/rabbitmq/node/data.go b/metricbeat/module/rabbitmq/node/data.go index bbf24e3fd595..066f392d59e1 100644 --- a/metricbeat/module/rabbitmq/node/data.go +++ b/metricbeat/module/rabbitmq/node/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/metricbeat/module/rabbitmq/node/node.go b/metricbeat/module/rabbitmq/node/node.go index 8c409ec991e5..b5856012e4aa 100644 --- a/metricbeat/module/rabbitmq/node/node.go +++ b/metricbeat/module/rabbitmq/node/node.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/node/node_integration_test.go b/metricbeat/module/rabbitmq/node/node_integration_test.go index d66087160e0d..cc040a496f4d 100644 --- a/metricbeat/module/rabbitmq/node/node_integration_test.go +++ b/metricbeat/module/rabbitmq/node/node_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/mtest" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/rabbitmq/node/node_test.go b/metricbeat/module/rabbitmq/node/node_test.go index f84c9fead28b..33c726d971c7 100644 --- a/metricbeat/module/rabbitmq/node/node_test.go +++ b/metricbeat/module/rabbitmq/node/node_test.go @@ -20,8 +20,8 @@ package node import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/mtest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/rabbitmq/queue/data.go b/metricbeat/module/rabbitmq/queue/data.go index 35a4a772c0e6..ad4040673047 100644 --- a/metricbeat/module/rabbitmq/queue/data.go +++ b/metricbeat/module/rabbitmq/queue/data.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/rabbitmq/queue/queue.go b/metricbeat/module/rabbitmq/queue/queue.go index 6a4e40ed3bd4..9a926464393c 100644 --- a/metricbeat/module/rabbitmq/queue/queue.go +++ b/metricbeat/module/rabbitmq/queue/queue.go @@ -20,8 +20,8 @@ package queue import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/queue/queue_test.go b/metricbeat/module/rabbitmq/queue/queue_test.go index 41f0fd61b209..173dab2a4cb0 100644 --- a/metricbeat/module/rabbitmq/queue/queue_test.go +++ b/metricbeat/module/rabbitmq/queue/queue_test.go @@ -20,8 +20,8 @@ package queue import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/mtest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/rabbitmq/shovel/data.go b/metricbeat/module/rabbitmq/shovel/data.go index f005342c6f3c..9eca4bc25988 100644 --- a/metricbeat/module/rabbitmq/shovel/data.go +++ b/metricbeat/module/rabbitmq/shovel/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/rabbitmq/shovel/shovel.go b/metricbeat/module/rabbitmq/shovel/shovel.go index 941de35351ee..33bd4114eec0 100644 --- a/metricbeat/module/rabbitmq/shovel/shovel.go +++ b/metricbeat/module/rabbitmq/shovel/shovel.go @@ -20,8 +20,8 @@ package shovel import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/shovel/shovel_test.go b/metricbeat/module/rabbitmq/shovel/shovel_test.go index 2852ce5e9ba9..f62313c2a164 100644 --- a/metricbeat/module/rabbitmq/shovel/shovel_test.go +++ b/metricbeat/module/rabbitmq/shovel/shovel_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/rabbitmq/mtest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/rabbitmq/url.go b/metricbeat/module/rabbitmq/url.go index 914011a0b564..0c173138a7f8 100644 --- a/metricbeat/module/rabbitmq/url.go +++ b/metricbeat/module/rabbitmq/url.go @@ -18,7 +18,7 @@ package rabbitmq import ( - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) // Subpaths to management plugin endpoints diff --git a/metricbeat/module/redis/fields.go b/metricbeat/module/redis/fields.go index 53f7ba29ea7a..eadb0661b0d8 100644 --- a/metricbeat/module/redis/fields.go +++ b/metricbeat/module/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/redis/info/data.go b/metricbeat/module/redis/info/data.go index a4f79e33e725..19c5d4387701 100644 --- a/metricbeat/module/redis/info/data.go +++ b/metricbeat/module/redis/info/data.go @@ -20,9 +20,9 @@ package info import ( "strings" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/redis/info/info.go b/metricbeat/module/redis/info/info.go index ff3614218706..b636c0d5656c 100644 --- a/metricbeat/module/redis/info/info.go +++ b/metricbeat/module/redis/info/info.go @@ -21,9 +21,9 @@ import ( "fmt" "strconv" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/redis" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/redis" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "redis"}.Build() diff --git a/metricbeat/module/redis/info/info_integration_test.go b/metricbeat/module/redis/info/info_integration_test.go index 54f5791e32bd..76f5f960a704 100644 --- a/metricbeat/module/redis/info/info_integration_test.go +++ b/metricbeat/module/redis/info/info_integration_test.go @@ -22,8 +22,8 @@ package info import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/redis/info/info_test.go b/metricbeat/module/redis/info/info_test.go index 3184978301fa..2ad4ef073c48 100644 --- a/metricbeat/module/redis/info/info_test.go +++ b/metricbeat/module/redis/info/info_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/metricbeat/module/redis/key/data.go b/metricbeat/module/redis/key/data.go index 30707687be13..6de17c2c180e 100644 --- a/metricbeat/module/redis/key/data.go +++ b/metricbeat/module/redis/key/data.go @@ -20,7 +20,7 @@ package key import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/redis/key/key.go b/metricbeat/module/redis/key/key.go index aa9bf6e1aa24..c8bf8a40cc86 100644 --- a/metricbeat/module/redis/key/key.go +++ b/metricbeat/module/redis/key/key.go @@ -20,9 +20,9 @@ package key import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/redis" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/redis" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "redis"}.Build() diff --git a/metricbeat/module/redis/key/key_integration_test.go b/metricbeat/module/redis/key/key_integration_test.go index 5d600b4a4e7a..56a61280f830 100644 --- a/metricbeat/module/redis/key/key_integration_test.go +++ b/metricbeat/module/redis/key/key_integration_test.go @@ -26,8 +26,8 @@ import ( rd "github.com/gomodule/redigo/redis" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/redis/keyspace/data.go b/metricbeat/module/redis/keyspace/data.go index 0f7be47e1f65..e72c50cb1742 100644 --- a/metricbeat/module/redis/keyspace/data.go +++ b/metricbeat/module/redis/keyspace/data.go @@ -20,10 +20,10 @@ package keyspace import ( "strings" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/redis" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/redis" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/redis/keyspace/keyspace.go b/metricbeat/module/redis/keyspace/keyspace.go index a26f90b686d0..1387003e20c8 100644 --- a/metricbeat/module/redis/keyspace/keyspace.go +++ b/metricbeat/module/redis/keyspace/keyspace.go @@ -20,9 +20,9 @@ package keyspace import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/redis" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/redis" ) var hostParser = parse.URLHostParserBuilder{DefaultScheme: "redis"}.Build() diff --git a/metricbeat/module/redis/keyspace/keyspace_integration_test.go b/metricbeat/module/redis/keyspace/keyspace_integration_test.go index 0798244bc53a..7285bb030afa 100644 --- a/metricbeat/module/redis/keyspace/keyspace_integration_test.go +++ b/metricbeat/module/redis/keyspace/keyspace_integration_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" rd "github.com/gomodule/redigo/redis" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/redis/metricset.go b/metricbeat/module/redis/metricset.go index 078e5dee9dfa..adc0675bbc1e 100644 --- a/metricbeat/module/redis/metricset.go +++ b/metricbeat/module/redis/metricset.go @@ -25,7 +25,7 @@ import ( rd "github.com/gomodule/redigo/redis" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/metricbeat/module/redis/metricset_integration_test.go b/metricbeat/module/redis/metricset_integration_test.go index d125417253c2..f47c88d31b25 100644 --- a/metricbeat/module/redis/metricset_integration_test.go +++ b/metricbeat/module/redis/metricset_integration_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" ) @@ -38,7 +38,7 @@ const ( ) func TestPasswords(t *testing.T) { - t.Skip("Changing password affects other tests, see https://github.com/elastic/beats/v7/issues/10955") + t.Skip("Changing password affects other tests, see https://github.com/elastic/beats/v9/issues/10955") service := compose.EnsureUp(t, "redis") host := service.Host() diff --git a/metricbeat/module/redis/metricset_test.go b/metricbeat/module/redis/metricset_test.go index 85c310a73ef1..d9dbf68b85cd 100644 --- a/metricbeat/module/redis/metricset_test.go +++ b/metricbeat/module/redis/metricset_test.go @@ -22,7 +22,7 @@ package redis import ( "testing" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/redis/redis_integration_test.go b/metricbeat/module/redis/redis_integration_test.go index b26896d48ba7..88ab36a584aa 100644 --- a/metricbeat/module/redis/redis_integration_test.go +++ b/metricbeat/module/redis/redis_integration_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" - _ "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + _ "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/module/system/core/config.go b/metricbeat/module/system/core/config.go index 20a0838d7da3..5d5dd25239c0 100644 --- a/metricbeat/module/system/core/config.go +++ b/metricbeat/module/system/core/config.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/logp" metrics "github.com/elastic/elastic-agent-system-metrics/metric/cpu" ) diff --git a/metricbeat/module/system/core/core.go b/metricbeat/module/system/core/core.go index 5d771d406eb1..fee18b067282 100644 --- a/metricbeat/module/system/core/core.go +++ b/metricbeat/module/system/core/core.go @@ -23,9 +23,9 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" metrics "github.com/elastic/elastic-agent-system-metrics/metric/cpu" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/system/core/core_test.go b/metricbeat/module/system/core/core_test.go index c7419bf6c7ce..681918193f1b 100644 --- a/metricbeat/module/system/core/core_test.go +++ b/metricbeat/module/system/core/core_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/cpu/config.go b/metricbeat/module/system/cpu/config.go index a3d06e8c3001..4486d4ad704a 100644 --- a/metricbeat/module/system/cpu/config.go +++ b/metricbeat/module/system/cpu/config.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/logp" metrics "github.com/elastic/elastic-agent-system-metrics/metric/cpu" ) diff --git a/metricbeat/module/system/cpu/cpu.go b/metricbeat/module/system/cpu/cpu.go index 9ccb2b635973..095152a4518c 100644 --- a/metricbeat/module/system/cpu/cpu.go +++ b/metricbeat/module/system/cpu/cpu.go @@ -24,9 +24,9 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" metrics "github.com/elastic/elastic-agent-system-metrics/metric/cpu" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/system/cpu/cpu_test.go b/metricbeat/module/system/cpu/cpu_test.go index 9b273e22d25d..8570455b3711 100644 --- a/metricbeat/module/system/cpu/cpu_test.go +++ b/metricbeat/module/system/cpu/cpu_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/diskio/diskio.go b/metricbeat/module/system/diskio/diskio.go index f266e7e6c80b..ea9c5914b91e 100644 --- a/metricbeat/module/system/diskio/diskio.go +++ b/metricbeat/module/system/diskio/diskio.go @@ -23,9 +23,9 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/diskio" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/system/diskio/diskio_test.go b/metricbeat/module/system/diskio/diskio_test.go index 59955c7a0975..bce9382dea03 100644 --- a/metricbeat/module/system/diskio/diskio_test.go +++ b/metricbeat/module/system/diskio/diskio_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/metricbeat/internal/sysinit" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/internal/sysinit" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/system/entropy/entropy.go b/metricbeat/module/system/entropy/entropy.go index d13517f8eec4..755e968c2021 100644 --- a/metricbeat/module/system/entropy/entropy.go +++ b/metricbeat/module/system/entropy/entropy.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/system/entropy/entropy_test.go b/metricbeat/module/system/entropy/entropy_test.go index e796e3dbef5e..cd25255bb8ec 100644 --- a/metricbeat/module/system/entropy/entropy_test.go +++ b/metricbeat/module/system/entropy/entropy_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index 5ea6bd8b91ae..cd20aff5510b 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -20,7 +20,7 @@ package system import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/system/filesystem/filesystem.go b/metricbeat/module/system/filesystem/filesystem.go index 11d8bb4a928d..3ec897b75d3f 100644 --- a/metricbeat/module/system/filesystem/filesystem.go +++ b/metricbeat/module/system/filesystem/filesystem.go @@ -23,11 +23,11 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" fs "github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/system/filesystem/filesystem_test.go b/metricbeat/module/system/filesystem/filesystem_test.go index b432a255b9a4..49ed189fc4d3 100644 --- a/metricbeat/module/system/filesystem/filesystem_test.go +++ b/metricbeat/module/system/filesystem/filesystem_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" fs "github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/system/fsstat/fsstat.go b/metricbeat/module/system/fsstat/fsstat.go index 3d04fbfb7e99..e547c11a6cf3 100644 --- a/metricbeat/module/system/fsstat/fsstat.go +++ b/metricbeat/module/system/fsstat/fsstat.go @@ -24,10 +24,10 @@ import ( "runtime" "strings" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/system/filesystem" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/system/filesystem" "github.com/elastic/elastic-agent-libs/mapstr" fs "github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/system/fsstat/fsstat_test.go b/metricbeat/module/system/fsstat/fsstat_test.go index a351cf0cf1e6..d2db959422bc 100644 --- a/metricbeat/module/system/fsstat/fsstat_test.go +++ b/metricbeat/module/system/fsstat/fsstat_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/load/load.go b/metricbeat/module/system/load/load.go index 96a330f337e7..b67ecb5780b8 100644 --- a/metricbeat/module/system/load/load.go +++ b/metricbeat/module/system/load/load.go @@ -22,8 +22,8 @@ package load import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/cpu" "github.com/elastic/elastic-agent-system-metrics/metric/system/numcpu" diff --git a/metricbeat/module/system/load/load_test.go b/metricbeat/module/system/load/load_test.go index 90506683b532..6af148141c6c 100644 --- a/metricbeat/module/system/load/load_test.go +++ b/metricbeat/module/system/load/load_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/memory/memory.go b/metricbeat/module/system/memory/memory.go index 8487fcc00834..d7e1cd047c8d 100644 --- a/metricbeat/module/system/memory/memory.go +++ b/metricbeat/module/system/memory/memory.go @@ -23,9 +23,9 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/v7/libbeat/common/diagnostics" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/diagnostics" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transform/typeconv" metrics "github.com/elastic/elastic-agent-system-metrics/metric/memory" diff --git a/metricbeat/module/system/memory/memory_test.go b/metricbeat/module/system/memory/memory_test.go index bf2827a8c14a..1ed555ef3f1f 100644 --- a/metricbeat/module/system/memory/memory_test.go +++ b/metricbeat/module/system/memory/memory_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/network/network.go b/metricbeat/module/system/network/network.go index b96eba9ec844..596545e4bdb9 100644 --- a/metricbeat/module/system/network/network.go +++ b/metricbeat/module/system/network/network.go @@ -24,8 +24,8 @@ import ( "math" "strings" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/metricbeat/module/system/network/network_test.go b/metricbeat/module/system/network/network_test.go index 4b03b43b9f40..165a27d24ed5 100644 --- a/metricbeat/module/system/network/network_test.go +++ b/metricbeat/module/system/network/network_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/metricbeat/module/system/network_summary/network_summary.go b/metricbeat/module/system/network_summary/network_summary.go index c329e4bd1b47..459a47f2861c 100644 --- a/metricbeat/module/system/network_summary/network_summary.go +++ b/metricbeat/module/system/network_summary/network_summary.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-system-metrics/metric/system/network" sysinfo "github.com/elastic/go-sysinfo" sysinfotypes "github.com/elastic/go-sysinfo/types" diff --git a/metricbeat/module/system/network_summary/network_summary_test.go b/metricbeat/module/system/network_summary/network_summary_test.go index 614326a2b808..9c7987c562ed 100644 --- a/metricbeat/module/system/network_summary/network_summary_test.go +++ b/metricbeat/module/system/network_summary/network_summary_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/network" "github.com/elastic/go-sysinfo/types" diff --git a/metricbeat/module/system/ntp/ntp.go b/metricbeat/module/system/ntp/ntp.go index 18867c97a138..d700416133b1 100644 --- a/metricbeat/module/system/ntp/ntp.go +++ b/metricbeat/module/system/ntp/ntp.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/beevik/ntp" diff --git a/metricbeat/module/system/ntp/ntp_test.go b/metricbeat/module/system/ntp/ntp_test.go index 3cf4f13d0349..5232f139c3fa 100644 --- a/metricbeat/module/system/ntp/ntp_test.go +++ b/metricbeat/module/system/ntp/ntp_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) type ntpSuccess struct{} diff --git a/metricbeat/module/system/process/config.go b/metricbeat/module/system/process/config.go index 4c67ec029be9..4b8b980ae9f8 100644 --- a/metricbeat/module/system/process/config.go +++ b/metricbeat/module/system/process/config.go @@ -18,7 +18,7 @@ package process import ( - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-system-metrics/metric/system/process" ) diff --git a/metricbeat/module/system/process/process.go b/metricbeat/module/system/process/process.go index 7988e7b1f777..0422eac86b95 100644 --- a/metricbeat/module/system/process/process.go +++ b/metricbeat/module/system/process/process.go @@ -25,8 +25,8 @@ import ( "os" "runtime" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-system-metrics/metric/system/cgroup" "github.com/elastic/elastic-agent-system-metrics/metric/system/process" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/system/process/process_test.go b/metricbeat/module/system/process/process_test.go index df558bb0d656..81a2e1847102 100644 --- a/metricbeat/module/system/process/process_test.go +++ b/metricbeat/module/system/process/process_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" "github.com/elastic/elastic-agent-system-metrics/metric/system/process" ) diff --git a/metricbeat/module/system/process_summary/process_summary.go b/metricbeat/module/system/process_summary/process_summary.go index a96e3ad1ff9f..793d8828a0c2 100644 --- a/metricbeat/module/system/process_summary/process_summary.go +++ b/metricbeat/module/system/process_summary/process_summary.go @@ -27,9 +27,9 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/process" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/system/process_summary/process_summary_test.go b/metricbeat/module/system/process_summary/process_summary_test.go index 1093ef1552b3..e8ea746002af 100644 --- a/metricbeat/module/system/process_summary/process_summary_test.go +++ b/metricbeat/module/system/process_summary/process_summary_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/process" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" diff --git a/metricbeat/module/system/raid/blockinfo/getdev.go b/metricbeat/module/system/raid/blockinfo/getdev.go index 7c92b0fc8815..1b264b13f2f2 100644 --- a/metricbeat/module/system/raid/blockinfo/getdev.go +++ b/metricbeat/module/system/raid/blockinfo/getdev.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // ListAll lists all the multi-disk devices in a RAID array diff --git a/metricbeat/module/system/raid/raid.go b/metricbeat/module/system/raid/raid.go index 7b07e36c4d2d..7f6221117e2c 100644 --- a/metricbeat/module/system/raid/raid.go +++ b/metricbeat/module/system/raid/raid.go @@ -20,9 +20,9 @@ package raid import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/system/raid/blockinfo" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/system/raid/blockinfo" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/system/raid/raid_test.go b/metricbeat/module/system/raid/raid_test.go index 28b3358f685d..b25f3f81ff20 100644 --- a/metricbeat/module/system/raid/raid_test.go +++ b/metricbeat/module/system/raid/raid_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/service/data.go b/metricbeat/module/system/service/data.go index cb2329a73077..1d1cbbab0790 100644 --- a/metricbeat/module/system/service/data.go +++ b/metricbeat/module/system/service/data.go @@ -25,7 +25,7 @@ import ( "github.com/coreos/go-systemd/v22/dbus" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/system/service/service.go b/metricbeat/module/system/service/service.go index edffc22fa94f..59ce5480f1bd 100644 --- a/metricbeat/module/system/service/service.go +++ b/metricbeat/module/system/service/service.go @@ -26,8 +26,8 @@ import ( "github.com/coreos/go-systemd/v22/dbus" "github.com/go-viper/mapstructure/v2" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" ) // Config stores the config object diff --git a/metricbeat/module/system/service/service_test.go b/metricbeat/module/system/service/service_test.go index 8b03f61ba136..4e842d394180 100644 --- a/metricbeat/module/system/service/service_test.go +++ b/metricbeat/module/system/service/service_test.go @@ -26,7 +26,7 @@ import ( "github.com/coreos/go-systemd/v22/dbus" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + _ "github.com/elastic/beats/v9/metricbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/system/socket/socket.go b/metricbeat/module/system/socket/socket.go index 8cba87b8fafa..26799ab257f3 100644 --- a/metricbeat/module/system/socket/socket.go +++ b/metricbeat/module/system/socket/socket.go @@ -27,9 +27,9 @@ import ( "strconv" "syscall" - sock "github.com/elastic/beats/v7/metricbeat/helper/socket" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + sock "github.com/elastic/beats/v9/metricbeat/helper/socket" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" "github.com/elastic/gosigar/sys/linux" diff --git a/metricbeat/module/system/socket/socket_test.go b/metricbeat/module/system/socket/socket_test.go index 3d27844f0229..42d9cbf12d51 100644 --- a/metricbeat/module/system/socket/socket_test.go +++ b/metricbeat/module/system/socket/socket_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - sock "github.com/elastic/beats/v7/metricbeat/helper/socket" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + sock "github.com/elastic/beats/v9/metricbeat/helper/socket" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/system/socket_summary/socket_summary.go b/metricbeat/module/system/socket_summary/socket_summary.go index a2116cbed4ed..38dd2dd8fe58 100644 --- a/metricbeat/module/system/socket_summary/socket_summary.go +++ b/metricbeat/module/system/socket_summary/socket_summary.go @@ -24,7 +24,7 @@ import ( "github.com/shirou/gopsutil/v4/net" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-system-metrics/metric/system/resolve" ) diff --git a/metricbeat/module/system/system.go b/metricbeat/module/system/system.go index e78cac590784..09431ff40c22 100644 --- a/metricbeat/module/system/system.go +++ b/metricbeat/module/system/system.go @@ -20,8 +20,8 @@ package system import ( "sync" - "github.com/elastic/beats/v7/metricbeat/internal/sysinit" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/internal/sysinit" + "github.com/elastic/beats/v9/metricbeat/mb" ) var once sync.Once diff --git a/metricbeat/module/system/uptime/uptime.go b/metricbeat/module/system/uptime/uptime.go index 20a03bdc13cc..50a1720463e0 100644 --- a/metricbeat/module/system/uptime/uptime.go +++ b/metricbeat/module/system/uptime/uptime.go @@ -22,8 +22,8 @@ package uptime import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" sigar "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/system/uptime/uptime_test.go b/metricbeat/module/system/uptime/uptime_test.go index 4d37de278e12..d04b957bb582 100644 --- a/metricbeat/module/system/uptime/uptime_test.go +++ b/metricbeat/module/system/uptime/uptime_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/system" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/system" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/users/users.go b/metricbeat/module/system/users/users.go index ef4c043fd3da..b7c8131c92f1 100644 --- a/metricbeat/module/system/users/users.go +++ b/metricbeat/module/system/users/users.go @@ -26,8 +26,8 @@ import ( "github.com/godbus/dbus/v5" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/traefik/fields.go b/metricbeat/module/traefik/fields.go index 34b71530aa06..214762409125 100644 --- a/metricbeat/module/traefik/fields.go +++ b/metricbeat/module/traefik/fields.go @@ -20,7 +20,7 @@ package traefik import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/traefik/health/data.go b/metricbeat/module/traefik/health/data.go index 7c267904de69..1d83999c28f3 100644 --- a/metricbeat/module/traefik/health/data.go +++ b/metricbeat/module/traefik/health/data.go @@ -18,8 +18,8 @@ package health import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/traefik/health/health.go b/metricbeat/module/traefik/health/health.go index 26861d7b32a0..a8495b0d734c 100644 --- a/metricbeat/module/traefik/health/health.go +++ b/metricbeat/module/traefik/health/health.go @@ -20,9 +20,9 @@ package health import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/traefik/health/health_integration_test.go b/metricbeat/module/traefik/health/health_integration_test.go index bbab1d06b145..f524fa3504e7 100644 --- a/metricbeat/module/traefik/health/health_integration_test.go +++ b/metricbeat/module/traefik/health/health_integration_test.go @@ -23,9 +23,9 @@ import ( "net/http" "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/traefik/mtest" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/traefik/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/traefik/health/health_test.go b/metricbeat/module/traefik/health/health_test.go index d6edbd5fe3de..f383b324e9cc 100644 --- a/metricbeat/module/traefik/health/health_test.go +++ b/metricbeat/module/traefik/health/health_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" - _ "github.com/elastic/beats/v7/metricbeat/module/traefik" + _ "github.com/elastic/beats/v9/metricbeat/module/traefik" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/uwsgi/fields.go b/metricbeat/module/uwsgi/fields.go index 5f471138cd5b..7098fe90dcc6 100644 --- a/metricbeat/module/uwsgi/fields.go +++ b/metricbeat/module/uwsgi/fields.go @@ -20,7 +20,7 @@ package uwsgi import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/uwsgi/status/data.go b/metricbeat/module/uwsgi/status/data.go index 23dd353290eb..d72528ac967f 100644 --- a/metricbeat/module/uwsgi/status/data.go +++ b/metricbeat/module/uwsgi/status/data.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/uwsgi/status/status.go b/metricbeat/module/uwsgi/status/status.go index 8ade1df3a8d9..8d4406a21cb9 100644 --- a/metricbeat/module/uwsgi/status/status.go +++ b/metricbeat/module/uwsgi/status/status.go @@ -27,8 +27,8 @@ import ( "net/url" "strings" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/uwsgi" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/uwsgi" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/uwsgi/status/status_integration_test.go b/metricbeat/module/uwsgi/status/status_integration_test.go index 9a912042ce6f..73995a081615 100644 --- a/metricbeat/module/uwsgi/status/status_integration_test.go +++ b/metricbeat/module/uwsgi/status/status_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/uwsgi/status/status_linux_test.go b/metricbeat/module/uwsgi/status/status_linux_test.go index bbd84faf85a7..8521f7065c18 100644 --- a/metricbeat/module/uwsgi/status/status_linux_test.go +++ b/metricbeat/module/uwsgi/status/status_linux_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetchDataUnixSock(t *testing.T) { diff --git a/metricbeat/module/uwsgi/status/status_test.go b/metricbeat/module/uwsgi/status/status_test.go index f8ab2133e86c..e8d14cdb3e13 100644 --- a/metricbeat/module/uwsgi/status/status_test.go +++ b/metricbeat/module/uwsgi/status/status_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/uwsgi/uwsgi.go b/metricbeat/module/uwsgi/uwsgi.go index 42f8be1eabf9..5d14ed193527 100644 --- a/metricbeat/module/uwsgi/uwsgi.go +++ b/metricbeat/module/uwsgi/uwsgi.go @@ -18,8 +18,8 @@ package uwsgi import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) // HostParser is used for parsing the configured uWSGI hosts. diff --git a/metricbeat/module/uwsgi/uwsgi_test.go b/metricbeat/module/uwsgi/uwsgi_test.go index 79ebf0eac667..0254e944a8b4 100644 --- a/metricbeat/module/uwsgi/uwsgi_test.go +++ b/metricbeat/module/uwsgi/uwsgi_test.go @@ -20,7 +20,7 @@ package uwsgi import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/vsphere/client/logout.go b/metricbeat/module/vsphere/client/logout.go index 9eaa77efd040..2d7fdde4263e 100644 --- a/metricbeat/module/vsphere/client/logout.go +++ b/metricbeat/module/vsphere/client/logout.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v9/libbeat/common/backoff" ) type Logouter interface { diff --git a/metricbeat/module/vsphere/cluster/cluster.go b/metricbeat/module/vsphere/cluster/cluster.go index 2849b7ff82d9..3ddebb2d6908 100644 --- a/metricbeat/module/vsphere/cluster/cluster.go +++ b/metricbeat/module/vsphere/cluster/cluster.go @@ -22,11 +22,11 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/vsphere" - vSphereClientUtil "github.com/elastic/beats/v7/metricbeat/module/vsphere/client" - "github.com/elastic/beats/v7/metricbeat/module/vsphere/security" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/vsphere" + vSphereClientUtil "github.com/elastic/beats/v9/metricbeat/module/vsphere/client" + "github.com/elastic/beats/v9/metricbeat/module/vsphere/security" "github.com/vmware/govmomi" "github.com/vmware/govmomi/property" diff --git a/metricbeat/module/vsphere/cluster/cluster_test.go b/metricbeat/module/vsphere/cluster/cluster_test.go index 72026716544d..451cfcb8da77 100644 --- a/metricbeat/module/vsphere/cluster/cluster_test.go +++ b/metricbeat/module/vsphere/cluster/cluster_test.go @@ -20,7 +20,7 @@ package cluster import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/vsphere/datastore/datastore.go b/metricbeat/module/vsphere/datastore/datastore.go index 8139188ee737..e4fed692d05d 100644 --- a/metricbeat/module/vsphere/datastore/datastore.go +++ b/metricbeat/module/vsphere/datastore/datastore.go @@ -22,11 +22,11 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/vsphere" - vSphereClientUtil "github.com/elastic/beats/v7/metricbeat/module/vsphere/client" - "github.com/elastic/beats/v7/metricbeat/module/vsphere/security" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/vsphere" + vSphereClientUtil "github.com/elastic/beats/v9/metricbeat/module/vsphere/client" + "github.com/elastic/beats/v9/metricbeat/module/vsphere/security" "github.com/vmware/govmomi" "github.com/vmware/govmomi/performance" diff --git a/metricbeat/module/vsphere/datastore/datastore_test.go b/metricbeat/module/vsphere/datastore/datastore_test.go index 17a7f690b856..3ee791159e4a 100644 --- a/metricbeat/module/vsphere/datastore/datastore_test.go +++ b/metricbeat/module/vsphere/datastore/datastore_test.go @@ -20,7 +20,7 @@ package datastore import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/metricbeat/module/vsphere/datastorecluster/datastorecluster.go b/metricbeat/module/vsphere/datastorecluster/datastorecluster.go index 51132bd278fe..c8b7b33137ab 100644 --- a/metricbeat/module/vsphere/datastorecluster/datastorecluster.go +++ b/metricbeat/module/vsphere/datastorecluster/datastorecluster.go @@ -28,13 +28,13 @@ import ( "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" - vSphereClientUtil "github.com/elastic/beats/v7/metricbeat/module/vsphere/client" + vSphereClientUtil "github.com/elastic/beats/v9/metricbeat/module/vsphere/client" - "github.com/elastic/beats/v7/metricbeat/module/vsphere/security" + "github.com/elastic/beats/v9/metricbeat/module/vsphere/security" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/vsphere" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/vsphere" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/vsphere/datastorecluster/datastorecluster_test.go b/metricbeat/module/vsphere/datastorecluster/datastorecluster_test.go index 216484212917..f30ba41e8b2b 100644 --- a/metricbeat/module/vsphere/datastorecluster/datastorecluster_test.go +++ b/metricbeat/module/vsphere/datastorecluster/datastorecluster_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "github.com/vmware/govmomi/simulator" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go index fff391f13457..56b1ddbfb1d6 100644 --- a/metricbeat/module/vsphere/fields.go +++ b/metricbeat/module/vsphere/fields.go @@ -20,7 +20,7 @@ package vsphere import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/vsphere/host/host.go b/metricbeat/module/vsphere/host/host.go index 7514afe3476d..f44a611afddf 100644 --- a/metricbeat/module/vsphere/host/host.go +++ b/metricbeat/module/vsphere/host/host.go @@ -22,11 +22,11 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/vsphere" - vSphereClientUtil "github.com/elastic/beats/v7/metricbeat/module/vsphere/client" - "github.com/elastic/beats/v7/metricbeat/module/vsphere/security" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/vsphere" + vSphereClientUtil "github.com/elastic/beats/v9/metricbeat/module/vsphere/client" + "github.com/elastic/beats/v9/metricbeat/module/vsphere/security" "github.com/vmware/govmomi" "github.com/vmware/govmomi/performance" diff --git a/metricbeat/module/vsphere/host/host_test.go b/metricbeat/module/vsphere/host/host_test.go index 5a69e0e546fe..a799b09ed252 100644 --- a/metricbeat/module/vsphere/host/host_test.go +++ b/metricbeat/module/vsphere/host/host_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/vsphere/metricset.go b/metricbeat/module/vsphere/metricset.go index c7089b52ac7d..3e8af9bde6c8 100644 --- a/metricbeat/module/vsphere/metricset.go +++ b/metricbeat/module/vsphere/metricset.go @@ -20,8 +20,8 @@ package vsphere import ( "net/url" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) var HostParser = parse.URLHostParserBuilder{ diff --git a/metricbeat/module/vsphere/network/network.go b/metricbeat/module/vsphere/network/network.go index 29395190851f..cbbf77a6c34d 100644 --- a/metricbeat/module/vsphere/network/network.go +++ b/metricbeat/module/vsphere/network/network.go @@ -28,13 +28,13 @@ import ( "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" - vSphereClientUtil "github.com/elastic/beats/v7/metricbeat/module/vsphere/client" + vSphereClientUtil "github.com/elastic/beats/v9/metricbeat/module/vsphere/client" - "github.com/elastic/beats/v7/metricbeat/module/vsphere/security" + "github.com/elastic/beats/v9/metricbeat/module/vsphere/security" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/vsphere" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/vsphere" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/vsphere/network/network_test.go b/metricbeat/module/vsphere/network/network_test.go index cb472689e3ba..81a0db855369 100644 --- a/metricbeat/module/vsphere/network/network_test.go +++ b/metricbeat/module/vsphere/network/network_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "github.com/vmware/govmomi/simulator" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/vsphere/resourcepool/resourcepool.go b/metricbeat/module/vsphere/resourcepool/resourcepool.go index 1a754bbae46b..0be5125b2b09 100644 --- a/metricbeat/module/vsphere/resourcepool/resourcepool.go +++ b/metricbeat/module/vsphere/resourcepool/resourcepool.go @@ -28,13 +28,13 @@ import ( "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" - vSphereClientUtil "github.com/elastic/beats/v7/metricbeat/module/vsphere/client" + vSphereClientUtil "github.com/elastic/beats/v9/metricbeat/module/vsphere/client" - "github.com/elastic/beats/v7/metricbeat/module/vsphere/security" + "github.com/elastic/beats/v9/metricbeat/module/vsphere/security" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/vsphere" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/vsphere" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/vsphere/resourcepool/resourcepool_test.go b/metricbeat/module/vsphere/resourcepool/resourcepool_test.go index d3aecccebb65..928dc339f92a 100644 --- a/metricbeat/module/vsphere/resourcepool/resourcepool_test.go +++ b/metricbeat/module/vsphere/resourcepool/resourcepool_test.go @@ -20,7 +20,7 @@ package resourcepool import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/vsphere/virtualmachine/data_test.go b/metricbeat/module/vsphere/virtualmachine/data_test.go index b1676db8118d..2f8f8269770f 100644 --- a/metricbeat/module/vsphere/virtualmachine/data_test.go +++ b/metricbeat/module/vsphere/virtualmachine/data_test.go @@ -24,7 +24,7 @@ import ( "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go index 6f2794ccc899..f607a7bf9b63 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go @@ -23,11 +23,11 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/vsphere" - vSphereClientUtil "github.com/elastic/beats/v7/metricbeat/module/vsphere/client" - "github.com/elastic/beats/v7/metricbeat/module/vsphere/security" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/vsphere" + vSphereClientUtil "github.com/elastic/beats/v9/metricbeat/module/vsphere/client" + "github.com/elastic/beats/v9/metricbeat/module/vsphere/security" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/vmware/govmomi" diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go index 5099eb3f3ab4..4c2596a1fbb7 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/vmware/govmomi/simulator" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/windows/fields.go b/metricbeat/module/windows/fields.go index f18a67c22b97..bc991f7a8ec8 100644 --- a/metricbeat/module/windows/fields.go +++ b/metricbeat/module/windows/fields.go @@ -20,7 +20,7 @@ package windows import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/windows/perfmon/data.go b/metricbeat/module/windows/perfmon/data.go index 5e35c9ae4e1b..804ebe8f6d5d 100644 --- a/metricbeat/module/windows/perfmon/data.go +++ b/metricbeat/module/windows/perfmon/data.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/windows/perfmon/data_test.go b/metricbeat/module/windows/perfmon/data_test.go index b9e2a9668091..238651af4268 100644 --- a/metricbeat/module/windows/perfmon/data_test.go +++ b/metricbeat/module/windows/perfmon/data_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v9/metricbeat/helper/windows/pdh" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/windows/perfmon/perfmon.go b/metricbeat/module/windows/perfmon/perfmon.go index 40d38c082e4b..75601bee0462 100644 --- a/metricbeat/module/windows/perfmon/perfmon.go +++ b/metricbeat/module/windows/perfmon/perfmon.go @@ -22,9 +22,9 @@ package perfmon import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/windows/perfmon/perfmon_test.go b/metricbeat/module/windows/perfmon/perfmon_test.go index 11385e4aaffe..02404b2e01d4 100644 --- a/metricbeat/module/windows/perfmon/perfmon_test.go +++ b/metricbeat/module/windows/perfmon/perfmon_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/helper/windows/pdh" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/windows/perfmon/reader.go b/metricbeat/module/windows/perfmon/reader.go index 1bd7508ebfd5..4a268c3c523f 100644 --- a/metricbeat/module/windows/perfmon/reader.go +++ b/metricbeat/module/windows/perfmon/reader.go @@ -26,9 +26,9 @@ import ( "time" "unicode" - "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v9/metricbeat/helper/windows/pdh" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/windows/perfmon/reader_test.go b/metricbeat/module/windows/perfmon/reader_test.go index 9a26b7c87285..96270815c170 100644 --- a/metricbeat/module/windows/perfmon/reader_test.go +++ b/metricbeat/module/windows/perfmon/reader_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v9/metricbeat/helper/windows/pdh" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/windows/service/service.go b/metricbeat/module/windows/service/service.go index 61b950af7454..9ed5d95bc83a 100644 --- a/metricbeat/module/windows/service/service.go +++ b/metricbeat/module/windows/service/service.go @@ -20,7 +20,7 @@ package service import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/windows/service/service_integration_test.go b/metricbeat/module/windows/service/service_integration_test.go index e2b3bad73aa1..5117fe2059bd 100644 --- a/metricbeat/module/windows/service/service_integration_test.go +++ b/metricbeat/module/windows/service/service_integration_test.go @@ -25,7 +25,7 @@ import ( "github.com/StackExchange/wmi" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/windows/service/service_status.go b/metricbeat/module/windows/service/service_status.go index a4076c6bffe0..be1f3b64cb5f 100644 --- a/metricbeat/module/windows/service/service_status.go +++ b/metricbeat/module/windows/service/service_status.go @@ -29,7 +29,7 @@ import ( "unicode/utf16" "unsafe" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "errors" diff --git a/metricbeat/module/windows/windows.go b/metricbeat/module/windows/windows.go index 1ea9a8339eec..25dfee570e95 100644 --- a/metricbeat/module/windows/windows.go +++ b/metricbeat/module/windows/windows.go @@ -22,8 +22,8 @@ package windows import ( "sync" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/metricbeat/module/windows/wmi/wmi.go b/metricbeat/module/windows/wmi/wmi.go index b4882a3bd06c..2fd5b36192bc 100644 --- a/metricbeat/module/windows/wmi/wmi.go +++ b/metricbeat/module/windows/wmi/wmi.go @@ -22,8 +22,8 @@ package wmi import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" wmi "github.com/microsoft/wmi/pkg/wmiinstance" diff --git a/metricbeat/module/zookeeper/connection/connection.go b/metricbeat/module/zookeeper/connection/connection.go index 3075f7ff8044..4cfb0de7c7b9 100644 --- a/metricbeat/module/zookeeper/connection/connection.go +++ b/metricbeat/module/zookeeper/connection/connection.go @@ -20,9 +20,9 @@ package connection import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/zookeeper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/zookeeper" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/zookeeper/connection/connection_integration_test.go b/metricbeat/module/zookeeper/connection/connection_integration_test.go index 9d0b73b3e69d..d26480d09d40 100644 --- a/metricbeat/module/zookeeper/connection/connection_integration_test.go +++ b/metricbeat/module/zookeeper/connection/connection_integration_test.go @@ -22,8 +22,8 @@ package connection import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/zookeeper/connection/data.go b/metricbeat/module/zookeeper/connection/data.go index 715cb8bc87ce..cc21c3efbfc8 100644 --- a/metricbeat/module/zookeeper/connection/data.go +++ b/metricbeat/module/zookeeper/connection/data.go @@ -24,7 +24,7 @@ import ( "regexp" "strconv" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/zookeeper/fields.go b/metricbeat/module/zookeeper/fields.go index adac8f5f621b..417f339187f8 100644 --- a/metricbeat/module/zookeeper/fields.go +++ b/metricbeat/module/zookeeper/fields.go @@ -20,7 +20,7 @@ package zookeeper import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/metricbeat/module/zookeeper/mntr/data.go b/metricbeat/module/zookeeper/mntr/data.go index 03be8653a5df..e78205ddab25 100644 --- a/metricbeat/module/zookeeper/mntr/data.go +++ b/metricbeat/module/zookeeper/mntr/data.go @@ -22,9 +22,9 @@ import ( "io" "regexp" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/zookeeper/mntr/mntr.go b/metricbeat/module/zookeeper/mntr/mntr.go index f08c7d362876..5930f951e3ed 100644 --- a/metricbeat/module/zookeeper/mntr/mntr.go +++ b/metricbeat/module/zookeeper/mntr/mntr.go @@ -46,9 +46,9 @@ package mntr import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/zookeeper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/zookeeper" ) func init() { diff --git a/metricbeat/module/zookeeper/mntr/mntr_integration_test.go b/metricbeat/module/zookeeper/mntr/mntr_integration_test.go index f16478baed41..3f1e63be3ae6 100644 --- a/metricbeat/module/zookeeper/mntr/mntr_integration_test.go +++ b/metricbeat/module/zookeeper/mntr/mntr_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/zookeeper/mntr/mntr_test.go b/metricbeat/module/zookeeper/mntr/mntr_test.go index 916dab367a05..7d166ee25994 100644 --- a/metricbeat/module/zookeeper/mntr/mntr_test.go +++ b/metricbeat/module/zookeeper/mntr/mntr_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/zookeeper/server/server.go b/metricbeat/module/zookeeper/server/server.go index 86dde3df443f..db7f636f83bb 100644 --- a/metricbeat/module/zookeeper/server/server.go +++ b/metricbeat/module/zookeeper/server/server.go @@ -41,9 +41,9 @@ package server import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/module/zookeeper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/module/zookeeper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/metricbeat/module/zookeeper/server/server_integration_test.go b/metricbeat/module/zookeeper/server/server_integration_test.go index d6df63237d06..5ad8699feb8b 100644 --- a/metricbeat/module/zookeeper/server/server_integration_test.go +++ b/metricbeat/module/zookeeper/server/server_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/zookeeper/zookeeper_integration_test.go b/metricbeat/module/zookeeper/zookeeper_integration_test.go index 95a34ba4d2f3..544aa546cc0c 100644 --- a/metricbeat/module/zookeeper/zookeeper_integration_test.go +++ b/metricbeat/module/zookeeper/zookeeper_integration_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v9/libbeat/tests/compose" ) func TestServerID(t *testing.T) { diff --git a/metricbeat/processor/add_kubernetes_metadata/indexers.go b/metricbeat/processor/add_kubernetes_metadata/indexers.go index 249f70238b72..524630281272 100644 --- a/metricbeat/processor/add_kubernetes_metadata/indexers.go +++ b/metricbeat/processor/add_kubernetes_metadata/indexers.go @@ -18,7 +18,7 @@ package add_kubernetes_metadata import ( - kubernetes "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" + kubernetes "github.com/elastic/beats/v9/libbeat/processors/add_kubernetes_metadata" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/metricbeat/scripts/mage/config.go b/metricbeat/scripts/mage/config.go index e49e223753fe..734dc5ffaa45 100644 --- a/metricbeat/scripts/mage/config.go +++ b/metricbeat/scripts/mage/config.go @@ -20,7 +20,7 @@ package mage import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) const modulesConfigYml = "build/config.modules.yml.tmpl" diff --git a/metricbeat/scripts/mage/docs_collector.go b/metricbeat/scripts/mage/docs_collector.go index dbd261483483..064757630b0e 100644 --- a/metricbeat/scripts/mage/docs_collector.go +++ b/metricbeat/scripts/mage/docs_collector.go @@ -31,7 +31,7 @@ import ( "github.com/magefile/mage/sh" "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage" ) // moduleData provides module-level data that will be used to populate the module list diff --git a/metricbeat/scripts/mage/fields.go b/metricbeat/scripts/mage/fields.go index 487b1bc6fc56..f5e944f3c90e 100644 --- a/metricbeat/scripts/mage/fields.go +++ b/metricbeat/scripts/mage/fields.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // GenerateOSSMetricbeatModuleIncludeListGo generates include/list_{suffix}.go files containing diff --git a/metricbeat/scripts/mage/package.go b/metricbeat/scripts/mage/package.go index 43e12652f4a5..5f6e6262a48b 100644 --- a/metricbeat/scripts/mage/package.go +++ b/metricbeat/scripts/mage/package.go @@ -27,7 +27,7 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) const ( diff --git a/metricbeat/scripts/mage/target/metricset/metricset.go b/metricbeat/scripts/mage/target/metricset/metricset.go index d75f6658c5ca..2a9b932e6376 100644 --- a/metricbeat/scripts/mage/target/metricset/metricset.go +++ b/metricbeat/scripts/mage/target/metricset/metricset.go @@ -23,7 +23,7 @@ import ( "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // CreateMetricset creates a new metricset. diff --git a/metricbeat/scripts/module/metricset/metricset.go.tmpl b/metricbeat/scripts/module/metricset/metricset.go.tmpl index 2f78bf98d9a9..a56ca608afd4 100644 --- a/metricbeat/scripts/module/metricset/metricset.go.tmpl +++ b/metricbeat/scripts/module/metricset/metricset.go.tmpl @@ -2,8 +2,8 @@ package {metricset} import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/scripts/msetlists/cmd/main.go b/metricbeat/scripts/msetlists/cmd/main.go index 88c0030425f4..4a0ae416e3d7 100644 --- a/metricbeat/scripts/msetlists/cmd/main.go +++ b/metricbeat/scripts/msetlists/cmd/main.go @@ -22,9 +22,9 @@ import ( "fmt" "os" - _ "github.com/elastic/beats/v7/metricbeat/include" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/scripts/msetlists" + _ "github.com/elastic/beats/v9/metricbeat/include" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/scripts/msetlists" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/metricbeat/scripts/msetlists/msetlists.go b/metricbeat/scripts/msetlists/msetlists.go index 2280bcf2b6db..479e52b53fcf 100644 --- a/metricbeat/scripts/msetlists/msetlists.go +++ b/metricbeat/scripts/msetlists/msetlists.go @@ -20,7 +20,7 @@ package msetlists import ( "strings" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // DefaultMetricsets returns a JSON array of all registered default metricsets diff --git a/packetbeat/beater/install_npcap.go b/packetbeat/beater/install_npcap.go index c1413fdb6d9d..c7535e15ef8b 100644 --- a/packetbeat/beater/install_npcap.go +++ b/packetbeat/beater/install_npcap.go @@ -27,8 +27,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/packetbeat/npcap" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/packetbeat/npcap" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/beater/install_npcap_test.go b/packetbeat/beater/install_npcap_test.go index 3d8c678edaff..84e06db1b720 100644 --- a/packetbeat/beater/install_npcap_test.go +++ b/packetbeat/beater/install_npcap_test.go @@ -20,8 +20,8 @@ package beater import ( "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/beater/packetbeat.go b/packetbeat/beater/packetbeat.go index 4d8e4605843c..a16f5922cba3 100644 --- a/packetbeat/beater/packetbeat.go +++ b/packetbeat/beater/packetbeat.go @@ -24,21 +24,21 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/service" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/module" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/module" + "github.com/elastic/beats/v9/packetbeat/protos" // Add packetbeat default processors - _ "github.com/elastic/beats/v7/packetbeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v9/packetbeat/processor/add_kubernetes_metadata" ) // this is mainly a limitation to ensure that we never deadlock diff --git a/packetbeat/beater/processor.go b/packetbeat/beater/processor.go index 831da131617e..f086f389595b 100644 --- a/packetbeat/beater/processor.go +++ b/packetbeat/beater/processor.go @@ -24,19 +24,19 @@ import ( "github.com/gohugoio/hashstructure" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/flows" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/publish" - "github.com/elastic/beats/v7/packetbeat/sniffer" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/flows" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/publish" + "github.com/elastic/beats/v9/packetbeat/sniffer" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/packetbeat/beater/reloader.go b/packetbeat/beater/reloader.go index 6a34473cad29..bb87964966e4 100644 --- a/packetbeat/beater/reloader.go +++ b/packetbeat/beater/reloader.go @@ -20,9 +20,9 @@ package beater import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/reload" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/cmd/devices.go b/packetbeat/cmd/devices.go index 4635b822ab4b..1c9ba998f386 100644 --- a/packetbeat/cmd/devices.go +++ b/packetbeat/cmd/devices.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/packetbeat/sniffer" + "github.com/elastic/beats/v9/packetbeat/sniffer" ) func genDevicesCommand() *cobra.Command { diff --git a/packetbeat/cmd/root.go b/packetbeat/cmd/root.go index 7b1c20b34c6e..ce2bb9f7779b 100644 --- a/packetbeat/cmd/root.go +++ b/packetbeat/cmd/root.go @@ -22,13 +22,13 @@ import ( "github.com/spf13/pflag" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/packetbeat/beater" - "github.com/elastic/beats/v7/packetbeat/include" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/packetbeat/beater" + "github.com/elastic/beats/v9/packetbeat/include" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/config/agent.go b/packetbeat/config/agent.go index ba86116f1666..453e4136d1ef 100644 --- a/packetbeat/config/agent.go +++ b/packetbeat/config/agent.go @@ -21,7 +21,7 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/procs" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/config/config.go b/packetbeat/config/config.go index d0d0cf3439e1..687853c163f2 100644 --- a/packetbeat/config/config.go +++ b/packetbeat/config/config.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/packetbeat/procs" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/decoder/decoder.go b/packetbeat/decoder/decoder.go index 1460210d488d..65989707e829 100644 --- a/packetbeat/decoder/decoder.go +++ b/packetbeat/decoder/decoder.go @@ -25,11 +25,11 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" - "github.com/elastic/beats/v7/packetbeat/flows" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/icmp" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" - "github.com/elastic/beats/v7/packetbeat/protos/udp" + "github.com/elastic/beats/v9/packetbeat/flows" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/icmp" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/protos/udp" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/decoder/decoder_test.go b/packetbeat/decoder/decoder_test.go index d0ae846813a3..1392300b3d76 100644 --- a/packetbeat/decoder/decoder_test.go +++ b/packetbeat/decoder/decoder_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/packetbeat/flows" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/flows" + "github.com/elastic/beats/v9/packetbeat/protos" "github.com/elastic/elastic-agent-libs/logp" "github.com/google/gopacket" diff --git a/packetbeat/flows/flows.go b/packetbeat/flows/flows.go index 9df019af2d03..e6646dafb9d0 100644 --- a/packetbeat/flows/flows.go +++ b/packetbeat/flows/flows.go @@ -20,9 +20,9 @@ package flows import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/procs" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/flows/flows_test.go b/packetbeat/flows/flows_test.go index f8478ea83879..e2bf1fcec6e2 100644 --- a/packetbeat/flows/flows_test.go +++ b/packetbeat/flows/flows_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/procs" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/flows/worker.go b/packetbeat/flows/worker.go index 3edae26ed97c..88b832b50c73 100644 --- a/packetbeat/flows/worker.go +++ b/packetbeat/flows/worker.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/flowhash" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/flowhash" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/flows/worker_test.go b/packetbeat/flows/worker_test.go index 0e1c9f627183..15c2ee37d46d 100644 --- a/packetbeat/flows/worker_test.go +++ b/packetbeat/flows/worker_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" diff --git a/packetbeat/include/fields.go b/packetbeat/include/fields.go index bb474be4c4a8..965398fae43f 100644 --- a/packetbeat/include/fields.go +++ b/packetbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/include/list.go b/packetbeat/include/list.go index 3e1e5a391e6a..1993086f5ca3 100644 --- a/packetbeat/include/list.go +++ b/packetbeat/include/list.go @@ -21,24 +21,24 @@ package include import ( // Import packages to perform 'func InitializeModule()' when in-use. - m0 "github.com/elastic/beats/v7/packetbeat/processor/add_kubernetes_metadata" + m0 "github.com/elastic/beats/v9/packetbeat/processor/add_kubernetes_metadata" // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/packetbeat/protos/amqp" - _ "github.com/elastic/beats/v7/packetbeat/protos/cassandra" - _ "github.com/elastic/beats/v7/packetbeat/protos/dhcpv4" - _ "github.com/elastic/beats/v7/packetbeat/protos/dns" - _ "github.com/elastic/beats/v7/packetbeat/protos/http" - _ "github.com/elastic/beats/v7/packetbeat/protos/icmp" - _ "github.com/elastic/beats/v7/packetbeat/protos/memcache" - _ "github.com/elastic/beats/v7/packetbeat/protos/mongodb" - _ "github.com/elastic/beats/v7/packetbeat/protos/mysql" - _ "github.com/elastic/beats/v7/packetbeat/protos/nfs" - _ "github.com/elastic/beats/v7/packetbeat/protos/pgsql" - _ "github.com/elastic/beats/v7/packetbeat/protos/redis" - _ "github.com/elastic/beats/v7/packetbeat/protos/sip" - _ "github.com/elastic/beats/v7/packetbeat/protos/thrift" - _ "github.com/elastic/beats/v7/packetbeat/protos/tls" + _ "github.com/elastic/beats/v9/packetbeat/protos/amqp" + _ "github.com/elastic/beats/v9/packetbeat/protos/cassandra" + _ "github.com/elastic/beats/v9/packetbeat/protos/dhcpv4" + _ "github.com/elastic/beats/v9/packetbeat/protos/dns" + _ "github.com/elastic/beats/v9/packetbeat/protos/http" + _ "github.com/elastic/beats/v9/packetbeat/protos/icmp" + _ "github.com/elastic/beats/v9/packetbeat/protos/memcache" + _ "github.com/elastic/beats/v9/packetbeat/protos/mongodb" + _ "github.com/elastic/beats/v9/packetbeat/protos/mysql" + _ "github.com/elastic/beats/v9/packetbeat/protos/nfs" + _ "github.com/elastic/beats/v9/packetbeat/protos/pgsql" + _ "github.com/elastic/beats/v9/packetbeat/protos/redis" + _ "github.com/elastic/beats/v9/packetbeat/protos/sip" + _ "github.com/elastic/beats/v9/packetbeat/protos/thrift" + _ "github.com/elastic/beats/v9/packetbeat/protos/tls" ) // InitializeModules initialize all of the modules. diff --git a/packetbeat/magefile.go b/packetbeat/magefile.go index cfdf06fc79b1..d56c351e1aa9 100644 --- a/packetbeat/magefile.go +++ b/packetbeat/magefile.go @@ -25,18 +25,18 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - packetbeat "github.com/elastic/beats/v7/packetbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + packetbeat "github.com/elastic/beats/v9/packetbeat/scripts/mage" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/notests" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/packetbeat/main.go b/packetbeat/main.go index 1f5324d4b4b9..9ea05382edb6 100644 --- a/packetbeat/main.go +++ b/packetbeat/main.go @@ -21,7 +21,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/packetbeat/cmd" + "github.com/elastic/beats/v9/packetbeat/cmd" ) // Setups and Runs Packetbeat diff --git a/packetbeat/main_test.go b/packetbeat/main_test.go index 359e70f161b0..5e2a2a9ac296 100644 --- a/packetbeat/main_test.go +++ b/packetbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - "github.com/elastic/beats/v7/packetbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + "github.com/elastic/beats/v9/packetbeat/cmd" ) var systemTest *bool diff --git a/packetbeat/module/pipeline.go b/packetbeat/module/pipeline.go index 74bb7d36b454..bbf8bb6b7ead 100644 --- a/packetbeat/module/pipeline.go +++ b/packetbeat/module/pipeline.go @@ -28,9 +28,9 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/filebeat/fileset" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/filebeat/fileset" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/pb/ecs.go b/packetbeat/pb/ecs.go index 5d612be0be28..b8a48b61f1cc 100644 --- a/packetbeat/pb/ecs.go +++ b/packetbeat/pb/ecs.go @@ -18,7 +18,7 @@ package pb import ( - "github.com/elastic/beats/v7/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/ecs" ) type ecsRelated struct { diff --git a/packetbeat/pb/event.go b/packetbeat/pb/event.go index de8bbaa7e3f8..81e6928e64c5 100644 --- a/packetbeat/pb/event.go +++ b/packetbeat/pb/event.go @@ -24,11 +24,11 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/flowhash" - "github.com/elastic/beats/v7/libbeat/conditions" - "github.com/elastic/beats/v7/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/flowhash" + "github.com/elastic/beats/v9/libbeat/conditions" + "github.com/elastic/beats/v9/libbeat/ecs" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/pb/event_test.go b/packetbeat/pb/event_test.go index b10c2f78d507..dda46c502f03 100644 --- a/packetbeat/pb/event_test.go +++ b/packetbeat/pb/event_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/ecs" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/processor/add_kubernetes_metadata/indexers.go b/packetbeat/processor/add_kubernetes_metadata/indexers.go index 3e5414bd6947..68be99e44313 100644 --- a/packetbeat/processor/add_kubernetes_metadata/indexers.go +++ b/packetbeat/processor/add_kubernetes_metadata/indexers.go @@ -18,7 +18,7 @@ package add_kubernetes_metadata import ( - kubernetes "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" + kubernetes "github.com/elastic/beats/v9/libbeat/processors/add_kubernetes_metadata" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/packetbeat/procs/procs.go b/packetbeat/procs/procs.go index f578b49a5d4e..7036d7972d9e 100644 --- a/packetbeat/procs/procs.go +++ b/packetbeat/procs/procs.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-sysinfo" ) diff --git a/packetbeat/procs/procs_linux.go b/packetbeat/procs/procs_linux.go index 8ad952a1e26e..92b067ec09e3 100644 --- a/packetbeat/procs/procs_linux.go +++ b/packetbeat/procs/procs_linux.go @@ -32,7 +32,7 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-sysinfo/types" "github.com/elastic/gosigar" diff --git a/packetbeat/procs/procs_other.go b/packetbeat/procs/procs_other.go index 874ca54b8fe0..30267711fbd0 100644 --- a/packetbeat/procs/procs_other.go +++ b/packetbeat/procs/procs_other.go @@ -20,7 +20,7 @@ package procs import ( - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/go-sysinfo/types" ) diff --git a/packetbeat/procs/procs_test.go b/packetbeat/procs/procs_test.go index 1606efc8c8f4..5133875bb61e 100644 --- a/packetbeat/procs/procs_test.go +++ b/packetbeat/procs/procs_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/procs/procs_windows.go b/packetbeat/procs/procs_windows.go index 064f341d28ae..26ad0c4dda3f 100644 --- a/packetbeat/procs/procs_windows.go +++ b/packetbeat/procs/procs_windows.go @@ -29,7 +29,7 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/go-sysinfo/types" ) diff --git a/packetbeat/protocols/plugin.go b/packetbeat/protocols/plugin.go index 46fd784e64b0..48277637c245 100644 --- a/packetbeat/protocols/plugin.go +++ b/packetbeat/protocols/plugin.go @@ -20,8 +20,8 @@ package protocols import ( "errors" - "github.com/elastic/beats/v7/libbeat/plugin" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/plugin" + "github.com/elastic/beats/v9/packetbeat/protos" ) type protocolPlugin struct { diff --git a/packetbeat/protos/amqp/amqp.go b/packetbeat/protos/amqp/amqp.go index 20ee7b307495..f79b2371cbb3 100644 --- a/packetbeat/protos/amqp/amqp.go +++ b/packetbeat/protos/amqp/amqp.go @@ -22,16 +22,16 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) var ( diff --git a/packetbeat/protos/amqp/amqp_parser.go b/packetbeat/protos/amqp/amqp_parser.go index 2d3a3097df3c..0414e9903641 100644 --- a/packetbeat/protos/amqp/amqp_parser.go +++ b/packetbeat/protos/amqp/amqp_parser.go @@ -21,7 +21,7 @@ import ( "encoding/binary" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/amqp/amqp_structs.go b/packetbeat/protos/amqp/amqp_structs.go index de31fce6af37..a0c009057bff 100644 --- a/packetbeat/protos/amqp/amqp_structs.go +++ b/packetbeat/protos/amqp/amqp_structs.go @@ -20,7 +20,7 @@ package amqp import ( "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/amqp/amqp_test.go b/packetbeat/protos/amqp/amqp_test.go index 04b486e89ab7..84d3e5c08315 100644 --- a/packetbeat/protos/amqp/amqp_test.go +++ b/packetbeat/protos/amqp/amqp_test.go @@ -24,14 +24,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/amqp/config.go b/packetbeat/protos/amqp/config.go index 4cbd5a5200a3..00eff0ada380 100644 --- a/packetbeat/protos/amqp/config.go +++ b/packetbeat/protos/amqp/config.go @@ -18,8 +18,8 @@ package amqp import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type amqpConfig struct { diff --git a/packetbeat/protos/amqp/fields.go b/packetbeat/protos/amqp/fields.go index 227baa345234..d355c0b1d289 100644 --- a/packetbeat/protos/amqp/fields.go +++ b/packetbeat/protos/amqp/fields.go @@ -20,7 +20,7 @@ package amqp import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/applayer/applayer.go b/packetbeat/protos/applayer/applayer.go index 597edb0d0eb2..45fa371e21d0 100644 --- a/packetbeat/protos/applayer/applayer.go +++ b/packetbeat/protos/applayer/applayer.go @@ -23,11 +23,11 @@ import ( "errors" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/streambuf" - "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/pb" ) // A Message its direction indicator diff --git a/packetbeat/protos/cassandra/cassandra.go b/packetbeat/protos/cassandra/cassandra.go index 7fc063e4000c..2e18bc7b3ee9 100644 --- a/packetbeat/protos/cassandra/cassandra.go +++ b/packetbeat/protos/cassandra/cassandra.go @@ -20,15 +20,15 @@ package cassandra import ( "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" - gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v9/packetbeat/protos/cassandra/internal/gocql" ) // cassandra application level protocol analyzer plugin diff --git a/packetbeat/protos/cassandra/config.go b/packetbeat/protos/cassandra/config.go index 8e93239bc6b9..c01e37c581e7 100644 --- a/packetbeat/protos/cassandra/config.go +++ b/packetbeat/protos/cassandra/config.go @@ -20,10 +20,10 @@ package cassandra import ( "fmt" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" - gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v9/packetbeat/protos/cassandra/internal/gocql" ) type cassandraConfig struct { diff --git a/packetbeat/protos/cassandra/fields.go b/packetbeat/protos/cassandra/fields.go index 19a9f8b98b67..657092b8eb12 100644 --- a/packetbeat/protos/cassandra/fields.go +++ b/packetbeat/protos/cassandra/fields.go @@ -20,7 +20,7 @@ package cassandra import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/cassandra/internal/gocql/frame.go b/packetbeat/protos/cassandra/internal/gocql/frame.go index e89c1d6120ed..ef03c6f96cda 100644 --- a/packetbeat/protos/cassandra/internal/gocql/frame.go +++ b/packetbeat/protos/cassandra/internal/gocql/frame.go @@ -23,7 +23,7 @@ import ( "runtime" "sync" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go b/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go index f39cde2d11e1..e2cd528a138b 100644 --- a/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go +++ b/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" ) type StreamDecoder struct { diff --git a/packetbeat/protos/cassandra/parser.go b/packetbeat/protos/cassandra/parser.go index 42268d17dd61..b7f467625ec4 100644 --- a/packetbeat/protos/cassandra/parser.go +++ b/packetbeat/protos/cassandra/parser.go @@ -21,11 +21,11 @@ import ( "errors" "time" - "github.com/elastic/beats/v7/libbeat/common/streambuf" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/libbeat/common/streambuf" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/elastic-agent-libs/logp" - gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v9/packetbeat/protos/cassandra/internal/gocql" ) type parser struct { diff --git a/packetbeat/protos/cassandra/pub.go b/packetbeat/protos/cassandra/pub.go index 94f7b9fb101a..e5a035464809 100644 --- a/packetbeat/protos/cassandra/pub.go +++ b/packetbeat/protos/cassandra/pub.go @@ -20,12 +20,12 @@ package cassandra import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/protos" ) // Transaction Publisher. diff --git a/packetbeat/protos/cassandra/trans.go b/packetbeat/protos/cassandra/trans.go index 0605dac791a8..61c302a461b4 100644 --- a/packetbeat/protos/cassandra/trans.go +++ b/packetbeat/protos/cassandra/trans.go @@ -20,9 +20,9 @@ package cassandra import ( "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/dhcpv4/config.go b/packetbeat/protos/dhcpv4/config.go index 7245e3c641b0..69ae8aac0173 100644 --- a/packetbeat/protos/dhcpv4/config.go +++ b/packetbeat/protos/dhcpv4/config.go @@ -18,7 +18,7 @@ package dhcpv4 import ( - "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/config" ) type dhcpv4Config struct { diff --git a/packetbeat/protos/dhcpv4/dhcpv4.go b/packetbeat/protos/dhcpv4/dhcpv4.go index becb5c9ea429..ef81b50c7385 100644 --- a/packetbeat/protos/dhcpv4/dhcpv4.go +++ b/packetbeat/protos/dhcpv4/dhcpv4.go @@ -25,12 +25,12 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/protos/dhcpv4/dhcpv4_test.go b/packetbeat/protos/dhcpv4/dhcpv4_test.go index b23aa2d65cc8..a91defc2bf12 100644 --- a/packetbeat/protos/dhcpv4/dhcpv4_test.go +++ b/packetbeat/protos/dhcpv4/dhcpv4_test.go @@ -26,11 +26,11 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/publish" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/dhcpv4/fields.go b/packetbeat/protos/dhcpv4/fields.go index 6c0816829065..7f87e1fd400a 100644 --- a/packetbeat/protos/dhcpv4/fields.go +++ b/packetbeat/protos/dhcpv4/fields.go @@ -20,7 +20,7 @@ package dhcpv4 import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/dns/config.go b/packetbeat/protos/dns/config.go index c1044cf2f7c2..a06753dc3938 100644 --- a/packetbeat/protos/dns/config.go +++ b/packetbeat/protos/dns/config.go @@ -18,8 +18,8 @@ package dns import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type dnsConfig struct { diff --git a/packetbeat/protos/dns/dns.go b/packetbeat/protos/dns/dns.go index 3bc6666dda93..d482b3562b39 100644 --- a/packetbeat/protos/dns/dns.go +++ b/packetbeat/protos/dns/dns.go @@ -34,10 +34,10 @@ import ( mkdns "github.com/miekg/dns" "golang.org/x/net/publicsuffix" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/protos/dns/dns_tcp.go b/packetbeat/protos/dns/dns_tcp.go index cf5c74af6ecd..0f7bf62a0e29 100644 --- a/packetbeat/protos/dns/dns_tcp.go +++ b/packetbeat/protos/dns/dns_tcp.go @@ -20,11 +20,11 @@ package dns import ( "encoding/binary" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" mkdns "github.com/miekg/dns" ) diff --git a/packetbeat/protos/dns/dns_tcp_test.go b/packetbeat/protos/dns/dns_tcp_test.go index 389266ebae4f..3f7208f2cade 100644 --- a/packetbeat/protos/dns/dns_tcp_test.go +++ b/packetbeat/protos/dns/dns_tcp_test.go @@ -33,9 +33,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) // Verify that the interface TCP has been satisfied. diff --git a/packetbeat/protos/dns/dns_test.go b/packetbeat/protos/dns/dns_test.go index cbb2e201d8ab..9eacbd40dca9 100644 --- a/packetbeat/protos/dns/dns_test.go +++ b/packetbeat/protos/dns/dns_test.go @@ -31,11 +31,11 @@ import ( mkdns "github.com/miekg/dns" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/publish" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/protos/dns/dns_udp.go b/packetbeat/protos/dns/dns_udp.go index 3b3a5fdd944f..494f1d97bd63 100644 --- a/packetbeat/protos/dns/dns_udp.go +++ b/packetbeat/protos/dns/dns_udp.go @@ -17,7 +17,7 @@ package dns -import "github.com/elastic/beats/v7/packetbeat/protos" +import "github.com/elastic/beats/v9/packetbeat/protos" // Only EDNS packets should have their size beyond this value const maxDNSPacketSize = (1 << 9) // 512 (bytes) diff --git a/packetbeat/protos/dns/dns_udp_test.go b/packetbeat/protos/dns/dns_udp_test.go index 1f13596110da..7c3e64ca31a9 100644 --- a/packetbeat/protos/dns/dns_udp_test.go +++ b/packetbeat/protos/dns/dns_udp_test.go @@ -41,8 +41,8 @@ import ( mkdns "github.com/miekg/dns" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/protos" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/dns/fields.go b/packetbeat/protos/dns/fields.go index 37b2b0b864a9..fa0e2c96d059 100644 --- a/packetbeat/protos/dns/fields.go +++ b/packetbeat/protos/dns/fields.go @@ -20,7 +20,7 @@ package dns import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/dns/names_test.go b/packetbeat/protos/dns/names_test.go index 72e0954d809d..41606dea3474 100644 --- a/packetbeat/protos/dns/names_test.go +++ b/packetbeat/protos/dns/names_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/pb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/http/config.go b/packetbeat/protos/http/config.go index 45878934b0c4..a20e292575fe 100644 --- a/packetbeat/protos/http/config.go +++ b/packetbeat/protos/http/config.go @@ -18,9 +18,9 @@ package http import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) type httpConfig struct { diff --git a/packetbeat/protos/http/event.go b/packetbeat/protos/http/event.go index 92d4935b1210..a894977ac12d 100644 --- a/packetbeat/protos/http/event.go +++ b/packetbeat/protos/http/event.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/ecs" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/http/event_test.go b/packetbeat/protos/http/event_test.go index 50be1897e50a..d9221b05c2c2 100644 --- a/packetbeat/protos/http/event_test.go +++ b/packetbeat/protos/http/event_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/elastic/beats/v7/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/ecs" ) // TestProtocolFieldsIsInSyncWithECS ensures that Packetbeat's clone of diff --git a/packetbeat/protos/http/fields.go b/packetbeat/protos/http/fields.go index c72afaafd459..27afbf7c8617 100644 --- a/packetbeat/protos/http/fields.go +++ b/packetbeat/protos/http/fields.go @@ -20,7 +20,7 @@ package http import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/http/http.go b/packetbeat/protos/http/http.go index c6347c2b257b..b09627e5adf2 100644 --- a/packetbeat/protos/http/http.go +++ b/packetbeat/protos/http/http.go @@ -28,12 +28,12 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/protos/http/http_parser.go b/packetbeat/protos/http/http_parser.go index 83d26218086b..67d03ffade22 100644 --- a/packetbeat/protos/http/http_parser.go +++ b/packetbeat/protos/http/http_parser.go @@ -25,9 +25,9 @@ import ( "time" "unicode" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/streambuf" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/streambuf" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/http/http_test.go b/packetbeat/protos/http/http_test.go index 50bf9e0874a5..4ebafe2d585e 100644 --- a/packetbeat/protos/http/http_test.go +++ b/packetbeat/protos/http/http_test.go @@ -30,11 +30,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/publish" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/protos/icmp/config.go b/packetbeat/protos/icmp/config.go index 4fcdb6667e50..8d4d6d6efb90 100644 --- a/packetbeat/protos/icmp/config.go +++ b/packetbeat/protos/icmp/config.go @@ -20,7 +20,7 @@ package icmp import ( "time" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos" ) type icmpConfig struct { diff --git a/packetbeat/protos/icmp/fields.go b/packetbeat/protos/icmp/fields.go index 7780bd3318cb..efdef364cc59 100644 --- a/packetbeat/protos/icmp/fields.go +++ b/packetbeat/protos/icmp/fields.go @@ -20,7 +20,7 @@ package icmp import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/icmp/icmp.go b/packetbeat/protos/icmp/icmp.go index 98b6a6deef54..3a555572d520 100644 --- a/packetbeat/protos/icmp/icmp.go +++ b/packetbeat/protos/icmp/icmp.go @@ -23,17 +23,17 @@ import ( "github.com/google/gopacket/layers" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/ecs" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/flows" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/flows" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" ) type icmpPlugin struct { diff --git a/packetbeat/protos/icmp/icmp_test.go b/packetbeat/protos/icmp/icmp_test.go index 7f7f47391399..0175b9d008ae 100644 --- a/packetbeat/protos/icmp/icmp_test.go +++ b/packetbeat/protos/icmp/icmp_test.go @@ -27,12 +27,12 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/protos/memcache/binary.go b/packetbeat/protos/memcache/binary.go index fe7f2c806b3b..f16ba54855f1 100644 --- a/packetbeat/protos/memcache/binary.go +++ b/packetbeat/protos/memcache/binary.go @@ -24,7 +24,7 @@ package memcache // init function. import ( - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/memcache/commands.go b/packetbeat/protos/memcache/commands.go index e58ae6e87f4b..67a4d87c9bbf 100644 --- a/packetbeat/protos/memcache/commands.go +++ b/packetbeat/protos/memcache/commands.go @@ -21,7 +21,7 @@ package memcache // binary/text protocol based commands with setters and serializers. import ( - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/memcache/config.go b/packetbeat/protos/memcache/config.go index dfe01e86e3b0..a421e2eee21e 100644 --- a/packetbeat/protos/memcache/config.go +++ b/packetbeat/protos/memcache/config.go @@ -20,8 +20,8 @@ package memcache import ( "time" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type memcacheConfig struct { diff --git a/packetbeat/protos/memcache/fields.go b/packetbeat/protos/memcache/fields.go index 4e2f93ad4c12..3a389b1ecb80 100644 --- a/packetbeat/protos/memcache/fields.go +++ b/packetbeat/protos/memcache/fields.go @@ -20,7 +20,7 @@ package memcache import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/memcache/memcache.go b/packetbeat/protos/memcache/memcache.go index 40a26b0716c6..4c4544911b32 100644 --- a/packetbeat/protos/memcache/memcache.go +++ b/packetbeat/protos/memcache/memcache.go @@ -25,16 +25,16 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" ) // memcache types diff --git a/packetbeat/protos/memcache/memcache_test.go b/packetbeat/protos/memcache/memcache_test.go index b220e545c534..b131867d530b 100644 --- a/packetbeat/protos/memcache/memcache_test.go +++ b/packetbeat/protos/memcache/memcache_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/memcache/parse.go b/packetbeat/protos/memcache/parse.go index 01ce9a05acba..9c24425d7656 100644 --- a/packetbeat/protos/memcache/parse.go +++ b/packetbeat/protos/memcache/parse.go @@ -22,7 +22,7 @@ package memcache import ( "time" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" ) type parserConfig struct { diff --git a/packetbeat/protos/memcache/parse_test.go b/packetbeat/protos/memcache/parse_test.go index 1ebca57d04b8..4075337a8edf 100644 --- a/packetbeat/protos/memcache/parse_test.go +++ b/packetbeat/protos/memcache/parse_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/memcache/plugin_tcp.go b/packetbeat/protos/memcache/plugin_tcp.go index 55160fd265ac..992e5ac5e808 100644 --- a/packetbeat/protos/memcache/plugin_tcp.go +++ b/packetbeat/protos/memcache/plugin_tcp.go @@ -22,12 +22,12 @@ package memcache import ( "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) type tcpMemcache struct { diff --git a/packetbeat/protos/memcache/plugin_udp.go b/packetbeat/protos/memcache/plugin_udp.go index 0f2933700369..90d3cbec1bf0 100644 --- a/packetbeat/protos/memcache/plugin_udp.go +++ b/packetbeat/protos/memcache/plugin_udp.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" ) type udpMemcache struct { diff --git a/packetbeat/protos/memcache/text.go b/packetbeat/protos/memcache/text.go index 6c4be0732212..c920c800bbe5 100644 --- a/packetbeat/protos/memcache/text.go +++ b/packetbeat/protos/memcache/text.go @@ -29,7 +29,7 @@ import ( "bytes" "fmt" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/mongodb/config.go b/packetbeat/protos/mongodb/config.go index c90aeb672909..49ccb9e2cab1 100644 --- a/packetbeat/protos/mongodb/config.go +++ b/packetbeat/protos/mongodb/config.go @@ -18,8 +18,8 @@ package mongodb import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type mongodbConfig struct { diff --git a/packetbeat/protos/mongodb/fields.go b/packetbeat/protos/mongodb/fields.go index d0c028c7e410..6c11f584d3bb 100644 --- a/packetbeat/protos/mongodb/fields.go +++ b/packetbeat/protos/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/mongodb/mongodb.go b/packetbeat/protos/mongodb/mongodb.go index 749342cf3d7d..b05a799e99fe 100644 --- a/packetbeat/protos/mongodb/mongodb.go +++ b/packetbeat/protos/mongodb/mongodb.go @@ -22,16 +22,16 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" "go.mongodb.org/mongo-driver/bson/primitive" ) diff --git a/packetbeat/protos/mongodb/mongodb_structs.go b/packetbeat/protos/mongodb/mongodb_structs.go index 67a9e26de8d2..0f74d00490e1 100644 --- a/packetbeat/protos/mongodb/mongodb_structs.go +++ b/packetbeat/protos/mongodb/mongodb_structs.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/mongodb/mongodb_test.go b/packetbeat/protos/mongodb/mongodb_test.go index 5e128178ab4a..e595bf949932 100644 --- a/packetbeat/protos/mongodb/mongodb_test.go +++ b/packetbeat/protos/mongodb/mongodb_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/mysql/config.go b/packetbeat/protos/mysql/config.go index 0c634b982913..3aef93b2b5cf 100644 --- a/packetbeat/protos/mysql/config.go +++ b/packetbeat/protos/mysql/config.go @@ -20,8 +20,8 @@ package mysql import ( "time" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type mysqlConfig struct { diff --git a/packetbeat/protos/mysql/fields.go b/packetbeat/protos/mysql/fields.go index 36346850662b..98a88485f495 100644 --- a/packetbeat/protos/mysql/fields.go +++ b/packetbeat/protos/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/mysql/mysql.go b/packetbeat/protos/mysql/mysql.go index 60556f627833..6d72d67d2082 100644 --- a/packetbeat/protos/mysql/mysql.go +++ b/packetbeat/protos/mysql/mysql.go @@ -25,16 +25,16 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) // Packet types diff --git a/packetbeat/protos/mysql/mysql_test.go b/packetbeat/protos/mysql/mysql_test.go index 1963d156a334..6285f8bb2229 100644 --- a/packetbeat/protos/mysql/mysql_test.go +++ b/packetbeat/protos/mysql/mysql_test.go @@ -27,15 +27,15 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/publish" ) const serverPort = 3306 diff --git a/packetbeat/protos/nfs/config.go b/packetbeat/protos/nfs/config.go index e23672024c87..ddb64344e587 100644 --- a/packetbeat/protos/nfs/config.go +++ b/packetbeat/protos/nfs/config.go @@ -20,7 +20,7 @@ package nfs import ( "time" - "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/config" ) type rpcConfig struct { diff --git a/packetbeat/protos/nfs/fields.go b/packetbeat/protos/nfs/fields.go index 3250c5deb214..5e179ad5d570 100644 --- a/packetbeat/protos/nfs/fields.go +++ b/packetbeat/protos/nfs/fields.go @@ -20,7 +20,7 @@ package nfs import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/nfs/nfs.go b/packetbeat/protos/nfs/nfs.go index 983996a4d789..571c21211ea9 100644 --- a/packetbeat/protos/nfs/nfs.go +++ b/packetbeat/protos/nfs/nfs.go @@ -18,8 +18,8 @@ package nfs import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/packetbeat/pb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/nfs/request_handler.go b/packetbeat/protos/nfs/request_handler.go index dd448c472d38..825028e318ff 100644 --- a/packetbeat/protos/nfs/request_handler.go +++ b/packetbeat/protos/nfs/request_handler.go @@ -23,12 +23,12 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) const nfsProgramNumber = 100003 diff --git a/packetbeat/protos/nfs/rpc.go b/packetbeat/protos/nfs/rpc.go index 90c158014309..d5b501945eda 100644 --- a/packetbeat/protos/nfs/rpc.go +++ b/packetbeat/protos/nfs/rpc.go @@ -26,13 +26,13 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) var debugf = logp.MakeDebug("rpc") diff --git a/packetbeat/protos/pgsql/config.go b/packetbeat/protos/pgsql/config.go index 13c115314093..7b8ab675c106 100644 --- a/packetbeat/protos/pgsql/config.go +++ b/packetbeat/protos/pgsql/config.go @@ -18,8 +18,8 @@ package pgsql import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type pgsqlConfig struct { diff --git a/packetbeat/protos/pgsql/fields.go b/packetbeat/protos/pgsql/fields.go index e4cece6a10b9..880f7b855abb 100644 --- a/packetbeat/protos/pgsql/fields.go +++ b/packetbeat/protos/pgsql/fields.go @@ -20,7 +20,7 @@ package pgsql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/pgsql/parse.go b/packetbeat/protos/pgsql/parse.go index 9a302f99a18b..39ad202b2842 100644 --- a/packetbeat/protos/pgsql/parse.go +++ b/packetbeat/protos/pgsql/parse.go @@ -21,7 +21,7 @@ import ( "errors" "strings" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) var ( diff --git a/packetbeat/protos/pgsql/pgsql.go b/packetbeat/protos/pgsql/pgsql.go index 607167a2defc..d04a7c997313 100644 --- a/packetbeat/protos/pgsql/pgsql.go +++ b/packetbeat/protos/pgsql/pgsql.go @@ -22,16 +22,16 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" "go.uber.org/zap" ) diff --git a/packetbeat/protos/pgsql/pgsql_test.go b/packetbeat/protos/pgsql/pgsql_test.go index a1fb5f12cc23..e71d99a7c2f6 100644 --- a/packetbeat/protos/pgsql/pgsql_test.go +++ b/packetbeat/protos/pgsql/pgsql_test.go @@ -27,14 +27,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/protos.go b/packetbeat/protos/protos.go index 41b5cbd44d50..91db5c7e1e7d 100644 --- a/packetbeat/protos/protos.go +++ b/packetbeat/protos/protos.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/packetbeat/procs" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/protos_test.go b/packetbeat/protos/protos_test.go index 39c11c7847c4..4014e97c3a5d 100644 --- a/packetbeat/protos/protos_test.go +++ b/packetbeat/protos/protos_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/go-ucfg" diff --git a/packetbeat/protos/redis/config.go b/packetbeat/protos/redis/config.go index a1fd48f4149c..20e409538f26 100644 --- a/packetbeat/protos/redis/config.go +++ b/packetbeat/protos/redis/config.go @@ -18,8 +18,8 @@ package redis import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type redisConfig struct { diff --git a/packetbeat/protos/redis/fields.go b/packetbeat/protos/redis/fields.go index ddca880b0653..81939bd6ed01 100644 --- a/packetbeat/protos/redis/fields.go +++ b/packetbeat/protos/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/redis/redis.go b/packetbeat/protos/redis/redis.go index 1cbe42ae9347..319ac23fabe5 100644 --- a/packetbeat/protos/redis/redis.go +++ b/packetbeat/protos/redis/redis.go @@ -22,17 +22,17 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) type stream struct { diff --git a/packetbeat/protos/redis/redis_parse.go b/packetbeat/protos/redis/redis_parse.go index e9cbb01f7dc1..cf6568cd3c94 100644 --- a/packetbeat/protos/redis/redis_parse.go +++ b/packetbeat/protos/redis/redis_parse.go @@ -21,8 +21,8 @@ import ( "bytes" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/registry.go b/packetbeat/protos/registry.go index 93877f0792f8..6293243e0627 100644 --- a/packetbeat/protos/registry.go +++ b/packetbeat/protos/registry.go @@ -20,11 +20,11 @@ package protos import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" - "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/procs" ) type ProtocolPlugin func( diff --git a/packetbeat/protos/sip/config.go b/packetbeat/protos/sip/config.go index baa6966985b7..5c0e09cfc0ae 100644 --- a/packetbeat/protos/sip/config.go +++ b/packetbeat/protos/sip/config.go @@ -18,8 +18,8 @@ package sip import ( - cfg "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + cfg "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type config struct { diff --git a/packetbeat/protos/sip/event.go b/packetbeat/protos/sip/event.go index b92401e6d6e8..ee91a4aa2d36 100644 --- a/packetbeat/protos/sip/event.go +++ b/packetbeat/protos/sip/event.go @@ -18,7 +18,7 @@ package sip import ( - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) // ProtocolFields contains SIP fields. diff --git a/packetbeat/protos/sip/fields.go b/packetbeat/protos/sip/fields.go index 23c9e6057f84..c6aafafa2602 100644 --- a/packetbeat/protos/sip/fields.go +++ b/packetbeat/protos/sip/fields.go @@ -20,7 +20,7 @@ package sip import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/sip/parser.go b/packetbeat/protos/sip/parser.go index 290d2227c53c..aa781e2d8b20 100644 --- a/packetbeat/protos/sip/parser.go +++ b/packetbeat/protos/sip/parser.go @@ -24,9 +24,9 @@ import ( "time" "unicode" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/streambuf" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/streambuf" + "github.com/elastic/beats/v9/packetbeat/protos" ) // sip Message diff --git a/packetbeat/protos/sip/plugin.go b/packetbeat/protos/sip/plugin.go index 90bb5d4f2447..c301e924bc14 100644 --- a/packetbeat/protos/sip/plugin.go +++ b/packetbeat/protos/sip/plugin.go @@ -24,12 +24,12 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/sip/plugin_test.go b/packetbeat/protos/sip/plugin_test.go index d0ec4a250efa..72292ad4a07b 100644 --- a/packetbeat/protos/sip/plugin_test.go +++ b/packetbeat/protos/sip/plugin_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" ) func TestParseURI(t *testing.T) { diff --git a/packetbeat/protos/tcp/tcp.go b/packetbeat/protos/tcp/tcp.go index 8b97b45ad35c..2cc7bafc1c89 100644 --- a/packetbeat/protos/tcp/tcp.go +++ b/packetbeat/protos/tcp/tcp.go @@ -28,14 +28,14 @@ import ( "github.com/google/gopacket/layers" "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/elastic-agent-libs/monitoring/adapter" - "github.com/elastic/beats/v7/packetbeat/flows" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/flows" + "github.com/elastic/beats/v9/packetbeat/protos" ) const TCPMaxDataInStream = 10 * (1 << 20) diff --git a/packetbeat/protos/tcp/tcp_test.go b/packetbeat/protos/tcp/tcp_test.go index 3be35b758e5b..836a222f5395 100644 --- a/packetbeat/protos/tcp/tcp_test.go +++ b/packetbeat/protos/tcp/tcp_test.go @@ -27,9 +27,9 @@ import ( "github.com/google/gopacket/layers" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" conf "github.com/elastic/elastic-agent-libs/config" "github.com/stretchr/testify/assert" diff --git a/packetbeat/protos/thrift/config.go b/packetbeat/protos/thrift/config.go index 0d946a02438f..2e39e3bed820 100644 --- a/packetbeat/protos/thrift/config.go +++ b/packetbeat/protos/thrift/config.go @@ -18,8 +18,8 @@ package thrift import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type thriftConfig struct { diff --git a/packetbeat/protos/thrift/fields.go b/packetbeat/protos/thrift/fields.go index a40f5b2e4ecb..876bbb9f3ec3 100644 --- a/packetbeat/protos/thrift/fields.go +++ b/packetbeat/protos/thrift/fields.go @@ -20,7 +20,7 @@ package thrift import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/thrift/thrift.go b/packetbeat/protos/thrift/thrift.go index f8b649459529..edb578b765ae 100644 --- a/packetbeat/protos/thrift/thrift.go +++ b/packetbeat/protos/thrift/thrift.go @@ -27,16 +27,16 @@ import ( "time" "unicode/utf8" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) type thriftPlugin struct { diff --git a/packetbeat/protos/thrift/thrift_test.go b/packetbeat/protos/thrift/thrift_test.go index df62ae56a5a5..f9423df2937b 100644 --- a/packetbeat/protos/thrift/thrift_test.go +++ b/packetbeat/protos/thrift/thrift_test.go @@ -24,9 +24,9 @@ import ( "net" "testing" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/tls/alerts_test.go b/packetbeat/protos/tls/alerts_test.go index 25b9c27db11b..f6d586c2308e 100644 --- a/packetbeat/protos/tls/alerts_test.go +++ b/packetbeat/protos/tls/alerts_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/packetbeat/protos/tls/buffer.go b/packetbeat/protos/tls/buffer.go index 2c93984eba59..3d72d2ae4be7 100644 --- a/packetbeat/protos/tls/buffer.go +++ b/packetbeat/protos/tls/buffer.go @@ -20,7 +20,7 @@ package tls import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" ) type bufferView struct { diff --git a/packetbeat/protos/tls/config.go b/packetbeat/protos/tls/config.go index 2190ccc18dd7..3aceb6104389 100644 --- a/packetbeat/protos/tls/config.go +++ b/packetbeat/protos/tls/config.go @@ -18,8 +18,8 @@ package tls import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type tlsConfig struct { diff --git a/packetbeat/protos/tls/fields.go b/packetbeat/protos/tls/fields.go index 7a91cec9b783..074f492a0a81 100644 --- a/packetbeat/protos/tls/fields.go +++ b/packetbeat/protos/tls/fields.go @@ -20,7 +20,7 @@ package tls import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/tls/ja3_test.go b/packetbeat/protos/tls/ja3_test.go index 264c9ae2ba46..9b3d789b0295 100644 --- a/packetbeat/protos/tls/ja3_test.go +++ b/packetbeat/protos/tls/ja3_test.go @@ -23,7 +23,7 @@ import ( "encoding/hex" "testing" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/protos/tls/parse.go b/packetbeat/protos/tls/parse.go index 37e04a1e9a17..70b78de5d42c 100644 --- a/packetbeat/protos/tls/parse.go +++ b/packetbeat/protos/tls/parse.go @@ -27,7 +27,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/tls/parse_test.go b/packetbeat/protos/tls/parse_test.go index 6e9f22a3e969..c6ca22724808 100644 --- a/packetbeat/protos/tls/parse_test.go +++ b/packetbeat/protos/tls/parse_test.go @@ -29,7 +29,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v9/libbeat/common/streambuf" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/tls/tls.go b/packetbeat/protos/tls/tls.go index 79fc7e9fdc4b..b15a20567dbf 100644 --- a/packetbeat/protos/tls/tls.go +++ b/packetbeat/protos/tls/tls.go @@ -22,15 +22,15 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/x509util" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/packetbeat/pb" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/x509util" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/packetbeat/pb" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/protos/tls/tls_test.go b/packetbeat/protos/tls/tls_test.go index 6eebbe381c8e..93068644c059 100644 --- a/packetbeat/protos/tls/tls_test.go +++ b/packetbeat/protos/tls/tls_test.go @@ -29,11 +29,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/publish" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/protos/udp/udp.go b/packetbeat/protos/udp/udp.go index 1ee1f6976d5c..15f21ef46e95 100644 --- a/packetbeat/protos/udp/udp.go +++ b/packetbeat/protos/udp/udp.go @@ -26,14 +26,14 @@ import ( "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/elastic-agent-libs/monitoring/adapter" - "github.com/elastic/beats/v7/packetbeat/flows" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/flows" + "github.com/elastic/beats/v9/packetbeat/protos" ) type Processor interface { diff --git a/packetbeat/protos/udp/udp_test.go b/packetbeat/protos/udp/udp_test.go index fc77232e2f7e..ca363714464c 100644 --- a/packetbeat/protos/udp/udp_test.go +++ b/packetbeat/protos/udp/udp_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/packetbeat/protos" "github.com/elastic/elastic-agent-libs/logp" // import plugins for testing - _ "github.com/elastic/beats/v7/packetbeat/protos/http" - _ "github.com/elastic/beats/v7/packetbeat/protos/mysql" - _ "github.com/elastic/beats/v7/packetbeat/protos/redis" + _ "github.com/elastic/beats/v9/packetbeat/protos/http" + _ "github.com/elastic/beats/v9/packetbeat/protos/mysql" + _ "github.com/elastic/beats/v9/packetbeat/protos/redis" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/publish/publish.go b/packetbeat/publish/publish.go index 4c8ec5cc6974..b28c4810d55f 100644 --- a/packetbeat/publish/publish.go +++ b/packetbeat/publish/publish.go @@ -21,10 +21,10 @@ import ( "errors" "net" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/packetbeat/pb" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/packetbeat/publish/publish_test.go b/packetbeat/publish/publish_test.go index b21bf1cdd956..e0c70a9fddfc 100644 --- a/packetbeat/publish/publish_test.go +++ b/packetbeat/publish/publish_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/packetbeat/pb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/packetbeat/scripts/mage/build.go b/packetbeat/scripts/mage/build.go index 6077f9c4f6f8..f8efed15396d 100644 --- a/packetbeat/scripts/mage/build.go +++ b/packetbeat/scripts/mage/build.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // CrossBuild cross-builds the beat for all target platforms. diff --git a/packetbeat/scripts/mage/config.go b/packetbeat/scripts/mage/config.go index f41b50ffff75..efeb06e969c9 100644 --- a/packetbeat/scripts/mage/config.go +++ b/packetbeat/scripts/mage/config.go @@ -20,7 +20,7 @@ package mage import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) func device(goos string) string { diff --git a/packetbeat/scripts/mage/package.go b/packetbeat/scripts/mage/package.go index 76373df2b73a..c9dd42e7c1ca 100644 --- a/packetbeat/scripts/mage/package.go +++ b/packetbeat/scripts/mage/package.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // CustomizePackaging modifies the device in the configuration files based on diff --git a/packetbeat/scripts/mage/pcap.go b/packetbeat/scripts/mage/pcap.go index 6c38bd38abad..7802063e50a2 100644 --- a/packetbeat/scripts/mage/pcap.go +++ b/packetbeat/scripts/mage/pcap.go @@ -20,7 +20,7 @@ package mage import ( "go.uber.org/multierr" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // GolangCrossBuild build the Beat binary inside of the golang-builder. diff --git a/packetbeat/scripts/tcp-protocol/README.md b/packetbeat/scripts/tcp-protocol/README.md index b593a182237f..a8836ec8625e 100644 --- a/packetbeat/scripts/tcp-protocol/README.md +++ b/packetbeat/scripts/tcp-protocol/README.md @@ -23,7 +23,7 @@ This requires [python](https://www.python.org/downloads/) to be installed. - server: Send echo response upon receiving a message. Echo response begins with `<` character. Errors responses begin with `!` character. An error message will be returned for any received request not starting with `>`. - + - Echo Server sample code: ``` @@ -99,7 +99,7 @@ func echo(sock net.Conn) { ### 2.1 Add protocol analyzer (echo) to packetbeat: -Create analyzer skeleton from code generator template. +Create analyzer skeleton from code generator template. ``` $ cd ${GOPATH}/src/github.com/elastic/beats/packetbeat @@ -107,7 +107,7 @@ Create analyzer skeleton from code generator template. ``` Load plugin into packetbeat by running `make update`. Or add `_ -"github.com/elastic/beats/v7/packetbeat/protos/echo"` to the import list in +"github.com/elastic/beats/v9/packetbeat/protos/echo"` to the import list in `$GOPATH/src/github.com/elastic/beats/packetbeat/include/list.go`. ### 2.2 Standalone beat with protocol analyzer (echo): @@ -132,8 +132,8 @@ package main import ( "os" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/packetbeat/beater" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/packetbeat/beater" // import supported protocol modules _ "github.com/urso/pb_echo/protos/echo" diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl index 66ca38c28360..ca6885451015 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl @@ -1,8 +1,8 @@ package {protocol} import ( - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/protos" ) type {protocol}Config struct { diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl index 00c64cf15dc3..30985f245c42 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/parser.go.tmpl @@ -4,8 +4,8 @@ import ( "errors" "time" - "github.com/elastic/beats/v7/libbeat/common/streambuf" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/libbeat/common/streambuf" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" ) type parser struct { diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl index cf69faac9c90..4be004c6b3d7 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/pub.go.tmpl @@ -1,10 +1,10 @@ package {protocol} import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" - "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos" ) // Transaction Publisher. diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl index c8d63dd939a9..68d603e00de8 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/trans.go.tmpl @@ -3,10 +3,10 @@ package {protocol} import ( "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos/applayer" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos/applayer" ) type transactions struct { diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl index 5a703ca3bdbd..772649908c11 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl @@ -3,12 +3,12 @@ package {protocol} import ( "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" ) // {plugin_type} application level protocol analyzer plugin diff --git a/packetbeat/sniffer/afpacket_linux.go b/packetbeat/sniffer/afpacket_linux.go index d00b7f1febb1..40e89bfc2273 100644 --- a/packetbeat/sniffer/afpacket_linux.go +++ b/packetbeat/sniffer/afpacket_linux.go @@ -31,7 +31,7 @@ import ( "github.com/google/gopacket/pcap" "golang.org/x/net/bpf" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/packetbeat/sniffer/decoders.go b/packetbeat/sniffer/decoders.go index 0104820bea22..1241a5ebc835 100644 --- a/packetbeat/sniffer/decoders.go +++ b/packetbeat/sniffer/decoders.go @@ -20,15 +20,15 @@ package sniffer import ( "github.com/google/gopacket/layers" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/decoder" - "github.com/elastic/beats/v7/packetbeat/flows" - "github.com/elastic/beats/v7/packetbeat/procs" - "github.com/elastic/beats/v7/packetbeat/protos" - "github.com/elastic/beats/v7/packetbeat/protos/icmp" - "github.com/elastic/beats/v7/packetbeat/protos/tcp" - "github.com/elastic/beats/v7/packetbeat/protos/udp" - "github.com/elastic/beats/v7/packetbeat/publish" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/decoder" + "github.com/elastic/beats/v9/packetbeat/flows" + "github.com/elastic/beats/v9/packetbeat/procs" + "github.com/elastic/beats/v9/packetbeat/protos" + "github.com/elastic/beats/v9/packetbeat/protos/icmp" + "github.com/elastic/beats/v9/packetbeat/protos/tcp" + "github.com/elastic/beats/v9/packetbeat/protos/udp" + "github.com/elastic/beats/v9/packetbeat/publish" ) // Decoders functions return a Decoder able to process the provided network diff --git a/packetbeat/sniffer/device.go b/packetbeat/sniffer/device.go index 0bab214cc271..9398df0823fd 100644 --- a/packetbeat/sniffer/device.go +++ b/packetbeat/sniffer/device.go @@ -27,7 +27,7 @@ import ( "github.com/google/gopacket/pcap" - "github.com/elastic/beats/v7/packetbeat/route" + "github.com/elastic/beats/v9/packetbeat/route" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/packetbeat/sniffer/sniffer.go b/packetbeat/sniffer/sniffer.go index 24c77180b46a..c90e51fd0c96 100644 --- a/packetbeat/sniffer/sniffer.go +++ b/packetbeat/sniffer/sniffer.go @@ -36,8 +36,8 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/packetbeat/config" - "github.com/elastic/beats/v7/packetbeat/decoder" + "github.com/elastic/beats/v9/packetbeat/config" + "github.com/elastic/beats/v9/packetbeat/decoder" ) // Sniffer provides packet sniffing capabilities, forwarding packets read diff --git a/testing/go-ech/ech.go b/testing/go-ech/ech.go index 4e559629a74d..7c1c95f13850 100644 --- a/testing/go-ech/ech.go +++ b/testing/go-ech/ech.go @@ -32,7 +32,7 @@ import ( "github.com/elastic/go-elasticsearch/v8" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) // VerifyEnvVars ensures that the env vars to connect to ES are set, and that the ES_HOST starts with https diff --git a/winlogbeat/beater/acker.go b/winlogbeat/beater/acker.go index d35a01664846..98dc35941e04 100644 --- a/winlogbeat/beater/acker.go +++ b/winlogbeat/beater/acker.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" ) type eventACKer struct { diff --git a/winlogbeat/beater/eventlogger.go b/winlogbeat/beater/eventlogger.go index 0e80140a24d1..bc4de15f7129 100644 --- a/winlogbeat/beater/eventlogger.go +++ b/winlogbeat/beater/eventlogger.go @@ -20,20 +20,20 @@ package beater import ( "context" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" - "github.com/elastic/beats/v7/libbeat/publisher/pipetool" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v9/libbeat/publisher/pipetool" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" - "github.com/elastic/beats/v7/winlogbeat/eventlog" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/winlogbeat/eventlog" ) type eventLogger struct { diff --git a/winlogbeat/beater/eventlogger_test.go b/winlogbeat/beater/eventlogger_test.go index d458a8d16f68..9e0cdc9f175d 100644 --- a/winlogbeat/beater/eventlogger_test.go +++ b/winlogbeat/beater/eventlogger_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/winlogbeat/beater/winlogbeat.go b/winlogbeat/beater/winlogbeat.go index 1541d508faa0..f5f308eeeb1b 100644 --- a/winlogbeat/beater/winlogbeat.go +++ b/winlogbeat/beater/winlogbeat.go @@ -26,18 +26,18 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" - "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/v7/winlogbeat/module" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v9/winlogbeat/module" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" - "github.com/elastic/beats/v7/winlogbeat/config" - "github.com/elastic/beats/v7/winlogbeat/eventlog" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/winlogbeat/config" + "github.com/elastic/beats/v9/winlogbeat/eventlog" ) const pipelinesWarning = "Winlogbeat is unable to load the ingest pipelines" + diff --git a/winlogbeat/cmd/root.go b/winlogbeat/cmd/root.go index 6b020aa839c3..77f8ab080c60 100644 --- a/winlogbeat/cmd/root.go +++ b/winlogbeat/cmd/root.go @@ -18,18 +18,18 @@ package cmd import ( - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/winlogbeat/beater" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/winlogbeat/beater" "github.com/elastic/elastic-agent-libs/mapstr" // Register fields. - _ "github.com/elastic/beats/v7/winlogbeat/include" + _ "github.com/elastic/beats/v9/winlogbeat/include" // Import processors and supporting modules. - _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v9/libbeat/processors/timestamp" ) const ( diff --git a/winlogbeat/eventlog/errors_windows.go b/winlogbeat/eventlog/errors_windows.go index d7734ab8f3a6..aa916b71f813 100644 --- a/winlogbeat/eventlog/errors_windows.go +++ b/winlogbeat/eventlog/errors_windows.go @@ -21,7 +21,7 @@ import ( "errors" "io" - win "github.com/elastic/beats/v7/winlogbeat/sys/wineventlog" + win "github.com/elastic/beats/v9/winlogbeat/sys/wineventlog" ) // IsRecoverable returns a boolean indicating whether the error represents diff --git a/winlogbeat/eventlog/eventlog.go b/winlogbeat/eventlog/eventlog.go index 529dacc45a02..36a421208558 100644 --- a/winlogbeat/eventlog/eventlog.go +++ b/winlogbeat/eventlog/eventlog.go @@ -20,9 +20,9 @@ package eventlog import ( "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/winlogbeat/eventlog/runner.go b/winlogbeat/eventlog/runner.go index 08ba4dd59deb..8b6b6b896487 100644 --- a/winlogbeat/eventlog/runner.go +++ b/winlogbeat/eventlog/runner.go @@ -25,8 +25,8 @@ import ( "math" "time" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/go-concert/ctxtool" diff --git a/winlogbeat/eventlog/wineventlog.go b/winlogbeat/eventlog/wineventlog.go index 390b7f7a9767..38ee5b7dc39b 100644 --- a/winlogbeat/eventlog/wineventlog.go +++ b/winlogbeat/eventlog/wineventlog.go @@ -29,8 +29,8 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" - win "github.com/elastic/beats/v7/winlogbeat/sys/wineventlog" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" + win "github.com/elastic/beats/v9/winlogbeat/sys/wineventlog" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/winlogbeat/eventlog/wineventlog_test.go b/winlogbeat/eventlog/wineventlog_test.go index 489e79af2bb1..c2d8194c09a2 100644 --- a/winlogbeat/eventlog/wineventlog_test.go +++ b/winlogbeat/eventlog/wineventlog_test.go @@ -34,8 +34,8 @@ import ( "golang.org/x/sys/windows/registry" "golang.org/x/sys/windows/svc/eventlog" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" - "github.com/elastic/beats/v7/winlogbeat/sys/wineventlog" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/winlogbeat/sys/wineventlog" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/go-sysinfo/providers/windows" diff --git a/winlogbeat/include/fields.go b/winlogbeat/include/fields.go index 0cd9a9f1d76a..a855f25a3b98 100644 --- a/winlogbeat/include/fields.go +++ b/winlogbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/winlogbeat/magefile.go b/winlogbeat/magefile.go index 5aca0140bab5..ad2b5ee2e4a5 100644 --- a/winlogbeat/magefile.go +++ b/winlogbeat/magefile.go @@ -24,24 +24,24 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/build" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/build" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/pkg" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/dashboards" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/docs" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/docs" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" // mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" // mage:import - winlogbeat "github.com/elastic/beats/v7/winlogbeat/scripts/mage" + winlogbeat "github.com/elastic/beats/v9/winlogbeat/scripts/mage" ) func init() { diff --git a/winlogbeat/main.go b/winlogbeat/main.go index 61828c64c93f..bee736ad5bbb 100644 --- a/winlogbeat/main.go +++ b/winlogbeat/main.go @@ -28,7 +28,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/winlogbeat/cmd" + "github.com/elastic/beats/v9/winlogbeat/cmd" ) func main() { diff --git a/winlogbeat/main_test.go b/winlogbeat/main_test.go index 0bbc2e4e5262..edfded41b644 100644 --- a/winlogbeat/main_test.go +++ b/winlogbeat/main_test.go @@ -22,8 +22,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - "github.com/elastic/beats/v7/winlogbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + "github.com/elastic/beats/v9/winlogbeat/cmd" ) var systemTest *bool diff --git a/winlogbeat/module/pipeline.go b/winlogbeat/module/pipeline.go index 8e36703c92ec..9df2050f02b9 100644 --- a/winlogbeat/module/pipeline.go +++ b/winlogbeat/module/pipeline.go @@ -29,9 +29,9 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/filebeat/fileset" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/filebeat/fileset" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/winlogbeat/scripts/mage/config.go b/winlogbeat/scripts/mage/config.go index 15240127193d..3c244f7d3ed4 100644 --- a/winlogbeat/scripts/mage/config.go +++ b/winlogbeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // config generates short/reference configs. diff --git a/winlogbeat/scripts/mage/docs.go b/winlogbeat/scripts/mage/docs.go index c2360fd054ed..5abc6f467772 100644 --- a/winlogbeat/scripts/mage/docs.go +++ b/winlogbeat/scripts/mage/docs.go @@ -25,7 +25,7 @@ import ( "regexp" "strings" - "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage" ) const moduleDocsGlob = "module/*/_meta/docs.md" diff --git a/winlogbeat/scripts/mage/fields.go b/winlogbeat/scripts/mage/fields.go index 0535419d70ee..17226dc4dd51 100644 --- a/winlogbeat/scripts/mage/fields.go +++ b/winlogbeat/scripts/mage/fields.go @@ -22,7 +22,7 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) var fb fieldsBuilder diff --git a/winlogbeat/scripts/mage/package.go b/winlogbeat/scripts/mage/package.go index 5f79aa8d08b3..fe4f7a317952 100644 --- a/winlogbeat/scripts/mage/package.go +++ b/winlogbeat/scripts/mage/package.go @@ -25,9 +25,9 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + "github.com/elastic/beats/v9/dev-tools/mage/target/pkg" ) const ( diff --git a/winlogbeat/scripts/mage/update.go b/winlogbeat/scripts/mage/update.go index f85e75ef1eb0..dba9ec3f050b 100644 --- a/winlogbeat/scripts/mage/update.go +++ b/winlogbeat/scripts/mage/update.go @@ -20,11 +20,11 @@ package mage import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - "github.com/elastic/beats/v7/dev-tools/mage/target/common" - "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" - "github.com/elastic/beats/v7/dev-tools/mage/target/docs" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/dashboards" + "github.com/elastic/beats/v9/dev-tools/mage/target/docs" ) func init() { diff --git a/winlogbeat/sys/strings.go b/winlogbeat/sys/strings.go index 34325c32f9d1..91c13cf8cca5 100644 --- a/winlogbeat/sys/strings.go +++ b/winlogbeat/sys/strings.go @@ -20,7 +20,7 @@ package sys import ( "strings" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) // UTF16BytesToString converts the given UTF-16 bytes to a string. diff --git a/winlogbeat/sys/strings_test.go b/winlogbeat/sys/strings_test.go index 53f2d8ae632d..a2c5d4d8eea5 100644 --- a/winlogbeat/sys/strings_test.go +++ b/winlogbeat/sys/strings_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) func TestUTF16BytesToString(t *testing.T) { diff --git a/winlogbeat/sys/winevent/event.go b/winlogbeat/sys/winevent/event.go index 069dc7405401..2b2b2d790d34 100644 --- a/winlogbeat/sys/winevent/event.go +++ b/winlogbeat/sys/winevent/event.go @@ -24,8 +24,8 @@ import ( "strings" "time" - libxml "github.com/elastic/beats/v7/libbeat/common/encoding/xml" - "github.com/elastic/beats/v7/winlogbeat/sys" + libxml "github.com/elastic/beats/v9/libbeat/common/encoding/xml" + "github.com/elastic/beats/v9/winlogbeat/sys" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/winlogbeat/sys/winevent/maputil.go b/winlogbeat/sys/winevent/maputil.go index 49adcc5a2aa5..1d8bfd2e5d4e 100644 --- a/winlogbeat/sys/winevent/maputil.go +++ b/winlogbeat/sys/winevent/maputil.go @@ -22,7 +22,7 @@ import ( "reflect" "time" - "github.com/elastic/beats/v7/winlogbeat/sys" + "github.com/elastic/beats/v9/winlogbeat/sys" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/winlogbeat/sys/wineventlog/bookmark.go b/winlogbeat/sys/wineventlog/bookmark.go index e60330611658..3518431390ea 100644 --- a/winlogbeat/sys/wineventlog/bookmark.go +++ b/winlogbeat/sys/wineventlog/bookmark.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/winlogbeat/sys" + "github.com/elastic/beats/v9/winlogbeat/sys" ) // Bookmark is a handle to an event log bookmark. diff --git a/winlogbeat/sys/wineventlog/format_message.go b/winlogbeat/sys/wineventlog/format_message.go index 4bc03166939a..18a15b4e891c 100644 --- a/winlogbeat/sys/wineventlog/format_message.go +++ b/winlogbeat/sys/wineventlog/format_message.go @@ -24,7 +24,7 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/winlogbeat/sys" + "github.com/elastic/beats/v9/winlogbeat/sys" ) // getMessageStringFromHandle returns the message for the given eventHandle. diff --git a/winlogbeat/sys/wineventlog/metadata_store.go b/winlogbeat/sys/wineventlog/metadata_store.go index 18c1e38f2bc6..472607efd0f0 100644 --- a/winlogbeat/sys/wineventlog/metadata_store.go +++ b/winlogbeat/sys/wineventlog/metadata_store.go @@ -30,8 +30,8 @@ import ( "go.uber.org/multierr" - "github.com/elastic/beats/v7/winlogbeat/sys" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/winlogbeat/sys" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/winlogbeat/sys/wineventlog/renderer.go b/winlogbeat/sys/wineventlog/renderer.go index 79c22480b3d9..e0caed4774f7 100644 --- a/winlogbeat/sys/wineventlog/renderer.go +++ b/winlogbeat/sys/wineventlog/renderer.go @@ -36,8 +36,8 @@ import ( "go.uber.org/multierr" "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/winlogbeat/sys" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/winlogbeat/sys" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/winlogbeat/sys/wineventlog/renderer_test.go b/winlogbeat/sys/wineventlog/renderer_test.go index daecafa07d7e..44eb59299115 100644 --- a/winlogbeat/sys/wineventlog/renderer_test.go +++ b/winlogbeat/sys/wineventlog/renderer_test.go @@ -33,7 +33,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/winlogbeat/sys/wineventlog/syscall_windows.go b/winlogbeat/sys/wineventlog/syscall_windows.go index 45ee740b420e..7f0aa146faa2 100644 --- a/winlogbeat/sys/wineventlog/syscall_windows.go +++ b/winlogbeat/sys/wineventlog/syscall_windows.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/winlogbeat/sys" + "github.com/elastic/beats/v9/winlogbeat/sys" ) // EvtHandle is a handle to the event log. diff --git a/winlogbeat/sys/wineventlog/wineventlog_windows.go b/winlogbeat/sys/wineventlog/wineventlog_windows.go index 3c70799535e7..bb675a7ae27b 100644 --- a/winlogbeat/sys/wineventlog/wineventlog_windows.go +++ b/winlogbeat/sys/wineventlog/wineventlog_windows.go @@ -30,8 +30,8 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/winlogbeat/sys" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/winlogbeat/sys" ) // Errors diff --git a/winlogbeat/sys/wineventlog/wineventlog_windows_test.go b/winlogbeat/sys/wineventlog/wineventlog_windows_test.go index 8c23098cd3a8..e7cd4fe8660a 100644 --- a/winlogbeat/sys/wineventlog/wineventlog_windows_test.go +++ b/winlogbeat/sys/wineventlog/wineventlog_windows_test.go @@ -32,7 +32,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/winlogbeat/sys/winevent" + "github.com/elastic/beats/v9/winlogbeat/sys/winevent" ) var updateXML = flag.Bool("update", false, "update XML golden files from evtx files in testdata") diff --git a/x-pack/agentbeat/cmd/cmd.go b/x-pack/agentbeat/cmd/cmd.go index feb00a1c480e..4d8d2cba10ac 100644 --- a/x-pack/agentbeat/cmd/cmd.go +++ b/x-pack/agentbeat/cmd/cmd.go @@ -7,8 +7,8 @@ package cmd import ( "fmt" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cmd" "github.com/spf13/cobra" ) diff --git a/x-pack/agentbeat/cmd/prepare_root_command.go b/x-pack/agentbeat/cmd/prepare_root_command.go index 310183fb0d63..18ff4607aaa6 100644 --- a/x-pack/agentbeat/cmd/prepare_root_command.go +++ b/x-pack/agentbeat/cmd/prepare_root_command.go @@ -9,12 +9,12 @@ package cmd import ( "github.com/spf13/cobra" - auditbeat "github.com/elastic/beats/v7/x-pack/auditbeat/cmd" - filebeat "github.com/elastic/beats/v7/x-pack/filebeat/cmd" - heartbeat "github.com/elastic/beats/v7/x-pack/heartbeat/cmd" - metricbeat "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" - osquerybeat "github.com/elastic/beats/v7/x-pack/osquerybeat/cmd" - packetbeat "github.com/elastic/beats/v7/x-pack/packetbeat/cmd" + auditbeat "github.com/elastic/beats/v9/x-pack/auditbeat/cmd" + filebeat "github.com/elastic/beats/v9/x-pack/filebeat/cmd" + heartbeat "github.com/elastic/beats/v9/x-pack/heartbeat/cmd" + metricbeat "github.com/elastic/beats/v9/x-pack/metricbeat/cmd" + osquerybeat "github.com/elastic/beats/v9/x-pack/osquerybeat/cmd" + packetbeat "github.com/elastic/beats/v9/x-pack/packetbeat/cmd" ) func prepareRootCommand() *cobra.Command { diff --git a/x-pack/agentbeat/cmd/prepare_root_command_fips.go b/x-pack/agentbeat/cmd/prepare_root_command_fips.go index f087f50036a4..acd48a88169a 100644 --- a/x-pack/agentbeat/cmd/prepare_root_command_fips.go +++ b/x-pack/agentbeat/cmd/prepare_root_command_fips.go @@ -9,9 +9,9 @@ package cmd import ( "github.com/spf13/cobra" - auditbeat "github.com/elastic/beats/v7/x-pack/auditbeat/cmd" - filebeat "github.com/elastic/beats/v7/x-pack/filebeat/cmd" - metricbeat "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" + auditbeat "github.com/elastic/beats/v9/x-pack/auditbeat/cmd" + filebeat "github.com/elastic/beats/v9/x-pack/filebeat/cmd" + metricbeat "github.com/elastic/beats/v9/x-pack/metricbeat/cmd" ) func prepareRootCommand() *cobra.Command { diff --git a/x-pack/agentbeat/magefile.go b/x-pack/agentbeat/magefile.go index 7da7a17881db..21bd9e64c889 100644 --- a/x-pack/agentbeat/magefile.go +++ b/x-pack/agentbeat/magefile.go @@ -19,19 +19,19 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" - packetbeat "github.com/elastic/beats/v7/packetbeat/scripts/mage" - osquerybeat "github.com/elastic/beats/v7/x-pack/osquerybeat/scripts/mage" - xpacketbeat "github.com/elastic/beats/v7/x-pack/packetbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + metricbeat "github.com/elastic/beats/v9/metricbeat/scripts/mage" + packetbeat "github.com/elastic/beats/v9/packetbeat/scripts/mage" + osquerybeat "github.com/elastic/beats/v9/x-pack/osquerybeat/scripts/mage" + xpacketbeat "github.com/elastic/beats/v9/x-pack/packetbeat/scripts/mage" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/x-pack/agentbeat/main.go b/x-pack/agentbeat/main.go index 0c3311a7429e..9f5a5e58d1cd 100644 --- a/x-pack/agentbeat/main.go +++ b/x-pack/agentbeat/main.go @@ -8,7 +8,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - agentbeatcmd "github.com/elastic/beats/v7/x-pack/agentbeat/cmd" + agentbeatcmd "github.com/elastic/beats/v9/x-pack/agentbeat/cmd" ) func main() { diff --git a/x-pack/agentbeat/main_test.go b/x-pack/agentbeat/main_test.go index 5e38cfe3ba47..10a9ab0fe7de 100644 --- a/x-pack/agentbeat/main_test.go +++ b/x-pack/agentbeat/main_test.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/x-pack/agentbeat/cmd" + "github.com/elastic/beats/v9/x-pack/agentbeat/cmd" ) var ( diff --git a/x-pack/auditbeat/cmd/root.go b/x-pack/auditbeat/cmd/root.go index 4e229c849224..bd95c36a5e91 100644 --- a/x-pack/auditbeat/cmd/root.go +++ b/x-pack/auditbeat/cmd/root.go @@ -14,18 +14,18 @@ import ( "github.com/elastic/elastic-agent-client/v7/pkg/proto" "github.com/elastic/elastic-agent-libs/mapstr" - auditbeatcmd "github.com/elastic/beats/v7/auditbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/x-pack/auditbeat/include" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + auditbeatcmd "github.com/elastic/beats/v9/auditbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/x-pack/auditbeat/include" + "github.com/elastic/beats/v9/x-pack/libbeat/management" // Register base auditbeat includes. - _ "github.com/elastic/beats/v7/auditbeat/include" + _ "github.com/elastic/beats/v9/auditbeat/include" // Register libbeat x-pack modules. - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" ) // Name of the beat diff --git a/x-pack/auditbeat/include/list.go b/x-pack/auditbeat/include/list.go index d1f2add177ba..d168475f4317 100644 --- a/x-pack/auditbeat/include/list.go +++ b/x-pack/auditbeat/include/list.go @@ -8,16 +8,16 @@ package include import ( // Import packages to perform 'func InitializeModule()' when in-use. - m0 "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd" + m0 "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd" // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/host" - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/login" - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/package" - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/process" - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket" - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/user" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/host" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/login" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/package" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/process" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/user" ) // InitializeModules initialize all of the modules. diff --git a/x-pack/auditbeat/magefile.go b/x-pack/auditbeat/magefile.go index f58ca1d9a4d5..d9daff89fcd4 100644 --- a/x-pack/auditbeat/magefile.go +++ b/x-pack/auditbeat/magefile.go @@ -11,23 +11,23 @@ import ( "os" "time" - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" "github.com/magefile/mage/mg" "go.uber.org/multierr" - auditbeat "github.com/elastic/beats/v7/auditbeat/scripts/mage" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + auditbeat "github.com/elastic/beats/v9/auditbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" ) func init() { diff --git a/x-pack/auditbeat/main.go b/x-pack/auditbeat/main.go index 58844e4f6411..ac3f8d8d8dac 100644 --- a/x-pack/auditbeat/main.go +++ b/x-pack/auditbeat/main.go @@ -8,7 +8,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/x-pack/auditbeat/cmd" + "github.com/elastic/beats/v9/x-pack/auditbeat/cmd" ) func main() { diff --git a/x-pack/auditbeat/main_test.go b/x-pack/auditbeat/main_test.go index 5d2376452712..b91179bc6948 100644 --- a/x-pack/auditbeat/main_test.go +++ b/x-pack/auditbeat/main_test.go @@ -10,8 +10,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - "github.com/elastic/beats/v7/x-pack/auditbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + "github.com/elastic/beats/v9/x-pack/auditbeat/cmd" ) var systemTest *bool diff --git a/x-pack/auditbeat/module/system/fields.go b/x-pack/auditbeat/module/system/fields.go index 4b0a95d23b0a..8545f1461190 100644 --- a/x-pack/auditbeat/module/system/fields.go +++ b/x-pack/auditbeat/module/system/fields.go @@ -7,7 +7,7 @@ package system import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/auditbeat/module/system/host/host.go b/x-pack/auditbeat/module/system/host/host.go index 3cc6a9a1e38a..504b76c154bb 100644 --- a/x-pack/auditbeat/module/system/host/host.go +++ b/x-pack/auditbeat/module/system/host/host.go @@ -18,11 +18,11 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/datastore" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/datastore" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-sysinfo" diff --git a/x-pack/auditbeat/module/system/host/host_test.go b/x-pack/auditbeat/module/system/host/host_test.go index 1d950e96cb55..0278b292ef27 100644 --- a/x-pack/auditbeat/module/system/host/host_test.go +++ b/x-pack/auditbeat/module/system/host/host_test.go @@ -7,11 +7,11 @@ package host import ( "testing" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" ) func TestData(t *testing.T) { diff --git a/x-pack/auditbeat/module/system/login/login.go b/x-pack/auditbeat/module/system/login/login.go index 857815169693..fa7de48ec99d 100644 --- a/x-pack/auditbeat/module/system/login/login.go +++ b/x-pack/auditbeat/module/system/login/login.go @@ -11,11 +11,11 @@ import ( "net" "time" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/datastore" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/datastore" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/login/login_linux_amd64_test.go b/x-pack/auditbeat/module/system/login/login_linux_amd64_test.go index 407fbec217bf..e49ebdc51580 100644 --- a/x-pack/auditbeat/module/system/login/login_linux_amd64_test.go +++ b/x-pack/auditbeat/module/system/login/login_linux_amd64_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/login/login_linux_arm64_test.go b/x-pack/auditbeat/module/system/login/login_linux_arm64_test.go index f0363419fce1..dbe549ad5db9 100644 --- a/x-pack/auditbeat/module/system/login/login_linux_arm64_test.go +++ b/x-pack/auditbeat/module/system/login/login_linux_arm64_test.go @@ -18,11 +18,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/login/login_other.go b/x-pack/auditbeat/module/system/login/login_other.go index d8ff9d5cc097..4539c346d91f 100644 --- a/x-pack/auditbeat/module/system/login/login_other.go +++ b/x-pack/auditbeat/module/system/login/login_other.go @@ -9,9 +9,9 @@ package login import ( "fmt" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" ) const ( diff --git a/x-pack/auditbeat/module/system/login/utmp.go b/x-pack/auditbeat/module/system/login/utmp.go index 33044f9109eb..e124707f9b8e 100644 --- a/x-pack/auditbeat/module/system/login/utmp.go +++ b/x-pack/auditbeat/module/system/login/utmp.go @@ -19,7 +19,7 @@ import ( "strconv" "syscall" - "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v9/auditbeat/datastore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/package/flatbuffers.go b/x-pack/auditbeat/module/system/package/flatbuffers.go index f17eee20f357..41bba64e1819 100644 --- a/x-pack/auditbeat/module/system/package/flatbuffers.go +++ b/x-pack/auditbeat/module/system/package/flatbuffers.go @@ -14,7 +14,7 @@ import ( flatbuffers "github.com/google/flatbuffers/go" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/package/schema" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/package/schema" ) // Requires the Google flatbuffer compiler and Elastic go-licenser. diff --git a/x-pack/auditbeat/module/system/package/package.go b/x-pack/auditbeat/module/system/package/package.go index 72de1e899960..2f46d607c537 100644 --- a/x-pack/auditbeat/module/system/package/package.go +++ b/x-pack/auditbeat/module/system/package/package.go @@ -27,11 +27,11 @@ import ( "github.com/gofrs/uuid/v5" "go.etcd.io/bbolt" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/datastore" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/cache" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/datastore" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/cache" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/package/package_homebrew_test.go b/x-pack/auditbeat/module/system/package/package_homebrew_test.go index 3eeb7f3d14e9..84cc2a41448c 100644 --- a/x-pack/auditbeat/module/system/package/package_homebrew_test.go +++ b/x-pack/auditbeat/module/system/package/package_homebrew_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - "github.com/elastic/beats/v7/libbeat/beat" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + "github.com/elastic/beats/v9/libbeat/beat" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestHomebrew(t *testing.T) { diff --git a/x-pack/auditbeat/module/system/package/package_linux_test.go b/x-pack/auditbeat/module/system/package/package_linux_test.go index 16d67b1b43c0..916a71d26d14 100644 --- a/x-pack/auditbeat/module/system/package/package_linux_test.go +++ b/x-pack/auditbeat/module/system/package/package_linux_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/user" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/user" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/package/package_test.go b/x-pack/auditbeat/module/system/package/package_test.go index 77f6b1d6040d..503f822993a4 100644 --- a/x-pack/auditbeat/module/system/package/package_test.go +++ b/x-pack/auditbeat/module/system/package/package_test.go @@ -17,14 +17,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - "github.com/elastic/beats/v7/auditbeat/datastore" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + "github.com/elastic/beats/v9/auditbeat/datastore" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/package/package_windows.go b/x-pack/auditbeat/module/system/package/package_windows.go index 7243ed4107e0..4ad8e8e21ba8 100644 --- a/x-pack/auditbeat/module/system/package/package_windows.go +++ b/x-pack/auditbeat/module/system/package/package_windows.go @@ -9,8 +9,8 @@ package pkg import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" ) const ( diff --git a/x-pack/auditbeat/module/system/process/config.go b/x-pack/auditbeat/module/system/process/config.go index 05d1aa271108..302217f9bf02 100644 --- a/x-pack/auditbeat/module/system/process/config.go +++ b/x-pack/auditbeat/module/system/process/config.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/auditbeat/helper/hasher" + "github.com/elastic/beats/v9/auditbeat/helper/hasher" ) // Config defines the host metricset's configuration options. diff --git a/x-pack/auditbeat/module/system/process/gosysinfo_provider.go b/x-pack/auditbeat/module/system/process/gosysinfo_provider.go index 1fb70cc5e659..931229b5861e 100644 --- a/x-pack/auditbeat/module/system/process/gosysinfo_provider.go +++ b/x-pack/auditbeat/module/system/process/gosysinfo_provider.go @@ -15,11 +15,11 @@ import ( "github.com/cespare/xxhash/v2" "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/auditbeat/datastore" - "github.com/elastic/beats/v7/auditbeat/helper/hasher" - "github.com/elastic/beats/v7/libbeat/common/capabilities" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/cache" + "github.com/elastic/beats/v9/auditbeat/datastore" + "github.com/elastic/beats/v9/auditbeat/helper/hasher" + "github.com/elastic/beats/v9/libbeat/common/capabilities" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/cache" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/types" diff --git a/x-pack/auditbeat/module/system/process/hash_default_fips.go b/x-pack/auditbeat/module/system/process/hash_default_fips.go index 65c0286555d8..9de61b0d22e1 100644 --- a/x-pack/auditbeat/module/system/process/hash_default_fips.go +++ b/x-pack/auditbeat/module/system/process/hash_default_fips.go @@ -6,6 +6,6 @@ package process -import "github.com/elastic/beats/v7/auditbeat/helper/hasher" +import "github.com/elastic/beats/v9/auditbeat/helper/hasher" var defaultHashes = []hasher.HashType{hasher.SHA256} diff --git a/x-pack/auditbeat/module/system/process/hash_default_nofips.go b/x-pack/auditbeat/module/system/process/hash_default_nofips.go index b539458e22dc..64c4ee39e0e9 100644 --- a/x-pack/auditbeat/module/system/process/hash_default_nofips.go +++ b/x-pack/auditbeat/module/system/process/hash_default_nofips.go @@ -6,6 +6,6 @@ package process -import "github.com/elastic/beats/v7/auditbeat/helper/hasher" +import "github.com/elastic/beats/v9/auditbeat/helper/hasher" var defaultHashes = []hasher.HashType{hasher.SHA1} diff --git a/x-pack/auditbeat/module/system/process/process.go b/x-pack/auditbeat/module/system/process/process.go index 3eb81493579a..9c0e688680ff 100644 --- a/x-pack/auditbeat/module/system/process/process.go +++ b/x-pack/auditbeat/module/system/process/process.go @@ -10,10 +10,10 @@ import ( "runtime" "time" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/process/process_test.go b/x-pack/auditbeat/module/system/process/process_test.go index 6cc72511919c..46b7d99b427f 100644 --- a/x-pack/auditbeat/module/system/process/process_test.go +++ b/x-pack/auditbeat/module/system/process/process_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - "github.com/elastic/beats/v7/auditbeat/helper/hasher" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + "github.com/elastic/beats/v9/auditbeat/helper/hasher" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-sysinfo/types" ) diff --git a/x-pack/auditbeat/module/system/process/quark_provider_linux.go b/x-pack/auditbeat/module/system/process/quark_provider_linux.go index ceb2d3b222ab..bd74453ec58e 100644 --- a/x-pack/auditbeat/module/system/process/quark_provider_linux.go +++ b/x-pack/auditbeat/module/system/process/quark_provider_linux.go @@ -12,10 +12,10 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/auditbeat/helper/hasher" - "github.com/elastic/beats/v7/auditbeat/helper/tty" - "github.com/elastic/beats/v7/libbeat/common/capabilities" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/auditbeat/helper/hasher" + "github.com/elastic/beats/v9/auditbeat/helper/tty" + "github.com/elastic/beats/v9/libbeat/common/capabilities" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/auditbeat/module/system/process/quark_provider_linux_test.go b/x-pack/auditbeat/module/system/process/quark_provider_linux_test.go index 92e4707a8fec..763ee36078f3 100644 --- a/x-pack/auditbeat/module/system/process/quark_provider_linux_test.go +++ b/x-pack/auditbeat/module/system/process/quark_provider_linux_test.go @@ -14,12 +14,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/helper/tty" - "github.com/elastic/beats/v7/libbeat/common/capabilities" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/helper/tty" + "github.com/elastic/beats/v9/libbeat/common/capabilities" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/mapstr" quark "github.com/elastic/go-quark" ) diff --git a/x-pack/auditbeat/module/system/process/quark_provider_other.go b/x-pack/auditbeat/module/system/process/quark_provider_other.go index 513d7e9df514..18f28da4212f 100644 --- a/x-pack/auditbeat/module/system/process/quark_provider_other.go +++ b/x-pack/auditbeat/module/system/process/quark_provider_other.go @@ -9,7 +9,7 @@ package process import ( "errors" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // NewFromQuark instantiates the module with quark's backend. diff --git a/x-pack/auditbeat/module/system/socket/dns/afpacket/afpacket.go b/x-pack/auditbeat/module/system/socket/dns/afpacket/afpacket.go index 1f70e44cb49a..932bd4df5d5a 100644 --- a/x-pack/auditbeat/module/system/socket/dns/afpacket/afpacket.go +++ b/x-pack/auditbeat/module/system/socket/dns/afpacket/afpacket.go @@ -19,13 +19,13 @@ import ( "github.com/miekg/dns" "golang.org/x/net/bpf" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/google/gopacket" "github.com/google/gopacket/afpacket" "github.com/google/gopacket/layers" - parent "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns" + parent "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/dns" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/socket/dns/dns.go b/x-pack/auditbeat/module/system/socket/dns/dns.go index 9136d94e2f26..d2099253aff2 100644 --- a/x-pack/auditbeat/module/system/socket/dns/dns.go +++ b/x-pack/auditbeat/module/system/socket/dns/dns.go @@ -9,7 +9,7 @@ import ( "fmt" "net" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/socket/dns/registry.go b/x-pack/auditbeat/module/system/socket/dns/registry.go index b3ab9b65f33a..242074d73011 100644 --- a/x-pack/auditbeat/module/system/socket/dns/registry.go +++ b/x-pack/auditbeat/module/system/socket/dns/registry.go @@ -7,7 +7,7 @@ package dns import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/socket/events.go b/x-pack/auditbeat/module/system/socket/events.go index fe390c0ea92c..0c1ece7e5cc4 100644 --- a/x-pack/auditbeat/module/system/socket/events.go +++ b/x-pack/auditbeat/module/system/socket/events.go @@ -18,7 +18,7 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" ) const ( diff --git a/x-pack/auditbeat/module/system/socket/guess/creds.go b/x-pack/auditbeat/module/system/socket/guess/creds.go index 8c808dcdbe53..88631cd0f293 100644 --- a/x-pack/auditbeat/module/system/socket/guess/creds.go +++ b/x-pack/auditbeat/module/system/socket/guess/creds.go @@ -14,8 +14,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go b/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go index 258d9f21a4f9..a398601a7a93 100644 --- a/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go +++ b/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go @@ -13,8 +13,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/deref.go b/x-pack/auditbeat/module/system/socket/guess/deref.go index e2c3c0082c54..f4ff2e92b193 100644 --- a/x-pack/auditbeat/module/system/socket/guess/deref.go +++ b/x-pack/auditbeat/module/system/socket/guess/deref.go @@ -13,8 +13,8 @@ import ( "strconv" "syscall" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/guess.go b/x-pack/auditbeat/module/system/socket/guess/guess.go index 718afa0ad7b5..c1096fbac9db 100644 --- a/x-pack/auditbeat/module/system/socket/guess/guess.go +++ b/x-pack/auditbeat/module/system/socket/guess/guess.go @@ -12,8 +12,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/inetsock.go b/x-pack/auditbeat/module/system/socket/guess/inetsock.go index 1f6553f41670..d5d90b4399fd 100644 --- a/x-pack/auditbeat/module/system/socket/guess/inetsock.go +++ b/x-pack/auditbeat/module/system/socket/guess/inetsock.go @@ -14,8 +14,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/inetsock6.go b/x-pack/auditbeat/module/system/socket/guess/inetsock6.go index bf0e9620861a..f0b28b5636c8 100644 --- a/x-pack/auditbeat/module/system/socket/guess/inetsock6.go +++ b/x-pack/auditbeat/module/system/socket/guess/inetsock6.go @@ -14,8 +14,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go b/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go index 69676b41a2d9..9f835128083b 100644 --- a/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go +++ b/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go @@ -12,8 +12,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/iplocalout.go b/x-pack/auditbeat/module/system/socket/guess/iplocalout.go index 26a95405e8ec..b504b7823cf2 100644 --- a/x-pack/auditbeat/module/system/socket/guess/iplocalout.go +++ b/x-pack/auditbeat/module/system/socket/guess/iplocalout.go @@ -13,8 +13,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/skbuff.go b/x-pack/auditbeat/module/system/socket/guess/skbuff.go index ba53089aed38..5a56e60ac779 100644 --- a/x-pack/auditbeat/module/system/socket/guess/skbuff.go +++ b/x-pack/auditbeat/module/system/socket/guess/skbuff.go @@ -17,8 +17,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go b/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go index bfaebf544af4..8064294216d0 100644 --- a/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go +++ b/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go @@ -14,8 +14,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go b/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go index f9f7c1874215..cd92490af687 100644 --- a/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go +++ b/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go @@ -13,8 +13,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/socketsk.go b/x-pack/auditbeat/module/system/socket/guess/socketsk.go index 3c12cd294630..433e3c518e31 100644 --- a/x-pack/auditbeat/module/system/socket/guess/socketsk.go +++ b/x-pack/auditbeat/module/system/socket/guess/socketsk.go @@ -12,8 +12,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/syscallargs.go b/x-pack/auditbeat/module/system/socket/guess/syscallargs.go index 902940985b93..8ec42be8728f 100644 --- a/x-pack/auditbeat/module/system/socket/guess/syscallargs.go +++ b/x-pack/auditbeat/module/system/socket/guess/syscallargs.go @@ -12,8 +12,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go index 058736eec56f..27c9eb46c02c 100644 --- a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go +++ b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go @@ -10,8 +10,8 @@ package guess import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go index 73f810e74146..184ad20849c0 100644 --- a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go +++ b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go @@ -12,8 +12,8 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go b/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go index 09241e6641ea..f5ad837404ab 100644 --- a/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go +++ b/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go @@ -10,8 +10,8 @@ package guess import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/helper/probes.go b/x-pack/auditbeat/module/system/socket/helper/probes.go index 30bc09093469..d34e20e5da91 100644 --- a/x-pack/auditbeat/module/system/socket/helper/probes.go +++ b/x-pack/auditbeat/module/system/socket/helper/probes.go @@ -12,7 +12,7 @@ import ( "strings" "text/template" - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/helper/types.go b/x-pack/auditbeat/module/system/socket/helper/types.go index d466e847e751..9d4f266e2f84 100644 --- a/x-pack/auditbeat/module/system/socket/helper/types.go +++ b/x-pack/auditbeat/module/system/socket/helper/types.go @@ -7,7 +7,7 @@ package helper import ( - "github.com/elastic/beats/v7/auditbeat/tracing" + "github.com/elastic/beats/v9/auditbeat/tracing" ) // Logger exposes logging functions. diff --git a/x-pack/auditbeat/module/system/socket/kprobes.go b/x-pack/auditbeat/module/system/socket/kprobes.go index d468cfa9599d..58317f3ffb83 100644 --- a/x-pack/auditbeat/module/system/socket/kprobes.go +++ b/x-pack/auditbeat/module/system/socket/kprobes.go @@ -12,8 +12,8 @@ import ( "strings" "unsafe" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/socket/kprobes_test.go b/x-pack/auditbeat/module/system/socket/kprobes_test.go index 8ddca79e957a..84796e1cdad4 100644 --- a/x-pack/auditbeat/module/system/socket/kprobes_test.go +++ b/x-pack/auditbeat/module/system/socket/kprobes_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/guess" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/guess" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" ) func probeName(p tracing.Probe) string { diff --git a/x-pack/auditbeat/module/system/socket/socket_linux.go b/x-pack/auditbeat/module/system/socket/socket_linux.go index 48378eb4b598..642b8568a7fc 100644 --- a/x-pack/auditbeat/module/system/socket/socket_linux.go +++ b/x-pack/auditbeat/module/system/socket/socket_linux.go @@ -23,23 +23,23 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/guess" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/guess" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-perf" "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/providers/linux" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/dns" // Register dns capture implementations - _ "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns/afpacket" + _ "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/dns/afpacket" ) const ( diff --git a/x-pack/auditbeat/module/system/socket/socket_other.go b/x-pack/auditbeat/module/system/socket/socket_other.go index 8e584ab3fdad..39a9692940b6 100644 --- a/x-pack/auditbeat/module/system/socket/socket_other.go +++ b/x-pack/auditbeat/module/system/socket/socket_other.go @@ -9,9 +9,9 @@ package socket import ( "fmt" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" ) const ( diff --git a/x-pack/auditbeat/module/system/socket/state.go b/x-pack/auditbeat/module/system/socket/state.go index 76e7508ead76..68e9e0d6d6a7 100644 --- a/x-pack/auditbeat/module/system/socket/state.go +++ b/x-pack/auditbeat/module/system/socket/state.go @@ -19,12 +19,12 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/flowhash" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/flowhash" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/dns" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/helper" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-libaudit/v2/aucoalesce" ) diff --git a/x-pack/auditbeat/module/system/socket/state_test.go b/x-pack/auditbeat/module/system/socket/state_test.go index bb7aa3729a1a..d9cb7f8fcec3 100644 --- a/x-pack/auditbeat/module/system/socket/state_test.go +++ b/x-pack/auditbeat/module/system/socket/state_test.go @@ -19,11 +19,11 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system/socket/dns" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/module/system/socket/template.go b/x-pack/auditbeat/module/system/socket/template.go index c1a97a163b9d..ce4febbb032a 100644 --- a/x-pack/auditbeat/module/system/socket/template.go +++ b/x-pack/auditbeat/module/system/socket/template.go @@ -10,8 +10,8 @@ import ( "strings" "unsafe" - "github.com/elastic/beats/v7/auditbeat/tracing" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/auditbeat/tracing" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/system.go b/x-pack/auditbeat/module/system/system.go index c5d885dde1bc..3cb15776c929 100644 --- a/x-pack/auditbeat/module/system/system.go +++ b/x-pack/auditbeat/module/system/system.go @@ -5,8 +5,8 @@ package system import ( - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/go-sysinfo" ) diff --git a/x-pack/auditbeat/module/system/user/user.go b/x-pack/auditbeat/module/system/user/user.go index 7b60aecb174f..71bf27e6910c 100644 --- a/x-pack/auditbeat/module/system/user/user.go +++ b/x-pack/auditbeat/module/system/user/user.go @@ -22,12 +22,12 @@ import ( "github.com/cespare/xxhash/v2" "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/datastore" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/cache" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/datastore" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/cache" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/auditbeat/module/system/user/user_test.go b/x-pack/auditbeat/module/system/user/user_test.go index 43794d38df5f..da607a27d189 100644 --- a/x-pack/auditbeat/module/system/user/user_test.go +++ b/x-pack/auditbeat/module/system/user/user_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/auditbeat/core" - abtest "github.com/elastic/beats/v7/auditbeat/testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/auditbeat/core" + abtest "github.com/elastic/beats/v9/auditbeat/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" ) func TestData(t *testing.T) { diff --git a/x-pack/auditbeat/module/system/user/users_other.go b/x-pack/auditbeat/module/system/user/users_other.go index 86dc09a0a1a5..2f826b99afbd 100644 --- a/x-pack/auditbeat/module/system/user/users_other.go +++ b/x-pack/auditbeat/module/system/user/users_other.go @@ -9,9 +9,9 @@ package user import ( "fmt" - "github.com/elastic/beats/v7/auditbeat/ab" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v9/auditbeat/ab" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/auditbeat/module/system" ) const ( diff --git a/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go b/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go index 7358327acd7b..2ed4f9f145cd 100644 --- a/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go +++ b/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go @@ -13,14 +13,14 @@ import ( "strconv" "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/processdb" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/processdb" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/procfs" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/provider" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go b/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go index d0fa6fad0665..71a292585bc1 100644 --- a/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go +++ b/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go @@ -15,10 +15,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/processdb" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/processdb" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/procfs" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/auditbeat/processors/sessionmd/fields.go b/x-pack/auditbeat/processors/sessionmd/fields.go index b409524b8119..2de30af65696 100644 --- a/x-pack/auditbeat/processors/sessionmd/fields.go +++ b/x-pack/auditbeat/processors/sessionmd/fields.go @@ -7,7 +7,7 @@ package sessionmd import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/auditbeat/processors/sessionmd/processdb/db.go b/x-pack/auditbeat/processors/sessionmd/processdb/db.go index f8f7b2fd0bc6..a2ac638e8219 100644 --- a/x-pack/auditbeat/processors/sessionmd/processdb/db.go +++ b/x-pack/auditbeat/processors/sessionmd/processdb/db.go @@ -20,11 +20,11 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/auditbeat/helper/tty" - "github.com/elastic/beats/v7/libbeat/common/capabilities" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/timeutils" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/auditbeat/helper/tty" + "github.com/elastic/beats/v9/libbeat/common/capabilities" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/procfs" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/timeutils" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/auditbeat/processors/sessionmd/processdb/db_test.go b/x-pack/auditbeat/processors/sessionmd/processdb/db_test.go index ff6a943e61ba..ba031359f901 100644 --- a/x-pack/auditbeat/processors/sessionmd/processdb/db_test.go +++ b/x-pack/auditbeat/processors/sessionmd/processdb/db_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/auditbeat/helper/tty" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/timeutils" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/auditbeat/helper/tty" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/procfs" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/timeutils" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/auditbeat/processors/sessionmd/processdb/entry_leader_test.go b/x-pack/auditbeat/processors/sessionmd/processdb/entry_leader_test.go index 57dc717b4078..bc557a571599 100644 --- a/x-pack/auditbeat/processors/sessionmd/processdb/entry_leader_test.go +++ b/x-pack/auditbeat/processors/sessionmd/processdb/entry_leader_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/auditbeat/helper/tty" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/auditbeat/helper/tty" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/procfs" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/auditbeat/processors/sessionmd/procfs/procfs.go b/x-pack/auditbeat/processors/sessionmd/procfs/procfs.go index 9b689c344a3e..480c81dd8036 100644 --- a/x-pack/auditbeat/processors/sessionmd/procfs/procfs.go +++ b/x-pack/auditbeat/processors/sessionmd/procfs/procfs.go @@ -13,9 +13,9 @@ import ( "github.com/prometheus/procfs" "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/auditbeat/helper/tty" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/timeutils" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/auditbeat/helper/tty" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/timeutils" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_linux.go b/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_linux.go index c94e6bb1dec9..72b82b2ac70b 100644 --- a/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_linux.go +++ b/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_linux.go @@ -20,10 +20,10 @@ import ( quark "github.com/elastic/go-quark" - "github.com/elastic/beats/v7/auditbeat/helper/tty" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/auditbeat/helper/tty" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/provider" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_other.go b/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_other.go index 54f46f94209b..b4de31264c86 100644 --- a/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_other.go +++ b/x-pack/auditbeat/processors/sessionmd/provider/kerneltracingprovider/kerneltracingprovider_other.go @@ -10,9 +10,9 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/provider" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider.go b/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider.go index 7baf8b75f25e..9cc6cbda2533 100644 --- a/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider.go +++ b/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider.go @@ -10,11 +10,11 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/processdb" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/processdb" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/procfs" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/provider" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider_test.go b/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider_test.go index 4a90c3651714..a7fd50cbf8eb 100644 --- a/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider_test.go +++ b/x-pack/auditbeat/processors/sessionmd/provider/procfsprovider/procfsprovider_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/processdb" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/processdb" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/procfs" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/auditbeat/processors/sessionmd/provider/provider.go b/x-pack/auditbeat/processors/sessionmd/provider/provider.go index 8f464de93abf..24dd0b21d878 100644 --- a/x-pack/auditbeat/processors/sessionmd/provider/provider.go +++ b/x-pack/auditbeat/processors/sessionmd/provider/provider.go @@ -7,8 +7,8 @@ package provider import ( - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/types" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/auditbeat/processors/sessionmd/types" ) type Provider interface { diff --git a/x-pack/auditbeat/processors/sessionmd/types/events.go b/x-pack/auditbeat/processors/sessionmd/types/events.go index f283ddd5e21c..e4161aced01e 100644 --- a/x-pack/auditbeat/processors/sessionmd/types/events.go +++ b/x-pack/auditbeat/processors/sessionmd/types/events.go @@ -6,7 +6,7 @@ package types //go:generate stringer -linecomment=true -type=Type,HookPoint,Field -output=gen_types_string.go -import "github.com/elastic/beats/v7/auditbeat/helper/tty" +import "github.com/elastic/beats/v9/auditbeat/helper/tty" type Type uint64 diff --git a/x-pack/auditbeat/seccomp_linux.go b/x-pack/auditbeat/seccomp_linux.go index dc8735f9b94b..1464aa947919 100644 --- a/x-pack/auditbeat/seccomp_linux.go +++ b/x-pack/auditbeat/seccomp_linux.go @@ -7,7 +7,7 @@ package main import ( "runtime" - "github.com/elastic/beats/v7/libbeat/common/seccomp" + "github.com/elastic/beats/v9/libbeat/common/seccomp" ) func init() { diff --git a/x-pack/dockerlogbeat/handlers.go b/x-pack/dockerlogbeat/handlers.go index 31466d44b657..c028b422d938 100644 --- a/x-pack/dockerlogbeat/handlers.go +++ b/x-pack/dockerlogbeat/handlers.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/daemon/logger" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemanager" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipelinemanager" "github.com/docker/docker/pkg/ioutils" ) diff --git a/x-pack/dockerlogbeat/magefile.go b/x-pack/dockerlogbeat/magefile.go index e1a5fff708be..855f9969c39c 100644 --- a/x-pack/dockerlogbeat/magefile.go +++ b/x-pack/dockerlogbeat/magefile.go @@ -27,15 +27,15 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/notests" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) const ( diff --git a/x-pack/dockerlogbeat/main.go b/x-pack/dockerlogbeat/main.go index c0735f354b6e..b1d8c3e0def8 100644 --- a/x-pack/dockerlogbeat/main.go +++ b/x-pack/dockerlogbeat/main.go @@ -12,14 +12,14 @@ import ( "github.com/docker/go-plugins-helpers/sdk" - _ "github.com/elastic/beats/v7/libbeat/outputs/console" - _ "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/v7/libbeat/outputs/fileout" - _ "github.com/elastic/beats/v7/libbeat/outputs/kafka" - _ "github.com/elastic/beats/v7/libbeat/outputs/logstash" - _ "github.com/elastic/beats/v7/libbeat/outputs/redis" - _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemanager" + _ "github.com/elastic/beats/v9/libbeat/outputs/console" + _ "github.com/elastic/beats/v9/libbeat/outputs/elasticsearch" + _ "github.com/elastic/beats/v9/libbeat/outputs/fileout" + _ "github.com/elastic/beats/v9/libbeat/outputs/kafka" + _ "github.com/elastic/beats/v9/libbeat/outputs/logstash" + _ "github.com/elastic/beats/v9/libbeat/outputs/redis" + _ "github.com/elastic/beats/v9/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipelinemanager" "github.com/elastic/elastic-agent-libs/config" logpcfg "github.com/elastic/elastic-agent-libs/logp/configure" "github.com/elastic/elastic-agent-libs/service" diff --git a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go index 3fd25630f80d..d1f41e00f8de 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go +++ b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go @@ -15,9 +15,9 @@ import ( "github.com/docker/docker/api/types/backend" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipereader" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipereader" helper "github.com/elastic/elastic-agent-autodiscover/docker" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go index f4bd8be5e8c0..ee900668efe0 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go +++ b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go @@ -18,9 +18,9 @@ import ( "github.com/docker/docker/daemon/logger/jsonfilelog" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemock" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipereader" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipelinemock" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipereader" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/dockerlogbeat/pipelinemanager/config.go b/x-pack/dockerlogbeat/pipelinemanager/config.go index b6bbf3a26fe4..6a7d82b97153 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/config.go +++ b/x-pack/dockerlogbeat/pipelinemanager/config.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go index b4820f734088..6e71c76e4a0c 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go +++ b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go @@ -13,12 +13,12 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cloudid" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cloudid" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/file" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go b/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go index 11d33aa34bbd..ef0b7047abe9 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go +++ b/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go @@ -15,7 +15,7 @@ import ( "github.com/gohugoio/hashstructure" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipereader" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipereader" "github.com/elastic/elastic-agent-libs/config" "github.com/docker/docker/api/types/plugins/logdriver" @@ -24,7 +24,7 @@ import ( protoio "github.com/gogo/protobuf/io" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/dockerlogbeat/pipelinemanager/selector.go b/x-pack/dockerlogbeat/pipelinemanager/selector.go index 216d21a29c2d..09ef1c279fb3 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/selector.go +++ b/x-pack/dockerlogbeat/pipelinemanager/selector.go @@ -7,9 +7,9 @@ package pipelinemanager import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outil" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/dockerlogbeat/pipelinemock/pipelines.go b/x-pack/dockerlogbeat/pipelinemock/pipelines.go index 04c7972e8ee3..42c5f872e714 100644 --- a/x-pack/dockerlogbeat/pipelinemock/pipelines.go +++ b/x-pack/dockerlogbeat/pipelinemock/pipelines.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) // MockBeatClient mocks the Client interface diff --git a/x-pack/dockerlogbeat/pipereader/reader_test.go b/x-pack/dockerlogbeat/pipereader/reader_test.go index 8875d43d6870..9fc654639640 100644 --- a/x-pack/dockerlogbeat/pipereader/reader_test.go +++ b/x-pack/dockerlogbeat/pipereader/reader_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types/plugins/logdriver" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemock" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipelinemock" ) func TestPipeReader(t *testing.T) { diff --git a/x-pack/filebeat/cmd/agent.go b/x-pack/filebeat/cmd/agent.go index 4183ddc06f50..64b02c798685 100644 --- a/x-pack/filebeat/cmd/agent.go +++ b/x-pack/filebeat/cmd/agent.go @@ -7,8 +7,8 @@ package cmd import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/x-pack/libbeat/management" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" ) diff --git a/x-pack/filebeat/cmd/otelcmd_disabled.go b/x-pack/filebeat/cmd/otelcmd_disabled.go index af7e1424dd0a..c22f92d44256 100644 --- a/x-pack/filebeat/cmd/otelcmd_disabled.go +++ b/x-pack/filebeat/cmd/otelcmd_disabled.go @@ -7,7 +7,7 @@ package cmd import ( - cmd "github.com/elastic/beats/v7/libbeat/cmd" + cmd "github.com/elastic/beats/v9/libbeat/cmd" ) func addOTelCommand(command *cmd.BeatsRootCmd) { diff --git a/x-pack/filebeat/cmd/otelcmd_enabled.go b/x-pack/filebeat/cmd/otelcmd_enabled.go index 110ae9f589c7..5f78b7e31281 100644 --- a/x-pack/filebeat/cmd/otelcmd_enabled.go +++ b/x-pack/filebeat/cmd/otelcmd_enabled.go @@ -7,8 +7,8 @@ package cmd import ( - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/x-pack/libbeat/common/otelbeat" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/x-pack/libbeat/common/otelbeat" ) func addOTelCommand(command *cmd.BeatsRootCmd) { diff --git a/x-pack/filebeat/cmd/root.go b/x-pack/filebeat/cmd/root.go index 9b44ebb55960..fccf2a9cb53e 100644 --- a/x-pack/filebeat/cmd/root.go +++ b/x-pack/filebeat/cmd/root.go @@ -11,16 +11,16 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - fbcmd "github.com/elastic/beats/v7/filebeat/cmd" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/x-pack/filebeat/include" - inputs "github.com/elastic/beats/v7/x-pack/filebeat/input/default-inputs" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + fbcmd "github.com/elastic/beats/v9/filebeat/cmd" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/x-pack/filebeat/include" + inputs "github.com/elastic/beats/v9/x-pack/filebeat/input/default-inputs" + "github.com/elastic/beats/v9/x-pack/libbeat/management" // Register the includes. - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" ) // Name is the name of the beat diff --git a/x-pack/filebeat/fbreceiver/factory.go b/x-pack/filebeat/fbreceiver/factory.go index b40cdbae4337..695012099359 100644 --- a/x-pack/filebeat/fbreceiver/factory.go +++ b/x-pack/filebeat/fbreceiver/factory.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/filebeat/beater" - "github.com/elastic/beats/v7/filebeat/cmd" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/x-pack/filebeat/include" - inputs "github.com/elastic/beats/v7/x-pack/filebeat/input/default-inputs" - xpInstance "github.com/elastic/beats/v7/x-pack/libbeat/cmd/instance" + "github.com/elastic/beats/v9/filebeat/beater" + "github.com/elastic/beats/v9/filebeat/cmd" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/x-pack/filebeat/include" + inputs "github.com/elastic/beats/v9/x-pack/filebeat/input/default-inputs" + xpInstance "github.com/elastic/beats/v9/x-pack/libbeat/cmd/instance" "github.com/elastic/elastic-agent-libs/mapstr" "go.opentelemetry.io/collector/component" diff --git a/x-pack/filebeat/fbreceiver/receiver.go b/x-pack/filebeat/fbreceiver/receiver.go index 005277ecef53..beda1f31f8d4 100644 --- a/x-pack/filebeat/fbreceiver/receiver.go +++ b/x-pack/filebeat/fbreceiver/receiver.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - xpInstance "github.com/elastic/beats/v7/x-pack/libbeat/cmd/instance" + xpInstance "github.com/elastic/beats/v9/x-pack/libbeat/cmd/instance" "go.opentelemetry.io/collector/component" "go.uber.org/zap" diff --git a/x-pack/filebeat/fbreceiver/receiver_test.go b/x-pack/filebeat/fbreceiver/receiver_test.go index d35f097e2df4..c172c0122288 100644 --- a/x-pack/filebeat/fbreceiver/receiver_test.go +++ b/x-pack/filebeat/fbreceiver/receiver_test.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "testing" - "github.com/elastic/beats/v7/libbeat/otelbeat/oteltest" + "github.com/elastic/beats/v9/libbeat/otelbeat/oteltest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/x-pack/filebeat/include/list.go b/x-pack/filebeat/include/list.go index 25cb4cc00def..1aba077acbdd 100644 --- a/x-pack/filebeat/include/list.go +++ b/x-pack/filebeat/include/list.go @@ -8,56 +8,56 @@ package include import ( // Import packages to perform 'func InitializeModule()' when in-use. - m0 "github.com/elastic/beats/v7/x-pack/filebeat/processors/add_nomad_metadata" - m1 "github.com/elastic/beats/v7/x-pack/filebeat/processors/aws_vpcflow" - m2 "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef" + m0 "github.com/elastic/beats/v9/x-pack/filebeat/processors/add_nomad_metadata" + m1 "github.com/elastic/beats/v9/x-pack/filebeat/processors/aws_vpcflow" + m2 "github.com/elastic/beats/v9/x-pack/filebeat/processors/decode_cef" // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/awscloudwatch" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/awss3" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/azureblobstorage" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/azureeventhub" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/cometd" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/etw" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/gcppubsub" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/gcs" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/lumberjack" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/activemq" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/awsfargate" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/azure" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/cef" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/checkpoint" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/cisco" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/coredns" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/crowdstrike" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/cyberarkpas" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/envoyproxy" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/fortinet" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/google_workspace" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/ibmmq" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/iptables" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/juniper" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/microsoft" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/misp" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/mssql" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/mysqlenterprise" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/netflow" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/o365" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/okta" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/oracle" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/panw" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/rabbitmq" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/salesforce" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/snyk" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/sophos" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/suricata" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/threatintel" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/zeek" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/zookeeper" - _ "github.com/elastic/beats/v7/x-pack/filebeat/module/zoom" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/awscloudwatch" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/awss3" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/azureblobstorage" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/azureeventhub" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/cometd" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/etw" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/gcppubsub" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/gcs" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/lumberjack" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/activemq" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/awsfargate" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/azure" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/cef" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/checkpoint" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/cisco" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/coredns" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/crowdstrike" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/cyberarkpas" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/envoyproxy" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/fortinet" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/google_workspace" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/ibmmq" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/iptables" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/juniper" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/microsoft" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/misp" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/mssql" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/mysqlenterprise" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/netflow" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/o365" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/okta" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/oracle" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/panw" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/rabbitmq" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/salesforce" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/snyk" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/sophos" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/suricata" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/threatintel" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/zeek" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/zookeeper" + _ "github.com/elastic/beats/v9/x-pack/filebeat/module/zoom" ) // InitializeModules initialize all of the modules. diff --git a/x-pack/filebeat/input/awscloudwatch/cloudwatch.go b/x-pack/filebeat/input/awscloudwatch/cloudwatch.go index f9fe58862798..38e13b6272f3 100644 --- a/x-pack/filebeat/input/awscloudwatch/cloudwatch.go +++ b/x-pack/filebeat/input/awscloudwatch/cloudwatch.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/awscloudwatch/cloudwatch_worker.go b/x-pack/filebeat/input/awscloudwatch/cloudwatch_worker.go index fd373bf8d3a4..91bb2ceaeaba 100644 --- a/x-pack/filebeat/input/awscloudwatch/cloudwatch_worker.go +++ b/x-pack/filebeat/input/awscloudwatch/cloudwatch_worker.go @@ -15,9 +15,9 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awscloudwatch/config.go b/x-pack/filebeat/input/awscloudwatch/config.go index 72ee5fd98e02..f8691c6a12ff 100644 --- a/x-pack/filebeat/input/awscloudwatch/config.go +++ b/x-pack/filebeat/input/awscloudwatch/config.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/filebeat/harvester" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v9/filebeat/harvester" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" ) const ( diff --git a/x-pack/filebeat/input/awscloudwatch/fields.go b/x-pack/filebeat/input/awscloudwatch/fields.go index 9d879200a487..8c3251423ba5 100644 --- a/x-pack/filebeat/input/awscloudwatch/fields.go +++ b/x-pack/filebeat/input/awscloudwatch/fields.go @@ -7,7 +7,7 @@ package awscloudwatch import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/input/awscloudwatch/input.go b/x-pack/filebeat/input/awscloudwatch/input.go index 9486875925a7..9aa055813da5 100644 --- a/x-pack/filebeat/input/awscloudwatch/input.go +++ b/x-pack/filebeat/input/awscloudwatch/input.go @@ -14,14 +14,14 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" - "github.com/elastic/beats/v7/x-pack/libbeat/statusreporterhelper" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v9/x-pack/libbeat/statusreporterhelper" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/x-pack/filebeat/input/awscloudwatch/input_integration_test.go b/x-pack/filebeat/input/awscloudwatch/input_integration_test.go index 45c30b7eb30a..498f9038b0d5 100644 --- a/x-pack/filebeat/input/awscloudwatch/input_integration_test.go +++ b/x-pack/filebeat/input/awscloudwatch/input_integration_test.go @@ -30,8 +30,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" "github.com/stretchr/testify/assert" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awscloudwatch/processor.go b/x-pack/filebeat/input/awscloudwatch/processor.go index 9e98481342e0..0939bb3cd289 100644 --- a/x-pack/filebeat/input/awscloudwatch/processor.go +++ b/x-pack/filebeat/input/awscloudwatch/processor.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/awscloudwatch/state_handler.go b/x-pack/filebeat/input/awscloudwatch/state_handler.go index 84a5ac033aa3..0e61746f9886 100644 --- a/x-pack/filebeat/input/awscloudwatch/state_handler.go +++ b/x-pack/filebeat/input/awscloudwatch/state_handler.go @@ -10,7 +10,7 @@ import ( "github.com/zyedidia/generic/heap" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awscloudwatch/state_handler_test.go b/x-pack/filebeat/input/awscloudwatch/state_handler_test.go index f4c0f71394e3..e6944421d6f5 100644 --- a/x-pack/filebeat/input/awscloudwatch/state_handler_test.go +++ b/x-pack/filebeat/input/awscloudwatch/state_handler_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" ) func TestStateHandler(t *testing.T) { diff --git a/x-pack/filebeat/input/awss3/acks.go b/x-pack/filebeat/input/awss3/acks.go index a3850c01e87a..914473c1c4df 100644 --- a/x-pack/filebeat/input/awss3/acks.go +++ b/x-pack/filebeat/input/awss3/acks.go @@ -7,8 +7,8 @@ package awss3 import ( "github.com/zyedidia/generic/queue" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" ) type awsACKHandler struct { diff --git a/x-pack/filebeat/input/awss3/config.go b/x-pack/filebeat/input/awss3/config.go index 5455d084f635..47507299bf1e 100644 --- a/x-pack/filebeat/input/awss3/config.go +++ b/x-pack/filebeat/input/awss3/config.go @@ -17,13 +17,13 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/dustin/go-humanize" - "github.com/elastic/beats/v7/libbeat/common/cfgtype" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader/parser" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + "github.com/elastic/beats/v9/libbeat/common/cfgtype" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader/parser" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" ) type config struct { diff --git a/x-pack/filebeat/input/awss3/config_test.go b/x-pack/filebeat/input/awss3/config_test.go index bd0aba8c70d2..805e656cee27 100644 --- a/x-pack/filebeat/input/awss3/config_test.go +++ b/x-pack/filebeat/input/awss3/config_test.go @@ -13,9 +13,9 @@ import ( "github.com/dustin/go-humanize" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader/parser" - "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader/parser" + "github.com/elastic/beats/v9/libbeat/reader/readfile" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/awss3/decoding_test.go b/x-pack/filebeat/input/awss3/decoding_test.go index e0a58fad13a4..297e29517907 100644 --- a/x-pack/filebeat/input/awss3/decoding_test.go +++ b/x-pack/filebeat/input/awss3/decoding_test.go @@ -15,7 +15,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/filebeat/input/awss3/fields.go b/x-pack/filebeat/input/awss3/fields.go index ec65c3a6b2c7..0d41dfbd8d0d 100644 --- a/x-pack/filebeat/input/awss3/fields.go +++ b/x-pack/filebeat/input/awss3/fields.go @@ -7,7 +7,7 @@ package awss3 import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/input/awss3/input.go b/x-pack/filebeat/input/awss3/input.go index 2f1017e23ed1..4e9d4a43e98b 100644 --- a/x-pack/filebeat/input/awss3/input.go +++ b/x-pack/filebeat/input/awss3/input.go @@ -7,10 +7,10 @@ package awss3 import ( "fmt" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/statestore" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/statestore" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/x-pack/filebeat/input/awss3/input_benchmark_test.go b/x-pack/filebeat/input/awss3/input_benchmark_test.go index b31caba4abeb..22393cc78ad1 100644 --- a/x-pack/filebeat/input/awss3/input_benchmark_test.go +++ b/x-pack/filebeat/input/awss3/input_benchmark_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" diff --git a/x-pack/filebeat/input/awss3/input_integration_test.go b/x-pack/filebeat/input/awss3/input_integration_test.go index cea23270128c..07a16e1ec97a 100644 --- a/x-pack/filebeat/input/awss3/input_integration_test.go +++ b/x-pack/filebeat/input/awss3/input_integration_test.go @@ -30,7 +30,7 @@ import ( "golang.org/x/sync/errgroup" "gopkg.in/yaml.v2" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awss3/input_test.go b/x-pack/filebeat/input/awss3/input_test.go index 77f3087f1ac5..decc4261b863 100644 --- a/x-pack/filebeat/input/awss3/input_test.go +++ b/x-pack/filebeat/input/awss3/input_test.go @@ -11,9 +11,9 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/management/status" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/management/status" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/awss3/interfaces.go b/x-pack/filebeat/input/awss3/interfaces.go index 512e95893b40..2f47bc5bfab9 100644 --- a/x-pack/filebeat/input/awss3/interfaces.go +++ b/x-pack/filebeat/input/awss3/interfaces.go @@ -16,7 +16,7 @@ import ( "github.com/aws/smithy-go/middleware" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" @@ -28,7 +28,7 @@ import ( // Run 'go generate' to create mocks that are used in tests. //go:generate go run go.uber.org/mock/mockgen -source=interfaces.go -destination=mock_interfaces_test.go -package awss3 -mock_names=sqsAPI=MockSQSAPI,sqsProcessor=MockSQSProcessor,s3API=MockS3API,s3Pager=MockS3Pager,s3ObjectHandlerFactory=MockS3ObjectHandlerFactory,s3ObjectHandler=MockS3ObjectHandler -//go:generate go run go.uber.org/mock/mockgen -destination=mock_publisher_test.go -package=awss3 -mock_names=Client=MockBeatClient,Pipeline=MockBeatPipeline github.com/elastic/beats/v7/libbeat/beat Client,Pipeline +//go:generate go run go.uber.org/mock/mockgen -destination=mock_publisher_test.go -package=awss3 -mock_names=Client=MockBeatClient,Pipeline=MockBeatPipeline github.com/elastic/beats/v9/libbeat/beat Client,Pipeline //go:generate go run github.com/elastic/go-licenser -license Elastic . //go:generate go run golang.org/x/tools/cmd/goimports -w -local github.com/elastic . diff --git a/x-pack/filebeat/input/awss3/mock_interfaces_test.go b/x-pack/filebeat/input/awss3/mock_interfaces_test.go index b611802dbad7..3b23d88f26aa 100644 --- a/x-pack/filebeat/input/awss3/mock_interfaces_test.go +++ b/x-pack/filebeat/input/awss3/mock_interfaces_test.go @@ -22,7 +22,7 @@ import ( types "github.com/aws/aws-sdk-go-v2/service/sqs/types" gomock "go.uber.org/mock/gomock" - beat "github.com/elastic/beats/v7/libbeat/beat" + beat "github.com/elastic/beats/v9/libbeat/beat" logp "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awss3/mock_publisher_test.go b/x-pack/filebeat/input/awss3/mock_publisher_test.go index 3bffc9142b3f..bffcb1352d29 100644 --- a/x-pack/filebeat/input/awss3/mock_publisher_test.go +++ b/x-pack/filebeat/input/awss3/mock_publisher_test.go @@ -3,11 +3,11 @@ // you may not use this file except in compliance with the Elastic License. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/elastic/beats/v7/libbeat/beat (interfaces: Client,Pipeline) +// Source: github.com/elastic/beats/v9/libbeat/beat (interfaces: Client,Pipeline) // // Generated by this command: // -// mockgen -destination=mock_publisher_test.go -package=awss3 -mock_names=Client=MockBeatClient,Pipeline=MockBeatPipeline github.com/elastic/beats/v7/libbeat/beat Client,Pipeline +// mockgen -destination=mock_publisher_test.go -package=awss3 -mock_names=Client=MockBeatClient,Pipeline=MockBeatPipeline github.com/elastic/beats/v9/libbeat/beat Client,Pipeline // // Package awss3 is a generated GoMock package. @@ -18,7 +18,7 @@ import ( gomock "go.uber.org/mock/gomock" - beat "github.com/elastic/beats/v7/libbeat/beat" + beat "github.com/elastic/beats/v9/libbeat/beat" ) // MockBeatClient is a mock of Client interface. diff --git a/x-pack/filebeat/input/awss3/s3.go b/x-pack/filebeat/input/awss3/s3.go index 18bda4511fdc..ebace9b022c0 100644 --- a/x-pack/filebeat/input/awss3/s3.go +++ b/x-pack/filebeat/input/awss3/s3.go @@ -12,7 +12,7 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) func (in *s3PollerInput) createS3API(ctx context.Context) (*awsS3API, error) { diff --git a/x-pack/filebeat/input/awss3/s3_input.go b/x-pack/filebeat/input/awss3/s3_input.go index 78f880988686..c769f3c6d230 100644 --- a/x-pack/filebeat/input/awss3/s3_input.go +++ b/x-pack/filebeat/input/awss3/s3_input.go @@ -13,12 +13,12 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/ratelimit" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/x-pack/libbeat/statusreporterhelper" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/x-pack/libbeat/statusreporterhelper" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/timed" ) diff --git a/x-pack/filebeat/input/awss3/s3_objects.go b/x-pack/filebeat/input/awss3/s3_objects.go index 8f522598d9e2..6760349a13d4 100644 --- a/x-pack/filebeat/input/awss3/s3_objects.go +++ b/x-pack/filebeat/input/awss3/s3_objects.go @@ -19,12 +19,12 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/reader" - "github.com/elastic/beats/v7/libbeat/reader/readfile" - "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" - x_reader "github.com/elastic/beats/v7/x-pack/libbeat/reader" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/reader" + "github.com/elastic/beats/v9/libbeat/reader/readfile" + "github.com/elastic/beats/v9/libbeat/reader/readfile/encoding" + x_reader "github.com/elastic/beats/v9/x-pack/libbeat/reader" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/awss3/s3_objects_test.go b/x-pack/filebeat/input/awss3/s3_objects_test.go index f49cd9b611fa..3279490fa6db 100644 --- a/x-pack/filebeat/input/awss3/s3_objects_test.go +++ b/x-pack/filebeat/input/awss3/s3_objects_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/x-pack/filebeat/input/awss3/s3_test.go b/x-pack/filebeat/input/awss3/s3_test.go index ac2df531d2f2..a53d9d12a904 100644 --- a/x-pack/filebeat/input/awss3/s3_test.go +++ b/x-pack/filebeat/input/awss3/s3_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/awss3/script.go b/x-pack/filebeat/input/awss3/script.go index 4c163b2ffa2e..a9896cf02c1d 100644 --- a/x-pack/filebeat/input/awss3/script.go +++ b/x-pack/filebeat/input/awss3/script.go @@ -15,7 +15,7 @@ import ( "github.com/dop251/goja" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/x-pack/filebeat/input/awss3/script_jss3event_v2.go b/x-pack/filebeat/input/awss3/script_jss3event_v2.go index f998c9bf2954..99207b328721 100644 --- a/x-pack/filebeat/input/awss3/script_jss3event_v2.go +++ b/x-pack/filebeat/input/awss3/script_jss3event_v2.go @@ -11,7 +11,7 @@ import ( "github.com/dop251/goja" - "github.com/elastic/beats/v7/libbeat/common/encoding/xml" + "github.com/elastic/beats/v9/libbeat/common/encoding/xml" ) func newJSS3EventV2Constructor(s *session) func(call goja.ConstructorCall) *goja.Object { diff --git a/x-pack/filebeat/input/awss3/sqs.go b/x-pack/filebeat/input/awss3/sqs.go index 9a1bf08fad27..a0e6029f787c 100644 --- a/x-pack/filebeat/input/awss3/sqs.go +++ b/x-pack/filebeat/input/awss3/sqs.go @@ -16,7 +16,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs/types" "github.com/aws/smithy-go" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awss3/sqs_input.go b/x-pack/filebeat/input/awss3/sqs_input.go index 00df4efc4acf..bc18e2b18875 100644 --- a/x-pack/filebeat/input/awss3/sqs_input.go +++ b/x-pack/filebeat/input/awss3/sqs_input.go @@ -16,10 +16,10 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/libbeat/statusreporterhelper" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/libbeat/statusreporterhelper" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awss3/sqs_s3_event.go b/x-pack/filebeat/input/awss3/sqs_s3_event.go index e0a0a0a5b6ba..cdd749fe5474 100644 --- a/x-pack/filebeat/input/awss3/sqs_s3_event.go +++ b/x-pack/filebeat/input/awss3/sqs_s3_event.go @@ -19,8 +19,8 @@ import ( "github.com/aws/smithy-go" "go.uber.org/multierr" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/awss3/sqs_s3_event_test.go b/x-pack/filebeat/input/awss3/sqs_s3_event_test.go index fe3a7837ff64..d44bf03a4991 100644 --- a/x-pack/filebeat/input/awss3/sqs_s3_event_test.go +++ b/x-pack/filebeat/input/awss3/sqs_s3_event_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/go-concert/timed" ) diff --git a/x-pack/filebeat/input/awss3/sqs_test.go b/x-pack/filebeat/input/awss3/sqs_test.go index e2fd4d792eae..d17aac2d40f2 100644 --- a/x-pack/filebeat/input/awss3/sqs_test.go +++ b/x-pack/filebeat/input/awss3/sqs_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/awss3/states.go b/x-pack/filebeat/input/awss3/states.go index 63948c0b0686..c17e4c3777e8 100644 --- a/x-pack/filebeat/input/awss3/states.go +++ b/x-pack/filebeat/input/awss3/states.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/awss3/states_test.go b/x-pack/filebeat/input/awss3/states_test.go index b087b86b47c4..30360e69602c 100644 --- a/x-pack/filebeat/input/awss3/states_test.go +++ b/x-pack/filebeat/input/awss3/states_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" "github.com/elastic/elastic-agent-libs/logp" "github.com/stretchr/testify/assert" diff --git a/x-pack/filebeat/input/azureblobstorage/auth_test.go b/x-pack/filebeat/input/azureblobstorage/auth_test.go index f6378cc55df2..223951ad05a6 100644 --- a/x-pack/filebeat/input/azureblobstorage/auth_test.go +++ b/x-pack/filebeat/input/azureblobstorage/auth_test.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - beattest "github.com/elastic/beats/v7/libbeat/publisher/testing" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureblobstorage/mock" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + beattest "github.com/elastic/beats/v9/libbeat/publisher/testing" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureblobstorage/mock" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/azureblobstorage/config.go b/x-pack/filebeat/input/azureblobstorage/config.go index 2d171c67fe5b..c60f7cc0e1e9 100644 --- a/x-pack/filebeat/input/azureblobstorage/config.go +++ b/x-pack/filebeat/input/azureblobstorage/config.go @@ -10,9 +10,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader/parser" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader/parser" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/filebeat/input/azureblobstorage/decoding_test.go b/x-pack/filebeat/input/azureblobstorage/decoding_test.go index 564ff59f3722..3834d42914a8 100644 --- a/x-pack/filebeat/input/azureblobstorage/decoding_test.go +++ b/x-pack/filebeat/input/azureblobstorage/decoding_test.go @@ -19,8 +19,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/azureblobstorage/input.go b/x-pack/filebeat/input/azureblobstorage/input.go index 58a1231f463e..942d818c6828 100644 --- a/x-pack/filebeat/input/azureblobstorage/input.go +++ b/x-pack/filebeat/input/azureblobstorage/input.go @@ -11,12 +11,12 @@ import ( "reflect" "time" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/azureblobstorage/input_stateless_test.go b/x-pack/filebeat/input/azureblobstorage/input_stateless_test.go index dd75269afd03..132ab67cac44 100644 --- a/x-pack/filebeat/input/azureblobstorage/input_stateless_test.go +++ b/x-pack/filebeat/input/azureblobstorage/input_stateless_test.go @@ -9,10 +9,10 @@ import ( "golang.org/x/sync/errgroup" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/azureblobstorage/input_test.go b/x-pack/filebeat/input/azureblobstorage/input_test.go index 90f4e1e3cede..eacf8a8d1ab4 100644 --- a/x-pack/filebeat/input/azureblobstorage/input_test.go +++ b/x-pack/filebeat/input/azureblobstorage/input_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - beattest "github.com/elastic/beats/v7/libbeat/publisher/testing" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureblobstorage/mock" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + beattest "github.com/elastic/beats/v9/libbeat/publisher/testing" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureblobstorage/mock" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/x-pack/filebeat/input/azureblobstorage/job.go b/x-pack/filebeat/input/azureblobstorage/job.go index 2f3245227fa0..e448f2543d17 100644 --- a/x-pack/filebeat/input/azureblobstorage/job.go +++ b/x-pack/filebeat/input/azureblobstorage/job.go @@ -21,11 +21,11 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob" azcontainer "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/libbeat/reader" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/libbeat/reader" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/azureblobstorage/scheduler.go b/x-pack/filebeat/input/azureblobstorage/scheduler.go index abcd09a2315b..48c2fef04b8e 100644 --- a/x-pack/filebeat/input/azureblobstorage/scheduler.go +++ b/x-pack/filebeat/input/azureblobstorage/scheduler.go @@ -15,8 +15,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" azcontainer "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/management/status" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/go-concert/timed" diff --git a/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go b/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go index 39dbb85ac74d..a41cc5d926c8 100644 --- a/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go +++ b/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go @@ -16,9 +16,9 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/azureeventhub/input.go b/x-pack/filebeat/input/azureeventhub/input.go index 664123c564ea..7ef3c04680ed 100644 --- a/x-pack/filebeat/input/azureeventhub/input.go +++ b/x-pack/filebeat/input/azureeventhub/input.go @@ -13,8 +13,8 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/devigned/tab" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/feature" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/feature" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/x-pack/filebeat/input/azureeventhub/input_test.go b/x-pack/filebeat/input/azureeventhub/input_test.go index b46d47950a6d..0805d803750f 100644 --- a/x-pack/filebeat/input/azureeventhub/input_test.go +++ b/x-pack/filebeat/input/azureeventhub/input_test.go @@ -21,7 +21,7 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) var defaultTestConfig = azureInputConfig{ diff --git a/x-pack/filebeat/input/azureeventhub/v1_input.go b/x-pack/filebeat/input/azureeventhub/v1_input.go index 490c35eda4d6..7a84a6da8164 100644 --- a/x-pack/filebeat/input/azureeventhub/v1_input.go +++ b/x-pack/filebeat/input/azureeventhub/v1_input.go @@ -20,10 +20,10 @@ import ( "github.com/Azure/azure-event-hubs-go/v3/storage" "github.com/Azure/azure-storage-blob-go/azblob" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/azureeventhub/v2_input.go b/x-pack/filebeat/input/azureeventhub/v2_input.go index 8cbbb3703804..dad82e9e750c 100644 --- a/x-pack/filebeat/input/azureeventhub/v2_input.go +++ b/x-pack/filebeat/input/azureeventhub/v2_input.go @@ -21,10 +21,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/common/backoff" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/common/backoff" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/benchmark/input.go b/x-pack/filebeat/input/benchmark/input.go index dd4d1fafdb7e..9b07c5e9f677 100644 --- a/x-pack/filebeat/input/benchmark/input.go +++ b/x-pack/filebeat/input/benchmark/input.go @@ -10,11 +10,11 @@ import ( "github.com/rcrowley/go-metrics" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/cel/config_auth.go b/x-pack/filebeat/input/cel/config_auth.go index b00552a796d1..4f5b1d385268 100644 --- a/x-pack/filebeat/input/cel/config_auth.go +++ b/x-pack/filebeat/input/cel/config_auth.go @@ -20,7 +20,7 @@ import ( "golang.org/x/oauth2/endpoints" "golang.org/x/oauth2/google" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) type authConfig struct { diff --git a/x-pack/filebeat/input/cel/input.go b/x-pack/filebeat/input/cel/input.go index 35bebe73d1de..25e8577f043f 100644 --- a/x-pack/filebeat/input/cel/input.go +++ b/x-pack/filebeat/input/cel/input.go @@ -42,15 +42,15 @@ import ( "github.com/google/cel-go/ext" "google.golang.org/protobuf/types/known/structpb" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httplog" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httpmon" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httplog" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httpmon" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/cel/input_manager.go b/x-pack/filebeat/input/cel/input_manager.go index 0b557e6927e1..1266ae8afa37 100644 --- a/x-pack/filebeat/input/cel/input_manager.go +++ b/x-pack/filebeat/input/cel/input_manager.go @@ -7,9 +7,9 @@ package cel import ( "github.com/elastic/go-concert/unison" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/cel/input_test.go b/x-pack/filebeat/input/cel/input_test.go index da9f69e6aceb..086a1f9aa511 100644 --- a/x-pack/filebeat/input/cel/input_test.go +++ b/x-pack/filebeat/input/cel/input_test.go @@ -26,9 +26,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/icholy/digest" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/cel/integration_test.go b/x-pack/filebeat/input/cel/integration_test.go index 1ad676f4902a..eed44585c314 100644 --- a/x-pack/filebeat/input/cel/integration_test.go +++ b/x-pack/filebeat/input/cel/integration_test.go @@ -17,8 +17,8 @@ import ( "google.golang.org/protobuf/types/known/structpb" - "github.com/elastic/beats/v7/libbeat/tests/integration" - filebeat "github.com/elastic/beats/v7/x-pack/filebeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/integration" + filebeat "github.com/elastic/beats/v9/x-pack/filebeat/cmd" "github.com/elastic/elastic-agent-client/v7/pkg/client/mock" "github.com/elastic/elastic-agent-client/v7/pkg/proto" ) diff --git a/x-pack/filebeat/input/cloudfoundry/input.go b/x-pack/filebeat/input/cloudfoundry/input.go index 7334dada8fc3..742b2fe2230d 100644 --- a/x-pack/filebeat/input/cloudfoundry/input.go +++ b/x-pack/filebeat/input/cloudfoundry/input.go @@ -10,14 +10,14 @@ import ( "fmt" "time" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" ) type cloudfoundryEvent interface { diff --git a/x-pack/filebeat/input/cloudfoundry/input_integration_test.go b/x-pack/filebeat/input/cloudfoundry/input_integration_test.go index 1c99d61a664b..05be6f11e222 100644 --- a/x-pack/filebeat/input/cloudfoundry/input_integration_test.go +++ b/x-pack/filebeat/input/cloudfoundry/input_integration_test.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/require" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - pubtest "github.com/elastic/beats/v7/libbeat/publisher/testing" - cftest "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry/test" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + pubtest "github.com/elastic/beats/v9/libbeat/publisher/testing" + cftest "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry/test" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/cloudfoundry/v1.go b/x-pack/filebeat/input/cloudfoundry/v1.go index 94188c4ab4b0..1325267d8957 100644 --- a/x-pack/filebeat/input/cloudfoundry/v1.go +++ b/x-pack/filebeat/input/cloudfoundry/v1.go @@ -9,9 +9,9 @@ package cloudfoundry import ( "fmt" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" "github.com/elastic/go-concert/ctxtool" ) diff --git a/x-pack/filebeat/input/cloudfoundry/v2.go b/x-pack/filebeat/input/cloudfoundry/v2.go index c44509237ad0..d41bdb4446ab 100644 --- a/x-pack/filebeat/input/cloudfoundry/v2.go +++ b/x-pack/filebeat/input/cloudfoundry/v2.go @@ -7,9 +7,9 @@ package cloudfoundry import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" "github.com/elastic/go-concert/ctxtool" ) diff --git a/x-pack/filebeat/input/cometd/client_mocked.go b/x-pack/filebeat/input/cometd/client_mocked.go index 6079cb1f174e..e5d5d6745723 100644 --- a/x-pack/filebeat/input/cometd/client_mocked.go +++ b/x-pack/filebeat/input/cometd/client_mocked.go @@ -5,8 +5,8 @@ package cometd import ( - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/filebeat/input/cometd/cometd_integration_test.go b/x-pack/filebeat/input/cometd/cometd_integration_test.go index b76020d421b2..d9190fe69dfc 100644 --- a/x-pack/filebeat/input/cometd/cometd_integration_test.go +++ b/x-pack/filebeat/input/cometd/cometd_integration_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" bay "github.com/elastic/bayeux" conf "github.com/elastic/elastic-agent-libs/config" diff --git a/x-pack/filebeat/input/cometd/input.go b/x-pack/filebeat/input/cometd/input.go index 014f77922e13..be444b14b776 100644 --- a/x-pack/filebeat/input/cometd/input.go +++ b/x-pack/filebeat/input/cometd/input.go @@ -15,9 +15,9 @@ import ( "golang.org/x/time/rate" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/cometd/input_test.go b/x-pack/filebeat/input/cometd/input_test.go index 07a8b286859c..228d9fa99481 100644 --- a/x-pack/filebeat/input/cometd/input_test.go +++ b/x-pack/filebeat/input/cometd/input_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" bay "github.com/elastic/bayeux" - finput "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/filebeat/input/inputtest" - "github.com/elastic/beats/v7/libbeat/beat" + finput "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/filebeat/input/inputtest" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/x-pack/filebeat/input/default-inputs/inputs.go b/x-pack/filebeat/input/default-inputs/inputs.go index 6174066a32c0..dad317404a51 100644 --- a/x-pack/filebeat/input/default-inputs/inputs.go +++ b/x-pack/filebeat/input/default-inputs/inputs.go @@ -5,10 +5,10 @@ package inputs import ( - ossinputs "github.com/elastic/beats/v7/filebeat/input/default-inputs" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" + ossinputs "github.com/elastic/beats/v9/filebeat/input/default-inputs" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/default-inputs/inputs_aix.go b/x-pack/filebeat/input/default-inputs/inputs_aix.go index 89bf9a2960a7..6d491fd9c28f 100644 --- a/x-pack/filebeat/input/default-inputs/inputs_aix.go +++ b/x-pack/filebeat/input/default-inputs/inputs_aix.go @@ -5,16 +5,16 @@ package inputs import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/awss3" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics" - "github.com/elastic/beats/v7/x-pack/filebeat/input/http_endpoint" - "github.com/elastic/beats/v7/x-pack/filebeat/input/httpjson" - "github.com/elastic/beats/v7/x-pack/filebeat/input/lumberjack" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit" - "github.com/elastic/beats/v7/x-pack/filebeat/input/salesforce" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/awss3" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics" + "github.com/elastic/beats/v9/x-pack/filebeat/input/http_endpoint" + "github.com/elastic/beats/v9/x-pack/filebeat/input/httpjson" + "github.com/elastic/beats/v9/x-pack/filebeat/input/lumberjack" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit" + "github.com/elastic/beats/v9/x-pack/filebeat/input/salesforce" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/default-inputs/inputs_darwin.go b/x-pack/filebeat/input/default-inputs/inputs_darwin.go index 3712cb815988..82cd6a1788c5 100644 --- a/x-pack/filebeat/input/default-inputs/inputs_darwin.go +++ b/x-pack/filebeat/input/default-inputs/inputs_darwin.go @@ -7,26 +7,26 @@ package inputs import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/awscloudwatch" - "github.com/elastic/beats/v7/x-pack/filebeat/input/awss3" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureblobstorage" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureeventhub" - "github.com/elastic/beats/v7/x-pack/filebeat/input/benchmark" - "github.com/elastic/beats/v7/x-pack/filebeat/input/cel" - "github.com/elastic/beats/v7/x-pack/filebeat/input/cloudfoundry" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics" - "github.com/elastic/beats/v7/x-pack/filebeat/input/gcs" - "github.com/elastic/beats/v7/x-pack/filebeat/input/http_endpoint" - "github.com/elastic/beats/v7/x-pack/filebeat/input/httpjson" - "github.com/elastic/beats/v7/x-pack/filebeat/input/lumberjack" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit" - "github.com/elastic/beats/v7/x-pack/filebeat/input/salesforce" - "github.com/elastic/beats/v7/x-pack/filebeat/input/streaming" - "github.com/elastic/beats/v7/x-pack/filebeat/input/unifiedlogs" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/awscloudwatch" + "github.com/elastic/beats/v9/x-pack/filebeat/input/awss3" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureblobstorage" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureeventhub" + "github.com/elastic/beats/v9/x-pack/filebeat/input/benchmark" + "github.com/elastic/beats/v9/x-pack/filebeat/input/cel" + "github.com/elastic/beats/v9/x-pack/filebeat/input/cloudfoundry" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics" + "github.com/elastic/beats/v9/x-pack/filebeat/input/gcs" + "github.com/elastic/beats/v9/x-pack/filebeat/input/http_endpoint" + "github.com/elastic/beats/v9/x-pack/filebeat/input/httpjson" + "github.com/elastic/beats/v9/x-pack/filebeat/input/lumberjack" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit" + "github.com/elastic/beats/v9/x-pack/filebeat/input/salesforce" + "github.com/elastic/beats/v9/x-pack/filebeat/input/streaming" + "github.com/elastic/beats/v9/x-pack/filebeat/input/unifiedlogs" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/default-inputs/inputs_other.go b/x-pack/filebeat/input/default-inputs/inputs_other.go index 474a212f345b..c77ff269cc2e 100644 --- a/x-pack/filebeat/input/default-inputs/inputs_other.go +++ b/x-pack/filebeat/input/default-inputs/inputs_other.go @@ -7,25 +7,25 @@ package inputs import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/awscloudwatch" - "github.com/elastic/beats/v7/x-pack/filebeat/input/awss3" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureblobstorage" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureeventhub" - "github.com/elastic/beats/v7/x-pack/filebeat/input/benchmark" - "github.com/elastic/beats/v7/x-pack/filebeat/input/cel" - "github.com/elastic/beats/v7/x-pack/filebeat/input/cloudfoundry" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics" - "github.com/elastic/beats/v7/x-pack/filebeat/input/gcs" - "github.com/elastic/beats/v7/x-pack/filebeat/input/http_endpoint" - "github.com/elastic/beats/v7/x-pack/filebeat/input/httpjson" - "github.com/elastic/beats/v7/x-pack/filebeat/input/lumberjack" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit" - "github.com/elastic/beats/v7/x-pack/filebeat/input/salesforce" - "github.com/elastic/beats/v7/x-pack/filebeat/input/streaming" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/awscloudwatch" + "github.com/elastic/beats/v9/x-pack/filebeat/input/awss3" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureblobstorage" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureeventhub" + "github.com/elastic/beats/v9/x-pack/filebeat/input/benchmark" + "github.com/elastic/beats/v9/x-pack/filebeat/input/cel" + "github.com/elastic/beats/v9/x-pack/filebeat/input/cloudfoundry" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics" + "github.com/elastic/beats/v9/x-pack/filebeat/input/gcs" + "github.com/elastic/beats/v9/x-pack/filebeat/input/http_endpoint" + "github.com/elastic/beats/v9/x-pack/filebeat/input/httpjson" + "github.com/elastic/beats/v9/x-pack/filebeat/input/lumberjack" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit" + "github.com/elastic/beats/v9/x-pack/filebeat/input/salesforce" + "github.com/elastic/beats/v9/x-pack/filebeat/input/streaming" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/default-inputs/inputs_windows.go b/x-pack/filebeat/input/default-inputs/inputs_windows.go index abd2a991dcc3..d46c4d2f1a56 100644 --- a/x-pack/filebeat/input/default-inputs/inputs_windows.go +++ b/x-pack/filebeat/input/default-inputs/inputs_windows.go @@ -7,26 +7,26 @@ package inputs import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/awscloudwatch" - "github.com/elastic/beats/v7/x-pack/filebeat/input/awss3" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureblobstorage" - "github.com/elastic/beats/v7/x-pack/filebeat/input/azureeventhub" - "github.com/elastic/beats/v7/x-pack/filebeat/input/benchmark" - "github.com/elastic/beats/v7/x-pack/filebeat/input/cel" - "github.com/elastic/beats/v7/x-pack/filebeat/input/cloudfoundry" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics" - "github.com/elastic/beats/v7/x-pack/filebeat/input/etw" - "github.com/elastic/beats/v7/x-pack/filebeat/input/gcs" - "github.com/elastic/beats/v7/x-pack/filebeat/input/http_endpoint" - "github.com/elastic/beats/v7/x-pack/filebeat/input/httpjson" - "github.com/elastic/beats/v7/x-pack/filebeat/input/lumberjack" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit" - "github.com/elastic/beats/v7/x-pack/filebeat/input/salesforce" - "github.com/elastic/beats/v7/x-pack/filebeat/input/streaming" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/awscloudwatch" + "github.com/elastic/beats/v9/x-pack/filebeat/input/awss3" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureblobstorage" + "github.com/elastic/beats/v9/x-pack/filebeat/input/azureeventhub" + "github.com/elastic/beats/v9/x-pack/filebeat/input/benchmark" + "github.com/elastic/beats/v9/x-pack/filebeat/input/cel" + "github.com/elastic/beats/v9/x-pack/filebeat/input/cloudfoundry" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics" + "github.com/elastic/beats/v9/x-pack/filebeat/input/etw" + "github.com/elastic/beats/v9/x-pack/filebeat/input/gcs" + "github.com/elastic/beats/v9/x-pack/filebeat/input/http_endpoint" + "github.com/elastic/beats/v9/x-pack/filebeat/input/httpjson" + "github.com/elastic/beats/v9/x-pack/filebeat/input/lumberjack" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit" + "github.com/elastic/beats/v9/x-pack/filebeat/input/salesforce" + "github.com/elastic/beats/v9/x-pack/filebeat/input/streaming" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/conf.go b/x-pack/filebeat/input/entityanalytics/conf.go index 1360a0685421..c8948ce761af 100644 --- a/x-pack/filebeat/input/entityanalytics/conf.go +++ b/x-pack/filebeat/input/entityanalytics/conf.go @@ -7,7 +7,7 @@ package entityanalytics import ( "errors" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider" ) var ( diff --git a/x-pack/filebeat/input/entityanalytics/conf_test.go b/x-pack/filebeat/input/entityanalytics/conf_test.go index 1a5f3a4358c8..3973a6c89803 100644 --- a/x-pack/filebeat/input/entityanalytics/conf_test.go +++ b/x-pack/filebeat/input/entityanalytics/conf_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread" ) func TestConf_Validate(t *testing.T) { diff --git a/x-pack/filebeat/input/entityanalytics/input.go b/x-pack/filebeat/input/entityanalytics/input.go index 7757d4cf33b8..629409bcb8be 100644 --- a/x-pack/filebeat/input/entityanalytics/input.go +++ b/x-pack/filebeat/input/entityanalytics/input.go @@ -7,18 +7,18 @@ package entityanalytics import ( "fmt" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" // For provider registration. - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/activedirectory" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/jamf" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/okta" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/activedirectory" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/jamf" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/okta" ) // Name of this input. diff --git a/x-pack/filebeat/input/entityanalytics/input_test.go b/x-pack/filebeat/input/entityanalytics/input_test.go index 86f925adb229..f0f34f55d3b3 100644 --- a/x-pack/filebeat/input/entityanalytics/input_test.go +++ b/x-pack/filebeat/input/entityanalytics/input_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go b/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go index 8b9828980dbb..24c7f7631565 100644 --- a/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go +++ b/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime/debug" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/x-pack/filebeat/input/entityanalytics/internal/kvstore/input_test.go b/x-pack/filebeat/input/entityanalytics/internal/kvstore/input_test.go index 1c2a65162861..ef6017e54a49 100644 --- a/x-pack/filebeat/input/entityanalytics/internal/kvstore/input_test.go +++ b/x-pack/filebeat/input/entityanalytics/internal/kvstore/input_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/x-pack/filebeat/input/entityanalytics/internal/kvstore/manager.go b/x-pack/filebeat/input/entityanalytics/internal/kvstore/manager.go index 014b81e93fc3..2ee61db55259 100644 --- a/x-pack/filebeat/input/entityanalytics/internal/kvstore/manager.go +++ b/x-pack/filebeat/input/entityanalytics/internal/kvstore/manager.go @@ -5,7 +5,7 @@ package kvstore import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker.go b/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker.go index 71abb10d137f..f6cf72a19f2e 100644 --- a/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker.go +++ b/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker.go @@ -8,8 +8,8 @@ import ( "context" "sync/atomic" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" ) // TxTracker implements a transaction tracker. Individual beat events which diff --git a/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker_test.go b/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker_test.go index 7741fa1e595e..6be2cbbc14e5 100644 --- a/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker_test.go +++ b/x-pack/filebeat/input/entityanalytics/internal/kvstore/tracker_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) func TestTxTracker_Ack(t *testing.T) { diff --git a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go index 416df18dd1ab..ad1f11578aa2 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go +++ b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/activedirectory.go @@ -17,12 +17,12 @@ import ( "github.com/go-ldap/ldap/v3" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/activedirectory/internal/activedirectory" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/activedirectory/internal/activedirectory" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore.go b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore.go index 6ba6da1e1c4a..a156dbf75bc0 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore.go +++ b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/activedirectory/internal/activedirectory" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/activedirectory/internal/activedirectory" ) var ( diff --git a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore_test.go b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore_test.go index 747acacd8e3e..3e73b5d850f9 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/activedirectory/statestore_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/activedirectory/internal/activedirectory" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/activedirectory/internal/activedirectory" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock/mock.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock/mock.go index 25c93b7b78d1..a07acade1841 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock/mock.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock/mock.go @@ -8,7 +8,7 @@ package mock import ( "context" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/oauth2/oauth2.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/oauth2/oauth2.go index 717970310c3f..08efab1343e1 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/oauth2/oauth2.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/oauth2/oauth2.go @@ -16,7 +16,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/httpcommon" diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/azure.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/azure.go index a66e05887238..57c3c912eb0b 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/azure.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/azure.go @@ -13,16 +13,16 @@ import ( "github.com/gofrs/uuid/v5" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/oauth2" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/oauth2" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/azure_test.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/azure_test.go index c1fd2e0e2fd4..0041d8409a62 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/azure_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/azure_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" - mockauth "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock" - mockfetcher "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/mock" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" + mockauth "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock" + mockfetcher "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/mock" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device.go index 2a8bc0e2561d..5668a6736a94 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device.go @@ -7,7 +7,7 @@ package fetcher import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device_test.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device_test.go index 5f9e1bd11cee..5553aad1766c 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/device_test.go @@ -10,7 +10,7 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" ) func TestDevice_Merge(t *testing.T) { diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go index 2360eb6e3a6b..ced96cbacb7d 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph.go @@ -27,10 +27,10 @@ import ( "go.uber.org/zap/zapcore" "gopkg.in/natefinch/lumberjack.v2" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httplog" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httplog" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go index f21c99ea25cb..b90296a1d7fc 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/graph/graph_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/natefinch/lumberjack.v2" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/authenticator/mock" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/mock/mock.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/mock/mock.go index 4385385367d1..6efb656e4e3a 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/mock/mock.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/mock/mock.go @@ -10,7 +10,7 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user.go index 1a99e4ea889a..a2727e7c65f2 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user.go @@ -7,7 +7,7 @@ package fetcher import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user_test.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user_test.go index afb361f982fe..f5a709b11833 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher/user_test.go @@ -10,7 +10,7 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" ) func TestUser_Merge(t *testing.T) { diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore.go index dfa425c6c6ef..11d6810744c2 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore.go @@ -12,9 +12,9 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" ) var ( diff --git a/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore_test.go b/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore_test.go index 66f08d018d5e..487eb892981a 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/azuread/statestore_test.go @@ -14,9 +14,9 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/collections" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/collections" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/azuread/fetcher" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go b/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go index a500bc5c6c4f..51ab800e45e4 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go +++ b/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf.go @@ -23,13 +23,13 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httplog" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httplog" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf_test.go b/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf_test.go index 9ca7128d11c3..c7a46200590b 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/jamf/jamf_test.go @@ -21,7 +21,7 @@ import ( "github.com/google/go-cmp/cmp" "gopkg.in/natefinch/lumberjack.v2" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore.go b/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore.go index ffe2d0714cb6..a62228316f68 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore.go +++ b/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" ) var ( diff --git a/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore_test.go b/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore_test.go index 266a129aa4dd..60ed116267cb 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/jamf/statestore_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/jamf/internal/jamf" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/okta/okta.go b/x-pack/filebeat/input/entityanalytics/provider/okta/okta.go index b892dd6c0b58..06a651865220 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/okta/okta.go +++ b/x-pack/filebeat/input/entityanalytics/provider/okta/okta.go @@ -25,13 +25,13 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httplog" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httplog" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/entityanalytics/provider/okta/okta_test.go b/x-pack/filebeat/input/entityanalytics/provider/okta/okta_test.go index 5e9974ee6b8a..7cb83470a36c 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/okta/okta_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/okta/okta_test.go @@ -20,7 +20,7 @@ import ( "gopkg.in/natefinch/lumberjack.v2" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/okta/statestore.go b/x-pack/filebeat/input/entityanalytics/provider/okta/statestore.go index 296cbed5a408..03230a9d6c2e 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/okta/statestore.go +++ b/x-pack/filebeat/input/entityanalytics/provider/okta/statestore.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" ) var ( diff --git a/x-pack/filebeat/input/entityanalytics/provider/okta/statestore_test.go b/x-pack/filebeat/input/entityanalytics/provider/okta/statestore_test.go index 3a1c7e900c2e..76d755e3d548 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/okta/statestore_test.go +++ b/x-pack/filebeat/input/entityanalytics/provider/okta/statestore_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/internal/kvstore" - "github.com/elastic/beats/v7/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/internal/kvstore" + "github.com/elastic/beats/v9/x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/entityanalytics/provider/provider.go b/x-pack/filebeat/input/entityanalytics/provider/provider.go index ac1ae8b82b1f..026676174251 100644 --- a/x-pack/filebeat/input/entityanalytics/provider/provider.go +++ b/x-pack/filebeat/input/entityanalytics/provider/provider.go @@ -9,7 +9,7 @@ import ( "errors" "sync" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/etw/config.go b/x-pack/filebeat/input/etw/config.go index dddb88b64a78..66496e0b3241 100644 --- a/x-pack/filebeat/input/etw/config.go +++ b/x-pack/filebeat/input/etw/config.go @@ -9,7 +9,7 @@ package etw import ( "fmt" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/etw" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/etw" ) var validTraceLevel = map[string]bool{ diff --git a/x-pack/filebeat/input/etw/fields.go b/x-pack/filebeat/input/etw/fields.go index fa1303d036d8..fb859f26216e 100644 --- a/x-pack/filebeat/input/etw/fields.go +++ b/x-pack/filebeat/input/etw/fields.go @@ -7,7 +7,7 @@ package etw import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/input/etw/input.go b/x-pack/filebeat/input/etw/input.go index d2318c5d7120..e51845b1213a 100644 --- a/x-pack/filebeat/input/etw/input.go +++ b/x-pack/filebeat/input/etw/input.go @@ -13,11 +13,11 @@ import ( "sync" "time" - input "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/etw" + input "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/etw" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/etw/input_test.go b/x-pack/filebeat/input/etw/input_test.go index 457c48710a01..316d13821bd6 100644 --- a/x-pack/filebeat/input/etw/input_test.go +++ b/x-pack/filebeat/input/etw/input_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sys/windows" - input "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/etw" + input "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/etw" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/gcppubsub/config.go b/x-pack/filebeat/input/gcppubsub/config.go index c7c7d30dba93..363e8f83f168 100644 --- a/x-pack/filebeat/input/gcppubsub/config.go +++ b/x-pack/filebeat/input/gcppubsub/config.go @@ -12,8 +12,8 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/transport/httpcommon" "cloud.google.com/go/pubsub" diff --git a/x-pack/filebeat/input/gcppubsub/input.go b/x-pack/filebeat/input/gcppubsub/input.go index 1fc6ee39e08c..aa65edfdee49 100644 --- a/x-pack/filebeat/input/gcppubsub/input.go +++ b/x-pack/filebeat/input/gcppubsub/input.go @@ -24,12 +24,12 @@ import ( "github.com/gohugoio/hashstructure" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/version" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/gcppubsub/input_test.go b/x-pack/filebeat/input/gcppubsub/input_test.go index 02d9a746464f..48c7474e65ef 100644 --- a/x-pack/filebeat/input/gcppubsub/input_test.go +++ b/x-pack/filebeat/input/gcppubsub/input_test.go @@ -9,7 +9,7 @@ package gcppubsub import ( "testing" - "github.com/elastic/beats/v7/filebeat/input/inputtest" + "github.com/elastic/beats/v9/filebeat/input/inputtest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/gcppubsub/metrics.go b/x-pack/filebeat/input/gcppubsub/metrics.go index f0c0378184b3..ba80b4f5a999 100644 --- a/x-pack/filebeat/input/gcppubsub/metrics.go +++ b/x-pack/filebeat/input/gcppubsub/metrics.go @@ -9,7 +9,7 @@ package gcppubsub import ( "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/elastic-agent-libs/monitoring/adapter" diff --git a/x-pack/filebeat/input/gcppubsub/otel_test.go b/x-pack/filebeat/input/gcppubsub/otel_test.go index c949c2123974..761b24bb678f 100644 --- a/x-pack/filebeat/input/gcppubsub/otel_test.go +++ b/x-pack/filebeat/input/gcppubsub/otel_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/otelbeat/oteltest" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/otelbeat/oteltest" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-libs/testing/estools" ) diff --git a/x-pack/filebeat/input/gcppubsub/pubsub_test.go b/x-pack/filebeat/input/gcppubsub/pubsub_test.go index a9e384f0d45a..2e6bdd06ff2b 100644 --- a/x-pack/filebeat/input/gcppubsub/pubsub_test.go +++ b/x-pack/filebeat/input/gcppubsub/pubsub_test.go @@ -23,11 +23,11 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/api/iterator" - "github.com/elastic/beats/v7/filebeat/channel" - "github.com/elastic/beats/v7/filebeat/input" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/filebeat/channel" + "github.com/elastic/beats/v9/filebeat/input" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/libbeat/tests/resources" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/x-pack/filebeat/input/gcs/config.go b/x-pack/filebeat/input/gcs/config.go index 727bacbfb4a4..4f062aaf545c 100644 --- a/x-pack/filebeat/input/gcs/config.go +++ b/x-pack/filebeat/input/gcs/config.go @@ -15,9 +15,9 @@ import ( "cloud.google.com/go/storage" "golang.org/x/oauth2/google" - "github.com/elastic/beats/v7/libbeat/common/match" - "github.com/elastic/beats/v7/libbeat/reader/parser" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + "github.com/elastic/beats/v9/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/reader/parser" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/filebeat/input/gcs/decoding_test.go b/x-pack/filebeat/input/gcs/decoding_test.go index 4a0de7dbfb1c..4a919c514971 100644 --- a/x-pack/filebeat/input/gcs/decoding_test.go +++ b/x-pack/filebeat/input/gcs/decoding_test.go @@ -17,8 +17,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/gcs/helper.go b/x-pack/filebeat/input/gcs/helper.go index 1f17b81e0d90..ce684a3ebec2 100644 --- a/x-pack/filebeat/input/gcs/helper.go +++ b/x-pack/filebeat/input/gcs/helper.go @@ -12,7 +12,7 @@ import ( "io" "net/http" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/gcs/input.go b/x-pack/filebeat/input/gcs/input.go index aed2db28c09e..c3b04a0304bb 100644 --- a/x-pack/filebeat/input/gcs/input.go +++ b/x-pack/filebeat/input/gcs/input.go @@ -13,11 +13,11 @@ import ( "cloud.google.com/go/storage" "github.com/googleapis/gax-go/v2" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/gcs/input_stateless_test.go b/x-pack/filebeat/input/gcs/input_stateless_test.go index cab0660d2588..50db0b653718 100644 --- a/x-pack/filebeat/input/gcs/input_stateless_test.go +++ b/x-pack/filebeat/input/gcs/input_stateless_test.go @@ -11,11 +11,11 @@ import ( "github.com/googleapis/gax-go/v2" "golang.org/x/sync/errgroup" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/gcs/input_test.go b/x-pack/filebeat/input/gcs/input_test.go index b6a36c4910e9..37b90dbe561d 100644 --- a/x-pack/filebeat/input/gcs/input_test.go +++ b/x-pack/filebeat/input/gcs/input_test.go @@ -22,9 +22,9 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/api/option" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - beattest "github.com/elastic/beats/v7/libbeat/publisher/testing" - "github.com/elastic/beats/v7/x-pack/filebeat/input/gcs/mock" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + beattest "github.com/elastic/beats/v9/libbeat/publisher/testing" + "github.com/elastic/beats/v9/x-pack/filebeat/input/gcs/mock" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/gcs/job.go b/x-pack/filebeat/input/gcs/job.go index b0684b4e2ae0..8c9842913db7 100644 --- a/x-pack/filebeat/input/gcs/job.go +++ b/x-pack/filebeat/input/gcs/job.go @@ -19,11 +19,11 @@ import ( "cloud.google.com/go/storage" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/libbeat/reader" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/decoder" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/libbeat/reader" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/decoder" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/gcs/scheduler.go b/x-pack/filebeat/input/gcs/scheduler.go index ad764987f25a..d1294f4cd47b 100644 --- a/x-pack/filebeat/input/gcs/scheduler.go +++ b/x-pack/filebeat/input/gcs/scheduler.go @@ -16,8 +16,8 @@ import ( "cloud.google.com/go/storage" "google.golang.org/api/iterator" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/management/status" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/go-concert/timed" diff --git a/x-pack/filebeat/input/http_endpoint/ack.go b/x-pack/filebeat/input/http_endpoint/ack.go index 9dfc5a656b56..02612ca95966 100644 --- a/x-pack/filebeat/input/http_endpoint/ack.go +++ b/x-pack/filebeat/input/http_endpoint/ack.go @@ -7,8 +7,8 @@ package http_endpoint import ( "sync" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" ) // newEventACKHandler returns a beat ACKer that can receive callbacks when diff --git a/x-pack/filebeat/input/http_endpoint/handler.go b/x-pack/filebeat/input/http_endpoint/handler.go index c3f873a561b0..4238fc6ed675 100644 --- a/x-pack/filebeat/input/http_endpoint/handler.go +++ b/x-pack/filebeat/input/http_endpoint/handler.go @@ -30,11 +30,11 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/types/known/structpb" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/jsontransform" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httplog" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/jsontransform" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httplog" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/mito/lib" diff --git a/x-pack/filebeat/input/http_endpoint/handler_test.go b/x-pack/filebeat/input/http_endpoint/handler_test.go index 68ed9bc033ff..d633a833ecd2 100644 --- a/x-pack/filebeat/input/http_endpoint/handler_test.go +++ b/x-pack/filebeat/input/http_endpoint/handler_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/natefinch/lumberjack.v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/testing/testutils" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/testing/testutils" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/http_endpoint/input.go b/x-pack/filebeat/input/http_endpoint/input.go index b69c5d909478..e89bf117195d 100644 --- a/x-pack/filebeat/input/http_endpoint/input.go +++ b/x-pack/filebeat/input/http_endpoint/input.go @@ -29,10 +29,10 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/http_endpoint/input_test.go b/x-pack/filebeat/input/http_endpoint/input_test.go index 7d20513e6fad..7fa1b883a26d 100644 --- a/x-pack/filebeat/input/http_endpoint/input_test.go +++ b/x-pack/filebeat/input/http_endpoint/input_test.go @@ -19,7 +19,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" @@ -138,9 +138,9 @@ var serverPoolTests = []struct { events: []target{ { url: "http://127.0.0.1:9001/", wantHeader: http.Header{ - "Content-Length": {"0"}, - "Option-Header": {"options-header-value"}, - }, + "Content-Length": {"0"}, + "Option-Header": {"options-header-value"}, + }, }, }, wantStatus: http.StatusOK, @@ -165,8 +165,8 @@ var serverPoolTests = []struct { events: []target{ { url: "http://127.0.0.1:9001/", wantHeader: http.Header{ - "Content-Length": {"0"}, - }, + "Content-Length": {"0"}, + }, }, }, wantStatus: http.StatusOK, diff --git a/x-pack/filebeat/input/httpjson/config_auth.go b/x-pack/filebeat/input/httpjson/config_auth.go index 49ad46892f0b..2c5c86430e40 100644 --- a/x-pack/filebeat/input/httpjson/config_auth.go +++ b/x-pack/filebeat/input/httpjson/config_auth.go @@ -19,7 +19,7 @@ import ( "golang.org/x/oauth2/endpoints" "golang.org/x/oauth2/google" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) type authConfig struct { diff --git a/x-pack/filebeat/input/httpjson/cursor.go b/x-pack/filebeat/input/httpjson/cursor.go index 2881d70edc57..2e740bd9014d 100644 --- a/x-pack/filebeat/input/httpjson/cursor.go +++ b/x-pack/filebeat/input/httpjson/cursor.go @@ -5,8 +5,8 @@ package httpjson import ( - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/management/status" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/httpjson/input.go b/x-pack/filebeat/input/httpjson/input.go index 3a5b0ed0a28b..f3cf551adf3e 100644 --- a/x-pack/filebeat/input/httpjson/input.go +++ b/x-pack/filebeat/input/httpjson/input.go @@ -26,16 +26,16 @@ import ( "github.com/elastic/mito/lib/xml" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httplog" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/httpmon" - "github.com/elastic/beats/v7/x-pack/filebeat/input/internal/private" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httplog" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/httpmon" + "github.com/elastic/beats/v9/x-pack/filebeat/input/internal/private" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/httpjson/input_cursor.go b/x-pack/filebeat/input/httpjson/input_cursor.go index 281588d6fd79..3e9b6c56ea38 100644 --- a/x-pack/filebeat/input/httpjson/input_cursor.go +++ b/x-pack/filebeat/input/httpjson/input_cursor.go @@ -5,8 +5,8 @@ package httpjson import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/httpjson/input_manager.go b/x-pack/filebeat/input/httpjson/input_manager.go index 459012ac8ef0..9509a9e15161 100644 --- a/x-pack/filebeat/input/httpjson/input_manager.go +++ b/x-pack/filebeat/input/httpjson/input_manager.go @@ -10,10 +10,10 @@ import ( conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/go-concert/unison" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/httpjson/input_stateless.go b/x-pack/filebeat/input/httpjson/input_stateless.go index ea44b04808b5..b155b7a86ebf 100644 --- a/x-pack/filebeat/input/httpjson/input_stateless.go +++ b/x-pack/filebeat/input/httpjson/input_stateless.go @@ -5,9 +5,9 @@ package httpjson import ( - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - stateless "github.com/elastic/beats/v7/filebeat/input/v2/input-stateless" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + stateless "github.com/elastic/beats/v9/filebeat/input/v2/input-stateless" + "github.com/elastic/beats/v9/libbeat/beat" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/filebeat/input/httpjson/input_test.go b/x-pack/filebeat/input/httpjson/input_test.go index 83599b602efd..42550f070ff0 100644 --- a/x-pack/filebeat/input/httpjson/input_test.go +++ b/x-pack/filebeat/input/httpjson/input_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - beattest "github.com/elastic/beats/v7/libbeat/publisher/testing" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + beattest "github.com/elastic/beats/v9/libbeat/publisher/testing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/httpjson/metrics_test.go b/x-pack/filebeat/input/httpjson/metrics_test.go index b1531cbf204d..72327f59eb80 100644 --- a/x-pack/filebeat/input/httpjson/metrics_test.go +++ b/x-pack/filebeat/input/httpjson/metrics_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" - beattest "github.com/elastic/beats/v7/libbeat/publisher/testing" + beattest "github.com/elastic/beats/v9/libbeat/publisher/testing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/httpjson/pagination.go b/x-pack/filebeat/input/httpjson/pagination.go index 5b936c7cc5e9..acf88e0164c3 100644 --- a/x-pack/filebeat/input/httpjson/pagination.go +++ b/x-pack/filebeat/input/httpjson/pagination.go @@ -11,7 +11,7 @@ import ( "net/http" "net/url" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/mito/lib/xml" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/filebeat/input/httpjson/policy.go b/x-pack/filebeat/input/httpjson/policy.go index af8b6649aff6..28d2349d9402 100644 --- a/x-pack/filebeat/input/httpjson/policy.go +++ b/x-pack/filebeat/input/httpjson/policy.go @@ -15,7 +15,7 @@ import ( "net/url" "regexp" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/httpjson/rate_limiter.go b/x-pack/filebeat/input/httpjson/rate_limiter.go index c0ce94cdfe58..9357203319df 100644 --- a/x-pack/filebeat/input/httpjson/rate_limiter.go +++ b/x-pack/filebeat/input/httpjson/rate_limiter.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/httpjson/request.go b/x-pack/filebeat/input/httpjson/request.go index 2f3129718333..03673e1e8cf4 100644 --- a/x-pack/filebeat/input/httpjson/request.go +++ b/x-pack/filebeat/input/httpjson/request.go @@ -19,8 +19,8 @@ import ( "github.com/PaesslerAG/jsonpath" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/management/status" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/httpjson/request_test.go b/x-pack/filebeat/input/httpjson/request_test.go index 7f6b96880f5c..465baa0b3895 100644 --- a/x-pack/filebeat/input/httpjson/request_test.go +++ b/x-pack/filebeat/input/httpjson/request_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" - beattest "github.com/elastic/beats/v7/libbeat/publisher/testing" + beattest "github.com/elastic/beats/v9/libbeat/publisher/testing" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/httpjson/response.go b/x-pack/filebeat/input/httpjson/response.go index f54ef1fa42d3..b45b1c983060 100644 --- a/x-pack/filebeat/input/httpjson/response.go +++ b/x-pack/filebeat/input/httpjson/response.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/mito/lib/xml" diff --git a/x-pack/filebeat/input/httpjson/split.go b/x-pack/filebeat/input/httpjson/split.go index 6be028879132..8d27799a1f8d 100644 --- a/x-pack/filebeat/input/httpjson/split.go +++ b/x-pack/filebeat/input/httpjson/split.go @@ -10,7 +10,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/httpjson/transform.go b/x-pack/filebeat/input/httpjson/transform.go index b412d9090566..35dcf470f153 100644 --- a/x-pack/filebeat/input/httpjson/transform.go +++ b/x-pack/filebeat/input/httpjson/transform.go @@ -11,8 +11,8 @@ import ( "net/url" "strconv" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/httpjson/transform_append.go b/x-pack/filebeat/input/httpjson/transform_append.go index 182de7c3d1d9..b472d0a2fafe 100644 --- a/x-pack/filebeat/input/httpjson/transform_append.go +++ b/x-pack/filebeat/input/httpjson/transform_append.go @@ -7,7 +7,7 @@ package httpjson import ( "fmt" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/httpjson/transform_delete.go b/x-pack/filebeat/input/httpjson/transform_delete.go index 90dc30dd5e21..9c6b892f3f32 100644 --- a/x-pack/filebeat/input/httpjson/transform_delete.go +++ b/x-pack/filebeat/input/httpjson/transform_delete.go @@ -7,7 +7,7 @@ package httpjson import ( "fmt" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/httpjson/transform_registry.go b/x-pack/filebeat/input/httpjson/transform_registry.go index 518efbfb9d95..352c0d541b05 100644 --- a/x-pack/filebeat/input/httpjson/transform_registry.go +++ b/x-pack/filebeat/input/httpjson/transform_registry.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/httpjson/transform_set.go b/x-pack/filebeat/input/httpjson/transform_set.go index 0cf7eb00ed52..957f7a44d8cf 100644 --- a/x-pack/filebeat/input/httpjson/transform_set.go +++ b/x-pack/filebeat/input/httpjson/transform_set.go @@ -9,7 +9,7 @@ import ( "fmt" "net/url" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/httpjson/transform_test.go b/x-pack/filebeat/input/httpjson/transform_test.go index 11e8706f49e0..4c29b26a9d9e 100644 --- a/x-pack/filebeat/input/httpjson/transform_test.go +++ b/x-pack/filebeat/input/httpjson/transform_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/httpjson/value_tpl.go b/x-pack/filebeat/input/httpjson/value_tpl.go index af47803be94f..845794829e19 100644 --- a/x-pack/filebeat/input/httpjson/value_tpl.go +++ b/x-pack/filebeat/input/httpjson/value_tpl.go @@ -26,8 +26,8 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/useragent" ) diff --git a/x-pack/filebeat/input/httpjson/value_tpl_test.go b/x-pack/filebeat/input/httpjson/value_tpl_test.go index 087e2eddebcc..bfc83e508adc 100644 --- a/x-pack/filebeat/input/httpjson/value_tpl_test.go +++ b/x-pack/filebeat/input/httpjson/value_tpl_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/testing/testutils" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/testing/testutils" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/useragent" diff --git a/x-pack/filebeat/input/lumberjack/ack.go b/x-pack/filebeat/input/lumberjack/ack.go index 6e9e65cb695d..8855c4418eff 100644 --- a/x-pack/filebeat/input/lumberjack/ack.go +++ b/x-pack/filebeat/input/lumberjack/ack.go @@ -7,8 +7,8 @@ package lumberjack import ( "sync" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/acker" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/acker" ) // batchACKTracker invokes batchACK when all events associated to the batch diff --git a/x-pack/filebeat/input/lumberjack/fields.go b/x-pack/filebeat/input/lumberjack/fields.go index d54be5d16eb4..5e34de2d95e3 100644 --- a/x-pack/filebeat/input/lumberjack/fields.go +++ b/x-pack/filebeat/input/lumberjack/fields.go @@ -7,7 +7,7 @@ package lumberjack import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/input/lumberjack/input.go b/x-pack/filebeat/input/lumberjack/input.go index b19954ad7fa1..31448ad861f9 100644 --- a/x-pack/filebeat/input/lumberjack/input.go +++ b/x-pack/filebeat/input/lumberjack/input.go @@ -7,10 +7,10 @@ package lumberjack import ( "fmt" - inputv2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" + inputv2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/lumberjack/server.go b/x-pack/filebeat/input/lumberjack/server.go index b8c6607f4a7c..45bfcd612a47 100644 --- a/x-pack/filebeat/input/lumberjack/server.go +++ b/x-pack/filebeat/input/lumberjack/server.go @@ -13,8 +13,8 @@ import ( "golang.org/x/net/netutil" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" "github.com/elastic/elastic-agent-libs/transport/tlscommon" diff --git a/x-pack/filebeat/input/lumberjack/server_test.go b/x-pack/filebeat/input/lumberjack/server_test.go index f3ff1ae8c773..0ea83ece8747 100644 --- a/x-pack/filebeat/input/lumberjack/server_test.go +++ b/x-pack/filebeat/input/lumberjack/server_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/tlscommon" client "github.com/elastic/go-lumber/client/v2" diff --git a/x-pack/filebeat/input/netflow/case.go b/x-pack/filebeat/input/netflow/case.go index 6e2f74f2c4ce..ccd98d10638a 100644 --- a/x-pack/filebeat/input/netflow/case.go +++ b/x-pack/filebeat/input/netflow/case.go @@ -9,7 +9,7 @@ import ( "sync" "unicode" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/netflow/config.go b/x-pack/filebeat/input/netflow/config.go index 18a233b49f7b..65e0295e5663 100644 --- a/x-pack/filebeat/input/netflow/config.go +++ b/x-pack/filebeat/input/netflow/config.go @@ -9,8 +9,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/v7/filebeat/harvester" - "github.com/elastic/beats/v7/filebeat/inputsource/udp" + "github.com/elastic/beats/v9/filebeat/harvester" + "github.com/elastic/beats/v9/filebeat/inputsource/udp" ) type config struct { diff --git a/x-pack/filebeat/input/netflow/convert.go b/x-pack/filebeat/input/netflow/convert.go index 4b43c07d2916..a9d97c68620e 100644 --- a/x-pack/filebeat/input/netflow/convert.go +++ b/x-pack/filebeat/input/netflow/convert.go @@ -16,10 +16,10 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/flowhash" - "github.com/elastic/beats/v7/libbeat/conditions" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/flowhash" + "github.com/elastic/beats/v9/libbeat/conditions" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/netflow/decoder/config/config.go b/x-pack/filebeat/input/netflow/decoder/config/config.go index 8b51336596ea..3dca4212c563 100644 --- a/x-pack/filebeat/input/netflow/decoder/config/config.go +++ b/x-pack/filebeat/input/netflow/decoder/config/config.go @@ -7,7 +7,7 @@ package config import ( "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/netflow/decoder/decoder.go b/x-pack/filebeat/input/netflow/decoder/decoder.go index 37b00e5b3565..8e4b08a8a157 100644 --- a/x-pack/filebeat/input/netflow/decoder/decoder.go +++ b/x-pack/filebeat/input/netflow/decoder/decoder.go @@ -16,9 +16,9 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" ) // Decoder is a NetFlow decoder that accepts network packets from an Exporter diff --git a/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go b/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go index 2d88eb0bebfc..363d16d1d21b 100644 --- a/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go +++ b/x-pack/filebeat/input/netflow/decoder/examples/go-netflow-example.go @@ -12,7 +12,7 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder" ) func main() { diff --git a/x-pack/filebeat/input/netflow/decoder/include.go b/x-pack/filebeat/input/netflow/decoder/include.go index cb90760c5f36..af5ca5bf56d3 100644 --- a/x-pack/filebeat/input/netflow/decoder/include.go +++ b/x-pack/filebeat/input/netflow/decoder/include.go @@ -8,11 +8,11 @@ package decoder // into the protocol registry. import ( - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/ipfix" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v1" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v5" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v6" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v7" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v8" - _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v9" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/ipfix" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v1" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v5" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v6" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v7" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v8" + _ "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v9" ) diff --git a/x-pack/filebeat/input/netflow/decoder/ipfix/decoder.go b/x-pack/filebeat/input/netflow/decoder/ipfix/decoder.go index fc4ab1e03d31..b88b0702b7fa 100644 --- a/x-pack/filebeat/input/netflow/decoder/ipfix/decoder.go +++ b/x-pack/filebeat/input/netflow/decoder/ipfix/decoder.go @@ -13,9 +13,9 @@ import ( "math" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - v9 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v9" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + v9 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v9" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/ipfix/decoder_test.go b/x-pack/filebeat/input/netflow/decoder/ipfix/decoder_test.go index 3051903ab06c..d9dfc0366f6d 100644 --- a/x-pack/filebeat/input/netflow/decoder/ipfix/decoder_test.go +++ b/x-pack/filebeat/input/netflow/decoder/ipfix/decoder_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" - v9 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v9" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" + v9 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v9" ) func TestDecoderV9_ReadFieldDefinition(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix.go b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix.go index c3f3b0669b81..2209d9fbb2a5 100644 --- a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix.go +++ b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix.go @@ -5,9 +5,9 @@ package ipfix import ( - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - v9 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v9" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + v9 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v9" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go index d4b0445d419b..3b80c4fffeb2 100644 --- a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go +++ b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go @@ -14,11 +14,11 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" - v9 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v9" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" + v9 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v9" ) func init() { diff --git a/x-pack/filebeat/input/netflow/decoder/protocol/protocol.go b/x-pack/filebeat/input/netflow/decoder/protocol/protocol.go index 452a79b4d25f..8f72f38201f1 100644 --- a/x-pack/filebeat/input/netflow/decoder/protocol/protocol.go +++ b/x-pack/filebeat/input/netflow/decoder/protocol/protocol.go @@ -8,7 +8,7 @@ import ( "bytes" "net" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" ) // Protocol is the interface that NetFlow protocol parsers must conform to. diff --git a/x-pack/filebeat/input/netflow/decoder/protocol/registry.go b/x-pack/filebeat/input/netflow/decoder/protocol/registry.go index 56d40f6dac70..2989a3a07565 100644 --- a/x-pack/filebeat/input/netflow/decoder/protocol/registry.go +++ b/x-pack/filebeat/input/netflow/decoder/protocol/registry.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" ) // Registry is the global instance of the ProtocolRegistry. Protocol handlers diff --git a/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go b/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go index 8b2eb75f63c6..f834060e1343 100644 --- a/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go +++ b/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go @@ -13,8 +13,8 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" ) func init() { diff --git a/x-pack/filebeat/input/netflow/decoder/template/template.go b/x-pack/filebeat/input/netflow/decoder/template/template.go index 0dc207a241a0..099e1d5aa352 100644 --- a/x-pack/filebeat/input/netflow/decoder/template/template.go +++ b/x-pack/filebeat/input/netflow/decoder/template/template.go @@ -11,8 +11,8 @@ import ( "io" "math" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/template/template_test.go b/x-pack/filebeat/input/netflow/decoder/template/template_test.go index 5351b3efa063..17e158370069 100644 --- a/x-pack/filebeat/input/netflow/decoder/template/template_test.go +++ b/x-pack/filebeat/input/netflow/decoder/template/template_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - . "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + . "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func TestTemplate_Apply(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/template/tmpltest/test_helpers.go b/x-pack/filebeat/input/netflow/decoder/template/tmpltest/test_helpers.go index 0b1fd2336352..5b2ccd314900 100644 --- a/x-pack/filebeat/input/netflow/decoder/template/tmpltest/test_helpers.go +++ b/x-pack/filebeat/input/netflow/decoder/template/tmpltest/test_helpers.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" ) var ( diff --git a/x-pack/filebeat/input/netflow/decoder/test/helper.go b/x-pack/filebeat/input/netflow/decoder/test/helper.go index 6041d2e6c80a..82d364d8aa34 100644 --- a/x-pack/filebeat/input/netflow/decoder/test/helper.go +++ b/x-pack/filebeat/input/netflow/decoder/test/helper.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" ) type TestLogWriter struct { diff --git a/x-pack/filebeat/input/netflow/decoder/v1/v1.go b/x-pack/filebeat/input/netflow/decoder/v1/v1.go index e7ccc6659ba3..f0f56b076fc3 100644 --- a/x-pack/filebeat/input/netflow/decoder/v1/v1.go +++ b/x-pack/filebeat/input/netflow/decoder/v1/v1.go @@ -12,11 +12,11 @@ import ( "net" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go b/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go index f23e584cdd9e..ad15d60df89d 100644 --- a/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v1/v1_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/netflow/decoder/v5/v5.go b/x-pack/filebeat/input/netflow/decoder/v5/v5.go index d96091c8ca97..15326ac27fa9 100644 --- a/x-pack/filebeat/input/netflow/decoder/v5/v5.go +++ b/x-pack/filebeat/input/netflow/decoder/v5/v5.go @@ -11,12 +11,12 @@ import ( "net" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - v1 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v1" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + v1 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v1" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go b/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go index 5c6d1724e8f9..b84cf107f267 100644 --- a/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go @@ -15,10 +15,10 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func init() { diff --git a/x-pack/filebeat/input/netflow/decoder/v6/v6.go b/x-pack/filebeat/input/netflow/decoder/v6/v6.go index 5949af7960be..30f59e08cd17 100644 --- a/x-pack/filebeat/input/netflow/decoder/v6/v6.go +++ b/x-pack/filebeat/input/netflow/decoder/v6/v6.go @@ -5,12 +5,12 @@ package v6 import ( - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - v1 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v1" - v5 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v5" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + v1 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v1" + v5 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v5" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go b/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go index 5896e1da2b8a..46d6c2013be3 100644 --- a/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go @@ -15,10 +15,10 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func init() { diff --git a/x-pack/filebeat/input/netflow/decoder/v7/v7.go b/x-pack/filebeat/input/netflow/decoder/v7/v7.go index d851d9420784..eaed795810ab 100644 --- a/x-pack/filebeat/input/netflow/decoder/v7/v7.go +++ b/x-pack/filebeat/input/netflow/decoder/v7/v7.go @@ -11,12 +11,12 @@ import ( "net" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - v1 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/v1" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + v1 "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/v1" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go b/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go index 591c19afa11b..0c602222f2a6 100644 --- a/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go @@ -15,10 +15,10 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func TestNetflowProtocol_New(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/v8/v8.go b/x-pack/filebeat/input/netflow/decoder/v8/v8.go index 06b3ac6c292c..406dc7b32ed4 100644 --- a/x-pack/filebeat/input/netflow/decoder/v8/v8.go +++ b/x-pack/filebeat/input/netflow/decoder/v8/v8.go @@ -12,11 +12,11 @@ import ( "net" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go b/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go index b6ab529c073a..ed36578579a8 100644 --- a/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go @@ -16,10 +16,10 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func init() { diff --git a/x-pack/filebeat/input/netflow/decoder/v9/decoder.go b/x-pack/filebeat/input/netflow/decoder/v9/decoder.go index d283bab506be..68e12bbf56c3 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/decoder.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/decoder.go @@ -15,9 +15,9 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/v9/decoder_test.go b/x-pack/filebeat/input/netflow/decoder/v9/decoder_test.go index 399cd12bf866..8edf5ab7c2d7 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/decoder_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/decoder_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template/tmpltest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template/tmpltest" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func TestDecoderV9_ReadPacketHeader(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/v9/session.go b/x-pack/filebeat/input/netflow/decoder/v9/session.go index 4a31b16937d8..e5cbe8638d78 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/session.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/session.go @@ -12,8 +12,8 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" ) // SessionKey is the key used to lookup sessions: exporter address + port diff --git a/x-pack/filebeat/input/netflow/decoder/v9/session_test.go b/x-pack/filebeat/input/netflow/decoder/v9/session_test.go index 5f6791252532..28a91fad71f2 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/session_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/session_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func init() { diff --git a/x-pack/filebeat/input/netflow/decoder/v9/v9.go b/x-pack/filebeat/input/netflow/decoder/v9/v9.go index 611a9dcba256..343c9f006cf5 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/v9.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/v9.go @@ -13,9 +13,9 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" ) const ( diff --git a/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go b/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go index c2fc1c2fa14e..8271300f5c00 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go @@ -12,9 +12,9 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" ) func init() { diff --git a/x-pack/filebeat/input/netflow/definitions.go b/x-pack/filebeat/input/netflow/definitions.go index bc00ed5d2fcc..2e593639bddf 100644 --- a/x-pack/filebeat/input/netflow/definitions.go +++ b/x-pack/filebeat/input/netflow/definitions.go @@ -14,7 +14,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" ) var logstashName2Decoder = map[string]fields.Decoder{ diff --git a/x-pack/filebeat/input/netflow/definitions_test.go b/x-pack/filebeat/input/netflow/definitions_test.go index 8fdcbcac785c..0c1169f4a576 100644 --- a/x-pack/filebeat/input/netflow/definitions_test.go +++ b/x-pack/filebeat/input/netflow/definitions_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" ) func TestLoadFieldDefinitions(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/fields.go b/x-pack/filebeat/input/netflow/fields.go index 9139c49e5dc5..8aecdc4244ad 100644 --- a/x-pack/filebeat/input/netflow/fields.go +++ b/x-pack/filebeat/input/netflow/fields.go @@ -7,7 +7,7 @@ package netflow import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/input/netflow/fields_gen.go b/x-pack/filebeat/input/netflow/fields_gen.go index 519e945eba0f..885826ac2499 100644 --- a/x-pack/filebeat/input/netflow/fields_gen.go +++ b/x-pack/filebeat/input/netflow/fields_gen.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow" ) var ( diff --git a/x-pack/filebeat/input/netflow/input.go b/x-pack/filebeat/input/netflow/input.go index 228e2b4849cb..45c6abda5f87 100644 --- a/x-pack/filebeat/input/netflow/input.go +++ b/x-pack/filebeat/input/netflow/input.go @@ -12,15 +12,15 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/filebeat/input/netmetrics" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/filebeat/inputsource" - "github.com/elastic/beats/v7/filebeat/inputsource/udp" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/filebeat/input/netmetrics" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/filebeat/inputsource" + "github.com/elastic/beats/v9/filebeat/inputsource/udp" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/filebeat/input/netflow/input_test.go b/x-pack/filebeat/input/netflow/input_test.go index a45cc2600922..8c3661c2a1c5 100644 --- a/x-pack/filebeat/input/netflow/input_test.go +++ b/x-pack/filebeat/input/netflow/input_test.go @@ -9,8 +9,8 @@ package netflow import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/resources" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v9/libbeat/tests/resources" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/fields" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/filebeat/input/netflow/integration_test.go b/x-pack/filebeat/input/netflow/integration_test.go index 61e0f21ba2ac..cff1bf622444 100644 --- a/x-pack/filebeat/input/netflow/integration_test.go +++ b/x-pack/filebeat/input/netflow/integration_test.go @@ -23,8 +23,8 @@ import ( "golang.org/x/time/rate" - "github.com/elastic/beats/v7/libbeat/tests/integration" - filebeat "github.com/elastic/beats/v7/x-pack/filebeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/integration" + filebeat "github.com/elastic/beats/v9/x-pack/filebeat/cmd" "github.com/elastic/elastic-agent-client/v7/pkg/client/mock" "github.com/elastic/elastic-agent-client/v7/pkg/proto" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/filebeat/input/netflow/netflow_test.go b/x-pack/filebeat/input/netflow/netflow_test.go index d3ee1a5bc6ea..47ab5e03bb45 100644 --- a/x-pack/filebeat/input/netflow/netflow_test.go +++ b/x-pack/filebeat/input/netflow/netflow_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemock" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/dockerlogbeat/pipelinemock" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/protocol" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v9/x-pack/filebeat/input/netflow/decoder/test" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/o365audit/config.go b/x-pack/filebeat/input/o365audit/config.go index 312c1b7823ee..760daa002224 100644 --- a/x-pack/filebeat/input/o365audit/config.go +++ b/x-pack/filebeat/input/o365audit/config.go @@ -10,7 +10,7 @@ import ( "net/url" "time" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/auth" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/auth" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/x-pack/filebeat/input/o365audit/contentblob.go b/x-pack/filebeat/input/o365audit/contentblob.go index 26c11a7bbe7a..cbad2ba23dc6 100644 --- a/x-pack/filebeat/input/o365audit/contentblob.go +++ b/x-pack/filebeat/input/o365audit/contentblob.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/go-autorest/autorest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/poll" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/poll" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/o365audit/contentblob_test.go b/x-pack/filebeat/input/o365audit/contentblob_test.go index 0614c60ceac4..5d328d4e3846 100644 --- a/x-pack/filebeat/input/o365audit/contentblob_test.go +++ b/x-pack/filebeat/input/o365audit/contentblob_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/poll" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/poll" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/o365audit/input.go b/x-pack/filebeat/input/o365audit/input.go index d5fc5f5e3fc7..c21cb3a35c96 100644 --- a/x-pack/filebeat/input/o365audit/input.go +++ b/x-pack/filebeat/input/o365audit/input.go @@ -13,14 +13,14 @@ import ( "github.com/Azure/go-autorest/autorest" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/poll" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/poll" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/o365audit/listblobs.go b/x-pack/filebeat/input/o365audit/listblobs.go index 58ddd840dd27..c2cbc4b9c028 100644 --- a/x-pack/filebeat/input/o365audit/listblobs.go +++ b/x-pack/filebeat/input/o365audit/listblobs.go @@ -16,7 +16,7 @@ import ( "github.com/Azure/go-autorest/autorest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/poll" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/poll" ) // listBlob is a poll.Transaction that handles the content/"blobs" list. diff --git a/x-pack/filebeat/input/o365audit/listblobs_test.go b/x-pack/filebeat/input/o365audit/listblobs_test.go index 4ce3852b7555..854898d2b9da 100644 --- a/x-pack/filebeat/input/o365audit/listblobs_test.go +++ b/x-pack/filebeat/input/o365audit/listblobs_test.go @@ -19,7 +19,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/poll" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/poll" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/o365audit/pagination.go b/x-pack/filebeat/input/o365audit/pagination.go index 10703a0479ab..d15d49103863 100644 --- a/x-pack/filebeat/input/o365audit/pagination.go +++ b/x-pack/filebeat/input/o365audit/pagination.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/go-autorest/autorest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/poll" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/poll" ) // paginator is a decorator around a poll.Transaction to parse paginated requests. diff --git a/x-pack/filebeat/input/o365audit/poll/poll.go b/x-pack/filebeat/input/o365audit/poll/poll.go index 03e8e0eeff0e..20b8bb22bebb 100644 --- a/x-pack/filebeat/input/o365audit/poll/poll.go +++ b/x-pack/filebeat/input/o365audit/poll/poll.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/go-autorest/autorest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/auth" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/auth" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/o365audit/schema.go b/x-pack/filebeat/input/o365audit/schema.go index bd2385c87613..927af764b1ab 100644 --- a/x-pack/filebeat/input/o365audit/schema.go +++ b/x-pack/filebeat/input/o365audit/schema.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/input/o365audit/subscribe.go b/x-pack/filebeat/input/o365audit/subscribe.go index d6c606627a4f..d8722422b0f7 100644 --- a/x-pack/filebeat/input/o365audit/subscribe.go +++ b/x-pack/filebeat/input/o365audit/subscribe.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/go-autorest/autorest" - "github.com/elastic/beats/v7/x-pack/filebeat/input/o365audit/poll" + "github.com/elastic/beats/v9/x-pack/filebeat/input/o365audit/poll" ) // Subscribe is a poll.Transaction that subscribes to an event stream. diff --git a/x-pack/filebeat/input/salesforce/input.go b/x-pack/filebeat/input/salesforce/input.go index 6c5bee584eed..98db25d0d254 100644 --- a/x-pack/filebeat/input/salesforce/input.go +++ b/x-pack/filebeat/input/salesforce/input.go @@ -26,12 +26,12 @@ import ( "github.com/elastic/go-sfdc/session" "github.com/elastic/go-sfdc/soql" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport/httpcommon" diff --git a/x-pack/filebeat/input/salesforce/input_manager.go b/x-pack/filebeat/input/salesforce/input_manager.go index 801281e34a13..fca57a04c262 100644 --- a/x-pack/filebeat/input/salesforce/input_manager.go +++ b/x-pack/filebeat/input/salesforce/input_manager.go @@ -10,9 +10,9 @@ import ( "github.com/elastic/go-concert/unison" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/httpcommon" diff --git a/x-pack/filebeat/input/salesforce/input_manager_test.go b/x-pack/filebeat/input/salesforce/input_manager_test.go index c1739f0723ac..f384bf076135 100644 --- a/x-pack/filebeat/input/salesforce/input_manager_test.go +++ b/x-pack/filebeat/input/salesforce/input_manager_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/statestore" - "github.com/elastic/beats/v7/libbeat/statestore/storetest" + "github.com/elastic/beats/v9/libbeat/statestore" + "github.com/elastic/beats/v9/libbeat/statestore/storetest" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/unison" diff --git a/x-pack/filebeat/input/salesforce/input_test.go b/x-pack/filebeat/input/salesforce/input_test.go index 724145c3456c..7a3607dd6ee4 100644 --- a/x-pack/filebeat/input/salesforce/input_test.go +++ b/x-pack/filebeat/input/salesforce/input_test.go @@ -21,10 +21,10 @@ import ( "github.com/elastic/go-sfdc" "github.com/elastic/go-sfdc/soql" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/transform/typeconv" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/transform/typeconv" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/x-pack/filebeat/input/streaming/cel.go b/x-pack/filebeat/input/streaming/cel.go index b26b004d92cb..f7df678b5b60 100644 --- a/x-pack/filebeat/input/streaming/cel.go +++ b/x-pack/filebeat/input/streaming/cel.go @@ -14,7 +14,7 @@ import ( "github.com/google/cel-go/cel" "github.com/google/cel-go/checker/decls" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/useragent" "github.com/elastic/mito/lib" diff --git a/x-pack/filebeat/input/streaming/crowdstrike.go b/x-pack/filebeat/input/streaming/crowdstrike.go index 303f425a7c12..2c8269b2a5c9 100644 --- a/x-pack/filebeat/input/streaming/crowdstrike.go +++ b/x-pack/filebeat/input/streaming/crowdstrike.go @@ -18,9 +18,9 @@ import ( "golang.org/x/oauth2/clientcredentials" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport/httpcommon" diff --git a/x-pack/filebeat/input/streaming/crowdstrike_test.go b/x-pack/filebeat/input/streaming/crowdstrike_test.go index 98588b751bdf..06fccc120764 100644 --- a/x-pack/filebeat/input/streaming/crowdstrike_test.go +++ b/x-pack/filebeat/input/streaming/crowdstrike_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + cursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/streaming/input.go b/x-pack/filebeat/input/streaming/input.go index c087960d623d..b3f3ac8633f3 100644 --- a/x-pack/filebeat/input/streaming/input.go +++ b/x-pack/filebeat/input/streaming/input.go @@ -16,12 +16,12 @@ import ( "github.com/google/cel-go/common/types/ref" "google.golang.org/protobuf/types/known/structpb" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/statestore" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/go-concert/ctxtool" "github.com/elastic/mito/lib" diff --git a/x-pack/filebeat/input/streaming/input_manager.go b/x-pack/filebeat/input/streaming/input_manager.go index 5c9de6558c2a..aaba080f45cc 100644 --- a/x-pack/filebeat/input/streaming/input_manager.go +++ b/x-pack/filebeat/input/streaming/input_manager.go @@ -7,9 +7,9 @@ package streaming import ( "github.com/elastic/go-concert/unison" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/filebeat/input/streaming/input_test.go b/x-pack/filebeat/input/streaming/input_test.go index 732428983622..aabc8599d8a7 100644 --- a/x-pack/filebeat/input/streaming/input_test.go +++ b/x-pack/filebeat/input/streaming/input_test.go @@ -20,10 +20,10 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/testing/testutils" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/testing/testutils" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/streaming/metrics_test.go b/x-pack/filebeat/input/streaming/metrics_test.go index 271f35582d51..d40c62c1d599 100644 --- a/x-pack/filebeat/input/streaming/metrics_test.go +++ b/x-pack/filebeat/input/streaming/metrics_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/input/streaming/websocket.go b/x-pack/filebeat/input/streaming/websocket.go index ecf8b59f2b67..0cbdcb685861 100644 --- a/x-pack/filebeat/input/streaming/websocket.go +++ b/x-pack/filebeat/input/streaming/websocket.go @@ -24,9 +24,9 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/clientcredentials" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/management/status" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/httpcommon" "github.com/elastic/elastic-agent-libs/transport/tlscommon" diff --git a/x-pack/filebeat/input/unifiedlogs/input.go b/x-pack/filebeat/input/unifiedlogs/input.go index 44bc00887f38..01c32da45c0d 100644 --- a/x-pack/filebeat/input/unifiedlogs/input.go +++ b/x-pack/filebeat/input/unifiedlogs/input.go @@ -21,11 +21,11 @@ import ( "golang.org/x/sync/errgroup" - v2 "github.com/elastic/beats/v7/filebeat/input/v2" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/feature" - "github.com/elastic/beats/v7/libbeat/statestore" + v2 "github.com/elastic/beats/v9/filebeat/input/v2" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/feature" + "github.com/elastic/beats/v9/libbeat/statestore" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/input/unifiedlogs/input_test.go b/x-pack/filebeat/input/unifiedlogs/input_test.go index 734c6b081cfd..cdd04c24bc93 100644 --- a/x-pack/filebeat/input/unifiedlogs/input_test.go +++ b/x-pack/filebeat/input/unifiedlogs/input_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - inputcursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/monitoring/inputmon" + inputcursor "github.com/elastic/beats/v9/filebeat/input/v2/input-cursor" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/monitoring/inputmon" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/monitoring" ) diff --git a/x-pack/filebeat/magefile.go b/x-pack/filebeat/magefile.go index 67d462556953..2a98cdb2dae6 100644 --- a/x-pack/filebeat/magefile.go +++ b/x-pack/filebeat/magefile.go @@ -14,20 +14,20 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - filebeat "github.com/elastic/beats/v7/filebeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + filebeat "github.com/elastic/beats/v9/filebeat/scripts/mage" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import generate - _ "github.com/elastic/beats/v7/filebeat/scripts/mage/generate" + _ "github.com/elastic/beats/v9/filebeat/scripts/mage/generate" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/x-pack/filebeat/main.go b/x-pack/filebeat/main.go index bb7606bedb7f..cd53caf07a42 100644 --- a/x-pack/filebeat/main.go +++ b/x-pack/filebeat/main.go @@ -8,7 +8,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/x-pack/filebeat/cmd" + "github.com/elastic/beats/v9/x-pack/filebeat/cmd" ) // The basic model of execution: diff --git a/x-pack/filebeat/main_test.go b/x-pack/filebeat/main_test.go index 3d5424c30884..9dd0601bb86f 100644 --- a/x-pack/filebeat/main_test.go +++ b/x-pack/filebeat/main_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - fbcmd "github.com/elastic/beats/v7/x-pack/filebeat/cmd" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + fbcmd "github.com/elastic/beats/v9/x-pack/filebeat/cmd" ) var ( diff --git a/x-pack/filebeat/module/activemq/fields.go b/x-pack/filebeat/module/activemq/fields.go index ffc2fed66826..ef1655699faf 100644 --- a/x-pack/filebeat/module/activemq/fields.go +++ b/x-pack/filebeat/module/activemq/fields.go @@ -7,7 +7,7 @@ package activemq import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/aws/fields.go b/x-pack/filebeat/module/aws/fields.go index 7a2c4d912d6e..70d9ef3212e4 100644 --- a/x-pack/filebeat/module/aws/fields.go +++ b/x-pack/filebeat/module/aws/fields.go @@ -7,7 +7,7 @@ package aws import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/awsfargate/fields.go b/x-pack/filebeat/module/awsfargate/fields.go index c3a9fe22626a..91136766e83a 100644 --- a/x-pack/filebeat/module/awsfargate/fields.go +++ b/x-pack/filebeat/module/awsfargate/fields.go @@ -7,7 +7,7 @@ package awsfargate import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/azure/fields.go b/x-pack/filebeat/module/azure/fields.go index b677bb85c69a..e9300e692e85 100644 --- a/x-pack/filebeat/module/azure/fields.go +++ b/x-pack/filebeat/module/azure/fields.go @@ -7,7 +7,7 @@ package azure import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/cef/fields.go b/x-pack/filebeat/module/cef/fields.go index 7d3c3cfb4924..6a0c97f73be1 100644 --- a/x-pack/filebeat/module/cef/fields.go +++ b/x-pack/filebeat/module/cef/fields.go @@ -7,7 +7,7 @@ package cef import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/checkpoint/fields.go b/x-pack/filebeat/module/checkpoint/fields.go index 7a7ade2918e3..5a30d752a6f5 100644 --- a/x-pack/filebeat/module/checkpoint/fields.go +++ b/x-pack/filebeat/module/checkpoint/fields.go @@ -7,7 +7,7 @@ package checkpoint import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/cisco/fields.go b/x-pack/filebeat/module/cisco/fields.go index 414ffb548964..d55e2bda8492 100644 --- a/x-pack/filebeat/module/cisco/fields.go +++ b/x-pack/filebeat/module/cisco/fields.go @@ -7,7 +7,7 @@ package cisco import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/cisco/ios/pipeline_test.go b/x-pack/filebeat/module/cisco/ios/pipeline_test.go index 20c30c5cf92a..7f43ca52ebfc 100644 --- a/x-pack/filebeat/module/cisco/ios/pipeline_test.go +++ b/x-pack/filebeat/module/cisco/ios/pipeline_test.go @@ -9,9 +9,9 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - "github.com/elastic/beats/v7/testing/testutils" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors/script/javascript" + "github.com/elastic/beats/v9/testing/testutils" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" @@ -20,10 +20,10 @@ import ( "github.com/elastic/go-lookslike/validator" // Register JS "require" modules. - _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module" + _ "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module" // Register required processors. - _ "github.com/elastic/beats/v7/libbeat/cmd/instance" - _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v9/libbeat/cmd/instance" + _ "github.com/elastic/beats/v9/libbeat/processors/timestamp" ) var logInputHeaders = []string{ diff --git a/x-pack/filebeat/module/coredns/fields.go b/x-pack/filebeat/module/coredns/fields.go index 7fdf767fb9ab..ed384f3b9d23 100644 --- a/x-pack/filebeat/module/coredns/fields.go +++ b/x-pack/filebeat/module/coredns/fields.go @@ -7,7 +7,7 @@ package coredns import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/crowdstrike/fields.go b/x-pack/filebeat/module/crowdstrike/fields.go index 8b0b67a3e8f4..43065c9034a9 100644 --- a/x-pack/filebeat/module/crowdstrike/fields.go +++ b/x-pack/filebeat/module/crowdstrike/fields.go @@ -7,7 +7,7 @@ package crowdstrike import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/cyberarkpas/fields.go b/x-pack/filebeat/module/cyberarkpas/fields.go index 3e9c744b43bf..bceffa57da84 100644 --- a/x-pack/filebeat/module/cyberarkpas/fields.go +++ b/x-pack/filebeat/module/cyberarkpas/fields.go @@ -7,7 +7,7 @@ package cyberarkpas import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/envoyproxy/fields.go b/x-pack/filebeat/module/envoyproxy/fields.go index 1c13effdf1ea..5131bec3ff25 100644 --- a/x-pack/filebeat/module/envoyproxy/fields.go +++ b/x-pack/filebeat/module/envoyproxy/fields.go @@ -7,7 +7,7 @@ package envoyproxy import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/fortinet/fields.go b/x-pack/filebeat/module/fortinet/fields.go index 1bcc00adca20..058688a5b422 100644 --- a/x-pack/filebeat/module/fortinet/fields.go +++ b/x-pack/filebeat/module/fortinet/fields.go @@ -7,7 +7,7 @@ package fortinet import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/gcp/fields.go b/x-pack/filebeat/module/gcp/fields.go index b86ceed92b33..4a511d5977dd 100644 --- a/x-pack/filebeat/module/gcp/fields.go +++ b/x-pack/filebeat/module/gcp/fields.go @@ -7,7 +7,7 @@ package gcp import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/google_workspace/fields.go b/x-pack/filebeat/module/google_workspace/fields.go index ef64a7b50950..0fe325154365 100644 --- a/x-pack/filebeat/module/google_workspace/fields.go +++ b/x-pack/filebeat/module/google_workspace/fields.go @@ -7,7 +7,7 @@ package google_workspace import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/ibmmq/fields.go b/x-pack/filebeat/module/ibmmq/fields.go index 5fd12f90d357..f1c50188dcf5 100644 --- a/x-pack/filebeat/module/ibmmq/fields.go +++ b/x-pack/filebeat/module/ibmmq/fields.go @@ -7,7 +7,7 @@ package ibmmq import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/iptables/fields.go b/x-pack/filebeat/module/iptables/fields.go index d7ef5ec3bcc7..86471e9ef3f0 100644 --- a/x-pack/filebeat/module/iptables/fields.go +++ b/x-pack/filebeat/module/iptables/fields.go @@ -7,7 +7,7 @@ package iptables import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/juniper/fields.go b/x-pack/filebeat/module/juniper/fields.go index 26b3cfcef30c..9e08e8c5e091 100644 --- a/x-pack/filebeat/module/juniper/fields.go +++ b/x-pack/filebeat/module/juniper/fields.go @@ -7,7 +7,7 @@ package juniper import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/microsoft/fields.go b/x-pack/filebeat/module/microsoft/fields.go index 95c4477db1fd..2fff55aa7db3 100644 --- a/x-pack/filebeat/module/microsoft/fields.go +++ b/x-pack/filebeat/module/microsoft/fields.go @@ -7,7 +7,7 @@ package microsoft import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/misp/fields.go b/x-pack/filebeat/module/misp/fields.go index 78cafc5855f4..0307a65b83e5 100644 --- a/x-pack/filebeat/module/misp/fields.go +++ b/x-pack/filebeat/module/misp/fields.go @@ -7,7 +7,7 @@ package misp import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/mssql/fields.go b/x-pack/filebeat/module/mssql/fields.go index 6322325ca966..5d47f3249a94 100644 --- a/x-pack/filebeat/module/mssql/fields.go +++ b/x-pack/filebeat/module/mssql/fields.go @@ -7,7 +7,7 @@ package mssql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/mysqlenterprise/fields.go b/x-pack/filebeat/module/mysqlenterprise/fields.go index 55a420b609c5..7c7798e8168b 100644 --- a/x-pack/filebeat/module/mysqlenterprise/fields.go +++ b/x-pack/filebeat/module/mysqlenterprise/fields.go @@ -7,7 +7,7 @@ package mysqlenterprise import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/netflow/fields.go b/x-pack/filebeat/module/netflow/fields.go index 0db8d9c9f829..ca1baeea38f4 100644 --- a/x-pack/filebeat/module/netflow/fields.go +++ b/x-pack/filebeat/module/netflow/fields.go @@ -7,7 +7,7 @@ package netflow import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/o365/fields.go b/x-pack/filebeat/module/o365/fields.go index 7a0f190bf443..52c55bab6ecb 100644 --- a/x-pack/filebeat/module/o365/fields.go +++ b/x-pack/filebeat/module/o365/fields.go @@ -7,7 +7,7 @@ package o365 import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/okta/fields.go b/x-pack/filebeat/module/okta/fields.go index 43d7af8bdd80..4c6f754d608f 100644 --- a/x-pack/filebeat/module/okta/fields.go +++ b/x-pack/filebeat/module/okta/fields.go @@ -7,7 +7,7 @@ package okta import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/oracle/fields.go b/x-pack/filebeat/module/oracle/fields.go index 0a43da288a29..2e9c9ae71584 100644 --- a/x-pack/filebeat/module/oracle/fields.go +++ b/x-pack/filebeat/module/oracle/fields.go @@ -7,7 +7,7 @@ package oracle import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/panw/fields.go b/x-pack/filebeat/module/panw/fields.go index ddf289d7880d..194c16156579 100644 --- a/x-pack/filebeat/module/panw/fields.go +++ b/x-pack/filebeat/module/panw/fields.go @@ -7,7 +7,7 @@ package panw import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/rabbitmq/fields.go b/x-pack/filebeat/module/rabbitmq/fields.go index 6ab412444de1..976164a63924 100644 --- a/x-pack/filebeat/module/rabbitmq/fields.go +++ b/x-pack/filebeat/module/rabbitmq/fields.go @@ -7,7 +7,7 @@ package rabbitmq import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/salesforce/fields.go b/x-pack/filebeat/module/salesforce/fields.go index 78aa4fa0cc61..edeefd2e01cf 100644 --- a/x-pack/filebeat/module/salesforce/fields.go +++ b/x-pack/filebeat/module/salesforce/fields.go @@ -7,7 +7,7 @@ package salesforce import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/snyk/fields.go b/x-pack/filebeat/module/snyk/fields.go index 8a0887dad833..73fcaf058441 100644 --- a/x-pack/filebeat/module/snyk/fields.go +++ b/x-pack/filebeat/module/snyk/fields.go @@ -7,7 +7,7 @@ package snyk import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/sophos/fields.go b/x-pack/filebeat/module/sophos/fields.go index 9f929b6f32a8..d9ba9976297b 100644 --- a/x-pack/filebeat/module/sophos/fields.go +++ b/x-pack/filebeat/module/sophos/fields.go @@ -7,7 +7,7 @@ package sophos import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/suricata/fields.go b/x-pack/filebeat/module/suricata/fields.go index 6037f115efe1..4ecd445cf819 100644 --- a/x-pack/filebeat/module/suricata/fields.go +++ b/x-pack/filebeat/module/suricata/fields.go @@ -7,7 +7,7 @@ package suricata import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/threatintel/fields.go b/x-pack/filebeat/module/threatintel/fields.go index 634a2d56fa95..62288440abd5 100644 --- a/x-pack/filebeat/module/threatintel/fields.go +++ b/x-pack/filebeat/module/threatintel/fields.go @@ -7,7 +7,7 @@ package threatintel import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/zeek/fields.go b/x-pack/filebeat/module/zeek/fields.go index 58ce1bc4b1b3..62f0d1be68f9 100644 --- a/x-pack/filebeat/module/zeek/fields.go +++ b/x-pack/filebeat/module/zeek/fields.go @@ -7,7 +7,7 @@ package zeek import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/zookeeper/fields.go b/x-pack/filebeat/module/zookeeper/fields.go index 52a3b78cbc62..197637d116fc 100644 --- a/x-pack/filebeat/module/zookeeper/fields.go +++ b/x-pack/filebeat/module/zookeeper/fields.go @@ -7,7 +7,7 @@ package zookeeper import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/zoom/fields.go b/x-pack/filebeat/module/zoom/fields.go index c9b3e28cd9eb..5ee11e3f2f89 100644 --- a/x-pack/filebeat/module/zoom/fields.go +++ b/x-pack/filebeat/module/zoom/fields.go @@ -7,7 +7,7 @@ package zoom import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/processors/add_nomad_metadata/matchers.go b/x-pack/filebeat/processors/add_nomad_metadata/matchers.go index 4c59a4703e57..15c06d484596 100644 --- a/x-pack/filebeat/processors/add_nomad_metadata/matchers.go +++ b/x-pack/filebeat/processors/add_nomad_metadata/matchers.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/elastic/beats/v7/x-pack/libbeat/processors/add_nomad_metadata" + "github.com/elastic/beats/v9/x-pack/libbeat/processors/add_nomad_metadata" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/processors/aws_vpcflow/mapping.go b/x-pack/filebeat/processors/aws_vpcflow/mapping.go index 13eed241d76b..fe293545fa76 100644 --- a/x-pack/filebeat/processors/aws_vpcflow/mapping.go +++ b/x-pack/filebeat/processors/aws_vpcflow/mapping.go @@ -11,7 +11,7 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type vpcFlowField struct { diff --git a/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log.go b/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log.go index 6579855a02b8..bf322f2150b4 100644 --- a/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log.go +++ b/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log.go @@ -13,10 +13,10 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor/registry" - "github.com/elastic/beats/v7/x-pack/filebeat/processors/aws_vpcflow/internal/strings" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + jsprocessor "github.com/elastic/beats/v9/libbeat/processors/script/javascript/module/processor/registry" + "github.com/elastic/beats/v9/x-pack/filebeat/processors/aws_vpcflow/internal/strings" ) const ( diff --git a/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log_test.go b/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log_test.go index f88825b41107..d683636dd507 100644 --- a/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log_test.go +++ b/x-pack/filebeat/processors/aws_vpcflow/parse_aws_vpc_flow_log_test.go @@ -21,7 +21,7 @@ import ( "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) var updateGolden = flag.Bool("update", false, "Update golden test data.") diff --git a/x-pack/filebeat/processors/decode_cef/cef/cmd/cef2json/cef2json.go b/x-pack/filebeat/processors/decode_cef/cef/cmd/cef2json/cef2json.go index 9addd7c5b5b3..c03a05d67cdf 100644 --- a/x-pack/filebeat/processors/decode_cef/cef/cmd/cef2json/cef2json.go +++ b/x-pack/filebeat/processors/decode_cef/cef/cmd/cef2json/cef2json.go @@ -12,7 +12,7 @@ import ( "log" "os" - "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef/cef" + "github.com/elastic/beats/v9/x-pack/filebeat/processors/decode_cef/cef" ) var fullExtensionNames bool diff --git a/x-pack/filebeat/processors/decode_cef/cef/types.go b/x-pack/filebeat/processors/decode_cef/cef/types.go index 178fd42b586d..bacee1821a7f 100644 --- a/x-pack/filebeat/processors/decode_cef/cef/types.go +++ b/x-pack/filebeat/processors/decode_cef/cef/types.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) // DataType specifies one of CEF data types. diff --git a/x-pack/filebeat/processors/decode_cef/config.go b/x-pack/filebeat/processors/decode_cef/config.go index fe23ca12904b..a25c7329082e 100644 --- a/x-pack/filebeat/processors/decode_cef/config.go +++ b/x-pack/filebeat/processors/decode_cef/config.go @@ -4,7 +4,7 @@ package decode_cef -import "github.com/elastic/beats/v7/libbeat/common/cfgtype" +import "github.com/elastic/beats/v9/libbeat/common/cfgtype" type config struct { Field string `config:"field"` // Source field containing the CEF message. diff --git a/x-pack/filebeat/processors/decode_cef/decode_cef.go b/x-pack/filebeat/processors/decode_cef/decode_cef.go index 0ba0d39b8288..32a51a3d3655 100644 --- a/x-pack/filebeat/processors/decode_cef/decode_cef.go +++ b/x-pack/filebeat/processors/decode_cef/decode_cef.go @@ -12,9 +12,9 @@ import ( "go.uber.org/multierr" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef/cef" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/x-pack/filebeat/processors/decode_cef/cef" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/filebeat/processors/decode_cef/decode_cef_test.go b/x-pack/filebeat/processors/decode_cef/decode_cef_test.go index 8eb4a811a997..c576bba38624 100644 --- a/x-pack/filebeat/processors/decode_cef/decode_cef_test.go +++ b/x-pack/filebeat/processors/decode_cef/decode_cef_test.go @@ -15,7 +15,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/filebeat/processors/decode_cef/fields.go b/x-pack/filebeat/processors/decode_cef/fields.go index 2142ee7a7b52..2186e576d0ad 100644 --- a/x-pack/filebeat/processors/decode_cef/fields.go +++ b/x-pack/filebeat/processors/decode_cef/fields.go @@ -7,7 +7,7 @@ package decode_cef import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/processors/decode_cef/keys.ecs.go b/x-pack/filebeat/processors/decode_cef/keys.ecs.go index 18c34f9941f2..d02aab981eb2 100644 --- a/x-pack/filebeat/processors/decode_cef/keys.ecs.go +++ b/x-pack/filebeat/processors/decode_cef/keys.ecs.go @@ -8,7 +8,7 @@ import ( "errors" "strings" - "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef/cef" + "github.com/elastic/beats/v9/x-pack/filebeat/processors/decode_cef/cef" ) type mappedField struct { diff --git a/x-pack/filebeat/tests/ech/filebeat_fips_test.go b/x-pack/filebeat/tests/ech/filebeat_fips_test.go index d5e44068b2c8..beaf56ffe67d 100644 --- a/x-pack/filebeat/tests/ech/filebeat_fips_test.go +++ b/x-pack/filebeat/tests/ech/filebeat_fips_test.go @@ -11,8 +11,8 @@ import ( "path" "testing" - "github.com/elastic/beats/v7/libbeat/tests/integration" - "github.com/elastic/beats/v7/testing/go-ech" + "github.com/elastic/beats/v9/libbeat/tests/integration" + "github.com/elastic/beats/v9/testing/go-ech" ) const filebeatFIPSConfig = ` diff --git a/x-pack/filebeat/tests/integration/creator_agentbeat_test.go b/x-pack/filebeat/tests/integration/creator_agentbeat_test.go index 3a62d20732b1..2d61640a9211 100644 --- a/x-pack/filebeat/tests/integration/creator_agentbeat_test.go +++ b/x-pack/filebeat/tests/integration/creator_agentbeat_test.go @@ -9,7 +9,7 @@ package integration import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) func NewFilebeat(t *testing.T) *integration.BeatProc { diff --git a/x-pack/filebeat/tests/integration/creator_base_test.go b/x-pack/filebeat/tests/integration/creator_base_test.go index b278563255c6..0221e64ef235 100644 --- a/x-pack/filebeat/tests/integration/creator_base_test.go +++ b/x-pack/filebeat/tests/integration/creator_base_test.go @@ -9,7 +9,7 @@ package integration import ( "testing" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" ) func NewFilebeat(t *testing.T) *integration.BeatProc { diff --git a/x-pack/filebeat/tests/integration/managerV2_test.go b/x-pack/filebeat/tests/integration/managerV2_test.go index b15eb62a1fb6..124a4f51077a 100644 --- a/x-pack/filebeat/tests/integration/managerV2_test.go +++ b/x-pack/filebeat/tests/integration/managerV2_test.go @@ -29,11 +29,11 @@ import ( "google.golang.org/grpc/credentials" protobuf "google.golang.org/protobuf/proto" - "github.com/elastic/beats/v7/libbeat/tests/integration" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/testing/certutil" - "github.com/elastic/beats/v7/x-pack/libbeat/management" - "github.com/elastic/beats/v7/x-pack/libbeat/management/tests" + "github.com/elastic/beats/v9/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/testing/certutil" + "github.com/elastic/beats/v9/x-pack/libbeat/management" + "github.com/elastic/beats/v9/x-pack/libbeat/management/tests" "github.com/elastic/elastic-agent-client/v7/pkg/client/mock" "github.com/elastic/elastic-agent-client/v7/pkg/proto" ) diff --git a/x-pack/filebeat/tests/integration/otel_test.go b/x-pack/filebeat/tests/integration/otel_test.go index 3497dbe3d529..2cf99a867806 100644 --- a/x-pack/filebeat/tests/integration/otel_test.go +++ b/x-pack/filebeat/tests/integration/otel_test.go @@ -23,9 +23,9 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/otelbeat/oteltest" - libbeattesting "github.com/elastic/beats/v7/libbeat/testing" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/otelbeat/oteltest" + libbeattesting "github.com/elastic/beats/v9/libbeat/testing" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-libs/testing/estools" ) diff --git a/x-pack/filebeat/tests/integration/registrydiagnostics_test.go b/x-pack/filebeat/tests/integration/registrydiagnostics_test.go index d794c4eee379..7a5d1538bbbc 100644 --- a/x-pack/filebeat/tests/integration/registrydiagnostics_test.go +++ b/x-pack/filebeat/tests/integration/registrydiagnostics_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-client/v7/pkg/client/mock" "github.com/elastic/elastic-agent-client/v7/pkg/proto" ) diff --git a/x-pack/filebeat/tests/integration/status_reporter_test.go b/x-pack/filebeat/tests/integration/status_reporter_test.go index cdba7bc154cc..4a625c0ee891 100644 --- a/x-pack/filebeat/tests/integration/status_reporter_test.go +++ b/x-pack/filebeat/tests/integration/status_reporter_test.go @@ -22,11 +22,11 @@ import ( "github.com/elastic/elastic-agent-client/v7/pkg/client/mock" "github.com/elastic/elastic-agent-client/v7/pkg/proto" - "github.com/elastic/beats/v7/libbeat/common/reload" - lbmanagement "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/x-pack/filebeat/cmd" - "github.com/elastic/beats/v7/x-pack/libbeat/management" - "github.com/elastic/beats/v7/x-pack/libbeat/management/tests" + "github.com/elastic/beats/v9/libbeat/common/reload" + lbmanagement "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/x-pack/filebeat/cmd" + "github.com/elastic/beats/v9/x-pack/libbeat/management" + "github.com/elastic/beats/v9/x-pack/libbeat/management/tests" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/filebeat/tests/integration/windows/inputs_windows_test.go b/x-pack/filebeat/tests/integration/windows/inputs_windows_test.go index 3230ebe22663..d56b35f3dea0 100644 --- a/x-pack/filebeat/tests/integration/windows/inputs_windows_test.go +++ b/x-pack/filebeat/tests/integration/windows/inputs_windows_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - fbint "github.com/elastic/beats/v7/filebeat/testing/integration" - lbint "github.com/elastic/beats/v7/libbeat/testing/integration" + fbint "github.com/elastic/beats/v9/filebeat/testing/integration" + lbint "github.com/elastic/beats/v9/libbeat/testing/integration" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/heartbeat/cmd/import.go b/x-pack/heartbeat/cmd/import.go index d90b1648e3e3..3e251f6a32e8 100644 --- a/x-pack/heartbeat/cmd/import.go +++ b/x-pack/heartbeat/cmd/import.go @@ -9,5 +9,5 @@ package cmd // Agentbeat imports cmd directly and skips main, import all required plugins // here to have them bundled together import ( - _ "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser" + _ "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser" ) diff --git a/x-pack/heartbeat/cmd/root.go b/x-pack/heartbeat/cmd/root.go index a51397cd697d..d6273269c749 100644 --- a/x-pack/heartbeat/cmd/root.go +++ b/x-pack/heartbeat/cmd/root.go @@ -9,15 +9,15 @@ import ( "github.com/spf13/cobra" - heartbeatCmd "github.com/elastic/beats/v7/heartbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/common/reload" + heartbeatCmd "github.com/elastic/beats/v9/heartbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/common/reload" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" - _ "github.com/elastic/beats/v7/heartbeat/include" - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + _ "github.com/elastic/beats/v9/heartbeat/include" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" + "github.com/elastic/beats/v9/x-pack/libbeat/management" ) // RootCmd to handle beats cli diff --git a/x-pack/heartbeat/cmd/root_test.go b/x-pack/heartbeat/cmd/root_test.go index 27e9ec2dd1c0..ca76aeb2bf01 100644 --- a/x-pack/heartbeat/cmd/root_test.go +++ b/x-pack/heartbeat/cmd/root_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" ) // Test all required plugins are exported by this module, since it's the diff --git a/x-pack/heartbeat/include/fields.go b/x-pack/heartbeat/include/fields.go index 623cdf1bc3ff..32fb549fec6a 100644 --- a/x-pack/heartbeat/include/fields.go +++ b/x-pack/heartbeat/include/fields.go @@ -7,7 +7,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/heartbeat/include/list.go b/x-pack/heartbeat/include/list.go index d2fac57099d9..1ba1080b2cbb 100644 --- a/x-pack/heartbeat/include/list.go +++ b/x-pack/heartbeat/include/list.go @@ -10,5 +10,5 @@ package include import ( // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser" + _ "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser" ) diff --git a/x-pack/heartbeat/magefile.go b/x-pack/heartbeat/magefile.go index 4573ff75a2ef..2822434b45f0 100644 --- a/x-pack/heartbeat/magefile.go +++ b/x-pack/heartbeat/magefile.go @@ -14,21 +14,21 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/test" - heartbeat "github.com/elastic/beats/v7/heartbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" + heartbeat "github.com/elastic/beats/v9/heartbeat/scripts/mage" // mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" // mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/x-pack/heartbeat/main.go b/x-pack/heartbeat/main.go index ce265bd35467..36844f250660 100644 --- a/x-pack/heartbeat/main.go +++ b/x-pack/heartbeat/main.go @@ -8,7 +8,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/x-pack/heartbeat/cmd" + "github.com/elastic/beats/v9/x-pack/heartbeat/cmd" ) func main() { diff --git a/x-pack/heartbeat/main_test.go b/x-pack/heartbeat/main_test.go index 91fe8b60ad8c..651e0c6887be 100644 --- a/x-pack/heartbeat/main_test.go +++ b/x-pack/heartbeat/main_test.go @@ -9,8 +9,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/heartbeat/cmd" - "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v9/heartbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" ) var systemTest *bool diff --git a/x-pack/heartbeat/monitors/browser/browser.go b/x-pack/heartbeat/monitors/browser/browser.go index d0dc11a328fe..e5991c87a17d 100644 --- a/x-pack/heartbeat/monitors/browser/browser.go +++ b/x-pack/heartbeat/monitors/browser/browser.go @@ -12,9 +12,9 @@ import ( "github.com/elastic/elastic-agent-libs/config" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/security" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/security" ) func init() { diff --git a/x-pack/heartbeat/monitors/browser/config.go b/x-pack/heartbeat/monitors/browser/config.go index b03aa6c8b437..e9ba25422880 100644 --- a/x-pack/heartbeat/monitors/browser/config.go +++ b/x-pack/heartbeat/monitors/browser/config.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser/source" - "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser/synthexec" + "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser/source" + "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser/synthexec" "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/heartbeat/monitors/browser/config_test.go b/x-pack/heartbeat/monitors/browser/config_test.go index 8685e8d9797c..ec2f682db3a1 100644 --- a/x-pack/heartbeat/monitors/browser/config_test.go +++ b/x-pack/heartbeat/monitors/browser/config_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser/source" + "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser/source" ) func TestConfig_Validate(t *testing.T) { diff --git a/x-pack/heartbeat/monitors/browser/source/local.go b/x-pack/heartbeat/monitors/browser/source/local.go index 3efb403b8189..9b0290fe6f8c 100644 --- a/x-pack/heartbeat/monitors/browser/source/local.go +++ b/x-pack/heartbeat/monitors/browser/source/local.go @@ -9,7 +9,7 @@ package source import ( "fmt" - "github.com/elastic/beats/v7/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/ecserr" ) type LocalSource struct { diff --git a/x-pack/heartbeat/monitors/browser/source/zipurl.go b/x-pack/heartbeat/monitors/browser/source/zipurl.go index 148b6af084b2..32867cbc87af 100644 --- a/x-pack/heartbeat/monitors/browser/source/zipurl.go +++ b/x-pack/heartbeat/monitors/browser/source/zipurl.go @@ -9,7 +9,7 @@ package source import ( "fmt" - "github.com/elastic/beats/v7/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/ecserr" ) type ZipURLSource struct { diff --git a/x-pack/heartbeat/monitors/browser/sourcejob.go b/x-pack/heartbeat/monitors/browser/sourcejob.go index 5528d62f852f..c4e368f0f879 100644 --- a/x-pack/heartbeat/monitors/browser/sourcejob.go +++ b/x-pack/heartbeat/monitors/browser/sourcejob.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser/synthexec" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser/synthexec" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/heartbeat/monitors/browser/sourcejob_test.go b/x-pack/heartbeat/monitors/browser/sourcejob_test.go index 23567b7f12de..6262da0bbe2f 100644 --- a/x-pack/heartbeat/monitors/browser/sourcejob_test.go +++ b/x-pack/heartbeat/monitors/browser/sourcejob_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser/source" - "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser/synthexec" + "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser/source" + "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser/synthexec" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/heartbeat/monitors/browser/synthexec/enrich.go b/x-pack/heartbeat/monitors/browser/synthexec/enrich.go index 9201c11d1e58..cf52f554827e 100644 --- a/x-pack/heartbeat/monitors/browser/synthexec/enrich.go +++ b/x-pack/heartbeat/monitors/browser/synthexec/enrich.go @@ -9,15 +9,15 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/processors/add_data_stream" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/processors/add_data_stream" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/heartbeat/eventext" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/eventext" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/libbeat/beat" ) type enricher func(event *beat.Event, se *SynthEvent) error diff --git a/x-pack/heartbeat/monitors/browser/synthexec/enrich_test.go b/x-pack/heartbeat/monitors/browser/synthexec/enrich_test.go index 607c14256968..567c27c387a9 100644 --- a/x-pack/heartbeat/monitors/browser/synthexec/enrich_test.go +++ b/x-pack/heartbeat/monitors/browser/synthexec/enrich_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/processors/add_data_stream" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/processors/add_data_stream" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" diff --git a/x-pack/heartbeat/monitors/browser/synthexec/synthexec.go b/x-pack/heartbeat/monitors/browser/synthexec/synthexec.go index 939f5181d343..83c116e038e2 100644 --- a/x-pack/heartbeat/monitors/browser/synthexec/synthexec.go +++ b/x-pack/heartbeat/monitors/browser/synthexec/synthexec.go @@ -23,10 +23,10 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/monitors/jobs" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/monitors/jobs" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/libbeat/beat" ) const debugSelector = "synthexec" diff --git a/x-pack/heartbeat/monitors/browser/synthexec/synthexec_linux.go b/x-pack/heartbeat/monitors/browser/synthexec/synthexec_linux.go index 266b78ea6115..22a1dffb8291 100644 --- a/x-pack/heartbeat/monitors/browser/synthexec/synthexec_linux.go +++ b/x-pack/heartbeat/monitors/browser/synthexec/synthexec_linux.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/v7/heartbeat/security" + "github.com/elastic/beats/v9/heartbeat/security" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/heartbeat/monitors/browser/synthexec/synthtypes.go b/x-pack/heartbeat/monitors/browser/synthexec/synthtypes.go index ddd928b216d6..d8e41b84f7cd 100644 --- a/x-pack/heartbeat/monitors/browser/synthexec/synthtypes.go +++ b/x-pack/heartbeat/monitors/browser/synthexec/synthtypes.go @@ -14,8 +14,8 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" ) // These constants define all known synthetics event types diff --git a/x-pack/heartbeat/monitors/browser/synthexec/synthtypes_test.go b/x-pack/heartbeat/monitors/browser/synthexec/synthtypes_test.go index 38daabab1e1b..252ca35dd094 100644 --- a/x-pack/heartbeat/monitors/browser/synthexec/synthtypes_test.go +++ b/x-pack/heartbeat/monitors/browser/synthexec/synthtypes_test.go @@ -15,8 +15,8 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/v7/heartbeat/ecserr" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/wraputil" + "github.com/elastic/beats/v9/heartbeat/ecserr" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/wraputil" "github.com/stretchr/testify/require" ) diff --git a/x-pack/heartbeat/scenarios/basics_test.go b/x-pack/heartbeat/scenarios/basics_test.go index 4d2d7f741322..60b64d06f684 100644 --- a/x-pack/heartbeat/scenarios/basics_test.go +++ b/x-pack/heartbeat/scenarios/basics_test.go @@ -14,15 +14,15 @@ import ( "github.com/elastic/go-lookslike/testslike" "github.com/elastic/go-lookslike/validator" - "github.com/elastic/beats/v7/heartbeat/hbtestllext" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/http" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/icmp" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/tcp" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/jobsummary" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/summarizertesthelper" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/heartbeat/scenarios/framework" + "github.com/elastic/beats/v9/heartbeat/hbtestllext" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/http" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/icmp" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/tcp" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/jobsummary" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/summarizertesthelper" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/heartbeat/scenarios/framework" ) type CheckHistItem struct { diff --git a/x-pack/heartbeat/scenarios/browserbasics_test.go b/x-pack/heartbeat/scenarios/browserbasics_test.go index 2543982fb9b0..4df4d4d87c0c 100644 --- a/x-pack/heartbeat/scenarios/browserbasics_test.go +++ b/x-pack/heartbeat/scenarios/browserbasics_test.go @@ -14,12 +14,12 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/v7/heartbeat/hbtest" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/http" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/icmp" - _ "github.com/elastic/beats/v7/heartbeat/monitors/active/tcp" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/summarizer/jobsummary" - "github.com/elastic/beats/v7/x-pack/heartbeat/scenarios/framework" + "github.com/elastic/beats/v9/heartbeat/hbtest" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/http" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/icmp" + _ "github.com/elastic/beats/v9/heartbeat/monitors/active/tcp" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/summarizer/jobsummary" + "github.com/elastic/beats/v9/x-pack/heartbeat/scenarios/framework" ) func TestBrowserSummaries(t *testing.T) { diff --git a/x-pack/heartbeat/scenarios/browserscenarios_test.go b/x-pack/heartbeat/scenarios/browserscenarios_test.go index e15a150db5f0..e3d611298224 100644 --- a/x-pack/heartbeat/scenarios/browserscenarios_test.go +++ b/x-pack/heartbeat/scenarios/browserscenarios_test.go @@ -12,9 +12,9 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - _ "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser" - "github.com/elastic/beats/v7/x-pack/heartbeat/scenarios/framework" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + _ "github.com/elastic/beats/v9/x-pack/heartbeat/monitors/browser" + "github.com/elastic/beats/v9/x-pack/heartbeat/scenarios/framework" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/heartbeat/scenarios/framework/fakeloader.go b/x-pack/heartbeat/scenarios/framework/fakeloader.go index d5e1ee0a26ab..f36a4f685c43 100644 --- a/x-pack/heartbeat/scenarios/framework/fakeloader.go +++ b/x-pack/heartbeat/scenarios/framework/fakeloader.go @@ -8,8 +8,8 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" ) // Simulated state loader, close enough to test logic related to loading state from ES diff --git a/x-pack/heartbeat/scenarios/framework/framework.go b/x-pack/heartbeat/scenarios/framework/framework.go index 92d21705e4aa..11a9cdc13a88 100644 --- a/x-pack/heartbeat/scenarios/framework/framework.go +++ b/x-pack/heartbeat/scenarios/framework/framework.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/heartbeat/monitors/plugin" - "github.com/elastic/beats/v7/heartbeat/monitors/stdfields" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/heartbeat/monitors/plugin" + "github.com/elastic/beats/v9/heartbeat/monitors/stdfields" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" @@ -23,11 +23,11 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" - hbconfig "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/heartbeat/monitors" - "github.com/elastic/beats/v7/heartbeat/scheduler" - "github.com/elastic/beats/v7/libbeat/beat" - beatversion "github.com/elastic/beats/v7/libbeat/version" + hbconfig "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/heartbeat/monitors" + "github.com/elastic/beats/v9/heartbeat/scheduler" + "github.com/elastic/beats/v9/libbeat/beat" + beatversion "github.com/elastic/beats/v9/libbeat/version" ) type ( diff --git a/x-pack/heartbeat/scenarios/framework/framework_test.go b/x-pack/heartbeat/scenarios/framework/framework_test.go index 243f7c254777..78faafe130f3 100644 --- a/x-pack/heartbeat/scenarios/framework/framework_test.go +++ b/x-pack/heartbeat/scenarios/framework/framework_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/libbeat/processors/util" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/libbeat/processors/util" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/heartbeat/scenarios/framework/mocks.go b/x-pack/heartbeat/scenarios/framework/mocks.go index 51bdaac56588..9a885f3c13bd 100644 --- a/x-pack/heartbeat/scenarios/framework/mocks.go +++ b/x-pack/heartbeat/scenarios/framework/mocks.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" ) type mockClient struct { diff --git a/x-pack/heartbeat/scenarios/scenarios_test.go b/x-pack/heartbeat/scenarios/scenarios_test.go index 31f95270ee1e..4f80b8f8e987 100644 --- a/x-pack/heartbeat/scenarios/scenarios_test.go +++ b/x-pack/heartbeat/scenarios/scenarios_test.go @@ -12,8 +12,8 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/heartbeat/monitors/wrappers/monitorstate" - "github.com/elastic/beats/v7/x-pack/heartbeat/scenarios/framework" + "github.com/elastic/beats/v9/heartbeat/monitors/wrappers/monitorstate" + "github.com/elastic/beats/v9/x-pack/heartbeat/scenarios/framework" ) var scenarioDB = framework.NewScenarioDB() diff --git a/x-pack/heartbeat/scenarios/stateloader_test.go b/x-pack/heartbeat/scenarios/stateloader_test.go index c83ebafc0c76..44a9910c4b37 100644 --- a/x-pack/heartbeat/scenarios/stateloader_test.go +++ b/x-pack/heartbeat/scenarios/stateloader_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/heartbeat/scenarios/framework" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/heartbeat/scenarios/framework" ) const numRuns = 2 diff --git a/x-pack/heartbeat/scenarios/testws_test.go b/x-pack/heartbeat/scenarios/testws_test.go index 5309a63744d7..e5219a61de61 100644 --- a/x-pack/heartbeat/scenarios/testws_test.go +++ b/x-pack/heartbeat/scenarios/testws_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/heartbeat/hbtest" + "github.com/elastic/beats/v9/heartbeat/hbtest" ) var testWsOnce = &sync.Once{} diff --git a/x-pack/heartbeat/scenarios/twists_test.go b/x-pack/heartbeat/scenarios/twists_test.go index ad24b8a42f92..fe9d3692e633 100644 --- a/x-pack/heartbeat/scenarios/twists_test.go +++ b/x-pack/heartbeat/scenarios/twists_test.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/heartbeat/config" - "github.com/elastic/beats/v7/libbeat/processors/util" - "github.com/elastic/beats/v7/x-pack/heartbeat/scenarios/framework" + "github.com/elastic/beats/v9/heartbeat/config" + "github.com/elastic/beats/v9/libbeat/processors/util" + "github.com/elastic/beats/v9/x-pack/heartbeat/scenarios/framework" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/libbeat/autodiscover/providers/aws/config.go b/x-pack/libbeat/autodiscover/providers/aws/config.go index ada3cfe8ff15..769afb094213 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/config.go +++ b/x-pack/libbeat/autodiscover/providers/aws/config.go @@ -7,9 +7,9 @@ package aws import ( "time" - "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" ) // Config for all aws autodiscover providers. diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go index 40538f2de855..47773001de95 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go @@ -7,7 +7,7 @@ package ec2 import ( ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go index d7847fa7cccc..5eaf1fea8f28 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go @@ -12,7 +12,7 @@ import ( ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" "go.uber.org/multierr" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go index a32dc723eecd..499c35ba324e 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go @@ -12,11 +12,11 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go index f72f600bc542..d74d2fb5ea26 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" - "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/test" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" + "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws/test" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-libs/keystore" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go index 335883a78ca5..6b324f25cec5 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go b/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go index 48be6b62b5c0..53de9e4ccf75 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go @@ -7,7 +7,7 @@ package elb import ( elasticloadbalancingv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go b/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go index 6987484ed3fe..61cb56b0b674 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go @@ -10,11 +10,11 @@ import ( "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go b/x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go index a2f151a5ece9..0ff63ac68538 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + awsauto "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws" "github.com/elastic/elastic-agent-autodiscover/bus" "github.com/elastic/elastic-agent-libs/keystore" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/libbeat/autodiscover/providers/nomad/config.go b/x-pack/libbeat/autodiscover/providers/nomad/config.go index 7a0d59a9c1b5..a40598e1c571 100644 --- a/x-pack/libbeat/autodiscover/providers/nomad/config.go +++ b/x-pack/libbeat/autodiscover/providers/nomad/config.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/libbeat/autodiscover/providers/nomad/nomad.go b/x-pack/libbeat/autodiscover/providers/nomad/nomad.go index 627c22b15f0a..4e9f74530dd0 100644 --- a/x-pack/libbeat/autodiscover/providers/nomad/nomad.go +++ b/x-pack/libbeat/autodiscover/providers/nomad/nomad.go @@ -13,10 +13,10 @@ import ( "github.com/elastic/elastic-agent-autodiscover/utils" - "github.com/elastic/beats/v7/libbeat/autodiscover" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/x-pack/libbeat/common/nomad" + "github.com/elastic/beats/v9/libbeat/autodiscover" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/x-pack/libbeat/common/nomad" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" diff --git a/x-pack/libbeat/autodiscover/providers/nomad/nomad_test.go b/x-pack/libbeat/autodiscover/providers/nomad/nomad_test.go index fdfe0d4d7c3f..1b2e2002b313 100644 --- a/x-pack/libbeat/autodiscover/providers/nomad/nomad_test.go +++ b/x-pack/libbeat/autodiscover/providers/nomad/nomad_test.go @@ -16,9 +16,9 @@ import ( "github.com/hashicorp/nomad/api" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/autodiscover/template" - "github.com/elastic/beats/v7/libbeat/tests/resources" - "github.com/elastic/beats/v7/x-pack/libbeat/common/nomad" + "github.com/elastic/beats/v9/libbeat/autodiscover/template" + "github.com/elastic/beats/v9/libbeat/tests/resources" + "github.com/elastic/beats/v9/x-pack/libbeat/common/nomad" "github.com/elastic/elastic-agent-autodiscover/bus" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" diff --git a/x-pack/libbeat/cmd/instance/beat.go b/x-pack/libbeat/cmd/instance/beat.go index bf22fa62e3e4..b29d1c674db8 100644 --- a/x-pack/libbeat/cmd/instance/beat.go +++ b/x-pack/libbeat/cmd/instance/beat.go @@ -12,18 +12,18 @@ import ( "go.opentelemetry.io/collector/consumer" "go.uber.org/zap/zapcore" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cloudid" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/features" - "github.com/elastic/beats/v7/libbeat/idxmgmt" - "github.com/elastic/beats/v7/libbeat/instrumentation" - "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/plugin" - "github.com/elastic/beats/v7/libbeat/publisher/pipeline" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cloudid" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/features" + "github.com/elastic/beats/v9/libbeat/idxmgmt" + "github.com/elastic/beats/v9/libbeat/instrumentation" + "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/plugin" + "github.com/elastic/beats/v9/libbeat/publisher/pipeline" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/keystore" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/libbeat/cmd/instance/receiver.go b/x-pack/libbeat/cmd/instance/receiver.go index 6a2b9338568f..1c206ca2ae47 100644 --- a/x-pack/libbeat/cmd/instance/receiver.go +++ b/x-pack/libbeat/cmd/instance/receiver.go @@ -7,12 +7,12 @@ package instance import ( "fmt" - "github.com/elastic/beats/v7/libbeat/api" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/x-pack/libbeat/common/otelbeat/status" - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" + "github.com/elastic/beats/v9/libbeat/api" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/x-pack/libbeat/common/otelbeat/status" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" metricreport "github.com/elastic/elastic-agent-system-metrics/report" "go.opentelemetry.io/collector/component" diff --git a/x-pack/libbeat/common/cloudfoundry/cache.go b/x-pack/libbeat/common/cloudfoundry/cache.go index 4e76ab439753..8e15739505c3 100644 --- a/x-pack/libbeat/common/cloudfoundry/cache.go +++ b/x-pack/libbeat/common/cloudfoundry/cache.go @@ -14,7 +14,7 @@ import ( "github.com/cloudfoundry-community/go-cfclient" "github.com/pkg/errors" //nolint:gomodguard // go-cfclient uses pkg/errors internally, must be upgraded to at least https://github.com/cloudfoundry-community/go-cfclient/commit/0ada4e9452 - "github.com/elastic/beats/v7/x-pack/libbeat/persistentcache" + "github.com/elastic/beats/v9/x-pack/libbeat/persistentcache" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/libbeat/common/cloudfoundry/cache_integration_test.go b/x-pack/libbeat/common/cloudfoundry/cache_integration_test.go index 0ccf5c0a1757..dae413aa4a63 100644 --- a/x-pack/libbeat/common/cloudfoundry/cache_integration_test.go +++ b/x-pack/libbeat/common/cloudfoundry/cache_integration_test.go @@ -15,7 +15,7 @@ import ( "github.com/cloudfoundry-community/go-cfclient" - cftest "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry/test" + cftest "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry/test" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/libbeat/common/cloudfoundry/cache_test.go b/x-pack/libbeat/common/cloudfoundry/cache_test.go index 60764bcf7b86..68978dbab092 100644 --- a/x-pack/libbeat/common/cloudfoundry/cache_test.go +++ b/x-pack/libbeat/common/cloudfoundry/cache_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/testing/testutils" + "github.com/elastic/beats/v9/testing/testutils" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/libbeat/common/cloudfoundry/events.go b/x-pack/libbeat/common/cloudfoundry/events.go index a1af74929f9d..03828526dd1c 100644 --- a/x-pack/libbeat/common/cloudfoundry/events.go +++ b/x-pack/libbeat/common/cloudfoundry/events.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/cloudfoundry/sonde-go/events" diff --git a/x-pack/libbeat/common/nomad/metadata.go b/x-pack/libbeat/common/nomad/metadata.go index d4020603882d..e804585af460 100644 --- a/x-pack/libbeat/common/nomad/metadata.go +++ b/x-pack/libbeat/common/nomad/metadata.go @@ -7,7 +7,7 @@ package nomad import ( "regexp" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/safemapstr" diff --git a/x-pack/libbeat/common/nomad/watcher_test.go b/x-pack/libbeat/common/nomad/watcher_test.go index 00e1369fab45..a5bb2d36c26d 100644 --- a/x-pack/libbeat/common/nomad/watcher_test.go +++ b/x-pack/libbeat/common/nomad/watcher_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/resources" + "github.com/elastic/beats/v9/libbeat/tests/resources" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/libbeat/common/otelbeat/inspect.go b/x-pack/libbeat/common/otelbeat/inspect.go index 23baac6a6a9f..366d09d70891 100644 --- a/x-pack/libbeat/common/otelbeat/inspect.go +++ b/x-pack/libbeat/common/otelbeat/inspect.go @@ -12,9 +12,9 @@ import ( "go.opentelemetry.io/collector/confmap" "gopkg.in/yaml.v3" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/otelbeat" - "github.com/elastic/beats/v7/libbeat/otelbeat/beatconverter" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/otelbeat" + "github.com/elastic/beats/v9/libbeat/otelbeat/beatconverter" ) func OTelInspectComand(beatname string) *cobra.Command { diff --git a/x-pack/libbeat/common/otelbeat/otel.go b/x-pack/libbeat/common/otelbeat/otel.go index 44b3db82f3e0..7214ac737f9f 100644 --- a/x-pack/libbeat/common/otelbeat/otel.go +++ b/x-pack/libbeat/common/otelbeat/otel.go @@ -19,14 +19,14 @@ import ( "go.opentelemetry.io/collector/otelcol" "gopkg.in/yaml.v3" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/otelbeat/beatconverter" - "github.com/elastic/beats/v7/libbeat/otelbeat/providers/fbprovider" - "github.com/elastic/beats/v7/libbeat/otelbeat/providers/mbprovider" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/x-pack/filebeat/fbreceiver" - "github.com/elastic/beats/v7/x-pack/metricbeat/mbreceiver" - "github.com/elastic/beats/v7/x-pack/otel/processor/beatprocessor" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/otelbeat/beatconverter" + "github.com/elastic/beats/v9/libbeat/otelbeat/providers/fbprovider" + "github.com/elastic/beats/v9/libbeat/otelbeat/providers/mbprovider" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/x-pack/filebeat/fbreceiver" + "github.com/elastic/beats/v9/x-pack/metricbeat/mbreceiver" + "github.com/elastic/beats/v9/x-pack/otel/processor/beatprocessor" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/libbeat/common/otelbeat/status/reporter.go b/x-pack/libbeat/common/otelbeat/status/reporter.go index e368084aa287..0bace7da4e2c 100644 --- a/x-pack/libbeat/common/otelbeat/status/reporter.go +++ b/x-pack/libbeat/common/otelbeat/status/reporter.go @@ -8,7 +8,7 @@ import ( "errors" "sync" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componentstatus" diff --git a/x-pack/libbeat/common/otelbeat/status/reporter_test.go b/x-pack/libbeat/common/otelbeat/status/reporter_test.go index bd339180ac24..2889a618300e 100644 --- a/x-pack/libbeat/common/otelbeat/status/reporter_test.go +++ b/x-pack/libbeat/common/otelbeat/status/reporter_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componentstatus" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/otelbeat/oteltest" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/otelbeat/oteltest" ) func TestGroupStatus(t *testing.T) { diff --git a/x-pack/libbeat/common/otelbeat/status/runner.go b/x-pack/libbeat/common/otelbeat/status/runner.go index be3c5d11763e..265915a590f9 100644 --- a/x-pack/libbeat/common/otelbeat/status/runner.go +++ b/x-pack/libbeat/common/otelbeat/status/runner.go @@ -7,9 +7,9 @@ package status import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/config" "github.com/gohugoio/hashstructure" diff --git a/x-pack/libbeat/include/include.go b/x-pack/libbeat/include/include.go index 7e95f9474656..07e7bd5decdd 100644 --- a/x-pack/libbeat/include/include.go +++ b/x-pack/libbeat/include/include.go @@ -6,17 +6,17 @@ package include import ( // Register Fleet - _ "github.com/elastic/beats/v7/x-pack/libbeat/management" + _ "github.com/elastic/beats/v9/x-pack/libbeat/management" // register processors - _ "github.com/elastic/beats/v7/x-pack/libbeat/processors/add_cloudfoundry_metadata" - _ "github.com/elastic/beats/v7/x-pack/libbeat/processors/add_nomad_metadata" + _ "github.com/elastic/beats/v9/x-pack/libbeat/processors/add_cloudfoundry_metadata" + _ "github.com/elastic/beats/v9/x-pack/libbeat/processors/add_nomad_metadata" // register autodiscover providers - _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/ec2" - _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/elb" - _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/nomad" + _ "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws/ec2" + _ "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/aws/elb" + _ "github.com/elastic/beats/v9/x-pack/libbeat/autodiscover/providers/nomad" // register outputs - _ "github.com/elastic/beats/v7/x-pack/libbeat/outputs/otelconsumer" + _ "github.com/elastic/beats/v9/x-pack/libbeat/outputs/otelconsumer" ) diff --git a/x-pack/libbeat/libbeat.go b/x-pack/libbeat/libbeat.go index 501787b36132..0b456c392905 100644 --- a/x-pack/libbeat/libbeat.go +++ b/x-pack/libbeat/libbeat.go @@ -7,9 +7,9 @@ package main import ( "os" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/mock" - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/mock" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" ) // RootCmd to test libbeat diff --git a/x-pack/libbeat/libbeat_test.go b/x-pack/libbeat/libbeat_test.go index 338ebd7e5fbd..3cd4484fb9e0 100644 --- a/x-pack/libbeat/libbeat_test.go +++ b/x-pack/libbeat/libbeat_test.go @@ -8,7 +8,7 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v9/libbeat/tests/system/template" ) var systemTest *bool diff --git a/x-pack/libbeat/magefile.go b/x-pack/libbeat/magefile.go index 333584c7f8d2..e1e0b8ed5728 100644 --- a/x-pack/libbeat/magefile.go +++ b/x-pack/libbeat/magefile.go @@ -11,18 +11,18 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/x-pack/libbeat/management/blacklist.go b/x-pack/libbeat/management/blacklist.go index 96f39bcb2bf3..d4f9f2ec7116 100644 --- a/x-pack/libbeat/management/blacklist.go +++ b/x-pack/libbeat/management/blacklist.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v9/libbeat/common/match" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/libbeat/management/config.go b/x-pack/libbeat/management/config.go index 82986031465f..98456fb20dde 100644 --- a/x-pack/libbeat/management/config.go +++ b/x-pack/libbeat/management/config.go @@ -7,7 +7,7 @@ package management import ( "errors" - "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/common/reload" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/libbeat/management/devguide.asciidoc b/x-pack/libbeat/management/devguide.asciidoc index a2553a6e5df6..fac6cd1c631a 100644 --- a/x-pack/libbeat/management/devguide.asciidoc +++ b/x-pack/libbeat/management/devguide.asciidoc @@ -2,19 +2,19 @@ ## What is this document? -This guide is meant to be a high-level guide for adapting an individual beat to the newer V2 control protocol used by elastic-agent; +This guide is meant to be a high-level guide for adapting an individual beat to the newer V2 control protocol used by elastic-agent; this includes component registration, config transformation, and tests. ## Introduction: The V2 controller -The V2 remote management protocol is fundamentally different from V1; whereas V1 required the registration of a number of callbacks from a client to a server, -such as `OnConfig()` and `OnStop()`, V2, is more parallelized and flexible, -but as a trade-off requires more work on behalf of a client to manage the flow of commands from the server. +The V2 remote management protocol is fundamentally different from V1; whereas V1 required the registration of a number of callbacks from a client to a server, +such as `OnConfig()` and `OnStop()`, V2, is more parallelized and flexible, +but as a trade-off requires more work on behalf of a client to manage the flow of commands from the server. From the perspective of an individual beat however, little has changed, as this newer V2 server will still look for a `ReloadableList` callback registered by an -individual beat. However, the V2 server also offloads the work of transforming the "agent-native" config generated by fleet onto clients. -Previously, this config transformation was performed by an AST layer in elastic-agent, +individual beat. However, the V2 server also offloads the work of transforming the "agent-native" config generated by fleet onto clients. +Previously, this config transformation was performed by an AST layer in elastic-agent, as configured by YML spec files that lived in `elastic-agent/internal/spec`. In V2, this transformation must be performed by an individual beat. @@ -55,31 +55,31 @@ In this example agent YAML config, each item under the `streams` key will become ### Config Transformation Unlike with the V1 agent controller, with the V2 controller, individual beats will be required to make any transformations needed to format their config. -In V1, config transformation was performed by the agent and configured by a YAML file. In V2, this transformation process is fundamentally different, -as beats no longer receive the entire agent config, but individual per-input configs, +In V1, config transformation was performed by the agent and configured by a YAML file. In V2, this transformation process is fundamentally different, +as beats no longer receive the entire agent config, but individual per-input configs, and so the logic of the AST transformations present in `elastic-agent/internal/spec` cannot be moved one-to-one over to the V2 client in beats. In order for a beat to perform its own config transformations, it must register a callback function, as such: ``` -import "github.com/elastic/beats/v7/x-pack/libbeat/management" +import "github.com/elastic/beats/v9/x-pack/libbeat/management" ... management.ConfigTransform.SetTransform(metricbeatCfg) ``` -The `SetTransform` method takes a function with the following signature: +The `SetTransform` method takes a function with the following signature: ``` func(rawIn *proto.UnitExpectedConfig, agentInfo *client.AgentInfo) ([]*reload.ConfigWithMeta, error) ``` -This registration will usually happen early in the startup process, and for licensing reasons, must happen in `x-pack` code. +This registration will usually happen early in the startup process, and for licensing reasons, must happen in `x-pack` code. For the sake of consistency, both filebeat and metricbeat register this callback in `x-pack/[beatname]/cmd`. If a beat does not register a callback, the V2 client will perform a basic config transformation that adds metadata `processor` fields and breaks apart the individual inputs under the `streams` key. This function callback takes an `AgentInfo` struct that can be used for creating metadata `add_field` processors, as well as a `UnitExpectedConfig` structure that -represents the individual input config demonstrated in the previous section. The return value, `[]*reload.ConfigWithMeta`, should represent the final config that +represents the individual input config demonstrated in the previous section. The return value, `[]*reload.ConfigWithMeta`, should represent the final config that will be passed to the reloader interface. -The V2 client library provides a number of convenience functions. `CreateInputsFromStreams` will generate an array of input configs from the `streams` value, +The V2 client library provides a number of convenience functions. `CreateInputsFromStreams` will generate an array of input configs from the `streams` value, complete with metadata fields. `CreateReloadConfigFromInputs` will turn a list of input configs in the form of `[]map[string]interface{}` into a list of reloader configs that can be returned and sent to the registered reloader. @@ -91,7 +91,7 @@ as the tests themselves will try to initialize a number of global variables, req To add a new beat to the test, you must fetch the `BeatsRootCmd` object that starts a beat executible, and pass it to a wrapper that will modify the beats environment for use in a test wrapper: ``` -import fbroot "github.com/elastic/beats/v7/x-pack/filebeat/cmd" +import fbroot "github.com/elastic/beats/v9/x-pack/filebeat/cmd" ... filebeatCmd := fbroot.Filebeat() tests.InitBeatsForTest(t, filebeatCmd) @@ -113,4 +113,4 @@ the `BeatsRootCmd` object can be started as it would in any normal non-test setu t.Logf("Got %d events", len(events)) ``` -For more in-depth examples, examine the `fbtest` and `mbtest` directories. \ No newline at end of file +For more in-depth examples, examine the `fbtest` and `mbtest` directories. diff --git a/x-pack/libbeat/management/generate.go b/x-pack/libbeat/management/generate.go index 4d3b20759b77..f6485f0b5ebd 100644 --- a/x-pack/libbeat/management/generate.go +++ b/x-pack/libbeat/management/generate.go @@ -7,7 +7,7 @@ package management import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/common/reload" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" conf "github.com/elastic/elastic-agent-libs/config" diff --git a/x-pack/libbeat/management/managerV2.go b/x-pack/libbeat/management/managerV2.go index e088b948d34f..3c04eecbc038 100644 --- a/x-pack/libbeat/management/managerV2.go +++ b/x-pack/libbeat/management/managerV2.go @@ -20,13 +20,13 @@ import ( gproto "google.golang.org/protobuf/proto" "gopkg.in/yaml.v2" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/features" - lbmanagement "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/libbeat/management/status" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/features" + lbmanagement "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/version" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" conf "github.com/elastic/elastic-agent-libs/config" diff --git a/x-pack/libbeat/management/managerV2_test.go b/x-pack/libbeat/management/managerV2_test.go index d61dde5285eb..f3a06c500731 100644 --- a/x-pack/libbeat/management/managerV2_test.go +++ b/x-pack/libbeat/management/managerV2_test.go @@ -24,11 +24,11 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" - "github.com/elastic/beats/v7/libbeat/cfgfile" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/features" - "github.com/elastic/beats/v7/libbeat/tests/integration" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/cfgfile" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/features" + "github.com/elastic/beats/v9/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/version" ) func TestManagerV2(t *testing.T) { diff --git a/x-pack/libbeat/management/simple_input_config_test.go b/x-pack/libbeat/management/simple_input_config_test.go index c29c0f5a9f48..5f26b4e50e26 100644 --- a/x-pack/libbeat/management/simple_input_config_test.go +++ b/x-pack/libbeat/management/simple_input_config_test.go @@ -14,8 +14,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/client/mock" "github.com/elastic/elastic-agent-client/v7/pkg/proto" diff --git a/x-pack/libbeat/management/tests/fbtest/filebeat_v2_test.go b/x-pack/libbeat/management/tests/fbtest/filebeat_v2_test.go index 998966f3137d..b9e7ea646d2f 100644 --- a/x-pack/libbeat/management/tests/fbtest/filebeat_v2_test.go +++ b/x-pack/libbeat/management/tests/fbtest/filebeat_v2_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/require" - fbroot "github.com/elastic/beats/v7/x-pack/filebeat/cmd" + fbroot "github.com/elastic/beats/v9/x-pack/filebeat/cmd" // initialize the plugin system before libbeat does, so we can overwrite it properly - _ "github.com/elastic/beats/v7/x-pack/libbeat/management" - "github.com/elastic/beats/v7/x-pack/libbeat/management/tests" + _ "github.com/elastic/beats/v9/x-pack/libbeat/management" + "github.com/elastic/beats/v9/x-pack/libbeat/management/tests" "github.com/elastic/elastic-agent-client/v7/pkg/proto" ) diff --git a/x-pack/libbeat/management/tests/init.go b/x-pack/libbeat/management/tests/init.go index bce63a5bce7e..fb6a3e4af433 100644 --- a/x-pack/libbeat/management/tests/init.go +++ b/x-pack/libbeat/management/tests/init.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/common/reload" - lbmanagement "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/common/reload" + lbmanagement "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/x-pack/libbeat/management" "github.com/elastic/elastic-agent-client/v7/pkg/proto" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/libbeat/management/tests/mbtest/metricbeat_v2_test.go b/x-pack/libbeat/management/tests/mbtest/metricbeat_v2_test.go index 4ffa583120b4..20b8508c73f8 100644 --- a/x-pack/libbeat/management/tests/mbtest/metricbeat_v2_test.go +++ b/x-pack/libbeat/management/tests/mbtest/metricbeat_v2_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" // initialize the plugin system before libbeat does, so we can overwrite it properly - _ "github.com/elastic/beats/v7/x-pack/libbeat/management" - "github.com/elastic/beats/v7/x-pack/libbeat/management/tests" - "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" + _ "github.com/elastic/beats/v9/x-pack/libbeat/management" + "github.com/elastic/beats/v9/x-pack/libbeat/management/tests" + "github.com/elastic/beats/v9/x-pack/metricbeat/cmd" "github.com/elastic/elastic-agent-client/v7/pkg/proto" ) diff --git a/x-pack/libbeat/management/tests/mbtest/system/process_integration_test.go b/x-pack/libbeat/management/tests/mbtest/system/process_integration_test.go index 1708d2df06d2..afc556de1c66 100644 --- a/x-pack/libbeat/management/tests/mbtest/system/process_integration_test.go +++ b/x-pack/libbeat/management/tests/mbtest/system/process_integration_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/common/reload" - lbmanagement "github.com/elastic/beats/v7/libbeat/management" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + "github.com/elastic/beats/v9/libbeat/common/reload" + lbmanagement "github.com/elastic/beats/v9/libbeat/management" + "github.com/elastic/beats/v9/x-pack/libbeat/management" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" @@ -26,8 +26,8 @@ import ( "github.com/elastic/elastic-agent-client/v7/pkg/client/mock" "github.com/elastic/elastic-agent-client/v7/pkg/proto" - "github.com/elastic/beats/v7/x-pack/libbeat/management/tests" - "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" + "github.com/elastic/beats/v9/x-pack/libbeat/management/tests" + "github.com/elastic/beats/v9/x-pack/metricbeat/cmd" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/libbeat/management/unit.go b/x-pack/libbeat/management/unit.go index 729be62c77a7..c5bb182a8f07 100644 --- a/x-pack/libbeat/management/unit.go +++ b/x-pack/libbeat/management/unit.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/libbeat/management/unit_test.go b/x-pack/libbeat/management/unit_test.go index 9684ff5e16e9..71ec8246f50b 100644 --- a/x-pack/libbeat/management/unit_test.go +++ b/x-pack/libbeat/management/unit_test.go @@ -10,7 +10,7 @@ import ( "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" ) func TestUnitUpdate(t *testing.T) { diff --git a/x-pack/libbeat/outputs/otelconsumer/benchmark_test.go b/x-pack/libbeat/outputs/otelconsumer/benchmark_test.go index e28cb702c1cf..6590f7e8abe9 100644 --- a/x-pack/libbeat/outputs/otelconsumer/benchmark_test.go +++ b/x-pack/libbeat/outputs/otelconsumer/benchmark_test.go @@ -8,9 +8,9 @@ import ( "context" "testing" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/libbeat/outputs/otelconsumer/otelconsumer.go b/x-pack/libbeat/outputs/otelconsumer/otelconsumer.go index 976a9e6d6211..e22f86d2dab1 100644 --- a/x-pack/libbeat/outputs/otelconsumer/otelconsumer.go +++ b/x-pack/libbeat/outputs/otelconsumer/otelconsumer.go @@ -13,11 +13,11 @@ import ( "go.opentelemetry.io/collector/client" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/libbeat/otelbeat/otelmap" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/libbeat/otelbeat/otelmap" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/publisher" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go b/x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go index 1caba7ec1a60..e021d787ee27 100644 --- a/x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go +++ b/x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go @@ -21,9 +21,9 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/receiver/receivertest" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/outputs" - "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/outputs" + "github.com/elastic/beats/v9/libbeat/outputs/outest" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata.go b/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata.go index 37631e983582..1108314b730d 100644 --- a/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata.go +++ b/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata.go @@ -11,9 +11,9 @@ import ( "github.com/gofrs/uuid/v5" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata_test.go b/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata_test.go index 6154d6f0b90a..95193a271dee 100644 --- a/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata_test.go +++ b/x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata_test.go @@ -13,8 +13,8 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/libbeat/processors/add_nomad_metadata/indexers.go b/x-pack/libbeat/processors/add_nomad_metadata/indexers.go index 465b49749679..45c0292af8cc 100644 --- a/x-pack/libbeat/processors/add_nomad_metadata/indexers.go +++ b/x-pack/libbeat/processors/add_nomad_metadata/indexers.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/x-pack/libbeat/common/nomad" + "github.com/elastic/beats/v9/x-pack/libbeat/common/nomad" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/libbeat/processors/add_nomad_metadata/matchers.go b/x-pack/libbeat/processors/add_nomad_metadata/matchers.go index f7862a879313..eee5b50d8b85 100644 --- a/x-pack/libbeat/processors/add_nomad_metadata/matchers.go +++ b/x-pack/libbeat/processors/add_nomad_metadata/matchers.go @@ -8,10 +8,10 @@ import ( "fmt" "sync" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/fmtstr" - "github.com/elastic/beats/v7/libbeat/outputs/codec" - "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/fmtstr" + "github.com/elastic/beats/v9/libbeat/outputs/codec" + "github.com/elastic/beats/v9/libbeat/outputs/codec/format" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/libbeat/processors/add_nomad_metadata/nomad.go b/x-pack/libbeat/processors/add_nomad_metadata/nomad.go index 079466db38e9..0ab90e39ece3 100644 --- a/x-pack/libbeat/processors/add_nomad_metadata/nomad.go +++ b/x-pack/libbeat/processors/add_nomad_metadata/nomad.go @@ -7,10 +7,10 @@ package add_nomad_metadata import ( "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/x-pack/libbeat/common/nomad" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/x-pack/libbeat/common/nomad" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/libbeat/processors/add_nomad_metadata/registry.go b/x-pack/libbeat/processors/add_nomad_metadata/registry.go index 6d0ed4d03611..ff50fa1e68cc 100644 --- a/x-pack/libbeat/processors/add_nomad_metadata/registry.go +++ b/x-pack/libbeat/processors/add_nomad_metadata/registry.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - p "github.com/elastic/beats/v7/libbeat/plugin" + p "github.com/elastic/beats/v9/libbeat/plugin" ) var ( diff --git a/x-pack/libbeat/reader/decoder/parquet.go b/x-pack/libbeat/reader/decoder/parquet.go index 1c7d12a4fc37..ef0952b7e085 100644 --- a/x-pack/libbeat/reader/decoder/parquet.go +++ b/x-pack/libbeat/reader/decoder/parquet.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/elastic/beats/v7/x-pack/libbeat/reader/parquet" + "github.com/elastic/beats/v9/x-pack/libbeat/reader/parquet" ) // parquetDecoder is a decoder for parquet data. diff --git a/x-pack/libbeat/reader/etw/testdata/README.md b/x-pack/libbeat/reader/etw/testdata/README.md index 46509895f337..c4c99d1693a1 100644 --- a/x-pack/libbeat/reader/etw/testdata/README.md +++ b/x-pack/libbeat/reader/etw/testdata/README.md @@ -55,9 +55,9 @@ To measure the performance of the ETW reader, run the `BenchmarkETWCallbackRate` go test -run="^$" -bench=BenchmarkETWCallbackRate -benchtime=30s goos: windows goarch: amd64 -pkg: github.com/elastic/beats/v7/x-pack/libbeat/reader/etw +pkg: github.com/elastic/beats/v9/x-pack/libbeat/reader/etw cpu: 13th Gen Intel(R) Core(TM) i7-13700H BenchmarkETWCallbackRate-20 34 1000216150 ns/op 579.7 allocs/event 48558 bytes/event 1.000 duration_s 29644 events/s 30000 target_events/s 17189965 total_allocs_iter 1439854256 total_bytes_iter 29652 total_events_iter PASS -ok github.com/elastic/beats/v7/x-pack/libbeat/reader/etw 74.197s -``` \ No newline at end of file +ok github.com/elastic/beats/v9/x-pack/libbeat/reader/etw 74.197s +``` diff --git a/x-pack/libbeat/statusreporterhelper/status_reporter_helper.go b/x-pack/libbeat/statusreporterhelper/status_reporter_helper.go index 1bfadc6ca36f..5c9d8bd6a87e 100644 --- a/x-pack/libbeat/statusreporterhelper/status_reporter_helper.go +++ b/x-pack/libbeat/statusreporterhelper/status_reporter_helper.go @@ -10,7 +10,7 @@ package statusreporterhelper import ( "sync" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/libbeat/statusreporterhelper/status_reporter_helper_test.go b/x-pack/libbeat/statusreporterhelper/status_reporter_helper_test.go index f2b50eb38c1e..6cdedaaf72f0 100644 --- a/x-pack/libbeat/statusreporterhelper/status_reporter_helper_test.go +++ b/x-pack/libbeat/statusreporterhelper/status_reporter_helper_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/management/status" + "github.com/elastic/beats/v9/libbeat/management/status" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/cmd/agent.go b/x-pack/metricbeat/cmd/agent.go index 99fd85fb6716..65fb1c313368 100644 --- a/x-pack/metricbeat/cmd/agent.go +++ b/x-pack/metricbeat/cmd/agent.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/x-pack/libbeat/management" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" ) diff --git a/x-pack/metricbeat/cmd/otelcmd_disabled.go b/x-pack/metricbeat/cmd/otelcmd_disabled.go index af7e1424dd0a..c22f92d44256 100644 --- a/x-pack/metricbeat/cmd/otelcmd_disabled.go +++ b/x-pack/metricbeat/cmd/otelcmd_disabled.go @@ -7,7 +7,7 @@ package cmd import ( - cmd "github.com/elastic/beats/v7/libbeat/cmd" + cmd "github.com/elastic/beats/v9/libbeat/cmd" ) func addOTelCommand(command *cmd.BeatsRootCmd) { diff --git a/x-pack/metricbeat/cmd/otelcmd_enabled.go b/x-pack/metricbeat/cmd/otelcmd_enabled.go index afbb9e4dfa20..27650841af37 100644 --- a/x-pack/metricbeat/cmd/otelcmd_enabled.go +++ b/x-pack/metricbeat/cmd/otelcmd_enabled.go @@ -7,8 +7,8 @@ package cmd import ( - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/x-pack/libbeat/common/otelbeat" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/x-pack/libbeat/common/otelbeat" ) func addOTelCommand(command *cmd.BeatsRootCmd) { diff --git a/x-pack/metricbeat/cmd/root.go b/x-pack/metricbeat/cmd/root.go index 30d3d8386466..028cfeabf8f1 100644 --- a/x-pack/metricbeat/cmd/root.go +++ b/x-pack/metricbeat/cmd/root.go @@ -9,23 +9,23 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/metricbeat/beater" - mbcmd "github.com/elastic/beats/v7/metricbeat/cmd" - "github.com/elastic/beats/v7/metricbeat/cmd/test" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/metricbeat/beater" + mbcmd "github.com/elastic/beats/v9/metricbeat/cmd" + "github.com/elastic/beats/v9/metricbeat/cmd/test" + "github.com/elastic/beats/v9/x-pack/libbeat/management" "github.com/elastic/elastic-agent-libs/mapstr" // Register the includes. - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/include" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/include" // Import OSS modules. - _ "github.com/elastic/beats/v7/metricbeat/include" - _ "github.com/elastic/beats/v7/metricbeat/include/fields" + _ "github.com/elastic/beats/v9/metricbeat/include" + _ "github.com/elastic/beats/v9/metricbeat/include/fields" ) const ( diff --git a/x-pack/metricbeat/include/list.go b/x-pack/metricbeat/include/list.go index 055ecb30bac3..73b15cb0acc2 100644 --- a/x-pack/metricbeat/include/list.go +++ b/x-pack/metricbeat/include/list.go @@ -8,88 +8,88 @@ package include import ( // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/activemq" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/airflow" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/cat_shards" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/cat_template" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/cluster_health" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/cluster_settings" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/component_template" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/index_template" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/license" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/node_stats" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/tasks_management" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/awshealth" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/billing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/awsfargate" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/awsfargate/task_stats" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/app_insights" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/billing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/storage" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/benchmark" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/benchmark/info" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/container" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/counter" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/value" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cockroachdb" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd/blkio" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd/cpu" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd/memory" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/coredns" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/coredns/stats" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/billing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/carbon" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/ibmmq" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/iis" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/iis/application_pool" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio/citadel" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio/galley" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio/mesh" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio/mixer" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio/pilot" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki/device_health" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki/network_health" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql/performance" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql/transaction_log" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/openai" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/openai/usage" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle/performance" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle/sysmetric" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle/tablespace" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw/interfaces" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw/routing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw/system" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw/vpn" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus/collector" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus/remote_write" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/redisenterprise" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/sql" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/sql/query" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/stan" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/stan/channels" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/stan/stats" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/stan/subscriptions" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/statsd" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/statsd/server" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway/db" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway/memory" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway/replication" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway/resources" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/tomcat" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/activemq" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/airflow" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/cat_shards" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/cat_template" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/cluster_health" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/cluster_settings" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/component_template" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/index_template" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/license" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/node_stats" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/tasks_management" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/awshealth" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/billing" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/awsfargate" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/awsfargate/task_stats" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/app_insights" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/billing" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/monitor" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/storage" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/benchmark" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/benchmark/info" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/container" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/counter" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/value" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/cockroachdb" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd/blkio" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd/cpu" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd/memory" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/coredns" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/coredns/stats" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/billing" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/carbon" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/ibmmq" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/iis" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/iis/application_pool" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio/citadel" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio/galley" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio/mesh" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio/mixer" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio/pilot" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki/device_health" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki/network_health" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql/performance" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql/transaction_log" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/openai" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/openai/usage" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle/performance" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle/sysmetric" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle/tablespace" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw/interfaces" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw/routing" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw/system" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw/vpn" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus/remote_write" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/redisenterprise" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/sql" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/sql/query" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/stan" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/stan/channels" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/stan/stats" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/stan/subscriptions" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/statsd" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/statsd/server" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway/db" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway/memory" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway/replication" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway/resources" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/tomcat" ) diff --git a/x-pack/metricbeat/magefile.go b/x-pack/metricbeat/magefile.go index c0354283223c..31e7f0f5c0b0 100644 --- a/x-pack/metricbeat/magefile.go +++ b/x-pack/metricbeat/magefile.go @@ -20,18 +20,18 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + metricbeat "github.com/elastic/beats/v9/metricbeat/scripts/mage" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" //mage:import - _ "github.com/elastic/beats/v7/metricbeat/scripts/mage/target/metricset" + _ "github.com/elastic/beats/v9/metricbeat/scripts/mage/target/metricset" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/docker" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/docker" ) func init() { diff --git a/x-pack/metricbeat/main.go b/x-pack/metricbeat/main.go index 08afded3254f..a610ad685233 100644 --- a/x-pack/metricbeat/main.go +++ b/x-pack/metricbeat/main.go @@ -15,7 +15,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" + "github.com/elastic/beats/v9/x-pack/metricbeat/cmd" ) func main() { diff --git a/x-pack/metricbeat/main_test.go b/x-pack/metricbeat/main_test.go index dd63a8a48b7c..8d887d02d400 100644 --- a/x-pack/metricbeat/main_test.go +++ b/x-pack/metricbeat/main_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - mbcmd "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + mbcmd "github.com/elastic/beats/v9/x-pack/metricbeat/cmd" ) var ( diff --git a/x-pack/metricbeat/mbreceiver/factory.go b/x-pack/metricbeat/mbreceiver/factory.go index 8ab0c1a3fd5d..50625808c02a 100644 --- a/x-pack/metricbeat/mbreceiver/factory.go +++ b/x-pack/metricbeat/mbreceiver/factory.go @@ -12,20 +12,20 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - "github.com/elastic/beats/v7/metricbeat/beater" - "github.com/elastic/beats/v7/metricbeat/cmd" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + "github.com/elastic/beats/v9/metricbeat/beater" + "github.com/elastic/beats/v9/metricbeat/cmd" // Import OSS modules. - "github.com/elastic/beats/v7/metricbeat/include" - _ "github.com/elastic/beats/v7/metricbeat/include/fields" + "github.com/elastic/beats/v9/metricbeat/include" + _ "github.com/elastic/beats/v9/metricbeat/include/fields" // Import X-Pack modules. - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/include" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/include" - xpInstance "github.com/elastic/beats/v7/x-pack/libbeat/cmd/instance" + xpInstance "github.com/elastic/beats/v9/x-pack/libbeat/cmd/instance" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/mbreceiver/receiver.go b/x-pack/metricbeat/mbreceiver/receiver.go index 66a56259440e..a9dd2c76e9c9 100644 --- a/x-pack/metricbeat/mbreceiver/receiver.go +++ b/x-pack/metricbeat/mbreceiver/receiver.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - xpInstance "github.com/elastic/beats/v7/x-pack/libbeat/cmd/instance" + xpInstance "github.com/elastic/beats/v9/x-pack/libbeat/cmd/instance" "go.opentelemetry.io/collector/component" "go.uber.org/zap" diff --git a/x-pack/metricbeat/mbreceiver/receiver_test.go b/x-pack/metricbeat/mbreceiver/receiver_test.go index c050df4a0d2e..4440cf256f7a 100644 --- a/x-pack/metricbeat/mbreceiver/receiver_test.go +++ b/x-pack/metricbeat/mbreceiver/receiver_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/libbeat/otelbeat/oteltest" + "github.com/elastic/beats/v9/libbeat/otelbeat/oteltest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/x-pack/metricbeat/module/activemq/fields.go b/x-pack/metricbeat/module/activemq/fields.go index 40780e1f01fd..634276d1fb23 100644 --- a/x-pack/metricbeat/module/activemq/fields.go +++ b/x-pack/metricbeat/module/activemq/fields.go @@ -7,7 +7,7 @@ package activemq import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/airflow/fields.go b/x-pack/metricbeat/module/airflow/fields.go index 10de8d3c3bdc..f7bf2f2c945c 100644 --- a/x-pack/metricbeat/module/airflow/fields.go +++ b/x-pack/metricbeat/module/airflow/fields.go @@ -7,7 +7,7 @@ package airflow import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/airflow/statsd/data_test.go b/x-pack/metricbeat/module/airflow/statsd/data_test.go index da8ebc40f46d..1bfd6cdff1b2 100644 --- a/x-pack/metricbeat/module/airflow/statsd/data_test.go +++ b/x-pack/metricbeat/module/airflow/statsd/data_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/auditbeat/core" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/statsd/server" + "github.com/elastic/beats/v9/auditbeat/core" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/statsd/server" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/autoops_es/auto_ops_testing/testing.go b/x-pack/metricbeat/module/autoops_es/auto_ops_testing/testing.go index 679d86216f94..42f7e6ea2f4a 100644 --- a/x-pack/metricbeat/module/autoops_es/auto_ops_testing/testing.go +++ b/x-pack/metricbeat/module/autoops_es/auto_ops_testing/testing.go @@ -20,8 +20,8 @@ import ( "github.com/gofrs/uuid/v5" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/cache.go b/x-pack/metricbeat/module/autoops_es/cat_shards/cache.go index f72d6c5710cb..af494873d25d 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/cache.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/cache.go @@ -9,7 +9,7 @@ import ( "slices" "time" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards.go b/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards.go index 294433967318..65f882d978bf 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards.go @@ -5,7 +5,7 @@ package cat_shards import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards_test.go b/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards_test.go index d2bc11a8f5ea..5ad6bbdc698a 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards_test.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards_test.go @@ -10,8 +10,8 @@ package cat_shards import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/data.go b/x-pack/metricbeat/module/autoops_es/cat_shards/data.go index 221e7910728e..ecaf2f93af4e 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/data.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/data.go @@ -11,13 +11,13 @@ import ( "math" "slices" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/data_test.go b/x-pack/metricbeat/module/autoops_es/cat_shards/data_test.go index ee4242578989..499dbdb9393c 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/data_test.go @@ -12,9 +12,9 @@ import ( "slices" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/deserialize_test.go b/x-pack/metricbeat/module/autoops_es/cat_shards/deserialize_test.go index 2bbee2a722d6..92a97e608fe1 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/deserialize_test.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/deserialize_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) type jsonNumberTestType struct { diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/index_shards.go b/x-pack/metricbeat/module/autoops_es/cat_shards/index_shards.go index 2998fb49b266..4758f24dd22f 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/index_shards.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/index_shards.go @@ -5,7 +5,7 @@ package cat_shards import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) type Shard struct { diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices.go b/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices.go index b0e4dbe5d03c..059de401a4d1 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices.go @@ -7,8 +7,8 @@ package cat_shards import ( "slices" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) type ResolvedIndices struct { diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices_test.go b/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices_test.go index b82ba4eea72c..be5fe80b328d 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices_test.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/resolved_indices_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) func TestGetResolvedIndicesReturnsResponse(t *testing.T) { diff --git a/x-pack/metricbeat/module/autoops_es/cat_shards/testing.go b/x-pack/metricbeat/module/autoops_es/cat_shards/testing.go index a3a777c15f66..a52989146ba5 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_shards/testing.go +++ b/x-pack/metricbeat/module/autoops_es/cat_shards/testing.go @@ -13,7 +13,7 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/cat_template/cat_template.go b/x-pack/metricbeat/module/autoops_es/cat_template/cat_template.go index 762d0a6fadc8..27ba5209afc1 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_template/cat_template.go +++ b/x-pack/metricbeat/module/autoops_es/cat_template/cat_template.go @@ -5,7 +5,7 @@ package cat_template import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/cat_template/cat_template_test.go b/x-pack/metricbeat/module/autoops_es/cat_template/cat_template_test.go index bd35f0ef5303..3058e373db31 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_template/cat_template_test.go +++ b/x-pack/metricbeat/module/autoops_es/cat_template/cat_template_test.go @@ -10,8 +10,8 @@ package cat_template import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/cat_template/data.go b/x-pack/metricbeat/module/autoops_es/cat_template/data.go index 466dd9b19410..5b13b2ac4588 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_template/data.go +++ b/x-pack/metricbeat/module/autoops_es/cat_template/data.go @@ -7,14 +7,14 @@ package cat_template import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" - t "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/templates" - - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" + t "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/templates" + + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) const templatePathPrefix = "/_template/" diff --git a/x-pack/metricbeat/module/autoops_es/cat_template/data_test.go b/x-pack/metricbeat/module/autoops_es/cat_template/data_test.go index 4862e426983f..d0c72aac1354 100644 --- a/x-pack/metricbeat/module/autoops_es/cat_template/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/cat_template/data_test.go @@ -11,10 +11,10 @@ import ( "slices" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/templates" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/templates" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/stretchr/testify/require" diff --git a/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health.go b/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health.go index e0a9ec9e5d92..402846238a34 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health.go @@ -4,7 +4,7 @@ package cluster_health -import "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" +import "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" const ( ClusterHealthMetricSet = "cluster_health" diff --git a/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health_test.go b/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health_test.go index ec1a54c40194..2d273b69c7f0 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health_test.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_health/cluster_health_test.go @@ -10,11 +10,11 @@ package cluster_health import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/cluster_health/data.go b/x-pack/metricbeat/module/autoops_es/cluster_health/data.go index 4ca3ec79055a..450a65f464c9 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_health/data.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_health/data.go @@ -7,12 +7,12 @@ package cluster_health import ( "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/cluster_health/data_test.go b/x-pack/metricbeat/module/autoops_es/cluster_health/data_test.go index d5e2e47f4b03..3748881c9d0c 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_health/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_health/data_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings.go b/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings.go index e7a0c685bd2d..32124e71b276 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings.go @@ -4,7 +4,7 @@ package cluster_settings -import "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" +import "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" const ( ClusterSettingsMetricSet = "cluster_settings" diff --git a/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings_test.go b/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings_test.go index 331a9eeb4f95..aee38860447b 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings_test.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_settings/cluster_settings_test.go @@ -10,11 +10,11 @@ package cluster_settings import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/cluster_settings/data.go b/x-pack/metricbeat/module/autoops_es/cluster_settings/data.go index 35ae574f464f..a13e525e1b2c 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_settings/data.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_settings/data.go @@ -7,12 +7,12 @@ package cluster_settings import ( "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/cluster_settings/data_test.go b/x-pack/metricbeat/module/autoops_es/cluster_settings/data_test.go index 50c6c84b44ca..f21d422a5ed8 100644 --- a/x-pack/metricbeat/module/autoops_es/cluster_settings/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/cluster_settings/data_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/component_template/component_template.go b/x-pack/metricbeat/module/autoops_es/component_template/component_template.go index 5c4003591026..cb06b799598c 100644 --- a/x-pack/metricbeat/module/autoops_es/component_template/component_template.go +++ b/x-pack/metricbeat/module/autoops_es/component_template/component_template.go @@ -5,7 +5,7 @@ package component_template import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/component_template/component_template_test.go b/x-pack/metricbeat/module/autoops_es/component_template/component_template_test.go index d0642cbb85db..762e30372346 100644 --- a/x-pack/metricbeat/module/autoops_es/component_template/component_template_test.go +++ b/x-pack/metricbeat/module/autoops_es/component_template/component_template_test.go @@ -12,11 +12,11 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/component_template/data.go b/x-pack/metricbeat/module/autoops_es/component_template/data.go index 402b856461ad..7c5215d6ccbc 100644 --- a/x-pack/metricbeat/module/autoops_es/component_template/data.go +++ b/x-pack/metricbeat/module/autoops_es/component_template/data.go @@ -7,14 +7,14 @@ package component_template import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" - t "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/templates" - - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" + t "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/templates" + + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/component_template/data_test.go b/x-pack/metricbeat/module/autoops_es/component_template/data_test.go index 54a0d79851c7..f78e9839058f 100644 --- a/x-pack/metricbeat/module/autoops_es/component_template/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/component_template/data_test.go @@ -10,12 +10,12 @@ package component_template import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/autoops_es/events/error_event.go b/x-pack/metricbeat/module/autoops_es/events/error_event.go index 4b8230e17a6a..c9b6433f804c 100644 --- a/x-pack/metricbeat/module/autoops_es/events/error_event.go +++ b/x-pack/metricbeat/module/autoops_es/events/error_event.go @@ -10,8 +10,8 @@ import ( "net/http" "net/url" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" diff --git a/x-pack/metricbeat/module/autoops_es/events/error_event_test.go b/x-pack/metricbeat/module/autoops_es/events/error_event_test.go index 343f0de44e21..be685ca819ee 100644 --- a/x-pack/metricbeat/module/autoops_es/events/error_event_test.go +++ b/x-pack/metricbeat/module/autoops_es/events/error_event_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/version" "github.com/stretchr/testify/assert" diff --git a/x-pack/metricbeat/module/autoops_es/events/events.go b/x-pack/metricbeat/module/autoops_es/events/events.go index 4d65887a7f9d..01784e5fd088 100644 --- a/x-pack/metricbeat/module/autoops_es/events/events.go +++ b/x-pack/metricbeat/module/autoops_es/events/events.go @@ -5,8 +5,8 @@ package events import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/autoops_es/events/events_test.go b/x-pack/metricbeat/module/autoops_es/events/events_test.go index 12052def2b63..f546f8e69388 100644 --- a/x-pack/metricbeat/module/autoops_es/events/events_test.go +++ b/x-pack/metricbeat/module/autoops_es/events/events_test.go @@ -10,8 +10,8 @@ package events import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/stretchr/testify/require" diff --git a/x-pack/metricbeat/module/autoops_es/fields.go b/x-pack/metricbeat/module/autoops_es/fields.go index 538b0b7c5a2f..74b74330c26b 100644 --- a/x-pack/metricbeat/module/autoops_es/fields.go +++ b/x-pack/metricbeat/module/autoops_es/fields.go @@ -7,7 +7,7 @@ package autoops_es import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/autoops_es/index_template/data.go b/x-pack/metricbeat/module/autoops_es/index_template/data.go index 65a31adfb50e..edf5b187490a 100644 --- a/x-pack/metricbeat/module/autoops_es/index_template/data.go +++ b/x-pack/metricbeat/module/autoops_es/index_template/data.go @@ -7,14 +7,14 @@ package index_template import ( "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" - t "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/templates" - - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" + t "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/templates" + + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) const templatePathPrefix = "/_index_template/" diff --git a/x-pack/metricbeat/module/autoops_es/index_template/data_test.go b/x-pack/metricbeat/module/autoops_es/index_template/data_test.go index d7935835747e..bca4d33e358c 100644 --- a/x-pack/metricbeat/module/autoops_es/index_template/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/index_template/data_test.go @@ -12,10 +12,10 @@ import ( "slices" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/templates" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/templates" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/stretchr/testify/require" diff --git a/x-pack/metricbeat/module/autoops_es/index_template/index_template.go b/x-pack/metricbeat/module/autoops_es/index_template/index_template.go index 30b125bf1b1a..4491d5ca0121 100644 --- a/x-pack/metricbeat/module/autoops_es/index_template/index_template.go +++ b/x-pack/metricbeat/module/autoops_es/index_template/index_template.go @@ -5,7 +5,7 @@ package index_template import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/index_template/index_template_test.go b/x-pack/metricbeat/module/autoops_es/index_template/index_template_test.go index d0cae1ec8d10..383f9ca09739 100644 --- a/x-pack/metricbeat/module/autoops_es/index_template/index_template_test.go +++ b/x-pack/metricbeat/module/autoops_es/index_template/index_template_test.go @@ -12,11 +12,11 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/license/data.go b/x-pack/metricbeat/module/autoops_es/license/data.go index 0212b67795a4..cb19773c514b 100644 --- a/x-pack/metricbeat/module/autoops_es/license/data.go +++ b/x-pack/metricbeat/module/autoops_es/license/data.go @@ -7,12 +7,12 @@ package license import ( "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" - utils "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" + utils "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/license/data_test.go b/x-pack/metricbeat/module/autoops_es/license/data_test.go index 641a05147f43..b3a22717f203 100644 --- a/x-pack/metricbeat/module/autoops_es/license/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/license/data_test.go @@ -10,12 +10,12 @@ package license import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) // Expect a valid response from Elasticsearch to create a single event diff --git a/x-pack/metricbeat/module/autoops_es/license/license.go b/x-pack/metricbeat/module/autoops_es/license/license.go index 712d2ed2d240..cd7c5fc3abfa 100644 --- a/x-pack/metricbeat/module/autoops_es/license/license.go +++ b/x-pack/metricbeat/module/autoops_es/license/license.go @@ -4,7 +4,7 @@ package license -import "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" +import "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" const ( LicenseMetricsSet = "license" diff --git a/x-pack/metricbeat/module/autoops_es/license/license_test.go b/x-pack/metricbeat/module/autoops_es/license/license_test.go index d0e058a5bb12..e0157d905084 100644 --- a/x-pack/metricbeat/module/autoops_es/license/license_test.go +++ b/x-pack/metricbeat/module/autoops_es/license/license_test.go @@ -10,11 +10,11 @@ package license import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/metricset/cluster_info.go b/x-pack/metricbeat/module/autoops_es/metricset/cluster_info.go index 176dc38df973..c7d08cc2371e 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/cluster_info.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/cluster_info.go @@ -8,8 +8,8 @@ import ( "os" "time" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/logp" libversion "github.com/elastic/elastic-agent-libs/version" ) diff --git a/x-pack/metricbeat/module/autoops_es/metricset/metricset.go b/x-pack/metricbeat/module/autoops_es/metricset/metricset.go index e149d721e2a0..a32844cb5259 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/metricset.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/metricset.go @@ -7,10 +7,10 @@ package metricset import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) const MODULE_NAME = "autoops_es" diff --git a/x-pack/metricbeat/module/autoops_es/metricset/metricset_nested_test.go b/x-pack/metricbeat/module/autoops_es/metricset/metricset_nested_test.go index a08e87f2fefa..208dd185464e 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/metricset_nested_test.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/metricset_nested_test.go @@ -11,13 +11,13 @@ import ( "errors" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/metricset/metricset_test.go b/x-pack/metricbeat/module/autoops_es/metricset/metricset_test.go index abd12538f8b8..e6b487a6b540 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/metricset_test.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/metricset_test.go @@ -10,15 +10,15 @@ package metricset import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" "github.com/stretchr/testify/require" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) type testObjectType struct { diff --git a/x-pack/metricbeat/module/autoops_es/metricset/register.go b/x-pack/metricbeat/module/autoops_es/metricset/register.go index e2085ef12ceb..62048a03ee2c 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/register.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/register.go @@ -12,8 +12,8 @@ import ( "net/http" "slices" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/autoops_es/metricset/register_test.go b/x-pack/metricbeat/module/autoops_es/metricset/register_test.go index 00a3cb795276..a89f0f246cc4 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/register_test.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/register_test.go @@ -18,10 +18,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/x-pack/metricbeat/module/autoops_es/metricset/request.go b/x-pack/metricbeat/module/autoops_es/metricset/request.go index 31aca25fa5c1..bc7dfed22f1a 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/request.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/request.go @@ -5,8 +5,8 @@ package metricset import ( - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/metricset/testing.go b/x-pack/metricbeat/module/autoops_es/metricset/testing.go index 44ab678e9b30..e618b5a3ed3d 100644 --- a/x-pack/metricbeat/module/autoops_es/metricset/testing.go +++ b/x-pack/metricbeat/module/autoops_es/metricset/testing.go @@ -12,13 +12,13 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/version" ) diff --git a/x-pack/metricbeat/module/autoops_es/node_stats/cache.go b/x-pack/metricbeat/module/autoops_es/node_stats/cache.go index eb04f871553c..08516fbdb05a 100644 --- a/x-pack/metricbeat/module/autoops_es/node_stats/cache.go +++ b/x-pack/metricbeat/module/autoops_es/node_stats/cache.go @@ -5,7 +5,7 @@ package node_stats import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/autoops_es/node_stats/data.go b/x-pack/metricbeat/module/autoops_es/node_stats/data.go index a3ca141fb477..9cf38d4250e3 100644 --- a/x-pack/metricbeat/module/autoops_es/node_stats/data.go +++ b/x-pack/metricbeat/module/autoops_es/node_stats/data.go @@ -9,13 +9,13 @@ import ( "fmt" "time" - e "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" + e "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/autoops_es/node_stats/data_test.go b/x-pack/metricbeat/module/autoops_es/node_stats/data_test.go index aebf22ff1cc0..50200ba96a2c 100644 --- a/x-pack/metricbeat/module/autoops_es/node_stats/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/node_stats/data_test.go @@ -11,12 +11,12 @@ import ( "slices" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/autoops_es/node_stats/node_stats.go b/x-pack/metricbeat/module/autoops_es/node_stats/node_stats.go index 4b0743be3be2..b60c0d49eff7 100644 --- a/x-pack/metricbeat/module/autoops_es/node_stats/node_stats.go +++ b/x-pack/metricbeat/module/autoops_es/node_stats/node_stats.go @@ -5,7 +5,7 @@ package node_stats import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) const ( diff --git a/x-pack/metricbeat/module/autoops_es/node_stats/node_stats_test.go b/x-pack/metricbeat/module/autoops_es/node_stats/node_stats_test.go index 56776fe656ae..9a4842040fb6 100644 --- a/x-pack/metricbeat/module/autoops_es/node_stats/node_stats_test.go +++ b/x-pack/metricbeat/module/autoops_es/node_stats/node_stats_test.go @@ -10,11 +10,11 @@ package node_stats import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) var ( diff --git a/x-pack/metricbeat/module/autoops_es/node_stats/testing.go b/x-pack/metricbeat/module/autoops_es/node_stats/testing.go index 676cb0cbcd4d..8a6ee333ed05 100644 --- a/x-pack/metricbeat/module/autoops_es/node_stats/testing.go +++ b/x-pack/metricbeat/module/autoops_es/node_stats/testing.go @@ -13,7 +13,7 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/tasks_management/data.go b/x-pack/metricbeat/module/autoops_es/tasks_management/data.go index 4e01494ba5bf..2da1edbf1d96 100644 --- a/x-pack/metricbeat/module/autoops_es/tasks_management/data.go +++ b/x-pack/metricbeat/module/autoops_es/tasks_management/data.go @@ -10,12 +10,12 @@ import ( "maps" "slices" - e "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" + e "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/autoops_es/tasks_management/data_test.go b/x-pack/metricbeat/module/autoops_es/tasks_management/data_test.go index cbb7a2076c4e..68c3f82aee36 100644 --- a/x-pack/metricbeat/module/autoops_es/tasks_management/data_test.go +++ b/x-pack/metricbeat/module/autoops_es/tasks_management/data_test.go @@ -10,11 +10,11 @@ package tasks_management import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" ) // Tests that Cluster Info is consistently reported and the Task is properly reported diff --git a/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management.go b/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management.go index 97e254dcb694..6440dca51bc8 100644 --- a/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management.go +++ b/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management.go @@ -4,7 +4,7 @@ package tasks_management -import "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" +import "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" const ( TasksMetricSet = "tasks_management" diff --git a/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management_test.go b/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management_test.go index 7af3b5765e17..601cc4f6c02c 100644 --- a/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management_test.go +++ b/x-pack/metricbeat/module/autoops_es/tasks_management/tasks_management_test.go @@ -10,8 +10,8 @@ package tasks_management import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/metricset" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/auto_ops_testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/metricset" "github.com/stretchr/testify/require" ) diff --git a/x-pack/metricbeat/module/autoops_es/templates/templates.go b/x-pack/metricbeat/module/autoops_es/templates/templates.go index 3e7aa7acd4ab..382f2cb0c558 100644 --- a/x-pack/metricbeat/module/autoops_es/templates/templates.go +++ b/x-pack/metricbeat/module/autoops_es/templates/templates.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/events" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/events" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/autoops_es/utils" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/autoops_es/utils/http.go b/x-pack/metricbeat/module/autoops_es/utils/http.go index b4c79eac4690..7c6e80f19a71 100644 --- a/x-pack/metricbeat/module/autoops_es/utils/http.go +++ b/x-pack/metricbeat/module/autoops_es/utils/http.go @@ -10,7 +10,7 @@ import ( "io" "net/http" - "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v9/metricbeat/module/elasticsearch" ) // HTTPResponse represents a custom error containing HTTP status code, status, and the original error. diff --git a/x-pack/metricbeat/module/aws/aws.go b/x-pack/metricbeat/module/aws/aws.go index 592973f2b986..030c523f7230 100644 --- a/x-pack/metricbeat/module/aws/aws.go +++ b/x-pack/metricbeat/module/aws/aws.go @@ -19,8 +19,8 @@ import ( resourcegroupstaggingapitypes "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/types" "github.com/aws/aws-sdk-go-v2/service/sts" - "github.com/elastic/beats/v7/metricbeat/mb" - awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v9/metricbeat/mb" + awscommon "github.com/elastic/beats/v9/x-pack/libbeat/common/aws" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/aws/awshealth/awshealth.go b/x-pack/metricbeat/module/aws/awshealth/awshealth.go index a936d8978708..9357bda939d8 100644 --- a/x-pack/metricbeat/module/aws/awshealth/awshealth.go +++ b/x-pack/metricbeat/module/aws/awshealth/awshealth.go @@ -16,9 +16,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/health/types" "github.com/aws/smithy-go" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/aws/awshealth/awshealth_integration_test.go b/x-pack/metricbeat/module/aws/awshealth/awshealth_integration_test.go index 3a9f99de077c..fff357049e4a 100644 --- a/x-pack/metricbeat/module/aws/awshealth/awshealth_integration_test.go +++ b/x-pack/metricbeat/module/aws/awshealth/awshealth_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) // TODO diff --git a/x-pack/metricbeat/module/aws/billing/billing.go b/x-pack/metricbeat/module/aws/billing/billing.go index ce19fb434569..ce00ad53859a 100644 --- a/x-pack/metricbeat/module/aws/billing/billing.go +++ b/x-pack/metricbeat/module/aws/billing/billing.go @@ -22,8 +22,8 @@ import ( costexplorertypes "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" "github.com/aws/aws-sdk-go-v2/service/organizations" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/aws/billing/billing_integration_test.go b/x-pack/metricbeat/module/aws/billing/billing_integration_test.go index d01c6378a88e..b6502339189c 100644 --- a/x-pack/metricbeat/module/aws/billing/billing_integration_test.go +++ b/x-pack/metricbeat/module/aws/billing/billing_integration_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go index 8272783d7dfc..e59f571d3a0f 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go @@ -21,9 +21,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" resourcegroupstaggingapitypes "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/types" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_integration_test.go b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_integration_test.go index 3d59fe9ec71d..d23d727f97ba 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_integration_test.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go index 3fb36caf3c13..e970ccd069e6 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go @@ -23,8 +23,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/aws/cloudwatch/metadata.go b/x-pack/metricbeat/module/aws/cloudwatch/metadata.go index 543e22f042df..b21b88d0eca8 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/metadata.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/metadata.go @@ -9,10 +9,10 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch/metadata/ec2" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch/metadata/sqs" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch/metadata/ec2" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch/metadata/sqs" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/aws/cloudwatch/metadata/ec2/ec2.go b/x-pack/metricbeat/module/aws/cloudwatch/metadata/ec2/ec2.go index c00811f0cab1..6f5c05c63269 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/metadata/ec2/ec2.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/metadata/ec2/ec2.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds/rds.go b/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds/rds.go index 78dde6aa2aed..a764652b2cd3 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds/rds.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/metadata/rds/rds.go @@ -14,7 +14,7 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/rds" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) const metadataPrefix = "aws.rds.db_instance." diff --git a/x-pack/metricbeat/module/aws/cloudwatch/metadata/sqs/sqs.go b/x-pack/metricbeat/module/aws/cloudwatch/metadata/sqs/sqs.go index 5c50f60deebe..0622ad237333 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/metadata/sqs/sqs.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/metadata/sqs/sqs.go @@ -12,7 +12,7 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/sqs" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) const metadataPrefix = "aws.sqs.queue" diff --git a/x-pack/metricbeat/module/aws/dynamodb/dynamodb_integration_test.go b/x-pack/metricbeat/module/aws/dynamodb/dynamodb_integration_test.go index 042fcee527ae..22692763e481 100644 --- a/x-pack/metricbeat/module/aws/dynamodb/dynamodb_integration_test.go +++ b/x-pack/metricbeat/module/aws/dynamodb/dynamodb_integration_test.go @@ -9,8 +9,8 @@ package dynamodb import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/dynamodb/dynamodb_test.go b/x-pack/metricbeat/module/aws/dynamodb/dynamodb_test.go index 8dad69465c7e..0c3333746ce0 100644 --- a/x-pack/metricbeat/module/aws/dynamodb/dynamodb_test.go +++ b/x-pack/metricbeat/module/aws/dynamodb/dynamodb_test.go @@ -7,12 +7,12 @@ package dynamodb import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/ebs/ebs_integration_test.go b/x-pack/metricbeat/module/aws/ebs/ebs_integration_test.go index ebf8df1e3618..1694ae91ecbf 100644 --- a/x-pack/metricbeat/module/aws/ebs/ebs_integration_test.go +++ b/x-pack/metricbeat/module/aws/ebs/ebs_integration_test.go @@ -9,8 +9,8 @@ package ebs import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/ebs/ebs_test.go b/x-pack/metricbeat/module/aws/ebs/ebs_test.go index 1c45b4089bc1..905f788a4118 100644 --- a/x-pack/metricbeat/module/aws/ebs/ebs_test.go +++ b/x-pack/metricbeat/module/aws/ebs/ebs_test.go @@ -7,12 +7,12 @@ package ebs import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/ec2/ec2_integration_test.go b/x-pack/metricbeat/module/aws/ec2/ec2_integration_test.go index e5ea0fa7821f..00a38ba8394f 100644 --- a/x-pack/metricbeat/module/aws/ec2/ec2_integration_test.go +++ b/x-pack/metricbeat/module/aws/ec2/ec2_integration_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/ec2/ec2_test.go b/x-pack/metricbeat/module/aws/ec2/ec2_test.go index 3a746bc256de..5ba5be69a9a5 100644 --- a/x-pack/metricbeat/module/aws/ec2/ec2_test.go +++ b/x-pack/metricbeat/module/aws/ec2/ec2_test.go @@ -7,12 +7,12 @@ package ec2 import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/elb/elb_integration_test.go b/x-pack/metricbeat/module/aws/elb/elb_integration_test.go index 6a6a9d4ea3ac..c797a1edb20c 100644 --- a/x-pack/metricbeat/module/aws/elb/elb_integration_test.go +++ b/x-pack/metricbeat/module/aws/elb/elb_integration_test.go @@ -10,8 +10,8 @@ import ( "fmt" "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/aws/elb/elb_test.go b/x-pack/metricbeat/module/aws/elb/elb_test.go index fb6dd78c8cdc..30d854ced65a 100644 --- a/x-pack/metricbeat/module/aws/elb/elb_test.go +++ b/x-pack/metricbeat/module/aws/elb/elb_test.go @@ -7,12 +7,12 @@ package elb import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go index 9829b63fd019..9c943d629405 100644 --- a/x-pack/metricbeat/module/aws/fields.go +++ b/x-pack/metricbeat/module/aws/fields.go @@ -7,7 +7,7 @@ package aws import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/aws/kinesis/kinesis_integration_test.go b/x-pack/metricbeat/module/aws/kinesis/kinesis_integration_test.go index 79b529a784a6..0c41d44adb35 100644 --- a/x-pack/metricbeat/module/aws/kinesis/kinesis_integration_test.go +++ b/x-pack/metricbeat/module/aws/kinesis/kinesis_integration_test.go @@ -9,9 +9,9 @@ package kinesis import ( "testing" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/kinesis/kinesis_test.go b/x-pack/metricbeat/module/aws/kinesis/kinesis_test.go index 4d728e4b3632..9cd70c2c0f08 100644 --- a/x-pack/metricbeat/module/aws/kinesis/kinesis_test.go +++ b/x-pack/metricbeat/module/aws/kinesis/kinesis_test.go @@ -7,12 +7,12 @@ package kinesis import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/lambda/lambda_integration_test.go b/x-pack/metricbeat/module/aws/lambda/lambda_integration_test.go index 5c3ce93bbf0f..f929a4df6390 100644 --- a/x-pack/metricbeat/module/aws/lambda/lambda_integration_test.go +++ b/x-pack/metricbeat/module/aws/lambda/lambda_integration_test.go @@ -9,8 +9,8 @@ package lambda import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/lambda/lambda_test.go b/x-pack/metricbeat/module/aws/lambda/lambda_test.go index 17b7e748e08c..65755d0604e3 100644 --- a/x-pack/metricbeat/module/aws/lambda/lambda_test.go +++ b/x-pack/metricbeat/module/aws/lambda/lambda_test.go @@ -7,12 +7,12 @@ package lambda import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/natgateway/natgateway_integration_test.go b/x-pack/metricbeat/module/aws/natgateway/natgateway_integration_test.go index 9692824d3d14..e1c6dd76bc8e 100644 --- a/x-pack/metricbeat/module/aws/natgateway/natgateway_integration_test.go +++ b/x-pack/metricbeat/module/aws/natgateway/natgateway_integration_test.go @@ -9,8 +9,8 @@ package natgateway import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/natgateway/natgateway_test.go b/x-pack/metricbeat/module/aws/natgateway/natgateway_test.go index 64a857f72d67..79bfef330592 100644 --- a/x-pack/metricbeat/module/aws/natgateway/natgateway_test.go +++ b/x-pack/metricbeat/module/aws/natgateway/natgateway_test.go @@ -7,12 +7,12 @@ package natgateway import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/rds/rds_integration_test.go b/x-pack/metricbeat/module/aws/rds/rds_integration_test.go index 698c61075dde..42b822fd3fd0 100644 --- a/x-pack/metricbeat/module/aws/rds/rds_integration_test.go +++ b/x-pack/metricbeat/module/aws/rds/rds_integration_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/rds/rds_test.go b/x-pack/metricbeat/module/aws/rds/rds_test.go index 8ed70d147876..98ed260cba6d 100644 --- a/x-pack/metricbeat/module/aws/rds/rds_test.go +++ b/x-pack/metricbeat/module/aws/rds/rds_test.go @@ -7,12 +7,12 @@ package rds import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_integration_test.go b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_integration_test.go index 21b00eae158c..7079e8c98d34 100644 --- a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_integration_test.go +++ b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_integration_test.go @@ -9,9 +9,9 @@ package s3_daily_storage import ( "testing" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_test.go b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_test.go index 3b914ccab877..1a9484c856f2 100644 --- a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_test.go +++ b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_test.go @@ -7,12 +7,12 @@ package s3_daily_storage import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/s3_request/s3_request_integration_test.go b/x-pack/metricbeat/module/aws/s3_request/s3_request_integration_test.go index 2243180aa142..da2b167ea41c 100644 --- a/x-pack/metricbeat/module/aws/s3_request/s3_request_integration_test.go +++ b/x-pack/metricbeat/module/aws/s3_request/s3_request_integration_test.go @@ -9,9 +9,9 @@ package s3_request import ( "testing" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/s3_request/s3_request_test.go b/x-pack/metricbeat/module/aws/s3_request/s3_request_test.go index 2d719b80683b..8837bac3fd9b 100644 --- a/x-pack/metricbeat/module/aws/s3_request/s3_request_test.go +++ b/x-pack/metricbeat/module/aws/s3_request/s3_request_test.go @@ -7,12 +7,12 @@ package s3_request import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/sns/sns_integration_test.go b/x-pack/metricbeat/module/aws/sns/sns_integration_test.go index bc072f8ebc3b..3274013d1728 100644 --- a/x-pack/metricbeat/module/aws/sns/sns_integration_test.go +++ b/x-pack/metricbeat/module/aws/sns/sns_integration_test.go @@ -9,8 +9,8 @@ package sns import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/sns/sns_test.go b/x-pack/metricbeat/module/aws/sns/sns_test.go index 80ee257004f0..675a155b6189 100644 --- a/x-pack/metricbeat/module/aws/sns/sns_test.go +++ b/x-pack/metricbeat/module/aws/sns/sns_test.go @@ -7,12 +7,12 @@ package sns import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/sqs/sqs_integration_test.go b/x-pack/metricbeat/module/aws/sqs/sqs_integration_test.go index 4970e481b8f9..8ecea6bf4138 100644 --- a/x-pack/metricbeat/module/aws/sqs/sqs_integration_test.go +++ b/x-pack/metricbeat/module/aws/sqs/sqs_integration_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/v7/libbeat/processors/actions" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + _ "github.com/elastic/beats/v9/libbeat/processors/actions" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/sqs/sqs_test.go b/x-pack/metricbeat/module/aws/sqs/sqs_test.go index 83a784c9ff22..e75958345202 100644 --- a/x-pack/metricbeat/module/aws/sqs/sqs_test.go +++ b/x-pack/metricbeat/module/aws/sqs/sqs_test.go @@ -7,12 +7,12 @@ package sqs import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/transitgateway/transitgateway_integration_test.go b/x-pack/metricbeat/module/aws/transitgateway/transitgateway_integration_test.go index 751778b62878..0d0fe90c2ac1 100644 --- a/x-pack/metricbeat/module/aws/transitgateway/transitgateway_integration_test.go +++ b/x-pack/metricbeat/module/aws/transitgateway/transitgateway_integration_test.go @@ -9,8 +9,8 @@ package transitgateway import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/transitgateway/transitgateway_test.go b/x-pack/metricbeat/module/aws/transitgateway/transitgateway_test.go index 1efb60bda3f3..246ce43b5bd3 100644 --- a/x-pack/metricbeat/module/aws/transitgateway/transitgateway_test.go +++ b/x-pack/metricbeat/module/aws/transitgateway/transitgateway_test.go @@ -7,12 +7,12 @@ package transitgateway import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/usage/usage_integration_test.go b/x-pack/metricbeat/module/aws/usage/usage_integration_test.go index de0d5637c257..edfb76dab691 100644 --- a/x-pack/metricbeat/module/aws/usage/usage_integration_test.go +++ b/x-pack/metricbeat/module/aws/usage/usage_integration_test.go @@ -9,8 +9,8 @@ package usage import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/usage/usage_test.go b/x-pack/metricbeat/module/aws/usage/usage_test.go index 4a309ae72d2a..6e8f9029d1bc 100644 --- a/x-pack/metricbeat/module/aws/usage/usage_test.go +++ b/x-pack/metricbeat/module/aws/usage/usage_test.go @@ -7,12 +7,12 @@ package usage import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/vpn/vpn_integration_test.go b/x-pack/metricbeat/module/aws/vpn/vpn_integration_test.go index 23053a493e3f..948be501ebe7 100644 --- a/x-pack/metricbeat/module/aws/vpn/vpn_integration_test.go +++ b/x-pack/metricbeat/module/aws/vpn/vpn_integration_test.go @@ -9,8 +9,8 @@ package vpn import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/vpn/vpn_test.go b/x-pack/metricbeat/module/aws/vpn/vpn_test.go index 4b007305fe29..f16b99953308 100644 --- a/x-pack/metricbeat/module/aws/vpn/vpn_test.go +++ b/x-pack/metricbeat/module/aws/vpn/vpn_test.go @@ -7,12 +7,12 @@ package vpn import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/awsfargate/awsfargate.go b/x-pack/metricbeat/module/awsfargate/awsfargate.go index 7fae572f81a4..7dfbba30781e 100644 --- a/x-pack/metricbeat/module/awsfargate/awsfargate.go +++ b/x-pack/metricbeat/module/awsfargate/awsfargate.go @@ -7,7 +7,7 @@ package awsfargate import ( "time" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // Config defines all required and optional parameters for awsfargate metricsets diff --git a/x-pack/metricbeat/module/awsfargate/fields.go b/x-pack/metricbeat/module/awsfargate/fields.go index fd22574c8a59..01204fdafdab 100644 --- a/x-pack/metricbeat/module/awsfargate/fields.go +++ b/x-pack/metricbeat/module/awsfargate/fields.go @@ -7,7 +7,7 @@ package awsfargate import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/awsfargate/task_stats/cpu.go b/x-pack/metricbeat/module/awsfargate/task_stats/cpu.go index 54f26b2d4c16..1871974a1299 100644 --- a/x-pack/metricbeat/module/awsfargate/task_stats/cpu.go +++ b/x-pack/metricbeat/module/awsfargate/task_stats/cpu.go @@ -7,8 +7,8 @@ package task_stats import ( dcontainer "github.com/docker/docker/api/types/container" - "github.com/elastic/beats/v7/metricbeat/module/docker" - "github.com/elastic/beats/v7/metricbeat/module/docker/cpu" + "github.com/elastic/beats/v9/metricbeat/module/docker" + "github.com/elastic/beats/v9/metricbeat/module/docker/cpu" ) func getCPUStats(taskStats dcontainer.StatsResponse) cpu.CPUStats { diff --git a/x-pack/metricbeat/module/awsfargate/task_stats/data.go b/x-pack/metricbeat/module/awsfargate/task_stats/data.go index 0db9f40135d0..500df9360e45 100644 --- a/x-pack/metricbeat/module/awsfargate/task_stats/data.go +++ b/x-pack/metricbeat/module/awsfargate/task_stats/data.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/awsfargate/task_stats/task_stats.go b/x-pack/metricbeat/module/awsfargate/task_stats/task_stats.go index 630677fc0e1c..5d878371023b 100644 --- a/x-pack/metricbeat/module/awsfargate/task_stats/task_stats.go +++ b/x-pack/metricbeat/module/awsfargate/task_stats/task_stats.go @@ -15,10 +15,10 @@ import ( dcontainer "github.com/docker/docker/api/types/container" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/docker/cpu" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/awsfargate" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/docker/cpu" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/awsfargate" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/awsfargate/task_stats/task_stats_integration_test.go b/x-pack/metricbeat/module/awsfargate/task_stats/task_stats_integration_test.go index ec5e4ddfab37..ba458d22301b 100644 --- a/x-pack/metricbeat/module/awsfargate/task_stats/task_stats_integration_test.go +++ b/x-pack/metricbeat/module/awsfargate/task_stats/task_stats_integration_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" - "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" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb/testing/flags" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/add_metadata.go b/x-pack/metricbeat/module/azure/add_metadata.go index 1837325a2d55..ee55b18e61d7 100644 --- a/x-pack/metricbeat/module/azure/add_metadata.go +++ b/x-pack/metricbeat/module/azure/add_metadata.go @@ -7,7 +7,7 @@ package azure import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/azure/app_insights/app_insights.go b/x-pack/metricbeat/module/azure/app_insights/app_insights.go index de06e11a70e3..1ba2ac75ed36 100644 --- a/x-pack/metricbeat/module/azure/app_insights/app_insights.go +++ b/x-pack/metricbeat/module/azure/app_insights/app_insights.go @@ -10,9 +10,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb/parse" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/app_insights/app_insights_integration_test.go b/x-pack/metricbeat/module/azure/app_insights/app_insights_integration_test.go index c88b723c41eb..5a68f561115e 100644 --- a/x-pack/metricbeat/module/azure/app_insights/app_insights_integration_test.go +++ b/x-pack/metricbeat/module/azure/app_insights/app_insights_integration_test.go @@ -9,11 +9,11 @@ package app_insights import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) var metrics = []map[string]interface{}{{ diff --git a/x-pack/metricbeat/module/azure/app_insights/data.go b/x-pack/metricbeat/module/azure/app_insights/data.go index 7eb545ea9561..0abafbfa7284 100644 --- a/x-pack/metricbeat/module/azure/app_insights/data.go +++ b/x-pack/metricbeat/module/azure/app_insights/data.go @@ -16,10 +16,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/preview/appinsights/v1/insights" "github.com/Azure/go-autorest/autorest/date" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) const aggsRegex = "_(?:sum|count|unique|avg|min|max)$" diff --git a/x-pack/metricbeat/module/azure/app_insights/data_test.go b/x-pack/metricbeat/module/azure/app_insights/data_test.go index d596fb5104a5..f05dd1c5e02b 100644 --- a/x-pack/metricbeat/module/azure/app_insights/data_test.go +++ b/x-pack/metricbeat/module/azure/app_insights/data_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/Azure/azure-sdk-for-go/services/preview/appinsights/v1/insights" "github.com/Azure/go-autorest/autorest/date" diff --git a/x-pack/metricbeat/module/azure/app_state/app_state_integration_test.go b/x-pack/metricbeat/module/azure/app_state/app_state_integration_test.go index a2a7179d9d2f..61000a68a468 100644 --- a/x-pack/metricbeat/module/azure/app_state/app_state_integration_test.go +++ b/x-pack/metricbeat/module/azure/app_state/app_state_integration_test.go @@ -9,14 +9,14 @@ package app_state import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/app_insights" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/app_insights" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/app_state/app_state_test.go b/x-pack/metricbeat/module/azure/app_state/app_state_test.go index a0f783de9d18..9c3246aa2429 100644 --- a/x-pack/metricbeat/module/azure/app_state/app_state_test.go +++ b/x-pack/metricbeat/module/azure/app_state/app_state_test.go @@ -9,7 +9,7 @@ package app_state import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/azure.go b/x-pack/metricbeat/module/azure/azure.go index ebdb3b5a9fff..b4677da61c6b 100644 --- a/x-pack/metricbeat/module/azure/azure.go +++ b/x-pack/metricbeat/module/azure/azure.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) func init() { diff --git a/x-pack/metricbeat/module/azure/billing/billing.go b/x-pack/metricbeat/module/azure/billing/billing.go index 93bad5d87afc..6db6686a073c 100644 --- a/x-pack/metricbeat/module/azure/billing/billing.go +++ b/x-pack/metricbeat/module/azure/billing/billing.go @@ -10,9 +10,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/billing/billing_integration_test.go b/x-pack/metricbeat/module/azure/billing/billing_integration_test.go index 74835815e300..ad4961f5140c 100644 --- a/x-pack/metricbeat/module/azure/billing/billing_integration_test.go +++ b/x-pack/metricbeat/module/azure/billing/billing_integration_test.go @@ -9,11 +9,11 @@ package billing import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/billing/client.go b/x-pack/metricbeat/module/azure/billing/client.go index d0c0acf95e42..06e24a52b632 100644 --- a/x-pack/metricbeat/module/azure/billing/client.go +++ b/x-pack/metricbeat/module/azure/billing/client.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/costmanagement/armcostmanagement" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/billing/client_test.go b/x-pack/metricbeat/module/azure/billing/client_test.go index fba73277671e..8a458649ddda 100644 --- a/x-pack/metricbeat/module/azure/billing/client_test.go +++ b/x-pack/metricbeat/module/azure/billing/client_test.go @@ -17,7 +17,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/costmanagement/armcostmanagement" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/azure/billing/data.go b/x-pack/metricbeat/module/azure/billing/data.go index 3c0200727eca..06ebd8608a93 100644 --- a/x-pack/metricbeat/module/azure/billing/data.go +++ b/x-pack/metricbeat/module/azure/billing/data.go @@ -17,7 +17,7 @@ import ( "errors" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/azure/billing/data_test.go b/x-pack/metricbeat/module/azure/billing/data_test.go index 1b2075345c61..8f54f43c16d9 100644 --- a/x-pack/metricbeat/module/azure/billing/data_test.go +++ b/x-pack/metricbeat/module/azure/billing/data_test.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/costmanagement/armcostmanagement" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/azure/billing/mock_service.go b/x-pack/metricbeat/module/azure/billing/mock_service.go index fae6549bd751..60a9de963431 100644 --- a/x-pack/metricbeat/module/azure/billing/mock_service.go +++ b/x-pack/metricbeat/module/azure/billing/mock_service.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/costmanagement/armcostmanagement" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/billing/service.go b/x-pack/metricbeat/module/azure/billing/service.go index 9141ef8f5804..ef33a84f924a 100644 --- a/x-pack/metricbeat/module/azure/billing/service.go +++ b/x-pack/metricbeat/module/azure/billing/service.go @@ -11,7 +11,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" diff --git a/x-pack/metricbeat/module/azure/client.go b/x-pack/metricbeat/module/azure/client.go index 74f1b7dd828a..2e0459662ccd 100644 --- a/x-pack/metricbeat/module/azure/client.go +++ b/x-pack/metricbeat/module/azure/client.go @@ -15,7 +15,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/client_batch.go b/x-pack/metricbeat/module/azure/client_batch.go index ab26d9f3f579..9785353ea2fa 100644 --- a/x-pack/metricbeat/module/azure/client_batch.go +++ b/x-pack/metricbeat/module/azure/client_batch.go @@ -16,7 +16,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/client_utils.go b/x-pack/metricbeat/module/azure/client_utils.go index 1d081189e978..a0e9d3d0151c 100644 --- a/x-pack/metricbeat/module/azure/client_utils.go +++ b/x-pack/metricbeat/module/azure/client_utils.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics" diff --git a/x-pack/metricbeat/module/azure/compute_vm/compute_vm_integration_test.go b/x-pack/metricbeat/module/azure/compute_vm/compute_vm_integration_test.go index 532bb43c30f6..09cd50c81a04 100644 --- a/x-pack/metricbeat/module/azure/compute_vm/compute_vm_integration_test.go +++ b/x-pack/metricbeat/module/azure/compute_vm/compute_vm_integration_test.go @@ -9,14 +9,14 @@ package compute_vm import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/monitor" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/compute_vm/compute_vm_test.go b/x-pack/metricbeat/module/azure/compute_vm/compute_vm_test.go index c82a7c9782b8..ece4718c838c 100644 --- a/x-pack/metricbeat/module/azure/compute_vm/compute_vm_test.go +++ b/x-pack/metricbeat/module/azure/compute_vm/compute_vm_test.go @@ -9,7 +9,7 @@ package compute_vm import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_integration_test.go b/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_integration_test.go index d928b15b88e7..b1164664cb94 100644 --- a/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_integration_test.go +++ b/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_integration_test.go @@ -9,14 +9,14 @@ package compute_vm_scaleset import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/monitor" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_test.go b/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_test.go index 33b5213ec23f..3aef05f756d5 100644 --- a/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_test.go +++ b/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_test.go @@ -9,7 +9,7 @@ package compute_vm_scaleset import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go b/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go index 9aef7a7086a7..9afe8c1f14f6 100644 --- a/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go +++ b/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go @@ -9,14 +9,14 @@ package container_instance import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/monitor" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go b/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go index e18848625511..a2504e339554 100644 --- a/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go +++ b/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go @@ -9,7 +9,7 @@ package container_instance import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go b/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go index 72ef8d773e37..1c38a9fa243e 100644 --- a/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go +++ b/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go @@ -9,14 +9,14 @@ package container_registry import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/monitor" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go b/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go index 315e93d50351..b18c2710883c 100644 --- a/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go +++ b/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go @@ -9,7 +9,7 @@ package container_registry import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go b/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go index 6cbf09be10f6..1906317b5231 100644 --- a/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go +++ b/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go @@ -9,14 +9,14 @@ package container_service import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/monitor" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/container_service/container_service_test.go b/x-pack/metricbeat/module/azure/container_service/container_service_test.go index 5f09ff703dbd..fc26cd079b34 100644 --- a/x-pack/metricbeat/module/azure/container_service/container_service_test.go +++ b/x-pack/metricbeat/module/azure/container_service/container_service_test.go @@ -9,7 +9,7 @@ package container_service import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/data.go b/x-pack/metricbeat/module/azure/data.go index 269c28d2cd1d..4381b3b9833b 100644 --- a/x-pack/metricbeat/module/azure/data.go +++ b/x-pack/metricbeat/module/azure/data.go @@ -13,7 +13,7 @@ import ( "time" "unicode" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/azure/database_account/database_account_integration_test.go b/x-pack/metricbeat/module/azure/database_account/database_account_integration_test.go index dfa270d2065d..a17eea72e2ab 100644 --- a/x-pack/metricbeat/module/azure/database_account/database_account_integration_test.go +++ b/x-pack/metricbeat/module/azure/database_account/database_account_integration_test.go @@ -9,14 +9,14 @@ package database_account import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/monitor" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/monitor" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/database_account/database_account_test.go b/x-pack/metricbeat/module/azure/database_account/database_account_test.go index d6c7d3f24999..37756d9fbe7d 100644 --- a/x-pack/metricbeat/module/azure/database_account/database_account_test.go +++ b/x-pack/metricbeat/module/azure/database_account/database_account_test.go @@ -9,7 +9,7 @@ package database_account import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/azure/fields.go b/x-pack/metricbeat/module/azure/fields.go index 7adae8bb608e..0e5465a42de8 100644 --- a/x-pack/metricbeat/module/azure/fields.go +++ b/x-pack/metricbeat/module/azure/fields.go @@ -7,7 +7,7 @@ package azure import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/azure/mock_service.go b/x-pack/metricbeat/module/azure/mock_service.go index b86231a9c762..9689cd8ab5fc 100644 --- a/x-pack/metricbeat/module/azure/mock_service.go +++ b/x-pack/metricbeat/module/azure/mock_service.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // MockService mock for the azure monitor services diff --git a/x-pack/metricbeat/module/azure/monitor/client_helper.go b/x-pack/metricbeat/module/azure/monitor/client_helper.go index 435ff733e168..60fa04582fe6 100644 --- a/x-pack/metricbeat/module/azure/monitor/client_helper.go +++ b/x-pack/metricbeat/module/azure/monitor/client_helper.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" ) const missingMetricDefinitions = "no metric definitions were found for resource %s and namespace %s. Verify if the namespace is spelled correctly or if it is supported by the resource in case" diff --git a/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent.go b/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent.go index 9048e38d1ee4..81c3f6a07d74 100644 --- a/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent.go +++ b/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" ) // concurrentMapMetrics fetches concurrently metric definitions and writes them in MetricDefinitionsChan channel diff --git a/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent_test.go b/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent_test.go index 765646ad8e1d..bc865d0965c9 100644 --- a/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent_test.go +++ b/x-pack/metricbeat/module/azure/monitor/client_helper_concurrent_test.go @@ -18,7 +18,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/azure/monitor/client_helper_test.go b/x-pack/metricbeat/module/azure/monitor/client_helper_test.go index 51d0a308c315..d614f43b6b15 100644 --- a/x-pack/metricbeat/module/azure/monitor/client_helper_test.go +++ b/x-pack/metricbeat/module/azure/monitor/client_helper_test.go @@ -17,7 +17,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/azure/monitor/monitor.go b/x-pack/metricbeat/module/azure/monitor/monitor.go index 302ea5f347cd..82161d207bc6 100644 --- a/x-pack/metricbeat/module/azure/monitor/monitor.go +++ b/x-pack/metricbeat/module/azure/monitor/monitor.go @@ -7,8 +7,8 @@ package monitor import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/x-pack/metricbeat/module/azure/monitor/monitor_integration_test.go b/x-pack/metricbeat/module/azure/monitor/monitor_integration_test.go index c11e64d1a079..ef6134a934b7 100644 --- a/x-pack/metricbeat/module/azure/monitor/monitor_integration_test.go +++ b/x-pack/metricbeat/module/azure/monitor/monitor_integration_test.go @@ -9,12 +9,12 @@ package monitor import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/monitor/monitor_test.go b/x-pack/metricbeat/module/azure/monitor/monitor_test.go index 7f39ddcd8c41..0aabd40fabbc 100644 --- a/x-pack/metricbeat/module/azure/monitor/monitor_test.go +++ b/x-pack/metricbeat/module/azure/monitor/monitor_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/metricbeat/module/azure/storage/client_helper.go b/x-pack/metricbeat/module/azure/storage/client_helper.go index f6754da430bb..3ba96da45a52 100644 --- a/x-pack/metricbeat/module/azure/storage/client_helper.go +++ b/x-pack/metricbeat/module/azure/storage/client_helper.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" ) const resourceIDExtension = "/default" diff --git a/x-pack/metricbeat/module/azure/storage/client_helper_concurrent.go b/x-pack/metricbeat/module/azure/storage/client_helper_concurrent.go index fc18b2397f69..b1a26f91287f 100644 --- a/x-pack/metricbeat/module/azure/storage/client_helper_concurrent.go +++ b/x-pack/metricbeat/module/azure/storage/client_helper_concurrent.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" ) // concurrentMapMetrics fetches concurrently metric definitions and writes them in MetricDefinitionsChan channel diff --git a/x-pack/metricbeat/module/azure/storage/client_helper_concurrent_test.go b/x-pack/metricbeat/module/azure/storage/client_helper_concurrent_test.go index 437ae4844a19..cb31b988f09b 100644 --- a/x-pack/metricbeat/module/azure/storage/client_helper_concurrent_test.go +++ b/x-pack/metricbeat/module/azure/storage/client_helper_concurrent_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/azure/storage/client_helper_test.go b/x-pack/metricbeat/module/azure/storage/client_helper_test.go index 4ed9234395bd..7e071007c9e0 100644 --- a/x-pack/metricbeat/module/azure/storage/client_helper_test.go +++ b/x-pack/metricbeat/module/azure/storage/client_helper_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/azure/storage/storage.go b/x-pack/metricbeat/module/azure/storage/storage.go index ca2f2bd09c9f..e91781c02641 100644 --- a/x-pack/metricbeat/module/azure/storage/storage.go +++ b/x-pack/metricbeat/module/azure/storage/storage.go @@ -9,8 +9,8 @@ package storage import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure" ) const defaultStorageAccountNamespace = "Microsoft.Storage/storageAccounts" diff --git a/x-pack/metricbeat/module/azure/storage/storage_integration_test.go b/x-pack/metricbeat/module/azure/storage/storage_integration_test.go index a74abe5934de..a85755343e66 100644 --- a/x-pack/metricbeat/module/azure/storage/storage_integration_test.go +++ b/x-pack/metricbeat/module/azure/storage/storage_integration_test.go @@ -9,11 +9,11 @@ package storage import ( "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/azure/test" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetchMetricset(t *testing.T) { diff --git a/x-pack/metricbeat/module/azure/storage/storage_test.go b/x-pack/metricbeat/module/azure/storage/storage_test.go index 0c232317e928..474e53bbd63a 100644 --- a/x-pack/metricbeat/module/azure/storage/storage_test.go +++ b/x-pack/metricbeat/module/azure/storage/storage_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/metricbeat/module/benchmark/benchmark.go b/x-pack/metricbeat/module/benchmark/benchmark.go index a7cd62ca402b..21fb61a8d777 100644 --- a/x-pack/metricbeat/module/benchmark/benchmark.go +++ b/x-pack/metricbeat/module/benchmark/benchmark.go @@ -5,7 +5,7 @@ package benchmark import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) func init() { diff --git a/x-pack/metricbeat/module/benchmark/fields.go b/x-pack/metricbeat/module/benchmark/fields.go index 30fa60460d80..2aad4ffead87 100644 --- a/x-pack/metricbeat/module/benchmark/fields.go +++ b/x-pack/metricbeat/module/benchmark/fields.go @@ -7,7 +7,7 @@ package benchmark import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/benchmark/info/info.go b/x-pack/metricbeat/module/benchmark/info/info.go index c374fd325b37..c6d2f821070e 100644 --- a/x-pack/metricbeat/module/benchmark/info/info.go +++ b/x-pack/metricbeat/module/benchmark/info/info.go @@ -7,8 +7,8 @@ package info import ( "errors" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/benchmark/info/info_test.go b/x-pack/metricbeat/module/benchmark/info/info_test.go index 1df775e76b01..e97b2137752b 100644 --- a/x-pack/metricbeat/module/benchmark/info/info_test.go +++ b/x-pack/metricbeat/module/benchmark/info/info_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/cloudfoundry/cloudfoundry.go b/x-pack/metricbeat/module/cloudfoundry/cloudfoundry.go index 9a4f42e8d67a..dfe66c4f5afe 100644 --- a/x-pack/metricbeat/module/cloudfoundry/cloudfoundry.go +++ b/x-pack/metricbeat/module/cloudfoundry/cloudfoundry.go @@ -9,8 +9,8 @@ package cloudfoundry import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - cfcommon "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/metricbeat/mb" + cfcommon "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/container/container.go b/x-pack/metricbeat/module/cloudfoundry/container/container.go index c84403552659..e969fdf7f7bc 100644 --- a/x-pack/metricbeat/module/cloudfoundry/container/container.go +++ b/x-pack/metricbeat/module/cloudfoundry/container/container.go @@ -10,9 +10,9 @@ import ( "fmt" "math" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/container/container_integration_test.go b/x-pack/metricbeat/module/cloudfoundry/container/container_integration_test.go index 8e2e153c9409..1a92651d5095 100644 --- a/x-pack/metricbeat/module/cloudfoundry/container/container_integration_test.go +++ b/x-pack/metricbeat/module/cloudfoundry/container/container_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/mtest" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/container/container_test.go b/x-pack/metricbeat/module/cloudfoundry/container/container_test.go index 775eb52f8e18..85282f33ec8b 100644 --- a/x-pack/metricbeat/module/cloudfoundry/container/container_test.go +++ b/x-pack/metricbeat/module/cloudfoundry/container/container_test.go @@ -16,10 +16,10 @@ import ( "github.com/cloudfoundry/sonde-go/events" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/mtest" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/mtest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/counter/counter.go b/x-pack/metricbeat/module/cloudfoundry/counter/counter.go index 2007a0b72830..a3852bf916fd 100644 --- a/x-pack/metricbeat/module/cloudfoundry/counter/counter.go +++ b/x-pack/metricbeat/module/cloudfoundry/counter/counter.go @@ -9,9 +9,9 @@ package counter import ( "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/x-pack/metricbeat/module/cloudfoundry/counter/counter_integration_test.go b/x-pack/metricbeat/module/cloudfoundry/counter/counter_integration_test.go index c0369ce9774a..e89098a688e7 100644 --- a/x-pack/metricbeat/module/cloudfoundry/counter/counter_integration_test.go +++ b/x-pack/metricbeat/module/cloudfoundry/counter/counter_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/mtest" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/counter/counter_test.go b/x-pack/metricbeat/module/cloudfoundry/counter/counter_test.go index 43586d5d26df..cae0e253f0b8 100644 --- a/x-pack/metricbeat/module/cloudfoundry/counter/counter_test.go +++ b/x-pack/metricbeat/module/cloudfoundry/counter/counter_test.go @@ -14,10 +14,10 @@ import ( "github.com/cloudfoundry/sonde-go/events" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/mtest" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/mtest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/fields.go b/x-pack/metricbeat/module/cloudfoundry/fields.go index 30e0e9e5b2a0..76d52babf711 100644 --- a/x-pack/metricbeat/module/cloudfoundry/fields.go +++ b/x-pack/metricbeat/module/cloudfoundry/fields.go @@ -7,7 +7,7 @@ package cloudfoundry import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/cloudfoundry/hub.go b/x-pack/metricbeat/module/cloudfoundry/hub.go index cd77146ee7f3..3690acad2132 100644 --- a/x-pack/metricbeat/module/cloudfoundry/hub.go +++ b/x-pack/metricbeat/module/cloudfoundry/hub.go @@ -9,7 +9,7 @@ package cloudfoundry import ( "context" - cfcommon "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + cfcommon "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" ) // DopplerConsumer is the interface that a Doppler Consumer must implement for the Cloud Foundry module. diff --git a/x-pack/metricbeat/module/cloudfoundry/mtest/config.go b/x-pack/metricbeat/module/cloudfoundry/mtest/config.go index 962d5e2a2c25..30e6dc3fd5a4 100644 --- a/x-pack/metricbeat/module/cloudfoundry/mtest/config.go +++ b/x-pack/metricbeat/module/cloudfoundry/mtest/config.go @@ -9,8 +9,8 @@ package mtest import ( "testing" - "github.com/elastic/beats/v7/libbeat/beat" - cftest "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry/test" + "github.com/elastic/beats/v9/libbeat/beat" + cftest "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry/test" ) func GetConfig(t *testing.T, metricset string) map[string]interface{} { diff --git a/x-pack/metricbeat/module/cloudfoundry/mtest/modulemock.go b/x-pack/metricbeat/module/cloudfoundry/mtest/modulemock.go index d9d1e89dde2f..8f746d32d2f4 100644 --- a/x-pack/metricbeat/module/cloudfoundry/mtest/modulemock.go +++ b/x-pack/metricbeat/module/cloudfoundry/mtest/modulemock.go @@ -11,9 +11,9 @@ import ( "github.com/cloudfoundry/sonde-go/events" - "github.com/elastic/beats/v7/metricbeat/mb" - cfcommon "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry" + "github.com/elastic/beats/v9/metricbeat/mb" + cfcommon "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/v1.go b/x-pack/metricbeat/module/cloudfoundry/v1.go index 86610e0d6cbf..4a8fdcd230e8 100644 --- a/x-pack/metricbeat/module/cloudfoundry/v1.go +++ b/x-pack/metricbeat/module/cloudfoundry/v1.go @@ -9,8 +9,8 @@ package cloudfoundry import ( "sync/atomic" - "github.com/elastic/beats/v7/metricbeat/mb" - cfcommon "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/metricbeat/mb" + cfcommon "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/v1_test.go b/x-pack/metricbeat/module/cloudfoundry/v1_test.go index 39664ba104e9..fe2cf735e2db 100644 --- a/x-pack/metricbeat/module/cloudfoundry/v1_test.go +++ b/x-pack/metricbeat/module/cloudfoundry/v1_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - cfcommon "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/metricbeat/mb" + cfcommon "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/v2.go b/x-pack/metricbeat/module/cloudfoundry/v2.go index 3b81d54c2343..1ef246700800 100644 --- a/x-pack/metricbeat/module/cloudfoundry/v2.go +++ b/x-pack/metricbeat/module/cloudfoundry/v2.go @@ -10,8 +10,8 @@ import ( "context" "sync" - "github.com/elastic/beats/v7/metricbeat/mb" - cfcommon "github.com/elastic/beats/v7/x-pack/libbeat/common/cloudfoundry" + "github.com/elastic/beats/v9/metricbeat/mb" + cfcommon "github.com/elastic/beats/v9/x-pack/libbeat/common/cloudfoundry" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/value/value.go b/x-pack/metricbeat/module/cloudfoundry/value/value.go index 6733a8ad3e5f..4f8907e27f29 100644 --- a/x-pack/metricbeat/module/cloudfoundry/value/value.go +++ b/x-pack/metricbeat/module/cloudfoundry/value/value.go @@ -10,8 +10,8 @@ import ( "fmt" "math" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/value/value_integration_test.go b/x-pack/metricbeat/module/cloudfoundry/value/value_integration_test.go index 26119419fd20..34d8695c8880 100644 --- a/x-pack/metricbeat/module/cloudfoundry/value/value_integration_test.go +++ b/x-pack/metricbeat/module/cloudfoundry/value/value_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/mtest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/mtest" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/cloudfoundry/value/value_test.go b/x-pack/metricbeat/module/cloudfoundry/value/value_test.go index d7f31a7d9dde..84dfea019fcb 100644 --- a/x-pack/metricbeat/module/cloudfoundry/value/value_test.go +++ b/x-pack/metricbeat/module/cloudfoundry/value/value_test.go @@ -16,10 +16,10 @@ import ( "github.com/cloudfoundry/sonde-go/events" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/cloudfoundry/mtest" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/cloudfoundry/mtest" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/cockroachdb/fields.go b/x-pack/metricbeat/module/cockroachdb/fields.go index 863b8569de8d..e9b197b194f3 100644 --- a/x-pack/metricbeat/module/cockroachdb/fields.go +++ b/x-pack/metricbeat/module/cockroachdb/fields.go @@ -7,7 +7,7 @@ package cockroachdb import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go b/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go index d68cf23a46b3..7d088dd49b8b 100644 --- a/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go +++ b/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go @@ -12,14 +12,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/cockroachdb/status/status_test.go b/x-pack/metricbeat/module/cockroachdb/status/status_test.go index 2439fbec137c..f5fc1c62d668 100644 --- a/x-pack/metricbeat/module/cockroachdb/status/status_test.go +++ b/x-pack/metricbeat/module/cockroachdb/status/status_test.go @@ -11,13 +11,13 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/containerd/blkio/blkio.go b/x-pack/metricbeat/module/containerd/blkio/blkio.go index 36e0b72bde74..ff7a2961d6eb 100644 --- a/x-pack/metricbeat/module/containerd/blkio/blkio.go +++ b/x-pack/metricbeat/module/containerd/blkio/blkio.go @@ -7,14 +7,14 @@ package blkio import ( "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/containerd/blkio/blkio_test.go b/x-pack/metricbeat/module/containerd/blkio/blkio_test.go index 491285384282..3050ddb36451 100644 --- a/x-pack/metricbeat/module/containerd/blkio/blkio_test.go +++ b/x-pack/metricbeat/module/containerd/blkio/blkio_test.go @@ -25,10 +25,10 @@ package blkio import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd" ) func TestEventMapping(t *testing.T) { diff --git a/x-pack/metricbeat/module/containerd/containerd.go b/x-pack/metricbeat/module/containerd/containerd.go index 6343e66e280d..0ebb8e703de8 100644 --- a/x-pack/metricbeat/module/containerd/containerd.go +++ b/x-pack/metricbeat/module/containerd/containerd.go @@ -11,8 +11,8 @@ import ( "github.com/gohugoio/hashstructure" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" ) // Licensed to Elasticsearch B.V. under one or more contributor diff --git a/x-pack/metricbeat/module/containerd/cpu/cpu.go b/x-pack/metricbeat/module/containerd/cpu/cpu.go index a706d8dd3d17..fe64d44188c9 100644 --- a/x-pack/metricbeat/module/containerd/cpu/cpu.go +++ b/x-pack/metricbeat/module/containerd/cpu/cpu.go @@ -8,14 +8,14 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/containerd/cpu/cpu_test.go b/x-pack/metricbeat/module/containerd/cpu/cpu_test.go index 8ef2af6c6054..159074b7e1cf 100644 --- a/x-pack/metricbeat/module/containerd/cpu/cpu_test.go +++ b/x-pack/metricbeat/module/containerd/cpu/cpu_test.go @@ -9,9 +9,9 @@ package cpu import ( "testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd" ) func TestEventMapping(t *testing.T) { diff --git a/x-pack/metricbeat/module/containerd/fields.go b/x-pack/metricbeat/module/containerd/fields.go index a7506778b51a..e8448df52382 100644 --- a/x-pack/metricbeat/module/containerd/fields.go +++ b/x-pack/metricbeat/module/containerd/fields.go @@ -7,7 +7,7 @@ package containerd import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/containerd/memory/memory.go b/x-pack/metricbeat/module/containerd/memory/memory.go index 943a77c900d5..6d9a36beaf2b 100644 --- a/x-pack/metricbeat/module/containerd/memory/memory.go +++ b/x-pack/metricbeat/module/containerd/memory/memory.go @@ -9,10 +9,10 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd" ) const ( diff --git a/x-pack/metricbeat/module/containerd/memory/memory_test.go b/x-pack/metricbeat/module/containerd/memory/memory_test.go index 9ebb8d7394ee..3f24285d5a5e 100644 --- a/x-pack/metricbeat/module/containerd/memory/memory_test.go +++ b/x-pack/metricbeat/module/containerd/memory/memory_test.go @@ -9,10 +9,10 @@ package memory import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/containerd" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus/ptest" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/containerd" ) func TestEventMapping(t *testing.T) { diff --git a/x-pack/metricbeat/module/coredns/fields.go b/x-pack/metricbeat/module/coredns/fields.go index f095502c1c88..eead0bf58487 100644 --- a/x-pack/metricbeat/module/coredns/fields.go +++ b/x-pack/metricbeat/module/coredns/fields.go @@ -7,7 +7,7 @@ package coredns import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/coredns/stats/stats.go b/x-pack/metricbeat/module/coredns/stats/stats.go index 623af6883e09..d7e0a67c7abf 100644 --- a/x-pack/metricbeat/module/coredns/stats/stats.go +++ b/x-pack/metricbeat/module/coredns/stats/stats.go @@ -5,8 +5,8 @@ package stats import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" ) var mapping = &prometheus.MetricsMapping{ diff --git a/x-pack/metricbeat/module/coredns/stats/stats_integration_test.go b/x-pack/metricbeat/module/coredns/stats/stats_integration_test.go index 20e834685d93..9cfd1a8b1f34 100644 --- a/x-pack/metricbeat/module/coredns/stats/stats_integration_test.go +++ b/x-pack/metricbeat/module/coredns/stats/stats_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/coredns/stats/stats_test.go b/x-pack/metricbeat/module/coredns/stats/stats_test.go index 65cd0bbbe19a..cd1b541e569b 100644 --- a/x-pack/metricbeat/module/coredns/stats/stats_test.go +++ b/x-pack/metricbeat/module/coredns/stats/stats_test.go @@ -10,9 +10,9 @@ package stats import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/coredns" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/coredns" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/gcp/billing/billing.go b/x-pack/metricbeat/module/gcp/billing/billing.go index 84d2766b6a6e..c481554552de 100644 --- a/x-pack/metricbeat/module/gcp/billing/billing.go +++ b/x-pack/metricbeat/module/gcp/billing/billing.go @@ -17,8 +17,8 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go b/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go index 3a9fade5a720..7f282f02e9d0 100644 --- a/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go +++ b/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/gcp/billing/billing_test.go b/x-pack/metricbeat/module/gcp/billing/billing_test.go index f95009dc5dba..9c3217c91daf 100644 --- a/x-pack/metricbeat/module/gcp/billing/billing_test.go +++ b/x-pack/metricbeat/module/gcp/billing/billing_test.go @@ -12,7 +12,7 @@ import ( "cloud.google.com/go/bigquery" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/x-pack/metricbeat/module/gcp/carbon/carbon.go b/x-pack/metricbeat/module/gcp/carbon/carbon.go index fdb9d4b4ef4b..91722767bd1c 100644 --- a/x-pack/metricbeat/module/gcp/carbon/carbon.go +++ b/x-pack/metricbeat/module/gcp/carbon/carbon.go @@ -17,9 +17,9 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/carbon/carbon_integration_test.go b/x-pack/metricbeat/module/gcp/carbon/carbon_integration_test.go index 4ae179701e95..64acdbff9298 100644 --- a/x-pack/metricbeat/module/gcp/carbon/carbon_integration_test.go +++ b/x-pack/metricbeat/module/gcp/carbon/carbon_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/gcp/compute/compute_integration_test.go b/x-pack/metricbeat/module/gcp/compute/compute_integration_test.go index 22bf8b4de0bc..a2e067a73e21 100644 --- a/x-pack/metricbeat/module/gcp/compute/compute_integration_test.go +++ b/x-pack/metricbeat/module/gcp/compute/compute_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/compute/compute_test.go b/x-pack/metricbeat/module/gcp/compute/compute_test.go index ec8bd3859c7b..54df277fb0ed 100644 --- a/x-pack/metricbeat/module/gcp/compute/compute_test.go +++ b/x-pack/metricbeat/module/gcp/compute/compute_test.go @@ -7,12 +7,12 @@ package compute import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/gcp/dataproc/dataproc_integration_test.go b/x-pack/metricbeat/module/gcp/dataproc/dataproc_integration_test.go index 28c054ddcc6f..b98d5236aefa 100644 --- a/x-pack/metricbeat/module/gcp/dataproc/dataproc_integration_test.go +++ b/x-pack/metricbeat/module/gcp/dataproc/dataproc_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/dataproc/dataproc_test.go b/x-pack/metricbeat/module/gcp/dataproc/dataproc_test.go index 551d72e10a8e..415589ab21f8 100644 --- a/x-pack/metricbeat/module/gcp/dataproc/dataproc_test.go +++ b/x-pack/metricbeat/module/gcp/dataproc/dataproc_test.go @@ -6,12 +6,12 @@ package dataproc import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/gcp/fields.go b/x-pack/metricbeat/module/gcp/fields.go index 04b919fd0a6c..6681c6151ec6 100644 --- a/x-pack/metricbeat/module/gcp/fields.go +++ b/x-pack/metricbeat/module/gcp/fields.go @@ -7,7 +7,7 @@ package gcp import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/gcp/firestore/firestore_integration_test.go b/x-pack/metricbeat/module/gcp/firestore/firestore_integration_test.go index 1e0780924b84..15e680c953ee 100644 --- a/x-pack/metricbeat/module/gcp/firestore/firestore_integration_test.go +++ b/x-pack/metricbeat/module/gcp/firestore/firestore_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/firestore/firestore_test.go b/x-pack/metricbeat/module/gcp/firestore/firestore_test.go index b7342284417b..c97e3a8a5f9b 100644 --- a/x-pack/metricbeat/module/gcp/firestore/firestore_test.go +++ b/x-pack/metricbeat/module/gcp/firestore/firestore_test.go @@ -7,12 +7,12 @@ package firestore import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/gcp/gke/gke_integration_test.go b/x-pack/metricbeat/module/gcp/gke/gke_integration_test.go index ee6e65e2b85e..3b386ec6a091 100644 --- a/x-pack/metricbeat/module/gcp/gke/gke_integration_test.go +++ b/x-pack/metricbeat/module/gcp/gke/gke_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/gcp/gke/gke_test.go b/x-pack/metricbeat/module/gcp/gke/gke_test.go index 0d01478626e4..1c3b04629fbd 100644 --- a/x-pack/metricbeat/module/gcp/gke/gke_test.go +++ b/x-pack/metricbeat/module/gcp/gke/gke_test.go @@ -7,12 +7,12 @@ package gke import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go index 8043ba432738..572925413c77 100644 --- a/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go +++ b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_test.go b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_test.go index 197d9822b32e..d4fe5be496d7 100644 --- a/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_test.go +++ b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_test.go @@ -7,12 +7,12 @@ package loadbalancing import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/gcp/metrics/cloudsql/metadata.go b/x-pack/metricbeat/module/gcp/metrics/cloudsql/metadata.go index 044235e43166..097b10eb5967 100644 --- a/x-pack/metricbeat/module/gcp/metrics/cloudsql/metadata.go +++ b/x-pack/metricbeat/module/gcp/metrics/cloudsql/metadata.go @@ -14,8 +14,8 @@ import ( "google.golang.org/api/option" sqladmin "google.golang.org/api/sqladmin/v1" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/compute/metadata.go b/x-pack/metricbeat/module/gcp/metrics/compute/metadata.go index c1c071467e06..12c63fe0edfd 100644 --- a/x-pack/metricbeat/module/gcp/metrics/compute/metadata.go +++ b/x-pack/metricbeat/module/gcp/metrics/compute/metadata.go @@ -18,8 +18,8 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/dataproc/metadata.go b/x-pack/metricbeat/module/gcp/metrics/dataproc/metadata.go index 3c2615ccaa82..fe5bc288b932 100644 --- a/x-pack/metricbeat/module/gcp/metrics/dataproc/metadata.go +++ b/x-pack/metricbeat/module/gcp/metrics/dataproc/metadata.go @@ -19,8 +19,8 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/metadata_services.go b/x-pack/metricbeat/module/gcp/metrics/metadata_services.go index bc13ec66059a..5d5267c02068 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metadata_services.go +++ b/x-pack/metricbeat/module/gcp/metrics/metadata_services.go @@ -7,11 +7,11 @@ package metrics import ( "context" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics/cloudsql" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics/compute" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics/dataproc" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics/redis" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics/cloudsql" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics/compute" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics/dataproc" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics/redis" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/metrics_integration_test.go b/x-pack/metricbeat/module/gcp/metrics/metrics_integration_test.go index 6a2a8cdbd8c6..6f1ebe13c52c 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metrics_integration_test.go +++ b/x-pack/metricbeat/module/gcp/metrics/metrics_integration_test.go @@ -9,7 +9,7 @@ package metrics import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go index 915ff63190f0..44e9379ff6ef 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go +++ b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go @@ -18,7 +18,7 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go b/x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go index 20f8a5d9e366..8af582261c25 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go +++ b/x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go @@ -12,7 +12,7 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/types/known/durationpb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/metricset.go b/x-pack/metricbeat/module/gcp/metrics/metricset.go index 86db33e421bc..02aad6efbc8e 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metricset.go +++ b/x-pack/metricbeat/module/gcp/metrics/metricset.go @@ -20,8 +20,8 @@ import ( cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/redis/metadata.go b/x-pack/metricbeat/module/gcp/metrics/redis/metadata.go index 19024f42cf2c..48434591658a 100644 --- a/x-pack/metricbeat/module/gcp/metrics/redis/metadata.go +++ b/x-pack/metricbeat/module/gcp/metrics/redis/metadata.go @@ -17,8 +17,8 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" - "github.com/elastic/beats/v7/libbeat/common/backoff" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/libbeat/common/backoff" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/response_parser.go b/x-pack/metricbeat/module/gcp/metrics/response_parser.go index 44b6c561d543..38b5713d03f1 100644 --- a/x-pack/metricbeat/module/gcp/metrics/response_parser.go +++ b/x-pack/metricbeat/module/gcp/metrics/response_parser.go @@ -11,7 +11,7 @@ import ( "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/timeseries.go b/x-pack/metricbeat/module/gcp/metrics/timeseries.go index 0a0d3115450f..3cf29ec011ec 100644 --- a/x-pack/metricbeat/module/gcp/metrics/timeseries.go +++ b/x-pack/metricbeat/module/gcp/metrics/timeseries.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go b/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go index a3131578c8e6..b7a74fb2d0d7 100644 --- a/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go +++ b/x-pack/metricbeat/module/gcp/metrics/timeseries_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/pubsub/pubsub_integration_test.go b/x-pack/metricbeat/module/gcp/pubsub/pubsub_integration_test.go index 21bd818ef8d5..6897c1289969 100644 --- a/x-pack/metricbeat/module/gcp/pubsub/pubsub_integration_test.go +++ b/x-pack/metricbeat/module/gcp/pubsub/pubsub_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/pubsub/pubsub_test.go b/x-pack/metricbeat/module/gcp/pubsub/pubsub_test.go index 0abbb4a8847e..e20b4cda5f58 100644 --- a/x-pack/metricbeat/module/gcp/pubsub/pubsub_test.go +++ b/x-pack/metricbeat/module/gcp/pubsub/pubsub_test.go @@ -7,12 +7,12 @@ package pubsub import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/gcp/storage/storage_integration_test.go b/x-pack/metricbeat/module/gcp/storage/storage_integration_test.go index 4e204dc007b0..989e8d894cae 100644 --- a/x-pack/metricbeat/module/gcp/storage/storage_integration_test.go +++ b/x-pack/metricbeat/module/gcp/storage/storage_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/gcp/storage/storage_test.go b/x-pack/metricbeat/module/gcp/storage/storage_test.go index 7605c7ce094a..91a19338032e 100644 --- a/x-pack/metricbeat/module/gcp/storage/storage_test.go +++ b/x-pack/metricbeat/module/gcp/storage/storage_test.go @@ -7,12 +7,12 @@ package storage import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/ibmmq/fields.go b/x-pack/metricbeat/module/ibmmq/fields.go index edd045e5de62..6b40f4d58191 100644 --- a/x-pack/metricbeat/module/ibmmq/fields.go +++ b/x-pack/metricbeat/module/ibmmq/fields.go @@ -7,7 +7,7 @@ package ibmmq import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_integration_test.go b/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_integration_test.go index da7419a241c2..d7d75f32820c 100644 --- a/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_integration_test.go +++ b/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_integration_test.go @@ -12,14 +12,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_test.go b/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_test.go index 032a68942a8c..72c35c2737f8 100644 --- a/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_test.go +++ b/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_test.go @@ -10,13 +10,13 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/iis/application_pool/application_integration_test.go b/x-pack/metricbeat/module/iis/application_pool/application_integration_test.go index 15fa6af5575c..341c00f71c35 100644 --- a/x-pack/metricbeat/module/iis/application_pool/application_integration_test.go +++ b/x-pack/metricbeat/module/iis/application_pool/application_integration_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/iis/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/iis/test" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/iis/application_pool/application_pool.go b/x-pack/metricbeat/module/iis/application_pool/application_pool.go index 865246011cb7..86d864d12293 100644 --- a/x-pack/metricbeat/module/iis/application_pool/application_pool.go +++ b/x-pack/metricbeat/module/iis/application_pool/application_pool.go @@ -9,7 +9,7 @@ package application_pool import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/iis/application_pool/application_pool_test.go b/x-pack/metricbeat/module/iis/application_pool/application_pool_test.go index 3a8074d30a28..d5ba63fd1ae0 100644 --- a/x-pack/metricbeat/module/iis/application_pool/application_pool_test.go +++ b/x-pack/metricbeat/module/iis/application_pool/application_pool_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestMetricsetNoErrors(t *testing.T) { diff --git a/x-pack/metricbeat/module/iis/application_pool/reader.go b/x-pack/metricbeat/module/iis/application_pool/reader.go index ef0d373aace4..e827eab2522b 100644 --- a/x-pack/metricbeat/module/iis/application_pool/reader.go +++ b/x-pack/metricbeat/module/iis/application_pool/reader.go @@ -12,11 +12,11 @@ import ( "strings" "syscall" - "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v9/metricbeat/helper/windows/pdh" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/go-sysinfo" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/iis/application_pool/reader_test.go b/x-pack/metricbeat/module/iis/application_pool/reader_test.go index 17dfb1bccdf3..3fddafc12ce6 100644 --- a/x-pack/metricbeat/module/iis/application_pool/reader_test.go +++ b/x-pack/metricbeat/module/iis/application_pool/reader_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v9/metricbeat/helper/windows/pdh" "github.com/elastic/elastic-agent-libs/logp/logptest" ) diff --git a/x-pack/metricbeat/module/iis/fields.go b/x-pack/metricbeat/module/iis/fields.go index f8b1b2729be3..fe118f553a5b 100644 --- a/x-pack/metricbeat/module/iis/fields.go +++ b/x-pack/metricbeat/module/iis/fields.go @@ -7,7 +7,7 @@ package iis import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/iis/webserver/webserver_integration_test.go b/x-pack/metricbeat/module/iis/webserver/webserver_integration_test.go index fa8705678cfd..99d6f0396fbb 100644 --- a/x-pack/metricbeat/module/iis/webserver/webserver_integration_test.go +++ b/x-pack/metricbeat/module/iis/webserver/webserver_integration_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/iis/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/iis/test" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/windows" - _ "github.com/elastic/beats/v7/metricbeat/module/windows/perfmon" + _ "github.com/elastic/beats/v9/metricbeat/module/windows" + _ "github.com/elastic/beats/v9/metricbeat/module/windows/perfmon" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/iis/webserver/webserver_test.go b/x-pack/metricbeat/module/iis/webserver/webserver_test.go index 6b4766616271..1f5c955da10c 100644 --- a/x-pack/metricbeat/module/iis/webserver/webserver_test.go +++ b/x-pack/metricbeat/module/iis/webserver/webserver_test.go @@ -9,7 +9,7 @@ package webserver import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/iis/website/website_integration_test.go b/x-pack/metricbeat/module/iis/website/website_integration_test.go index 685b53330ccb..b01b24fd5829 100644 --- a/x-pack/metricbeat/module/iis/website/website_integration_test.go +++ b/x-pack/metricbeat/module/iis/website/website_integration_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/iis/test" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/iis/test" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/windows" - _ "github.com/elastic/beats/v7/metricbeat/module/windows/perfmon" + _ "github.com/elastic/beats/v9/metricbeat/module/windows" + _ "github.com/elastic/beats/v9/metricbeat/module/windows/perfmon" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/iis/website/website_test.go b/x-pack/metricbeat/module/iis/website/website_test.go index c1e9a0b19468..78c090aefe08 100644 --- a/x-pack/metricbeat/module/iis/website/website_test.go +++ b/x-pack/metricbeat/module/iis/website/website_test.go @@ -9,7 +9,7 @@ package website import ( "os" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/istio/citadel/citadel.go b/x-pack/metricbeat/module/istio/citadel/citadel.go index 163a4a0909e1..fa7d98be44cc 100644 --- a/x-pack/metricbeat/module/istio/citadel/citadel.go +++ b/x-pack/metricbeat/module/istio/citadel/citadel.go @@ -5,9 +5,9 @@ package citadel import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/istio/citadel/citadel_test.go b/x-pack/metricbeat/module/istio/citadel/citadel_test.go index 96f7685f7c0a..d0d2b5da235a 100644 --- a/x-pack/metricbeat/module/istio/citadel/citadel_test.go +++ b/x-pack/metricbeat/module/istio/citadel/citadel_test.go @@ -10,9 +10,9 @@ package citadel import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/istio/fields.go b/x-pack/metricbeat/module/istio/fields.go index c8c1bb39f9bc..40ad7ae957d3 100644 --- a/x-pack/metricbeat/module/istio/fields.go +++ b/x-pack/metricbeat/module/istio/fields.go @@ -7,7 +7,7 @@ package istio import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/istio/galley/galley.go b/x-pack/metricbeat/module/istio/galley/galley.go index e7f09a9fc641..7aff737d1f08 100644 --- a/x-pack/metricbeat/module/istio/galley/galley.go +++ b/x-pack/metricbeat/module/istio/galley/galley.go @@ -5,9 +5,9 @@ package galley import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/istio/galley/galley_test.go b/x-pack/metricbeat/module/istio/galley/galley_test.go index 1a3926b52e77..1c4b01eb0a51 100644 --- a/x-pack/metricbeat/module/istio/galley/galley_test.go +++ b/x-pack/metricbeat/module/istio/galley/galley_test.go @@ -10,9 +10,9 @@ package galley import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/istio/istiod/istiod_test.go b/x-pack/metricbeat/module/istio/istiod/istiod_test.go index 9a79b307a6cf..382de7974f6a 100644 --- a/x-pack/metricbeat/module/istio/istiod/istiod_test.go +++ b/x-pack/metricbeat/module/istio/istiod/istiod_test.go @@ -10,13 +10,13 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/istio/mesh/mesh.go b/x-pack/metricbeat/module/istio/mesh/mesh.go index 3c8a36b2b9b5..13fe2871ab75 100644 --- a/x-pack/metricbeat/module/istio/mesh/mesh.go +++ b/x-pack/metricbeat/module/istio/mesh/mesh.go @@ -5,9 +5,9 @@ package mesh import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/istio/mesh/mesh_test.go b/x-pack/metricbeat/module/istio/mesh/mesh_test.go index 58c270ba4349..034cdd32fba0 100644 --- a/x-pack/metricbeat/module/istio/mesh/mesh_test.go +++ b/x-pack/metricbeat/module/istio/mesh/mesh_test.go @@ -10,9 +10,9 @@ package mesh import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/istio/mixer/mixer.go b/x-pack/metricbeat/module/istio/mixer/mixer.go index 357624485d80..b405d0e481a9 100644 --- a/x-pack/metricbeat/module/istio/mixer/mixer.go +++ b/x-pack/metricbeat/module/istio/mixer/mixer.go @@ -5,9 +5,9 @@ package mixer import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/istio/mixer/mixer_test.go b/x-pack/metricbeat/module/istio/mixer/mixer_test.go index 1607678379ff..a5e3745bc99b 100644 --- a/x-pack/metricbeat/module/istio/mixer/mixer_test.go +++ b/x-pack/metricbeat/module/istio/mixer/mixer_test.go @@ -9,9 +9,9 @@ package mixer import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/istio/pilot/pilot.go b/x-pack/metricbeat/module/istio/pilot/pilot.go index 45d9d6df28d9..1e9f91126480 100644 --- a/x-pack/metricbeat/module/istio/pilot/pilot.go +++ b/x-pack/metricbeat/module/istio/pilot/pilot.go @@ -5,9 +5,9 @@ package pilot import ( - "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/istio/pilot/pilot_test.go b/x-pack/metricbeat/module/istio/pilot/pilot_test.go index 24c16c29ff33..cbc754c21c1f 100644 --- a/x-pack/metricbeat/module/istio/pilot/pilot_test.go +++ b/x-pack/metricbeat/module/istio/pilot/pilot_test.go @@ -9,9 +9,9 @@ package pilot import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/istio" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/istio/proxy/proxy_test.go b/x-pack/metricbeat/module/istio/proxy/proxy_test.go index 1f8618d68fb7..d469b99cbda3 100644 --- a/x-pack/metricbeat/module/istio/proxy/proxy_test.go +++ b/x-pack/metricbeat/module/istio/proxy/proxy_test.go @@ -11,13 +11,13 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/meraki/device_health/device_health.go b/x-pack/metricbeat/module/meraki/device_health/device_health.go index 6141bcc18744..28583df576c9 100644 --- a/x-pack/metricbeat/module/meraki/device_health/device_health.go +++ b/x-pack/metricbeat/module/meraki/device_health/device_health.go @@ -7,9 +7,9 @@ package device_health import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/logp" sdk "github.com/meraki/dashboard-api-go/v3/sdk" diff --git a/x-pack/metricbeat/module/meraki/device_health/devices.go b/x-pack/metricbeat/module/meraki/device_health/devices.go index f440be22b6fb..2f3578d2404a 100644 --- a/x-pack/metricbeat/module/meraki/device_health/devices.go +++ b/x-pack/metricbeat/module/meraki/device_health/devices.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/metricbeat/module/meraki/device_health/switchports.go b/x-pack/metricbeat/module/meraki/device_health/switchports.go index d36e3c11209d..17a6906fb7f3 100644 --- a/x-pack/metricbeat/module/meraki/device_health/switchports.go +++ b/x-pack/metricbeat/module/meraki/device_health/switchports.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/mapstr" sdk "github.com/meraki/dashboard-api-go/v3/sdk" diff --git a/x-pack/metricbeat/module/meraki/device_health/uplinks.go b/x-pack/metricbeat/module/meraki/device_health/uplinks.go index 2da61b94e3dd..7e7ce82ce254 100644 --- a/x-pack/metricbeat/module/meraki/device_health/uplinks.go +++ b/x-pack/metricbeat/module/meraki/device_health/uplinks.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/mapstr" sdk "github.com/meraki/dashboard-api-go/v3/sdk" diff --git a/x-pack/metricbeat/module/meraki/device_health/vpn_status.go b/x-pack/metricbeat/module/meraki/device_health/vpn_status.go index f5582e62d582..229195cdceea 100644 --- a/x-pack/metricbeat/module/meraki/device_health/vpn_status.go +++ b/x-pack/metricbeat/module/meraki/device_health/vpn_status.go @@ -7,7 +7,7 @@ package device_health import ( "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/logp" "github.com/go-resty/resty/v2" diff --git a/x-pack/metricbeat/module/meraki/fields.go b/x-pack/metricbeat/module/meraki/fields.go index a2a8ae7a5a95..c31b7aec37a6 100644 --- a/x-pack/metricbeat/module/meraki/fields.go +++ b/x-pack/metricbeat/module/meraki/fields.go @@ -7,7 +7,7 @@ package meraki import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/meraki/network_health/network_health.go b/x-pack/metricbeat/module/meraki/network_health/network_health.go index 0747a9221ba3..4c62a6d43dcf 100644 --- a/x-pack/metricbeat/module/meraki/network_health/network_health.go +++ b/x-pack/metricbeat/module/meraki/network_health/network_health.go @@ -7,9 +7,9 @@ package network_health import ( "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/logp" sdk "github.com/meraki/dashboard-api-go/v3/sdk" diff --git a/x-pack/metricbeat/module/meraki/network_health/networks.go b/x-pack/metricbeat/module/meraki/network_health/networks.go index fd8b3c0005e9..8ef6202734a3 100644 --- a/x-pack/metricbeat/module/meraki/network_health/networks.go +++ b/x-pack/metricbeat/module/meraki/network_health/networks.go @@ -9,8 +9,8 @@ import ( sdk "github.com/meraki/dashboard-api-go/v3/sdk" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/meraki/network_health/vpn_stats.go b/x-pack/metricbeat/module/meraki/network_health/vpn_stats.go index e19f9cc7a32f..a8d99f564d67 100644 --- a/x-pack/metricbeat/module/meraki/network_health/vpn_stats.go +++ b/x-pack/metricbeat/module/meraki/network_health/vpn_stats.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/meraki" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/meraki" "github.com/elastic/elastic-agent-libs/logp" "github.com/go-resty/resty/v2" diff --git a/x-pack/metricbeat/module/meraki/reporter.go b/x-pack/metricbeat/module/meraki/reporter.go index bf1acc85ca08..e579fa0e27f1 100644 --- a/x-pack/metricbeat/module/meraki/reporter.go +++ b/x-pack/metricbeat/module/meraki/reporter.go @@ -9,7 +9,7 @@ import ( "reflect" "time" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/meraki/reporter_test.go b/x-pack/metricbeat/module/meraki/reporter_test.go index 40bc60de2c6a..6548b272cc71 100644 --- a/x-pack/metricbeat/module/meraki/reporter_test.go +++ b/x-pack/metricbeat/module/meraki/reporter_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/mssql/fields.go b/x-pack/metricbeat/module/mssql/fields.go index d356fb23042b..423b5b88c092 100644 --- a/x-pack/metricbeat/module/mssql/fields.go +++ b/x-pack/metricbeat/module/mssql/fields.go @@ -7,7 +7,7 @@ package mssql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/mssql/mssql.go b/x-pack/metricbeat/module/mssql/mssql.go index 93e184d53f7e..da52f760f3ea 100644 --- a/x-pack/metricbeat/module/mssql/mssql.go +++ b/x-pack/metricbeat/module/mssql/mssql.go @@ -7,8 +7,8 @@ package mssql import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/mssql/performance/data.go b/x-pack/metricbeat/module/mssql/performance/data.go index 519edca00719..d1a0b4a45cbc 100644 --- a/x-pack/metricbeat/module/mssql/performance/data.go +++ b/x-pack/metricbeat/module/mssql/performance/data.go @@ -7,8 +7,8 @@ package performance import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstrstr" ) var ( diff --git a/x-pack/metricbeat/module/mssql/performance/data_integration_test.go b/x-pack/metricbeat/module/mssql/performance/data_integration_test.go index cf6b83d5c547..1d11959bdef7 100644 --- a/x-pack/metricbeat/module/mssql/performance/data_integration_test.go +++ b/x-pack/metricbeat/module/mssql/performance/data_integration_test.go @@ -12,8 +12,8 @@ import ( _ "github.com/microsoft/go-mssqldb" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - mtest "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + mtest "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/mssql/performance/performance.go b/x-pack/metricbeat/module/mssql/performance/performance.go index da6117bc55ec..d9612e5c9099 100644 --- a/x-pack/metricbeat/module/mssql/performance/performance.go +++ b/x-pack/metricbeat/module/mssql/performance/performance.go @@ -11,8 +11,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go b/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go index e8510f335abc..483686aeee18 100644 --- a/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go +++ b/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - mtest "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + mtest "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql/testing" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go b/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go index c5d2c3d9b577..a00b0bc563ee 100644 --- a/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go +++ b/x-pack/metricbeat/module/mssql/transaction_log/data_integration_test.go @@ -9,8 +9,8 @@ package transaction_log import ( "testing" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - mtest "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + mtest "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go index 8a9ddab2debd..615de66e81d4 100644 --- a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go +++ b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go @@ -10,8 +10,8 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go index 85aa36c0c4a3..344258ce322d 100644 --- a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go +++ b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log_integration_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - mtest "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + mtest "github.com/elastic/beats/v9/x-pack/metricbeat/module/mssql/testing" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/openai/fields.go b/x-pack/metricbeat/module/openai/fields.go index de875dbdaab1..ac3343f3357d 100644 --- a/x-pack/metricbeat/module/openai/fields.go +++ b/x-pack/metricbeat/module/openai/fields.go @@ -7,7 +7,7 @@ package openai import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/openai/usage/usage.go b/x-pack/metricbeat/module/openai/usage/usage.go index fb6b181ad9ed..cc25f0927983 100644 --- a/x-pack/metricbeat/module/openai/usage/usage.go +++ b/x-pack/metricbeat/module/openai/usage/usage.go @@ -17,8 +17,8 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/time/rate" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/paths" diff --git a/x-pack/metricbeat/module/openai/usage/usage_integration_test.go b/x-pack/metricbeat/module/openai/usage/usage_integration_test.go index 8cb842419955..84791f4ee30c 100644 --- a/x-pack/metricbeat/module/openai/usage/usage_integration_test.go +++ b/x-pack/metricbeat/module/openai/usage/usage_integration_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/oracle/connection.go b/x-pack/metricbeat/module/oracle/connection.go index 34a3f19241c6..fc968fe5eb2a 100644 --- a/x-pack/metricbeat/module/oracle/connection.go +++ b/x-pack/metricbeat/module/oracle/connection.go @@ -13,7 +13,7 @@ import ( "github.com/godror/godror" "github.com/godror/godror/dsn" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // ConnectionDetails contains all possible data that can be used to create a connection with diff --git a/x-pack/metricbeat/module/oracle/fields.go b/x-pack/metricbeat/module/oracle/fields.go index cbacdb7ccbca..1ecb319ab9d8 100644 --- a/x-pack/metricbeat/module/oracle/fields.go +++ b/x-pack/metricbeat/module/oracle/fields.go @@ -7,7 +7,7 @@ package oracle import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/oracle/performance/buffer_cache_hit_ratio.go b/x-pack/metricbeat/module/oracle/performance/buffer_cache_hit_ratio.go index ff7576d84481..55d8c9e48da6 100644 --- a/x-pack/metricbeat/module/oracle/performance/buffer_cache_hit_ratio.go +++ b/x-pack/metricbeat/module/oracle/performance/buffer_cache_hit_ratio.go @@ -11,7 +11,7 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/oracle/performance/cursors.go b/x-pack/metricbeat/module/oracle/performance/cursors.go index c1a1e9a08b08..a37e5c50e372 100644 --- a/x-pack/metricbeat/module/oracle/performance/cursors.go +++ b/x-pack/metricbeat/module/oracle/performance/cursors.go @@ -11,7 +11,7 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -44,16 +44,16 @@ type totalCursors struct { */ func (e *performanceExtractor) cursorsByUsernameAndMachine(ctx context.Context) ([]cursorsByUsernameAndMachine, error) { rows, err := e.db.QueryContext(ctx, ` - SELECT sum(a.value) total_cur, - avg(a.value) avg_cur, + SELECT sum(a.value) total_cur, + avg(a.value) avg_cur, max(a.value) max_cur, s.username, s.machine FROM v$sesstat a, v$statname b, v$session s - WHERE a.statistic# = b.statistic# + WHERE a.statistic# = b.statistic# AND s.sid = a.sid AND b.name = 'opened cursors current' - GROUP BY s.username, + GROUP BY s.username, s.machine ORDER BY 1 DESC`) if err != nil { @@ -113,11 +113,11 @@ func (m *MetricSet) addCursorByUsernameAndMachine(cs []cursorsByUsernameAndMachi */ func (e *performanceExtractor) totalCursors(ctx context.Context) (*totalCursors, error) { rows := e.db.QueryRowContext(ctx, ` - SELECT total_cursors, - current_cursors, - sess_cur_cache_hits, - parse_count_total, - sess_cur_cache_hits / total_cursors, + SELECT total_cursors, + current_cursors, + sess_cur_cache_hits, + parse_count_total, + sess_cur_cache_hits / total_cursors, sess_cur_cache_hits - parse_count_total FROM ( SELECT sum ( decode ( name, 'opened cursors cumulative', value, 0)) total_cursors, diff --git a/x-pack/metricbeat/module/oracle/performance/data.go b/x-pack/metricbeat/module/oracle/performance/data.go index 99bf75ff441a..eec4dfb27aab 100644 --- a/x-pack/metricbeat/module/oracle/performance/data.go +++ b/x-pack/metricbeat/module/oracle/performance/data.go @@ -10,7 +10,7 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // extract is the E of a ETL processing. Gets all the performance information into an instance of extractedData diff --git a/x-pack/metricbeat/module/oracle/performance/library_cache.go b/x-pack/metricbeat/module/oracle/performance/library_cache.go index bdf86e393a72..24a8f65c5166 100644 --- a/x-pack/metricbeat/module/oracle/performance/library_cache.go +++ b/x-pack/metricbeat/module/oracle/performance/library_cache.go @@ -11,7 +11,7 @@ import ( "database/sql" "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/oracle/performance/metricset.go b/x-pack/metricbeat/module/oracle/performance/metricset.go index 8f86efabda93..b84d27f77880 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset.go @@ -10,8 +10,8 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/x-pack/metricbeat/module/oracle/performance/metricset_test.go b/x-pack/metricbeat/module/oracle/performance/metricset_test.go index d8036257af27..b7fb5b0ae0f3 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset_test.go @@ -11,9 +11,9 @@ import ( _ "github.com/godror/godror" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/oracle/sysmetric/data.go b/x-pack/metricbeat/module/oracle/sysmetric/data.go index 0e1447ffa830..0b3156e810d9 100644 --- a/x-pack/metricbeat/module/oracle/sysmetric/data.go +++ b/x-pack/metricbeat/module/oracle/sysmetric/data.go @@ -10,7 +10,7 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // collect function collects all the system metric information into an instance of collectededData diff --git a/x-pack/metricbeat/module/oracle/sysmetric/metricset.go b/x-pack/metricbeat/module/oracle/sysmetric/metricset.go index aded3a1ba27f..f931ff8aef5a 100644 --- a/x-pack/metricbeat/module/oracle/sysmetric/metricset.go +++ b/x-pack/metricbeat/module/oracle/sysmetric/metricset.go @@ -10,8 +10,8 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/x-pack/metricbeat/module/oracle/sysmetric/metricset_test.go b/x-pack/metricbeat/module/oracle/sysmetric/metricset_test.go index cf45d3775807..5bdb955178a2 100644 --- a/x-pack/metricbeat/module/oracle/sysmetric/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/sysmetric/metricset_test.go @@ -11,9 +11,9 @@ import ( _ "github.com/godror/godror" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/oracle/sysmetric/sysmetric_metric.go b/x-pack/metricbeat/module/oracle/sysmetric/sysmetric_metric.go index 8a7ef1d7c109..b950c3812e89 100644 --- a/x-pack/metricbeat/module/oracle/sysmetric/sysmetric_metric.go +++ b/x-pack/metricbeat/module/oracle/sysmetric/sysmetric_metric.go @@ -14,7 +14,7 @@ import ( "strconv" "strings" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/oracle/tablespace/data.go b/x-pack/metricbeat/module/oracle/tablespace/data.go index 9eb79e137f42..54b1eeadb2dc 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/data.go +++ b/x-pack/metricbeat/module/oracle/tablespace/data.go @@ -10,10 +10,10 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) // extract is the E of a ETL processing. Gets the data files, used/free space and temp free space data that is fetch diff --git a/x-pack/metricbeat/module/oracle/tablespace/metricset.go b/x-pack/metricbeat/module/oracle/tablespace/metricset.go index da9ee8c7f8ec..13afd7927b6d 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/metricset.go +++ b/x-pack/metricbeat/module/oracle/tablespace/metricset.go @@ -11,8 +11,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go b/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go index 046f2dbb575f..4303238cf07a 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go @@ -11,9 +11,9 @@ import ( _ "github.com/godror/godror" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/oracle" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/panw/config.go b/x-pack/metricbeat/module/panw/config.go index 30a14bd12c60..b6ccd1144d55 100644 --- a/x-pack/metricbeat/module/panw/config.go +++ b/x-pack/metricbeat/module/panw/config.go @@ -5,7 +5,7 @@ package panw import ( - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb" ) const ( diff --git a/x-pack/metricbeat/module/panw/fields.go b/x-pack/metricbeat/module/panw/fields.go index c63f4af7486d..9783ee397e1b 100644 --- a/x-pack/metricbeat/module/panw/fields.go +++ b/x-pack/metricbeat/module/panw/fields.go @@ -7,7 +7,7 @@ package panw import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/panw/interfaces/ha_interfaces.go b/x-pack/metricbeat/module/panw/interfaces/ha_interfaces.go index 657110e4f736..f278133e8e8c 100644 --- a/x-pack/metricbeat/module/panw/interfaces/ha_interfaces.go +++ b/x-pack/metricbeat/module/panw/interfaces/ha_interfaces.go @@ -8,8 +8,8 @@ import ( "encoding/xml" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/interfaces/ifnet_interfaces.go b/x-pack/metricbeat/module/panw/interfaces/ifnet_interfaces.go index b14857f59057..ea1cd0057598 100644 --- a/x-pack/metricbeat/module/panw/interfaces/ifnet_interfaces.go +++ b/x-pack/metricbeat/module/panw/interfaces/ifnet_interfaces.go @@ -8,8 +8,8 @@ import ( "encoding/xml" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/interfaces/interfaces.go b/x-pack/metricbeat/module/panw/interfaces/interfaces.go index a5c50cb51016..0cd6e450dc85 100644 --- a/x-pack/metricbeat/module/panw/interfaces/interfaces.go +++ b/x-pack/metricbeat/module/panw/interfaces/interfaces.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/panw/interfaces/tunnels.go b/x-pack/metricbeat/module/panw/interfaces/tunnels.go index df4b371305fe..eb35dcc5c69b 100644 --- a/x-pack/metricbeat/module/panw/interfaces/tunnels.go +++ b/x-pack/metricbeat/module/panw/interfaces/tunnels.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/routing/bgp_peers.go b/x-pack/metricbeat/module/panw/routing/bgp_peers.go index 92fb5a0ec526..c69adb842971 100644 --- a/x-pack/metricbeat/module/panw/routing/bgp_peers.go +++ b/x-pack/metricbeat/module/panw/routing/bgp_peers.go @@ -9,8 +9,8 @@ import ( "net" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/routing/routing.go b/x-pack/metricbeat/module/panw/routing/routing.go index 6ce248495915..831eea4500bb 100644 --- a/x-pack/metricbeat/module/panw/routing/routing.go +++ b/x-pack/metricbeat/module/panw/routing/routing.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/panw/system/certificates.go b/x-pack/metricbeat/module/panw/system/certificates.go index 1909219d5dcd..8e7da6aa7716 100644 --- a/x-pack/metricbeat/module/panw/system/certificates.go +++ b/x-pack/metricbeat/module/panw/system/certificates.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/system/fans.go b/x-pack/metricbeat/module/panw/system/fans.go index 7045d0a3f8e4..05b6111b4deb 100644 --- a/x-pack/metricbeat/module/panw/system/fans.go +++ b/x-pack/metricbeat/module/panw/system/fans.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/system/filesystem.go b/x-pack/metricbeat/module/panw/system/filesystem.go index 64ae8881207c..e15107a737ce 100644 --- a/x-pack/metricbeat/module/panw/system/filesystem.go +++ b/x-pack/metricbeat/module/panw/system/filesystem.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/system/license.go b/x-pack/metricbeat/module/panw/system/license.go index 752f3a8afa13..93a3d608182c 100644 --- a/x-pack/metricbeat/module/panw/system/license.go +++ b/x-pack/metricbeat/module/panw/system/license.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/system/power.go b/x-pack/metricbeat/module/panw/system/power.go index 01006d949eb0..0e4781f8832e 100644 --- a/x-pack/metricbeat/module/panw/system/power.go +++ b/x-pack/metricbeat/module/panw/system/power.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/system/resources.go b/x-pack/metricbeat/module/panw/system/resources.go index 54353fe2db60..7ccbdec94b6f 100644 --- a/x-pack/metricbeat/module/panw/system/resources.go +++ b/x-pack/metricbeat/module/panw/system/resources.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/system/system.go b/x-pack/metricbeat/module/panw/system/system.go index 501084b3c730..9286414dbfc5 100644 --- a/x-pack/metricbeat/module/panw/system/system.go +++ b/x-pack/metricbeat/module/panw/system/system.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/panw/system/thermal.go b/x-pack/metricbeat/module/panw/system/thermal.go index 91f8454901d4..c9878b429cf4 100644 --- a/x-pack/metricbeat/module/panw/system/thermal.go +++ b/x-pack/metricbeat/module/panw/system/thermal.go @@ -8,8 +8,8 @@ import ( "encoding/xml" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/vpn/gp_sessions.go b/x-pack/metricbeat/module/panw/vpn/gp_sessions.go index ea8e3510e130..fc7def92c44e 100644 --- a/x-pack/metricbeat/module/panw/vpn/gp_sessions.go +++ b/x-pack/metricbeat/module/panw/vpn/gp_sessions.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/vpn/gp_stats.go b/x-pack/metricbeat/module/panw/vpn/gp_stats.go index 708b2be5b5c8..8589995ef61f 100644 --- a/x-pack/metricbeat/module/panw/vpn/gp_stats.go +++ b/x-pack/metricbeat/module/panw/vpn/gp_stats.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/panw/vpn/vpn.go b/x-pack/metricbeat/module/panw/vpn/vpn.go index f3a29147617c..1132791d6711 100644 --- a/x-pack/metricbeat/module/panw/vpn/vpn.go +++ b/x-pack/metricbeat/module/panw/vpn/vpn.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/panw" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/panw" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/prometheus/collector/collector.go b/x-pack/metricbeat/module/prometheus/collector/collector.go index 92f3552eebd2..399f0881d430 100644 --- a/x-pack/metricbeat/module/prometheus/collector/collector.go +++ b/x-pack/metricbeat/module/prometheus/collector/collector.go @@ -5,8 +5,8 @@ package collector import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/prometheus/collector/collector_integration_test.go b/x-pack/metricbeat/module/prometheus/collector/collector_integration_test.go index 2082b3aa1083..db99ce9ac1ec 100644 --- a/x-pack/metricbeat/module/prometheus/collector/collector_integration_test.go +++ b/x-pack/metricbeat/module/prometheus/collector/collector_integration_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/prometheus/collector/collector_test.go b/x-pack/metricbeat/module/prometheus/collector/collector_test.go index 1a2459738783..b7ad7af99751 100644 --- a/x-pack/metricbeat/module/prometheus/collector/collector_test.go +++ b/x-pack/metricbeat/module/prometheus/collector/collector_test.go @@ -15,12 +15,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus" // Import common fields for validation - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/prometheus/collector/counter.go b/x-pack/metricbeat/module/prometheus/collector/counter.go index 6f0f72d80eb8..8665a99a5ce6 100644 --- a/x-pack/metricbeat/module/prometheus/collector/counter.go +++ b/x-pack/metricbeat/module/prometheus/collector/counter.go @@ -7,7 +7,7 @@ package collector import ( "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) // CounterCache keeps a cache of the last value of all given counters diff --git a/x-pack/metricbeat/module/prometheus/collector/counter_test.go b/x-pack/metricbeat/module/prometheus/collector/counter_test.go index dc4e9cd64238..c48737aa65b2 100644 --- a/x-pack/metricbeat/module/prometheus/collector/counter_test.go +++ b/x-pack/metricbeat/module/prometheus/collector/counter_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v9/libbeat/common" ) func Test_CounterCache(t *testing.T) { diff --git a/x-pack/metricbeat/module/prometheus/collector/data.go b/x-pack/metricbeat/module/prometheus/collector/data.go index 992ba85e5c53..781fd5aac5a9 100644 --- a/x-pack/metricbeat/module/prometheus/collector/data.go +++ b/x-pack/metricbeat/module/prometheus/collector/data.go @@ -8,11 +8,11 @@ import ( "math" "strconv" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/prometheus/collector/histogram.go b/x-pack/metricbeat/module/prometheus/collector/histogram.go index 313d3a3ec934..fd095ab80c30 100644 --- a/x-pack/metricbeat/module/prometheus/collector/histogram.go +++ b/x-pack/metricbeat/module/prometheus/collector/histogram.go @@ -8,7 +8,7 @@ import ( "fmt" "math" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/prometheus/collector/histogram_test.go b/x-pack/metricbeat/module/prometheus/collector/histogram_test.go index 74ac977984c8..01e5273edefa 100644 --- a/x-pack/metricbeat/module/prometheus/collector/histogram_test.go +++ b/x-pack/metricbeat/module/prometheus/collector/histogram_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/proto" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/prometheus/fields.go b/x-pack/metricbeat/module/prometheus/fields.go index a34afd8d8235..07b537876d8c 100644 --- a/x-pack/metricbeat/module/prometheus/fields.go +++ b/x-pack/metricbeat/module/prometheus/fields.go @@ -7,7 +7,7 @@ package prometheus import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/prometheus/remote_write/data.go b/x-pack/metricbeat/module/prometheus/remote_write/data.go index b683faf78103..fa1416b01d3e 100644 --- a/x-pack/metricbeat/module/prometheus/remote_write/data.go +++ b/x-pack/metricbeat/module/prometheus/remote_write/data.go @@ -14,11 +14,11 @@ import ( "github.com/prometheus/common/model" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - "github.com/elastic/beats/v7/metricbeat/mb" - rw "github.com/elastic/beats/v7/metricbeat/module/prometheus/remote_write" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus/collector" + "github.com/elastic/beats/v9/libbeat/common/cfgwarn" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + "github.com/elastic/beats/v9/metricbeat/mb" + rw "github.com/elastic/beats/v9/metricbeat/module/prometheus/remote_write" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus/collector" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/prometheus/remote_write/remote_write.go b/x-pack/metricbeat/module/prometheus/remote_write/remote_write.go index 32940c120988..6fea89eac6c9 100644 --- a/x-pack/metricbeat/module/prometheus/remote_write/remote_write.go +++ b/x-pack/metricbeat/module/prometheus/remote_write/remote_write.go @@ -5,9 +5,9 @@ package remote_write import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - rw "github.com/elastic/beats/v7/metricbeat/module/prometheus/remote_write" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + rw "github.com/elastic/beats/v9/metricbeat/module/prometheus/remote_write" ) func init() { diff --git a/x-pack/metricbeat/module/prometheus/remote_write/remote_write_test.go b/x-pack/metricbeat/module/prometheus/remote_write/remote_write_test.go index f959bde42c6c..6ccfcfbdf807 100644 --- a/x-pack/metricbeat/module/prometheus/remote_write/remote_write_test.go +++ b/x-pack/metricbeat/module/prometheus/remote_write/remote_write_test.go @@ -13,8 +13,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" - xcollector "github.com/elastic/beats/v7/x-pack/metricbeat/module/prometheus/collector" + p "github.com/elastic/beats/v9/metricbeat/helper/prometheus" + xcollector "github.com/elastic/beats/v9/x-pack/metricbeat/module/prometheus/collector" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/redisenterprise/fields.go b/x-pack/metricbeat/module/redisenterprise/fields.go index 7b4dca9a9512..8c72444a5601 100644 --- a/x-pack/metricbeat/module/redisenterprise/fields.go +++ b/x-pack/metricbeat/module/redisenterprise/fields.go @@ -7,7 +7,7 @@ package redisenterprise import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go b/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go index 82f1c225bfa3..9b0bf5848bdf 100644 --- a/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go +++ b/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/redisenterprise/node/node_test.go b/x-pack/metricbeat/module/redisenterprise/node/node_test.go index bfdd13d63f34..87f32563c69c 100644 --- a/x-pack/metricbeat/module/redisenterprise/node/node_test.go +++ b/x-pack/metricbeat/module/redisenterprise/node/node_test.go @@ -10,13 +10,13 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go index 292d2c6884a8..e837b0148283 100644 --- a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go +++ b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go index f0b0190de0a0..ba6eb637dec9 100644 --- a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go +++ b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go @@ -10,13 +10,13 @@ import ( "os" "testing" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" // Register input module and metricset - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" - _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v9/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/sql/fields.go b/x-pack/metricbeat/module/sql/fields.go index 84b6ee3a78e7..0ad235022daf 100644 --- a/x-pack/metricbeat/module/sql/fields.go +++ b/x-pack/metricbeat/module/sql/fields.go @@ -7,7 +7,7 @@ package sql import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/sql/query/dsn.go b/x-pack/metricbeat/module/sql/query/dsn.go index e5b194fd0786..0ceecc15bb20 100644 --- a/x-pack/metricbeat/module/sql/query/dsn.go +++ b/x-pack/metricbeat/module/sql/query/dsn.go @@ -14,8 +14,8 @@ import ( "github.com/godror/godror" "github.com/godror/godror/dsn" - "github.com/elastic/beats/v7/metricbeat/helper/sql" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/sql" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/tlscommon" ) diff --git a/x-pack/metricbeat/module/sql/query/query.go b/x-pack/metricbeat/module/sql/query/query.go index bf5590683d68..ee5ff8ec11ce 100644 --- a/x-pack/metricbeat/module/sql/query/query.go +++ b/x-pack/metricbeat/module/sql/query/query.go @@ -11,8 +11,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/metricbeat/helper/sql" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper/sql" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/sql/query/query_integration_test.go b/x-pack/metricbeat/module/sql/query/query_integration_test.go index e5a99a5211a4..7d7445fdf31c 100644 --- a/x-pack/metricbeat/module/sql/query/query_integration_test.go +++ b/x-pack/metricbeat/module/sql/query/query_integration_test.go @@ -21,12 +21,12 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/tests/compose" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/metricbeat/module/mysql" - "github.com/elastic/beats/v7/metricbeat/module/postgresql" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/tests/compose" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/module/mysql" + "github.com/elastic/beats/v9/metricbeat/module/postgresql" ) type testFetchConfig struct { diff --git a/x-pack/metricbeat/module/stan/channels/channels.go b/x-pack/metricbeat/module/stan/channels/channels.go index 4e57bd9bd91c..3810c585bd83 100644 --- a/x-pack/metricbeat/module/stan/channels/channels.go +++ b/x-pack/metricbeat/module/stan/channels/channels.go @@ -7,9 +7,9 @@ package channels import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/stan/channels/channels_integration_test.go b/x-pack/metricbeat/module/stan/channels/channels_integration_test.go index bfd6909739c2..7d9abe7760f1 100644 --- a/x-pack/metricbeat/module/stan/channels/channels_integration_test.go +++ b/x-pack/metricbeat/module/stan/channels/channels_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/stan/channels/channels_test.go b/x-pack/metricbeat/module/stan/channels/channels_test.go index e78c39074553..d0f3b93385f0 100644 --- a/x-pack/metricbeat/module/stan/channels/channels_test.go +++ b/x-pack/metricbeat/module/stan/channels/channels_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/x-pack/metricbeat/module/stan/channels/data.go b/x-pack/metricbeat/module/stan/channels/data.go index 25d5d51f392a..dd84ae712587 100644 --- a/x-pack/metricbeat/module/stan/channels/data.go +++ b/x-pack/metricbeat/module/stan/channels/data.go @@ -8,9 +8,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/stan/fields.go b/x-pack/metricbeat/module/stan/fields.go index 498fe6d43e6c..9be8424d8641 100644 --- a/x-pack/metricbeat/module/stan/fields.go +++ b/x-pack/metricbeat/module/stan/fields.go @@ -7,7 +7,7 @@ package stan import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/stan/stats/data.go b/x-pack/metricbeat/module/stan/stats/data.go index d73549e26550..70d1641e0f84 100644 --- a/x-pack/metricbeat/module/stan/stats/data.go +++ b/x-pack/metricbeat/module/stan/stats/data.go @@ -8,9 +8,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/stan/stats/stats.go b/x-pack/metricbeat/module/stan/stats/stats.go index 2f213b8559b8..3ff72b4a16af 100644 --- a/x-pack/metricbeat/module/stan/stats/stats.go +++ b/x-pack/metricbeat/module/stan/stats/stats.go @@ -7,9 +7,9 @@ package stats import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/stan/stats/stats_integration_test.go b/x-pack/metricbeat/module/stan/stats/stats_integration_test.go index a035c07cd705..aacf4f441698 100644 --- a/x-pack/metricbeat/module/stan/stats/stats_integration_test.go +++ b/x-pack/metricbeat/module/stan/stats/stats_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/stan/stats/stats_test.go b/x-pack/metricbeat/module/stan/stats/stats_test.go index 2e1b19419b9d..78d0aecc5f78 100644 --- a/x-pack/metricbeat/module/stan/stats/stats_test.go +++ b/x-pack/metricbeat/module/stan/stats/stats_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/x-pack/metricbeat/module/stan/subscriptions/data.go b/x-pack/metricbeat/module/stan/subscriptions/data.go index 16f8c80ecc2b..970f864a93ea 100644 --- a/x-pack/metricbeat/module/stan/subscriptions/data.go +++ b/x-pack/metricbeat/module/stan/subscriptions/data.go @@ -8,9 +8,9 @@ import ( "encoding/json" "fmt" - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go b/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go index 03d1b3bf1c78..fce40c734a6a 100644 --- a/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go +++ b/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go @@ -7,9 +7,9 @@ package subscriptions import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/metricbeat/module/stan/subscriptions/subscriptions_integration_test.go b/x-pack/metricbeat/module/stan/subscriptions/subscriptions_integration_test.go index ab5e470c2002..39c69d92999c 100644 --- a/x-pack/metricbeat/module/stan/subscriptions/subscriptions_integration_test.go +++ b/x-pack/metricbeat/module/stan/subscriptions/subscriptions_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/stan/subscriptions/subscriptions_test.go b/x-pack/metricbeat/module/stan/subscriptions/subscriptions_test.go index c97343ab05a0..9325de1dab5c 100644 --- a/x-pack/metricbeat/module/stan/subscriptions/subscriptions_test.go +++ b/x-pack/metricbeat/module/stan/subscriptions/subscriptions_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/x-pack/metricbeat/module/statsd/fields.go b/x-pack/metricbeat/module/statsd/fields.go index 59a6fd2943fe..8be5842529b8 100644 --- a/x-pack/metricbeat/module/statsd/fields.go +++ b/x-pack/metricbeat/module/statsd/fields.go @@ -7,7 +7,7 @@ package statsd import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/statsd/server/data.go b/x-pack/metricbeat/module/statsd/server/data.go index 82e1d229d2de..eb72979b8b4b 100644 --- a/x-pack/metricbeat/module/statsd/server/data.go +++ b/x-pack/metricbeat/module/statsd/server/data.go @@ -11,8 +11,8 @@ import ( "strconv" "time" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/metricbeat/helper/server" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/statsd/server/data_test.go b/x-pack/metricbeat/module/statsd/server/data_test.go index c635288df0d5..4b40806d8604 100644 --- a/x-pack/metricbeat/module/statsd/server/data_test.go +++ b/x-pack/metricbeat/module/statsd/server/data_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/mb" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/metricbeat/module/statsd/server/registry.go b/x-pack/metricbeat/module/statsd/server/registry.go index da1ec2acbc9a..cde2f9b47e04 100644 --- a/x-pack/metricbeat/module/statsd/server/registry.go +++ b/x-pack/metricbeat/module/statsd/server/registry.go @@ -9,7 +9,7 @@ import ( "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/v7/metricbeat/helper/labelhash" + "github.com/elastic/beats/v9/metricbeat/helper/labelhash" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/statsd/server/server.go b/x-pack/metricbeat/module/statsd/server/server.go index eb232913423e..558b9ef2dcbc 100644 --- a/x-pack/metricbeat/module/statsd/server/server.go +++ b/x-pack/metricbeat/module/statsd/server/server.go @@ -10,9 +10,9 @@ import ( "strings" "time" - serverhelper "github.com/elastic/beats/v7/metricbeat/helper/server" - "github.com/elastic/beats/v7/metricbeat/helper/server/udp" - "github.com/elastic/beats/v7/metricbeat/mb" + serverhelper "github.com/elastic/beats/v9/metricbeat/helper/server" + "github.com/elastic/beats/v9/metricbeat/helper/server/udp" + "github.com/elastic/beats/v9/metricbeat/mb" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/syncgateway/db/data.go b/x-pack/metricbeat/module/syncgateway/db/data.go index d8fb8669ffce..dd670f2c680f 100644 --- a/x-pack/metricbeat/module/syncgateway/db/data.go +++ b/x-pack/metricbeat/module/syncgateway/db/data.go @@ -5,10 +5,10 @@ package db import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) type SgResponse struct { diff --git a/x-pack/metricbeat/module/syncgateway/db/data_test.go b/x-pack/metricbeat/module/syncgateway/db/data_test.go index 847d2a622595..2ba43fdadf92 100644 --- a/x-pack/metricbeat/module/syncgateway/db/data_test.go +++ b/x-pack/metricbeat/module/syncgateway/db/data_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/syncgateway/db/db.go b/x-pack/metricbeat/module/syncgateway/db/db.go index eae750f9badf..aa6816f7093c 100644 --- a/x-pack/metricbeat/module/syncgateway/db/db.go +++ b/x-pack/metricbeat/module/syncgateway/db/db.go @@ -7,10 +7,10 @@ package db import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) const ( diff --git a/x-pack/metricbeat/module/syncgateway/fields.go b/x-pack/metricbeat/module/syncgateway/fields.go index 2cdf7681d82c..4d122eeaa60b 100644 --- a/x-pack/metricbeat/module/syncgateway/fields.go +++ b/x-pack/metricbeat/module/syncgateway/fields.go @@ -7,7 +7,7 @@ package syncgateway import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/syncgateway/memory/data.go b/x-pack/metricbeat/module/syncgateway/memory/data.go index b51f91f30067..88c63fe91c89 100644 --- a/x-pack/metricbeat/module/syncgateway/memory/data.go +++ b/x-pack/metricbeat/module/syncgateway/memory/data.go @@ -5,8 +5,8 @@ package memory import ( - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) func eventMapping(r mb.ReporterV2, content *syncgateway.SgResponse) { diff --git a/x-pack/metricbeat/module/syncgateway/memory/data_test.go b/x-pack/metricbeat/module/syncgateway/memory/data_test.go index ad6ab9d98ff0..208516e5bb6e 100644 --- a/x-pack/metricbeat/module/syncgateway/memory/data_test.go +++ b/x-pack/metricbeat/module/syncgateway/memory/data_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/syncgateway/memory/memory.go b/x-pack/metricbeat/module/syncgateway/memory/memory.go index 0edc000d0f35..3e346941b91f 100644 --- a/x-pack/metricbeat/module/syncgateway/memory/memory.go +++ b/x-pack/metricbeat/module/syncgateway/memory/memory.go @@ -7,10 +7,10 @@ package memory import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) const ( diff --git a/x-pack/metricbeat/module/syncgateway/replication/data.go b/x-pack/metricbeat/module/syncgateway/replication/data.go index d7a0f2f5b0a2..2184044058be 100644 --- a/x-pack/metricbeat/module/syncgateway/replication/data.go +++ b/x-pack/metricbeat/module/syncgateway/replication/data.go @@ -5,10 +5,10 @@ package replication import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/metricbeat/module/syncgateway/replication/data_test.go b/x-pack/metricbeat/module/syncgateway/replication/data_test.go index a622bb656e3a..76c7a9e7aac7 100644 --- a/x-pack/metricbeat/module/syncgateway/replication/data_test.go +++ b/x-pack/metricbeat/module/syncgateway/replication/data_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/syncgateway/replication/replication.go b/x-pack/metricbeat/module/syncgateway/replication/replication.go index 3ce9be667054..cdf70619aa11 100644 --- a/x-pack/metricbeat/module/syncgateway/replication/replication.go +++ b/x-pack/metricbeat/module/syncgateway/replication/replication.go @@ -7,10 +7,10 @@ package replication import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) const ( diff --git a/x-pack/metricbeat/module/syncgateway/resources/data.go b/x-pack/metricbeat/module/syncgateway/resources/data.go index 46fcd2781daf..b00a0ff07a0c 100644 --- a/x-pack/metricbeat/module/syncgateway/resources/data.go +++ b/x-pack/metricbeat/module/syncgateway/resources/data.go @@ -5,10 +5,10 @@ package resources import ( - s "github.com/elastic/beats/v7/libbeat/common/schema" - c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + s "github.com/elastic/beats/v9/libbeat/common/schema" + c "github.com/elastic/beats/v9/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) var globalSchema = s.Schema{ diff --git a/x-pack/metricbeat/module/syncgateway/resources/data_test.go b/x-pack/metricbeat/module/syncgateway/resources/data_test.go index 7c0824770f47..504ff1423f7a 100644 --- a/x-pack/metricbeat/module/syncgateway/resources/data_test.go +++ b/x-pack/metricbeat/module/syncgateway/resources/data_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + mbtest "github.com/elastic/beats/v9/metricbeat/mb/testing" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/syncgateway/resources/resources.go b/x-pack/metricbeat/module/syncgateway/resources/resources.go index 2a4d8446ea7d..d97fc1b62b84 100644 --- a/x-pack/metricbeat/module/syncgateway/resources/resources.go +++ b/x-pack/metricbeat/module/syncgateway/resources/resources.go @@ -7,10 +7,10 @@ package resources import ( "fmt" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/metricbeat/mb/parse" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/syncgateway" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/mb/parse" + "github.com/elastic/beats/v9/x-pack/metricbeat/module/syncgateway" ) const ( diff --git a/x-pack/metricbeat/module/syncgateway/syncgateway.go b/x-pack/metricbeat/module/syncgateway/syncgateway.go index 4d261faa1903..3fa819c9b7f0 100644 --- a/x-pack/metricbeat/module/syncgateway/syncgateway.go +++ b/x-pack/metricbeat/module/syncgateway/syncgateway.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v9/metricbeat/helper" + "github.com/elastic/beats/v9/metricbeat/mb" ) func init() { diff --git a/x-pack/metricbeat/module/tomcat/fields.go b/x-pack/metricbeat/module/tomcat/fields.go index dfe281b5af22..3cb089f48e60 100644 --- a/x-pack/metricbeat/module/tomcat/fields.go +++ b/x-pack/metricbeat/module/tomcat/fields.go @@ -7,7 +7,7 @@ package tomcat import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/scripts/msetlists/main.go b/x-pack/metricbeat/scripts/msetlists/main.go index 79e0847c8f12..42af7e60faf4 100644 --- a/x-pack/metricbeat/scripts/msetlists/main.go +++ b/x-pack/metricbeat/scripts/msetlists/main.go @@ -9,10 +9,10 @@ import ( "fmt" "os" - "github.com/elastic/beats/v7/metricbeat/scripts/msetlists" + "github.com/elastic/beats/v9/metricbeat/scripts/msetlists" - "github.com/elastic/beats/v7/metricbeat/mb" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/include" + "github.com/elastic/beats/v9/metricbeat/mb" + _ "github.com/elastic/beats/v9/x-pack/metricbeat/include" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/paths" ) diff --git a/x-pack/metricbeat/tests/ech/metricbeat_fips_test.go b/x-pack/metricbeat/tests/ech/metricbeat_fips_test.go index 86dda01b6193..01edcb011416 100644 --- a/x-pack/metricbeat/tests/ech/metricbeat_fips_test.go +++ b/x-pack/metricbeat/tests/ech/metricbeat_fips_test.go @@ -10,7 +10,7 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/testing/go-ech" + "github.com/elastic/beats/v9/testing/go-ech" ) const metricbeatFIPSConfig = ` diff --git a/x-pack/metricbeat/tests/integration/otel_test.go b/x-pack/metricbeat/tests/integration/otel_test.go index 40b12c603492..ef359b8d2056 100644 --- a/x-pack/metricbeat/tests/integration/otel_test.go +++ b/x-pack/metricbeat/tests/integration/otel_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libbeattesting "github.com/elastic/beats/v7/libbeat/testing" - "github.com/elastic/beats/v7/libbeat/tests/integration" + libbeattesting "github.com/elastic/beats/v9/libbeat/testing" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/testing/estools" ) @@ -66,7 +66,7 @@ metricbeat: processes: - '.*' metricsets: - - cpu + - cpu output: elasticsearch: hosts: @@ -82,7 +82,7 @@ processors: - add_docker_metadata: ~ - add_kubernetes_metadata: ~ http.host: localhost -http.port: {{.MonitoringPort}} +http.port: {{.MonitoringPort}} ` // start metricbeat in otel mode @@ -509,7 +509,7 @@ metricbeat: processes: - '.*' metricsets: - - cpu + - cpu output: elasticsearch: hosts: diff --git a/x-pack/metricbeat/tests/integration/setup_integration_test.go b/x-pack/metricbeat/tests/integration/setup_integration_test.go index 7b29b8321e31..3d31c0949999 100644 --- a/x-pack/metricbeat/tests/integration/setup_integration_test.go +++ b/x-pack/metricbeat/tests/integration/setup_integration_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/libbeat/tests/integration" - "github.com/elastic/beats/v7/libbeat/version" + "github.com/elastic/beats/v9/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/version" ) func TestIndexTotalFieldsLimitNotReached(t *testing.T) { diff --git a/x-pack/osquerybeat/README.md b/x-pack/osquerybeat/README.md index 8f9337151684..630a84116293 100644 --- a/x-pack/osquerybeat/README.md +++ b/x-pack/osquerybeat/README.md @@ -3,7 +3,7 @@ Welcome to {Beat}. Ensure that this folder is at the following location: -`${GOPATH}/src/github.com/elastic/beats/v7/x-pack/osquerybeat` +`${GOPATH}/src/github.com/elastic/beats/v9/x-pack/osquerybeat` ## Getting Started with {Beat} @@ -24,7 +24,7 @@ It will create a clean git history for each major step. Note that you can always To push {Beat} in the git repository, run the following commands: ``` -git remote set-url origin https://github.com/elastic/beats/v7/x-pack/osquerybeat +git remote set-url origin https://github.com/elastic/beats/v9/x-pack/osquerybeat git push origin master ``` diff --git a/x-pack/osquerybeat/beater/action_handler.go b/x-pack/osquerybeat/beater/action_handler.go index a2a86bdf8dc2..33c05b9f1ed4 100644 --- a/x-pack/osquerybeat/beater/action_handler.go +++ b/x-pack/osquerybeat/beater/action_handler.go @@ -10,9 +10,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/action" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/action" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/action_handler_test.go b/x-pack/osquerybeat/beater/action_handler_test.go index d446b883175a..b3b5bd98e115 100644 --- a/x-pack/osquerybeat/beater/action_handler_test.go +++ b/x-pack/osquerybeat/beater/action_handler_test.go @@ -12,8 +12,8 @@ import ( "github.com/gofrs/uuid/v5" "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/osqdcli" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/osqdcli" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/config_plugin.go b/x-pack/osquerybeat/beater/config_plugin.go index 511d11a5b5e1..64cd8fcf5c36 100644 --- a/x-pack/osquerybeat/beater/config_plugin.go +++ b/x-pack/osquerybeat/beater/config_plugin.go @@ -11,8 +11,8 @@ import ( "strings" "sync" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/config_plugin_test.go b/x-pack/osquerybeat/beater/config_plugin_test.go index 636468d2d29a..cc9b49a7d1eb 100644 --- a/x-pack/osquerybeat/beater/config_plugin_test.go +++ b/x-pack/osquerybeat/beater/config_plugin_test.go @@ -13,9 +13,9 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/testutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/testutil" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/install.go b/x-pack/osquerybeat/beater/install.go index 73f40f148640..cb5b1753cefd 100644 --- a/x-pack/osquerybeat/beater/install.go +++ b/x-pack/osquerybeat/beater/install.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/distro" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/fileutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/distro" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/fileutil" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/logger_plugin_test.go b/x-pack/osquerybeat/beater/logger_plugin_test.go index db4777c89258..deb7eb96ea97 100644 --- a/x-pack/osquerybeat/beater/logger_plugin_test.go +++ b/x-pack/osquerybeat/beater/logger_plugin_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/osquery/osquery-go/plugin/logger" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/testutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/testutil" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/osquery_runner.go b/x-pack/osquerybeat/beater/osquery_runner.go index edd37de98621..d11a28056843 100644 --- a/x-pack/osquerybeat/beater/osquery_runner.go +++ b/x-pack/osquerybeat/beater/osquery_runner.go @@ -9,8 +9,8 @@ import ( "errors" "sync" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/osqd" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/osqd" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/osquery_runner_test.go b/x-pack/osquerybeat/beater/osquery_runner_test.go index e34119f571b6..31075ff3797d 100644 --- a/x-pack/osquerybeat/beater/osquery_runner_test.go +++ b/x-pack/osquerybeat/beater/osquery_runner_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/osqd" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/osqd" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/beater/osquerybeat.go b/x-pack/osquerybeat/beater/osquerybeat.go index 4aeba9e74cc8..b9eb6140b439 100644 --- a/x-pack/osquerybeat/beater/osquerybeat.go +++ b/x-pack/osquerybeat/beater/osquerybeat.go @@ -20,13 +20,13 @@ import ( "github.com/elastic/elastic-agent-libs/logp" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/common/proc" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/distro" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/osqd" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/osqdcli" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/pub" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/common/proc" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/distro" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/osqd" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/osqdcli" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/pub" conf "github.com/elastic/elastic-agent-libs/config" ) diff --git a/x-pack/osquerybeat/cmd/root.go b/x-pack/osquerybeat/cmd/root.go index 9c02433169ef..33a290509c29 100644 --- a/x-pack/osquerybeat/cmd/root.go +++ b/x-pack/osquerybeat/cmd/root.go @@ -15,19 +15,19 @@ import ( "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" - cmd "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/libbeat/common/cli" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/ecs" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/publisher/processing" - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" - "github.com/elastic/beats/v7/x-pack/libbeat/management" - "github.com/elastic/beats/v7/x-pack/osquerybeat/beater" - _ "github.com/elastic/beats/v7/x-pack/osquerybeat/include" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/install" + cmd "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/libbeat/common/cli" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/ecs" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/publisher/processing" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" + "github.com/elastic/beats/v9/x-pack/libbeat/management" + "github.com/elastic/beats/v9/x-pack/osquerybeat/beater" + _ "github.com/elastic/beats/v9/x-pack/osquerybeat/include" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/install" ) // Name of this beat diff --git a/x-pack/osquerybeat/cmd/root_test.go b/x-pack/osquerybeat/cmd/root_test.go index 5d0df4df0a6d..00ff1552b6f1 100644 --- a/x-pack/osquerybeat/cmd/root_test.go +++ b/x-pack/osquerybeat/cmd/root_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/common/reload" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" diff --git a/x-pack/osquerybeat/ext/osquery-extension/main_darwin.go b/x-pack/osquerybeat/ext/osquery-extension/main_darwin.go index 1b12d75fa6aa..94f5424aca5c 100644 --- a/x-pack/osquerybeat/ext/osquery-extension/main_darwin.go +++ b/x-pack/osquerybeat/ext/osquery-extension/main_darwin.go @@ -10,7 +10,7 @@ import ( "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" - "github.com/elastic/beats/v7/x-pack/osquerybeat/ext/osquery-extension/pkg/tables" + "github.com/elastic/beats/v9/x-pack/osquerybeat/ext/osquery-extension/pkg/tables" ) func RegisterTables(server *osquery.ExtensionManagerServer) { diff --git a/x-pack/osquerybeat/ext/osquery-extension/main_linux.go b/x-pack/osquerybeat/ext/osquery-extension/main_linux.go index 1b265005c35a..812cf93c1e54 100644 --- a/x-pack/osquerybeat/ext/osquery-extension/main_linux.go +++ b/x-pack/osquerybeat/ext/osquery-extension/main_linux.go @@ -10,7 +10,7 @@ import ( "github.com/osquery/osquery-go" "github.com/osquery/osquery-go/plugin/table" - "github.com/elastic/beats/v7/x-pack/osquerybeat/ext/osquery-extension/pkg/tables" + "github.com/elastic/beats/v9/x-pack/osquerybeat/ext/osquery-extension/pkg/tables" ) func RegisterTables(server *osquery.ExtensionManagerServer) { diff --git a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/elastic_file_analysis.go b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/elastic_file_analysis.go index d5616a039aaf..34078d5a8d52 100644 --- a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/elastic_file_analysis.go +++ b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/elastic_file_analysis.go @@ -19,7 +19,7 @@ import ( "github.com/osquery/osquery-go/plugin/table" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/command" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/command" ) func ExecuteStderr(ctx context.Context, name string, arg ...string) (out string, err error) { diff --git a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_groups.go b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_groups.go index 47e7026eca58..dd94c3acc2f2 100644 --- a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_groups.go +++ b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_groups.go @@ -9,7 +9,7 @@ import ( "github.com/osquery/osquery-go/plugin/table" - "github.com/elastic/beats/v7/x-pack/osquerybeat/ext/osquery-extension/pkg/hostfs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/ext/osquery-extension/pkg/hostfs" ) const ( diff --git a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_processes.go b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_processes.go index 8b90068fd440..ae96dc23cca3 100644 --- a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_processes.go +++ b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_processes.go @@ -13,8 +13,8 @@ import ( "github.com/osquery/osquery-go/plugin/table" - "github.com/elastic/beats/v7/x-pack/osquerybeat/ext/osquery-extension/pkg/hostfs" - "github.com/elastic/beats/v7/x-pack/osquerybeat/ext/osquery-extension/pkg/proc" + "github.com/elastic/beats/v9/x-pack/osquerybeat/ext/osquery-extension/pkg/hostfs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/ext/osquery-extension/pkg/proc" ) const ( diff --git a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_users.go b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_users.go index 4a60c5135b82..e1afcbb110c2 100644 --- a/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_users.go +++ b/x-pack/osquerybeat/ext/osquery-extension/pkg/tables/host_users.go @@ -9,7 +9,7 @@ import ( "github.com/osquery/osquery-go/plugin/table" - "github.com/elastic/beats/v7/x-pack/osquerybeat/ext/osquery-extension/pkg/hostfs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/ext/osquery-extension/pkg/hostfs" ) const ( diff --git a/x-pack/osquerybeat/include/fields.go b/x-pack/osquerybeat/include/fields.go index fd9ed97a8c68..9afd043f8d54 100644 --- a/x-pack/osquerybeat/include/fields.go +++ b/x-pack/osquerybeat/include/fields.go @@ -7,7 +7,7 @@ package include import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/osquerybeat/internal/action/action.go b/x-pack/osquerybeat/internal/action/action.go index 8cfa59abc412..11cd9147e76b 100644 --- a/x-pack/osquerybeat/internal/action/action.go +++ b/x-pack/osquerybeat/internal/action/action.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" ) var ( diff --git a/x-pack/osquerybeat/internal/action/action_test.go b/x-pack/osquerybeat/internal/action/action_test.go index 5e46316b3270..2da93351ac27 100644 --- a/x-pack/osquerybeat/internal/action/action_test.go +++ b/x-pack/osquerybeat/internal/action/action_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" ) func TestActionFromMap(t *testing.T) { diff --git a/x-pack/osquerybeat/internal/config/config.go b/x-pack/osquerybeat/internal/config/config.go index ec873206de75..930158b32e6e 100644 --- a/x-pack/osquerybeat/internal/config/config.go +++ b/x-pack/osquerybeat/internal/config/config.go @@ -10,7 +10,7 @@ package config import ( "fmt" - "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors" ) // Default index name for ad-hoc queries, since the dataset is defined at the stream level, for example: diff --git a/x-pack/osquerybeat/internal/config/watcher.go b/x-pack/osquerybeat/internal/config/watcher.go index 59c720693189..a50211cea382 100644 --- a/x-pack/osquerybeat/internal/config/watcher.go +++ b/x-pack/osquerybeat/internal/config/watcher.go @@ -8,7 +8,7 @@ import ( "context" "encoding/json" - "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/common/reload" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/internal/fetch/fetch.go b/x-pack/osquerybeat/internal/fetch/fetch.go index 071927d369e1..8b01729f1fad 100644 --- a/x-pack/osquerybeat/internal/fetch/fetch.go +++ b/x-pack/osquerybeat/internal/fetch/fetch.go @@ -13,7 +13,7 @@ import ( "os" "strings" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/hash" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/hash" ) // Download downloads the osquery distro package diff --git a/x-pack/osquerybeat/internal/install/verify.go b/x-pack/osquerybeat/internal/install/verify.go index 816518cb4ba9..64eed03970ee 100644 --- a/x-pack/osquerybeat/internal/install/verify.go +++ b/x-pack/osquerybeat/internal/install/verify.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/fileutil" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/osqd" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/fileutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/osqd" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/internal/msiutil/expand.go b/x-pack/osquerybeat/internal/msiutil/expand.go index 3af5c24441ab..e061b55128e8 100644 --- a/x-pack/osquerybeat/internal/msiutil/expand.go +++ b/x-pack/osquerybeat/internal/msiutil/expand.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/command" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/command" ) // Expand runs msiextract to extract the MSI. diff --git a/x-pack/osquerybeat/internal/osqd/osqueryd.go b/x-pack/osquerybeat/internal/osqd/osqueryd.go index dc0420a4de13..3f81927b3717 100644 --- a/x-pack/osquerybeat/internal/osqd/osqueryd.go +++ b/x-pack/osquerybeat/internal/osqd/osqueryd.go @@ -20,8 +20,8 @@ import ( "github.com/dolmen-go/contextio" - "github.com/elastic/beats/v7/libbeat/common/proc" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/fileutil" + "github.com/elastic/beats/v9/libbeat/common/proc" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/fileutil" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/osquerybeat/internal/osqd/osqueryd_test.go b/x-pack/osquerybeat/internal/osqd/osqueryd_test.go index 12b20b4e09cd..0f71cb28e06e 100644 --- a/x-pack/osquerybeat/internal/osqd/osqueryd_test.go +++ b/x-pack/osquerybeat/internal/osqd/osqueryd_test.go @@ -11,8 +11,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/fileutil" + "github.com/elastic/beats/v9/libbeat/common" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/fileutil" "github.com/elastic/elastic-agent-libs/logp" "github.com/gofrs/uuid/v5" diff --git a/x-pack/osquerybeat/internal/pkgutil/expand.go b/x-pack/osquerybeat/internal/pkgutil/expand.go index 1d49dbab26f7..692cdc28e482 100644 --- a/x-pack/osquerybeat/internal/pkgutil/expand.go +++ b/x-pack/osquerybeat/internal/pkgutil/expand.go @@ -13,8 +13,8 @@ import ( "path/filepath" "time" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/cpio" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/xar" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/cpio" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/xar" ) var ErrPayloadNotFound = errors.New("pkg Payload file not found") diff --git a/x-pack/osquerybeat/internal/pub/publisher.go b/x-pack/osquerybeat/internal/pub/publisher.go index 53589c3d3932..2c0b888a87db 100644 --- a/x-pack/osquerybeat/internal/pub/publisher.go +++ b/x-pack/osquerybeat/internal/pub/publisher.go @@ -8,12 +8,12 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/libbeat/processors" - "github.com/elastic/beats/v7/libbeat/processors/add_data_stream" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/config" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/libbeat/processors" + "github.com/elastic/beats/v9/libbeat/processors/add_data_stream" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/config" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) diff --git a/x-pack/osquerybeat/internal/pub/publisher_test.go b/x-pack/osquerybeat/internal/pub/publisher_test.go index 7b7d2120e847..3c96dff8a5c7 100644 --- a/x-pack/osquerybeat/internal/pub/publisher_test.go +++ b/x-pack/osquerybeat/internal/pub/publisher_test.go @@ -12,8 +12,8 @@ import ( "github.com/gofrs/uuid/v5" "github.com/google/go-cmp/cmp" - "github.com/elastic/beats/v7/libbeat/beat/events" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/ecs" + "github.com/elastic/beats/v9/libbeat/beat/events" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/ecs" ) func TestHitToEvent(t *testing.T) { diff --git a/x-pack/osquerybeat/magefile.go b/x-pack/osquerybeat/magefile.go index dae39ed840da..179060bca3b8 100644 --- a/x-pack/osquerybeat/magefile.go +++ b/x-pack/osquerybeat/magefile.go @@ -17,23 +17,23 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/command" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/distro" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/fileutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/command" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/distro" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/fileutil" - osquerybeat "github.com/elastic/beats/v7/x-pack/osquerybeat/scripts/mage" + osquerybeat "github.com/elastic/beats/v9/x-pack/osquerybeat/scripts/mage" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/pkg" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/integtest/notests" // mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/x-pack/osquerybeat/main.go b/x-pack/osquerybeat/main.go index 570f848729ea..792985c648d6 100644 --- a/x-pack/osquerybeat/main.go +++ b/x-pack/osquerybeat/main.go @@ -8,7 +8,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/x-pack/osquerybeat/cmd" + "github.com/elastic/beats/v9/x-pack/osquerybeat/cmd" ) func main() { diff --git a/x-pack/osquerybeat/main_test.go b/x-pack/osquerybeat/main_test.go index f9ed09ee1a8e..fba164f4f071 100644 --- a/x-pack/osquerybeat/main_test.go +++ b/x-pack/osquerybeat/main_test.go @@ -10,7 +10,7 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/x-pack/osquerybeat/cmd" + "github.com/elastic/beats/v9/x-pack/osquerybeat/cmd" ) var systemTest *bool diff --git a/x-pack/osquerybeat/scripts/mage/config.go b/x-pack/osquerybeat/scripts/mage/config.go index 1d3e773d602f..f39ff9e59b1e 100644 --- a/x-pack/osquerybeat/scripts/mage/config.go +++ b/x-pack/osquerybeat/scripts/mage/config.go @@ -5,7 +5,7 @@ package mage import ( - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // XPackConfigFileParams returns the configuration of sample and reference configuration data. diff --git a/x-pack/osquerybeat/scripts/mage/distro.go b/x-pack/osquerybeat/scripts/mage/distro.go index 0263eac829da..49f43da4540e 100644 --- a/x-pack/osquerybeat/scripts/mage/distro.go +++ b/x-pack/osquerybeat/scripts/mage/distro.go @@ -13,14 +13,14 @@ import ( "path/filepath" "strings" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/distro" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/fetch" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/fileutil" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/hash" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/msiutil" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/pkgutil" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/tar" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/distro" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/fetch" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/fileutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/hash" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/msiutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/pkgutil" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/tar" ) // FetchOsqueryDistros fetches Osquery official distros as a part of the build diff --git a/x-pack/osquerybeat/scripts/mage/package.go b/x-pack/osquerybeat/scripts/mage/package.go index 7e3293b4bcd2..d22d9140f4c2 100644 --- a/x-pack/osquerybeat/scripts/mage/package.go +++ b/x-pack/osquerybeat/scripts/mage/package.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/x-pack/osquerybeat/internal/distro" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/x-pack/osquerybeat/internal/distro" ) const defaultArch = "amd64" diff --git a/x-pack/osquerybeat/scripts/mage/update.go b/x-pack/osquerybeat/scripts/mage/update.go index b2a34bed44d8..e04601943889 100644 --- a/x-pack/osquerybeat/scripts/mage/update.go +++ b/x-pack/osquerybeat/scripts/mage/update.go @@ -7,7 +7,7 @@ package mage import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // Update target namespace. diff --git a/x-pack/otel/processor/beatprocessor/integration_test.go b/x-pack/otel/processor/beatprocessor/integration_test.go index 69e6b96c4ff5..4b900ea9aed5 100644 --- a/x-pack/otel/processor/beatprocessor/integration_test.go +++ b/x-pack/otel/processor/beatprocessor/integration_test.go @@ -17,8 +17,8 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/otelbeat/oteltest" - "github.com/elastic/beats/v7/libbeat/tests/integration" + "github.com/elastic/beats/v9/libbeat/otelbeat/oteltest" + "github.com/elastic/beats/v9/libbeat/tests/integration" "github.com/elastic/elastic-agent-libs/testing/estools" "github.com/gofrs/uuid/v5" diff --git a/x-pack/otel/processor/beatprocessor/processor.go b/x-pack/otel/processor/beatprocessor/processor.go index 8d9a670dd1f4..e0e66ac32b2e 100644 --- a/x-pack/otel/processor/beatprocessor/processor.go +++ b/x-pack/otel/processor/beatprocessor/processor.go @@ -9,8 +9,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/processors/add_host_metadata" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/processors/add_host_metadata" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" diff --git a/x-pack/otel/processor/beatprocessor/processor_test.go b/x-pack/otel/processor/beatprocessor/processor_test.go index 7dec2c071536..2e3e20a4bbc2 100644 --- a/x-pack/otel/processor/beatprocessor/processor_test.go +++ b/x-pack/otel/processor/beatprocessor/processor_test.go @@ -9,7 +9,7 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/beat" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/stretchr/testify/assert" diff --git a/x-pack/packetbeat/cmd/root.go b/x-pack/packetbeat/cmd/root.go index 523676b72526..04dbf73b7d88 100644 --- a/x-pack/packetbeat/cmd/root.go +++ b/x-pack/packetbeat/cmd/root.go @@ -9,23 +9,23 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd" - "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/v7/libbeat/processors" - packetbeatCmd "github.com/elastic/beats/v7/packetbeat/cmd" - "github.com/elastic/beats/v7/x-pack/libbeat/management" + "github.com/elastic/beats/v9/libbeat/cmd" + "github.com/elastic/beats/v9/libbeat/common/reload" + "github.com/elastic/beats/v9/libbeat/processors" + packetbeatCmd "github.com/elastic/beats/v9/packetbeat/cmd" + "github.com/elastic/beats/v9/x-pack/libbeat/management" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" conf "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" // This registers the Npcap installer on Windows. - _ "github.com/elastic/beats/v7/x-pack/packetbeat/npcap" + _ "github.com/elastic/beats/v9/x-pack/packetbeat/npcap" // Enable pipelines. - _ "github.com/elastic/beats/v7/x-pack/packetbeat/module" + _ "github.com/elastic/beats/v9/x-pack/packetbeat/module" ) // Name of this beat. diff --git a/x-pack/packetbeat/magefile.go b/x-pack/packetbeat/magefile.go index cefd85b7ea90..c980534af2c7 100644 --- a/x-pack/packetbeat/magefile.go +++ b/x-pack/packetbeat/magefile.go @@ -14,17 +14,17 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/build" - packetbeat "github.com/elastic/beats/v7/packetbeat/scripts/mage" - xpacketbeat "github.com/elastic/beats/v7/x-pack/packetbeat/scripts/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/build" + packetbeat "github.com/elastic/beats/v9/packetbeat/scripts/mage" + xpacketbeat "github.com/elastic/beats/v9/x-pack/packetbeat/scripts/mage" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/unittest" //mage:import - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" ) func init() { diff --git a/x-pack/packetbeat/main.go b/x-pack/packetbeat/main.go index f6f55b6d25b8..084e5add2744 100644 --- a/x-pack/packetbeat/main.go +++ b/x-pack/packetbeat/main.go @@ -8,7 +8,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/x-pack/packetbeat/cmd" + "github.com/elastic/beats/v9/x-pack/packetbeat/cmd" ) // Setups and Runs Packetbeat diff --git a/x-pack/packetbeat/main_test.go b/x-pack/packetbeat/main_test.go index 234d68f81698..23b2ba60fb16 100644 --- a/x-pack/packetbeat/main_test.go +++ b/x-pack/packetbeat/main_test.go @@ -8,8 +8,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - "github.com/elastic/beats/v7/x-pack/packetbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + "github.com/elastic/beats/v9/x-pack/packetbeat/cmd" ) var systemTest *bool diff --git a/x-pack/packetbeat/module/pipeline.go b/x-pack/packetbeat/module/pipeline.go index a325fba7de4f..2f504aed11f9 100644 --- a/x-pack/packetbeat/module/pipeline.go +++ b/x-pack/packetbeat/module/pipeline.go @@ -7,7 +7,7 @@ package module import ( "embed" - "github.com/elastic/beats/v7/packetbeat/module" + "github.com/elastic/beats/v9/packetbeat/module" ) // pipelineFS holds the yml representation of the ingest node pipelines diff --git a/x-pack/packetbeat/npcap/npcap_windows.go b/x-pack/packetbeat/npcap/npcap_windows.go index 41be3e1ad8fb..aa53a2e8d261 100644 --- a/x-pack/packetbeat/npcap/npcap_windows.go +++ b/x-pack/packetbeat/npcap/npcap_windows.go @@ -15,7 +15,7 @@ import ( "path" "strings" - "github.com/elastic/beats/v7/packetbeat/npcap" + "github.com/elastic/beats/v9/packetbeat/npcap" ) //go:embed installer/*.exe diff --git a/x-pack/packetbeat/scripts/mage/pcap.go b/x-pack/packetbeat/scripts/mage/pcap.go index 66d4df650c2c..9dc99e94f044 100644 --- a/x-pack/packetbeat/scripts/mage/pcap.go +++ b/x-pack/packetbeat/scripts/mage/pcap.go @@ -15,7 +15,7 @@ import ( "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // NpcapVersion specifies the version of the OEM Npcap installer to bundle with diff --git a/x-pack/packetbeat/tests/system/app_test.go b/x-pack/packetbeat/tests/system/app_test.go index d298b9157374..5fec9df0f324 100644 --- a/x-pack/packetbeat/tests/system/app_test.go +++ b/x-pack/packetbeat/tests/system/app_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/packetbeat/npcap" + "github.com/elastic/beats/v9/packetbeat/npcap" ) // Keep in sync with NpcapVersion in magefile.go. diff --git a/x-pack/winlogbeat/cmd/export.go b/x-pack/winlogbeat/cmd/export.go index 54f9f02e18c8..2d242d73ec0a 100644 --- a/x-pack/winlogbeat/cmd/export.go +++ b/x-pack/winlogbeat/cmd/export.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/v7/libbeat/cmd/instance" - "github.com/elastic/beats/v7/winlogbeat/module" + "github.com/elastic/beats/v9/libbeat/cmd/instance" + "github.com/elastic/beats/v9/winlogbeat/module" libversion "github.com/elastic/elastic-agent-libs/version" ) diff --git a/x-pack/winlogbeat/cmd/root.go b/x-pack/winlogbeat/cmd/root.go index 2bc5d4049460..fca524daa89c 100644 --- a/x-pack/winlogbeat/cmd/root.go +++ b/x-pack/winlogbeat/cmd/root.go @@ -5,15 +5,15 @@ package cmd import ( - "github.com/elastic/beats/v7/libbeat/cmd" - winlogbeatCmd "github.com/elastic/beats/v7/winlogbeat/cmd" + "github.com/elastic/beats/v9/libbeat/cmd" + winlogbeatCmd "github.com/elastic/beats/v9/winlogbeat/cmd" // Register fields. - _ "github.com/elastic/beats/v7/x-pack/libbeat/include" - _ "github.com/elastic/beats/v7/x-pack/winlogbeat/include" + _ "github.com/elastic/beats/v9/x-pack/libbeat/include" + _ "github.com/elastic/beats/v9/x-pack/winlogbeat/include" // Enable pipelines. - _ "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + _ "github.com/elastic/beats/v9/x-pack/winlogbeat/module" ) // Name of this beat. diff --git a/x-pack/winlogbeat/include/list.go b/x-pack/winlogbeat/include/list.go index 6ee9c51eefbb..4d5f522c326d 100644 --- a/x-pack/winlogbeat/include/list.go +++ b/x-pack/winlogbeat/include/list.go @@ -8,7 +8,7 @@ package include import ( // Import packages that perform 'func init()'. - _ "github.com/elastic/beats/v7/x-pack/winlogbeat/module/powershell" - _ "github.com/elastic/beats/v7/x-pack/winlogbeat/module/security" - _ "github.com/elastic/beats/v7/x-pack/winlogbeat/module/sysmon" + _ "github.com/elastic/beats/v9/x-pack/winlogbeat/module/powershell" + _ "github.com/elastic/beats/v9/x-pack/winlogbeat/module/security" + _ "github.com/elastic/beats/v9/x-pack/winlogbeat/module/sysmon" ) diff --git a/x-pack/winlogbeat/magefile.go b/x-pack/winlogbeat/magefile.go index 304a736136e6..44711f126ba3 100644 --- a/x-pack/winlogbeat/magefile.go +++ b/x-pack/winlogbeat/magefile.go @@ -12,19 +12,19 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/dev-tools/mage/target/test" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/dev-tools/mage/target/test" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/common" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/build" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/build" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/pkg" //mage:import - _ "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" + _ "github.com/elastic/beats/v9/dev-tools/mage/target/dashboards" //mage:import - winlogbeat "github.com/elastic/beats/v7/winlogbeat/scripts/mage" + winlogbeat "github.com/elastic/beats/v9/winlogbeat/scripts/mage" ) func init() { diff --git a/x-pack/winlogbeat/main.go b/x-pack/winlogbeat/main.go index 1ca2aa11a31e..cf432222f321 100644 --- a/x-pack/winlogbeat/main.go +++ b/x-pack/winlogbeat/main.go @@ -8,7 +8,7 @@ import ( "os" _ "time/tzdata" // for timezone handling - "github.com/elastic/beats/v7/x-pack/winlogbeat/cmd" + "github.com/elastic/beats/v9/x-pack/winlogbeat/cmd" ) func main() { diff --git a/x-pack/winlogbeat/main_test.go b/x-pack/winlogbeat/main_test.go index 2b8547a81726..ad6a1d461356 100644 --- a/x-pack/winlogbeat/main_test.go +++ b/x-pack/winlogbeat/main_test.go @@ -8,8 +8,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/v7/libbeat/tests/system/template" - "github.com/elastic/beats/v7/x-pack/winlogbeat/cmd" + "github.com/elastic/beats/v9/libbeat/tests/system/template" + "github.com/elastic/beats/v9/x-pack/winlogbeat/cmd" ) var systemTest *bool diff --git a/x-pack/winlogbeat/module/pipeline.go b/x-pack/winlogbeat/module/pipeline.go index a4ca3eaac653..35ab2339723b 100644 --- a/x-pack/winlogbeat/module/pipeline.go +++ b/x-pack/winlogbeat/module/pipeline.go @@ -7,7 +7,7 @@ package module import ( "embed" - "github.com/elastic/beats/v7/winlogbeat/module" + "github.com/elastic/beats/v9/winlogbeat/module" ) // pipelineFS holds the yml representation of the ingest node pipelines diff --git a/x-pack/winlogbeat/module/powershell/fields.go b/x-pack/winlogbeat/module/powershell/fields.go index 8ca3a28ece40..300e1bd59e37 100644 --- a/x-pack/winlogbeat/module/powershell/fields.go +++ b/x-pack/winlogbeat/module/powershell/fields.go @@ -7,7 +7,7 @@ package powershell import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/winlogbeat/module/powershell/test/powershell_ingest_test.go b/x-pack/winlogbeat/module/powershell/test/powershell_ingest_test.go index 5840b2f59731..5b05f3d2b6fd 100644 --- a/x-pack/winlogbeat/module/powershell/test/powershell_ingest_test.go +++ b/x-pack/winlogbeat/module/powershell/test/powershell_ingest_test.go @@ -13,7 +13,7 @@ package test import ( "testing" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module" ) // Ignore these fields because they can be different on different versions diff --git a/x-pack/winlogbeat/module/powershell/test/powershell_windows_test.go b/x-pack/winlogbeat/module/powershell/test/powershell_windows_test.go index 72f6e251774d..b9e52ce425f7 100644 --- a/x-pack/winlogbeat/module/powershell/test/powershell_windows_test.go +++ b/x-pack/winlogbeat/module/powershell/test/powershell_windows_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module" "github.com/elastic/go-sysinfo/providers/windows" // Register required processors. - _ "github.com/elastic/beats/v7/libbeat/cmd/instance" - _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v9/libbeat/cmd/instance" + _ "github.com/elastic/beats/v9/libbeat/processors/timestamp" ) // Ignore these fields because they can be different on different versions diff --git a/x-pack/winlogbeat/module/security/fields.go b/x-pack/winlogbeat/module/security/fields.go index f20229335ae6..2977fd514c19 100644 --- a/x-pack/winlogbeat/module/security/fields.go +++ b/x-pack/winlogbeat/module/security/fields.go @@ -7,7 +7,7 @@ package security import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/winlogbeat/module/security/test/security_ingest_test.go b/x-pack/winlogbeat/module/security/test/security_ingest_test.go index 02a69af1a1e6..83c21def2896 100644 --- a/x-pack/winlogbeat/module/security/test/security_ingest_test.go +++ b/x-pack/winlogbeat/module/security/test/security_ingest_test.go @@ -13,7 +13,7 @@ package test import ( "testing" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module" ) // Ignore these fields because they can be different on different versions diff --git a/x-pack/winlogbeat/module/security/test/security_windows_test.go b/x-pack/winlogbeat/module/security/test/security_windows_test.go index 693acd6cf0e7..3f26ab8c0246 100644 --- a/x-pack/winlogbeat/module/security/test/security_windows_test.go +++ b/x-pack/winlogbeat/module/security/test/security_windows_test.go @@ -7,11 +7,11 @@ package test import ( "testing" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module" // Register required processors. - _ "github.com/elastic/beats/v7/libbeat/cmd/instance" - _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v9/libbeat/cmd/instance" + _ "github.com/elastic/beats/v9/libbeat/processors/timestamp" ) // Ignore these fields because they can be different on different versions diff --git a/x-pack/winlogbeat/module/sysmon/fields.go b/x-pack/winlogbeat/module/sysmon/fields.go index d4aa583a6fda..b124c373945d 100644 --- a/x-pack/winlogbeat/module/sysmon/fields.go +++ b/x-pack/winlogbeat/module/sysmon/fields.go @@ -7,7 +7,7 @@ package sysmon import ( - "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v9/libbeat/asset" ) func init() { diff --git a/x-pack/winlogbeat/module/sysmon/test/sysmon_ingest_test.go b/x-pack/winlogbeat/module/sysmon/test/sysmon_ingest_test.go index 744b41d23703..7fb84a420e39 100644 --- a/x-pack/winlogbeat/module/sysmon/test/sysmon_ingest_test.go +++ b/x-pack/winlogbeat/module/sysmon/test/sysmon_ingest_test.go @@ -13,7 +13,7 @@ package test import ( "testing" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module" ) // Ignore these fields so that the tests will pass if Sysmon is not installed. diff --git a/x-pack/winlogbeat/module/sysmon/test/sysmon_windows_test.go b/x-pack/winlogbeat/module/sysmon/test/sysmon_windows_test.go index 464939cdc4ae..2f6d757cf374 100644 --- a/x-pack/winlogbeat/module/sysmon/test/sysmon_windows_test.go +++ b/x-pack/winlogbeat/module/sysmon/test/sysmon_windows_test.go @@ -7,11 +7,11 @@ package test import ( "testing" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module" // Register required processors. - _ "github.com/elastic/beats/v7/libbeat/cmd/instance" - _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v9/libbeat/cmd/instance" + _ "github.com/elastic/beats/v9/libbeat/processors/timestamp" ) // Ignore these fields so that the tests will pass if Sysmon is not installed. diff --git a/x-pack/winlogbeat/module/testing.go b/x-pack/winlogbeat/module/testing.go index 0758f9b95c93..306d2364774b 100644 --- a/x-pack/winlogbeat/module/testing.go +++ b/x-pack/winlogbeat/module/testing.go @@ -22,13 +22,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/mapping" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/winlogbeat/module" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module/wintest" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/mapping" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module/wintest" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/transport/httpcommon" diff --git a/x-pack/winlogbeat/module/testing_windows.go b/x-pack/winlogbeat/module/testing_windows.go index 75e19ddf09f8..c184c966d486 100644 --- a/x-pack/winlogbeat/module/testing_windows.go +++ b/x-pack/winlogbeat/module/testing_windows.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/v7/winlogbeat/checkpoint" - "github.com/elastic/beats/v7/winlogbeat/eventlog" + "github.com/elastic/beats/v9/winlogbeat/checkpoint" + "github.com/elastic/beats/v9/winlogbeat/eventlog" "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/mapstr" "github.com/elastic/elastic-agent-libs/monitoring" diff --git a/x-pack/winlogbeat/module/wintest/docker.go b/x-pack/winlogbeat/module/wintest/docker.go index 36552aecb79d..a26956aac0f9 100644 --- a/x-pack/winlogbeat/module/wintest/docker.go +++ b/x-pack/winlogbeat/module/wintest/docker.go @@ -13,7 +13,7 @@ import ( "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/v7/dev-tools/mage" + devtools "github.com/elastic/beats/v9/dev-tools/mage" ) // Docker starts docker-compose and waits for the services to be healthy. It returns diff --git a/x-pack/winlogbeat/module/wintest/docker_test.go b/x-pack/winlogbeat/module/wintest/docker_test.go index 46687a6d1d36..ae7bd8821a81 100644 --- a/x-pack/winlogbeat/module/wintest/docker_test.go +++ b/x-pack/winlogbeat/module/wintest/docker_test.go @@ -20,16 +20,16 @@ import ( "testing" "time" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/winlogbeat/module" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module/wintest" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module/wintest" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/transport/httpcommon" // Enable pipelines. - _ "github.com/elastic/beats/v7/x-pack/winlogbeat/module" + _ "github.com/elastic/beats/v9/x-pack/winlogbeat/module" ) func TestDocker(t *testing.T) { diff --git a/x-pack/winlogbeat/module/wintest/simulate_test.go b/x-pack/winlogbeat/module/wintest/simulate_test.go index 7e3870270852..9af885b54c8a 100644 --- a/x-pack/winlogbeat/module/wintest/simulate_test.go +++ b/x-pack/winlogbeat/module/wintest/simulate_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - devtools "github.com/elastic/beats/v7/dev-tools/mage" - "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" - "github.com/elastic/beats/v7/libbeat/version" - "github.com/elastic/beats/v7/winlogbeat/module" - "github.com/elastic/beats/v7/x-pack/winlogbeat/module/wintest" + devtools "github.com/elastic/beats/v9/dev-tools/mage" + "github.com/elastic/beats/v9/libbeat/beat" + "github.com/elastic/beats/v9/libbeat/esleg/eslegclient" + "github.com/elastic/beats/v9/libbeat/version" + "github.com/elastic/beats/v9/winlogbeat/module" + "github.com/elastic/beats/v9/x-pack/winlogbeat/module/wintest" "github.com/elastic/elastic-agent-libs/logp/logptest" "github.com/elastic/elastic-agent-libs/transport/httpcommon" )