diff --git a/auditbeat/cmd/root.go b/auditbeat/cmd/root.go index ae0b8e0d0ea2..a16be519cd58 100644 --- a/auditbeat/cmd/root.go +++ b/auditbeat/cmd/root.go @@ -21,11 +21,11 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/metricbeat/beater" - "github.com/elastic/beats/metricbeat/mb/module" + "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/metricbeat/beater" + "github.com/elastic/beats/v7/metricbeat/mb/module" ) // Name of the beat (auditbeat). diff --git a/auditbeat/core/eventmod.go b/auditbeat/core/eventmod.go index 3dfe57d82d35..662422f7e9da 100644 --- a/auditbeat/core/eventmod.go +++ b/auditbeat/core/eventmod.go @@ -18,8 +18,8 @@ package core import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // AddDatasetToEvent adds dataset information to the event. In particular this diff --git a/auditbeat/datastore/datastore.go b/auditbeat/datastore/datastore.go index 018897ee7bfd..5d06fd502c14 100644 --- a/auditbeat/datastore/datastore.go +++ b/auditbeat/datastore/datastore.go @@ -24,7 +24,7 @@ import ( bolt "github.com/coreos/bbolt" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/auditbeat/helper/hasher/hasher.go b/auditbeat/helper/hasher/hasher.go index a4411b4a8b36..cc4c928867e8 100644 --- a/auditbeat/helper/hasher/hasher.go +++ b/auditbeat/helper/hasher/hasher.go @@ -38,7 +38,7 @@ import ( "golang.org/x/crypto/sha3" "golang.org/x/time/rate" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) // HashType identifies a cryptographic algorithm. diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go index ace56f12c97e..be613215b809 100644 --- a/auditbeat/include/fields.go +++ b/auditbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/auditbeat/include/list.go b/auditbeat/include/list.go index 97177fac811d..737124691b12 100644 --- a/auditbeat/include/list.go +++ b/auditbeat/include/list.go @@ -21,6 +21,6 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/auditbeat/module/auditd" - _ "github.com/elastic/beats/auditbeat/module/file_integrity" + _ "github.com/elastic/beats/v7/auditbeat/module/auditd" + _ "github.com/elastic/beats/v7/auditbeat/module/file_integrity" ) diff --git a/auditbeat/magefile.go b/auditbeat/magefile.go index 74a65087dbc2..e9d80728ac40 100644 --- a/auditbeat/magefile.go +++ b/auditbeat/magefile.go @@ -26,13 +26,13 @@ import ( "github.com/magefile/mage/mg" - auditbeat "github.com/elastic/beats/auditbeat/scripts/mage" - devtools "github.com/elastic/beats/dev-tools/mage" + auditbeat "github.com/elastic/beats/v7/auditbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest" ) func init() { diff --git a/auditbeat/main.go b/auditbeat/main.go index 3403e3ec0c05..9937e2d42fe1 100644 --- a/auditbeat/main.go +++ b/auditbeat/main.go @@ -20,14 +20,14 @@ package main import ( "os" - "github.com/elastic/beats/auditbeat/cmd" + "github.com/elastic/beats/v7/auditbeat/cmd" // Register modules. - _ "github.com/elastic/beats/auditbeat/module/auditd" - _ "github.com/elastic/beats/auditbeat/module/file_integrity" + _ "github.com/elastic/beats/v7/auditbeat/module/auditd" + _ "github.com/elastic/beats/v7/auditbeat/module/file_integrity" // Register includes. - _ "github.com/elastic/beats/auditbeat/include" + _ "github.com/elastic/beats/v7/auditbeat/include" ) func main() { diff --git a/auditbeat/main_test.go b/auditbeat/main_test.go index 453fe4d27356..d6e81c2aad2c 100644 --- a/auditbeat/main_test.go +++ b/auditbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/auditbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/auditbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/auditbeat/module/auditd/audit_linux.go b/auditbeat/module/auditd/audit_linux.go index 35b7e683f0c2..1cf0236d7f7a 100644 --- a/auditbeat/module/auditd/audit_linux.go +++ b/auditbeat/module/auditd/audit_linux.go @@ -30,11 +30,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/elastic/go-libaudit" "github.com/elastic/go-libaudit/aucoalesce" "github.com/elastic/go-libaudit/auparse" diff --git a/auditbeat/module/auditd/audit_linux_test.go b/auditbeat/module/auditd/audit_linux_test.go index 6fc4bf4b0dfb..c8da4f06965b 100644 --- a/auditbeat/module/auditd/audit_linux_test.go +++ b/auditbeat/module/auditd/audit_linux_test.go @@ -34,12 +34,12 @@ import ( "github.com/prometheus/procfs" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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/go-libaudit" "github.com/elastic/go-libaudit/auparse" ) diff --git a/auditbeat/module/auditd/audit_unsupported.go b/auditbeat/module/auditd/audit_unsupported.go index 23d34b8042e7..94761612928d 100644 --- a/auditbeat/module/auditd/audit_unsupported.go +++ b/auditbeat/module/auditd/audit_unsupported.go @@ -22,8 +22,8 @@ package auditd import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/auditbeat/module/auditd/config_linux_test.go b/auditbeat/module/auditd/config_linux_test.go index c8a5e85fc6b1..8d677fdfcb73 100644 --- a/auditbeat/module/auditd/config_linux_test.go +++ b/auditbeat/module/auditd/config_linux_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfigValidate(t *testing.T) { diff --git a/auditbeat/module/auditd/fields.go b/auditbeat/module/auditd/fields.go index 83de724b83d6..5b23bddb2bbd 100644 --- a/auditbeat/module/auditd/fields.go +++ b/auditbeat/module/auditd/fields.go @@ -20,7 +20,7 @@ package auditd import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/auditbeat/module/auditd/show_linux.go b/auditbeat/module/auditd/show_linux.go index f7ce49fdce0c..bcd332eaa7be 100644 --- a/auditbeat/module/auditd/show_linux.go +++ b/auditbeat/module/auditd/show_linux.go @@ -27,7 +27,7 @@ import ( "github.com/elastic/go-libaudit" "github.com/elastic/go-libaudit/rule" - "github.com/elastic/beats/auditbeat/cmd" + "github.com/elastic/beats/v7/auditbeat/cmd" ) var ( diff --git a/auditbeat/module/file_integrity/config.go b/auditbeat/module/file_integrity/config.go index 6b76deb6ac8e..c280fb52d0ef 100644 --- a/auditbeat/module/file_integrity/config.go +++ b/auditbeat/module/file_integrity/config.go @@ -26,7 +26,7 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" ) // HashType identifies a cryptographic algorithm. diff --git a/auditbeat/module/file_integrity/config_test.go b/auditbeat/module/file_integrity/config_test.go index 202f186e29d5..c0097fc086e1 100644 --- a/auditbeat/module/file_integrity/config_test.go +++ b/auditbeat/module/file_integrity/config_test.go @@ -26,7 +26,7 @@ import ( "github.com/joeshaw/multierror" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-ucfg" ) diff --git a/auditbeat/module/file_integrity/event.go b/auditbeat/module/file_integrity/event.go index 3ca65fb18eb8..61e9b2148193 100644 --- a/auditbeat/module/file_integrity/event.go +++ b/auditbeat/module/file_integrity/event.go @@ -38,9 +38,9 @@ import ( "golang.org/x/crypto/blake2b" "golang.org/x/crypto/sha3" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Source identifies the source of an event (i.e. what triggered it). diff --git a/auditbeat/module/file_integrity/event_test.go b/auditbeat/module/file_integrity/event_test.go index 953de9276e89..1d20f1b39655 100644 --- a/auditbeat/module/file_integrity/event_test.go +++ b/auditbeat/module/file_integrity/event_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var testEventTime = time.Now().UTC() diff --git a/auditbeat/module/file_integrity/eventreader_fsevents.go b/auditbeat/module/file_integrity/eventreader_fsevents.go index b355e96eaecf..064c46c101f6 100644 --- a/auditbeat/module/file_integrity/eventreader_fsevents.go +++ b/auditbeat/module/file_integrity/eventreader_fsevents.go @@ -28,7 +28,7 @@ import ( "github.com/fsnotify/fsevents" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type fsreader struct { diff --git a/auditbeat/module/file_integrity/eventreader_fsnotify.go b/auditbeat/module/file_integrity/eventreader_fsnotify.go index b228ebc59a32..4c59191dfe71 100644 --- a/auditbeat/module/file_integrity/eventreader_fsnotify.go +++ b/auditbeat/module/file_integrity/eventreader_fsnotify.go @@ -26,8 +26,8 @@ import ( "github.com/fsnotify/fsnotify" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/module/file_integrity/monitor" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/auditbeat/module/file_integrity/monitor" + "github.com/elastic/beats/v7/libbeat/logp" ) type reader struct { diff --git a/auditbeat/module/file_integrity/fields.go b/auditbeat/module/file_integrity/fields.go index 84341850eb5a..c7dce9bc9867 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/auditbeat/module/file_integrity/fileinfo_windows.go b/auditbeat/module/file_integrity/fileinfo_windows.go index 880620a7b32f..9a61ce19cdb9 100644 --- a/auditbeat/module/file_integrity/fileinfo_windows.go +++ b/auditbeat/module/file_integrity/fileinfo_windows.go @@ -29,7 +29,7 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/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 2d6f823b1c7b..cd85894e6d1a 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/pkg/errors" - "github.com/elastic/beats/auditbeat/module/file_integrity/schema" + "github.com/elastic/beats/v7/auditbeat/module/file_integrity/schema" ) // Requires the Google flatbuffer compiler. diff --git a/auditbeat/module/file_integrity/metricset.go b/auditbeat/module/file_integrity/metricset.go index 8e6792fd93d2..ad5958a3e8eb 100644 --- a/auditbeat/module/file_integrity/metricset.go +++ b/auditbeat/module/file_integrity/metricset.go @@ -26,10 +26,10 @@ import ( bolt "github.com/coreos/bbolt" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/auditbeat/module/file_integrity/metricset_test.go b/auditbeat/module/file_integrity/metricset_test.go index 195de0a515f7..43fa02d15f78 100644 --- a/auditbeat/module/file_integrity/metricset_test.go +++ b/auditbeat/module/file_integrity/metricset_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/auditbeat/datastore" - abtest "github.com/elastic/beats/auditbeat/testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/auditbeat/datastore" + abtest "github.com/elastic/beats/v7/auditbeat/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/auditbeat/module/file_integrity/monitor/recursive.go b/auditbeat/module/file_integrity/monitor/recursive.go index b04658cfe8cc..8999ba5f8a0f 100644 --- a/auditbeat/module/file_integrity/monitor/recursive.go +++ b/auditbeat/module/file_integrity/monitor/recursive.go @@ -25,7 +25,7 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type recursiveWatcher struct { diff --git a/auditbeat/module/file_integrity/scanner.go b/auditbeat/module/file_integrity/scanner.go index 0438a6dad4f7..6a960065d1c3 100644 --- a/auditbeat/module/file_integrity/scanner.go +++ b/auditbeat/module/file_integrity/scanner.go @@ -26,7 +26,7 @@ import ( "golang.org/x/time/rate" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // scannerID is used as a global monotonically increasing counter for assigning diff --git a/auditbeat/scripts/mage/config.go b/auditbeat/scripts/mage/config.go index 72a67100dbd7..91f704461232 100644 --- a/auditbeat/scripts/mage/config.go +++ b/auditbeat/scripts/mage/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/auditbeat/scripts/mage/docs.go b/auditbeat/scripts/mage/docs.go index 0a2409e4323c..d28d1df62587 100644 --- a/auditbeat/scripts/mage/docs.go +++ b/auditbeat/scripts/mage/docs.go @@ -25,7 +25,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/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 1ff16f64ddce..fbda2077f4f7 100644 --- a/auditbeat/scripts/mage/package.go +++ b/auditbeat/scripts/mage/package.go @@ -20,7 +20,7 @@ package mage import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // PackagingFlavor specifies the type of packaging (OSS vs X-Pack). diff --git a/auditbeat/testing/setup.go b/auditbeat/testing/setup.go index 00939eb0cbcf..1a8a8866b196 100644 --- a/auditbeat/testing/setup.go +++ b/auditbeat/testing/setup.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) // SetupDataDir sets up a temporary data directory to use for testing. diff --git a/dev-tools/cmd/asset/asset.go b/dev-tools/cmd/asset/asset.go index 3fa75501f193..1696e0781360 100644 --- a/dev-tools/cmd/asset/asset.go +++ b/dev-tools/cmd/asset/asset.go @@ -26,8 +26,8 @@ import ( "io/ioutil" "os" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/licenses" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/licenses" ) var ( diff --git a/dev-tools/cmd/dashboards/export_dashboards.go b/dev-tools/cmd/dashboards/export_dashboards.go index 7e48f19caaef..eeae6773a969 100644 --- a/dev-tools/cmd/dashboards/export_dashboards.go +++ b/dev-tools/cmd/dashboards/export_dashboards.go @@ -29,8 +29,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/dashboards" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/dashboards" + "github.com/elastic/beats/v7/libbeat/kibana" ) var ( diff --git a/dev-tools/cmd/module_fields/module_fields.go b/dev-tools/cmd/module_fields/module_fields.go index 5c967ec9ecfd..203cc2980287 100644 --- a/dev-tools/cmd/module_fields/module_fields.go +++ b/dev-tools/cmd/module_fields/module_fields.go @@ -25,9 +25,9 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/generator/fields" - "github.com/elastic/beats/licenses" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/generator/fields" + "github.com/elastic/beats/v7/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 d3e5d3c2b3e7..d4fb9bd9d256 100644 --- a/dev-tools/cmd/module_include_list/module_include_list.go +++ b/dev-tools/cmd/module_include_list/module_include_list.go @@ -32,8 +32,8 @@ import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/licenses" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/licenses" ) var usageText = ` diff --git a/dev-tools/mage/check.go b/dev-tools/mage/check.go index 6c30bd1dafc1..11767ae7d3c9 100644 --- a/dev-tools/mage/check.go +++ b/dev-tools/mage/check.go @@ -35,8 +35,8 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - "github.com/elastic/beats/dev-tools/mage/gotool" - "github.com/elastic/beats/libbeat/processors/dissect" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/libbeat/processors/dissect" ) // Check looks for created/modified/deleted/renamed files and returns an error diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go index f62f9eadf091..59e4ccc2bcc7 100644 --- a/dev-tools/mage/crossbuild.go +++ b/dev-tools/mage/crossbuild.go @@ -31,7 +31,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) const defaultCrossBuildTarget = "golangCrossBuild" diff --git a/dev-tools/mage/fmt.go b/dev-tools/mage/fmt.go index 18a16d57be99..76d8d98b1129 100644 --- a/dev-tools/mage/fmt.go +++ b/dev-tools/mage/fmt.go @@ -27,7 +27,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - "github.com/elastic/beats/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) var ( diff --git a/dev-tools/mage/gomod.go b/dev-tools/mage/gomod.go index 5475dd88d1df..5ca6f0a80ce3 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/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) // copyModule contains a module name and the list of files or directories diff --git a/dev-tools/mage/install.go b/dev-tools/mage/install.go index 4d99a76f12fe..74c3ba2eee64 100644 --- a/dev-tools/mage/install.go +++ b/dev-tools/mage/install.go @@ -18,7 +18,7 @@ package mage import ( - "github.com/elastic/beats/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) var ( diff --git a/dev-tools/mage/pkg_test.go b/dev-tools/mage/pkg_test.go index f9bd3a708eda..e360686b54a3 100644 --- a/dev-tools/mage/pkg_test.go +++ b/dev-tools/mage/pkg_test.go @@ -88,7 +88,7 @@ func TestRepoRoot(t *testing.T) { t.Error(err) } - assert.Equal(t, "github.com/elastic/beats", repo.RootImportPath) + assert.Equal(t, "github.com/elastic/beats/v7", repo.RootImportPath) assert.True(t, filepath.IsAbs(repo.RootDir)) cwd := filepath.Join(repo.RootDir, repo.SubDir) assert.Equal(t, CWD(), cwd) diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index 30fe67f20076..dbe2b329147d 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -34,7 +34,7 @@ import ( "github.com/pkg/errors" "golang.org/x/tools/go/vcs" - "github.com/elastic/beats/dev-tools/mage/gotool" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) const ( diff --git a/dev-tools/mage/target/build/build.go b/dev-tools/mage/target/build/build.go index edb56e86ded5..4e668fc78691 100644 --- a/dev-tools/mage/target/build/build.go +++ b/dev-tools/mage/target/build/build.go @@ -18,7 +18,7 @@ package build import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/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 eb24360f6767..cd1614b19850 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/metricbeat/scripts/mage" + metricbeat "github.com/elastic/beats/v7/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 d5038c99c947..90e4e56a256c 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/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 ddda44fee328..fcda6e25fe51 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/dev-tools/mage" +import devtools "github.com/elastic/beats/v7/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 9405d69ca487..b29dac7ae906 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // Fmt formats source code (.go and .py) and adds license headers. diff --git a/dev-tools/mage/target/common/shared.go b/dev-tools/mage/target/common/shared.go index 68f2620b3f3a..a062bf50084e 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/dev-tools/mage" +import devtools "github.com/elastic/beats/v7/dev-tools/mage" // DumpVariables writes the template variables and values to stdout. func DumpVariables() error { diff --git a/dev-tools/mage/target/compose/compose.go b/dev-tools/mage/target/compose/compose.go index c6ee75b8bcdc..8af1666d7526 100644 --- a/dev-tools/mage/target/compose/compose.go +++ b/dev-tools/mage/target/compose/compose.go @@ -30,7 +30,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // SupportedVersions is the definition of supported version files diff --git a/dev-tools/mage/target/dashboards/dashboards.go b/dev-tools/mage/target/dashboards/dashboards.go index 372a61e52d25..c993b8bacc0a 100644 --- a/dev-tools/mage/target/dashboards/dashboards.go +++ b/dev-tools/mage/target/dashboards/dashboards.go @@ -21,7 +21,7 @@ import ( "github.com/magefile/mage/mg" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var ( diff --git a/dev-tools/mage/target/docs/docs.go b/dev-tools/mage/target/docs/docs.go index 7558b6280359..fa972056b5ae 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var ( diff --git a/dev-tools/mage/target/integtest/integtest.go b/dev-tools/mage/target/integtest/integtest.go index 33c924bbe180..142a713effc8 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/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/test" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/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 806d46789a34..7d4f0ef92213 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/dev-tools/mage" +import devtools "github.com/elastic/beats/v7/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 1805e9a62882..859849bac1ed 100644 --- a/dev-tools/mage/target/unittest/unittest.go +++ b/dev-tools/mage/target/unittest/unittest.go @@ -22,8 +22,8 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/test" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/target/test" ) func init() { diff --git a/dev-tools/magefile.go b/dev-tools/magefile.go index 233ccfde5a9f..083e7e3479c1 100644 --- a/dev-tools/magefile.go +++ b/dev-tools/magefile.go @@ -21,5 +21,5 @@ package main import ( // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" ) diff --git a/dev-tools/packaging/preference-pane/magefile.go b/dev-tools/packaging/preference-pane/magefile.go index 16ccb18184f5..77eb9c437dae 100644 --- a/dev-tools/packaging/preference-pane/magefile.go +++ b/dev-tools/packaging/preference-pane/magefile.go @@ -28,7 +28,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var builder = preferencePaneBuilder{ diff --git a/filebeat/autodiscover/autodiscover.go b/filebeat/autodiscover/autodiscover.go index faa0475163fd..85fa6cf65bd2 100644 --- a/filebeat/autodiscover/autodiscover.go +++ b/filebeat/autodiscover/autodiscover.go @@ -20,10 +20,10 @@ package autodiscover import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "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/bus" ) // AutodiscoverAdapter for Filebeat modules & input diff --git a/filebeat/autodiscover/builder/hints/config.go b/filebeat/autodiscover/builder/hints/config.go index 25994c211c83..55b1ffb18115 100644 --- a/filebeat/autodiscover/builder/hints/config.go +++ b/filebeat/autodiscover/builder/hints/config.go @@ -17,7 +17,7 @@ package hints -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" type config struct { Key string `config:"key"` diff --git a/filebeat/autodiscover/builder/hints/logs.go b/filebeat/autodiscover/builder/hints/logs.go index 571c30fd33b1..f467f7c2ef60 100644 --- a/filebeat/autodiscover/builder/hints/logs.go +++ b/filebeat/autodiscover/builder/hints/logs.go @@ -21,14 +21,14 @@ import ( "fmt" "regexp" - "github.com/elastic/beats/filebeat/fileset" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "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/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/autodiscover/builder/hints/logs_test.go b/filebeat/autodiscover/builder/hints/logs_test.go index 4303d41363e3..b316cdb506c2 100644 --- a/filebeat/autodiscover/builder/hints/logs_test.go +++ b/filebeat/autodiscover/builder/hints/logs_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/paths" ) func TestGenerateHints(t *testing.T) { diff --git a/filebeat/autodiscover/include.go b/filebeat/autodiscover/include.go index 1cebd28bc1a5..de15185e7166 100644 --- a/filebeat/autodiscover/include.go +++ b/filebeat/autodiscover/include.go @@ -19,5 +19,5 @@ package autodiscover import ( // include all filebeat specific builders - _ "github.com/elastic/beats/filebeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v7/filebeat/autodiscover/builder/hints" ) diff --git a/filebeat/beater/acker.go b/filebeat/beater/acker.go index a157bb7ec34f..35ef0ca0beb9 100644 --- a/filebeat/beater/acker.go +++ b/filebeat/beater/acker.go @@ -18,8 +18,8 @@ package beater import ( - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/logp" ) // eventAcker handles publisher pipeline ACKs and forwards diff --git a/filebeat/beater/acker_test.go b/filebeat/beater/acker_test.go index 717812500af5..2d195c8aabde 100644 --- a/filebeat/beater/acker_test.go +++ b/filebeat/beater/acker_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/input/file" ) type mockStatefulLogger struct { diff --git a/filebeat/beater/channels.go b/filebeat/beater/channels.go index cd0eba04f48a..38874cf483a4 100644 --- a/filebeat/beater/channels.go +++ b/filebeat/beater/channels.go @@ -20,9 +20,9 @@ package beater import ( "sync" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/registrar" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type registrarLogger struct { diff --git a/filebeat/beater/filebeat.go b/filebeat/beater/filebeat.go index 991ae798480e..30f2781c68d5 100644 --- a/filebeat/beater/filebeat.go +++ b/filebeat/beater/filebeat.go @@ -22,30 +22,30 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/common/reload" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/management" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - - fbautodiscover "github.com/elastic/beats/filebeat/autodiscover" - "github.com/elastic/beats/filebeat/channel" - cfg "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/filebeat/crawler" - "github.com/elastic/beats/filebeat/fileset" - "github.com/elastic/beats/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" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + + fbautodiscover "github.com/elastic/beats/v7/filebeat/autodiscover" + "github.com/elastic/beats/v7/filebeat/channel" + cfg "github.com/elastic/beats/v7/filebeat/config" + "github.com/elastic/beats/v7/filebeat/crawler" + "github.com/elastic/beats/v7/filebeat/fileset" + "github.com/elastic/beats/v7/filebeat/registrar" // Add filebeat level processors - _ "github.com/elastic/beats/filebeat/processor/add_kubernetes_metadata" - _ "github.com/elastic/beats/libbeat/processors/decode_csv_fields" + _ "github.com/elastic/beats/v7/filebeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v7/libbeat/processors/decode_csv_fields" ) const pipelinesWarning = "Filebeat is unable to load the Ingest Node pipelines for the configured" + diff --git a/filebeat/beater/signalwait.go b/filebeat/beater/signalwait.go index ce8399352a30..a6115f8d7066 100644 --- a/filebeat/beater/signalwait.go +++ b/filebeat/beater/signalwait.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type signalWait struct { diff --git a/filebeat/channel/connector.go b/filebeat/channel/connector.go index d2a20dd54a2c..8f253bb13230 100644 --- a/filebeat/channel/connector.go +++ b/filebeat/channel/connector.go @@ -18,11 +18,11 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "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" ) // ConnectorFunc is an adapter for using ordinary functions as Connector. diff --git a/filebeat/channel/connector_test.go b/filebeat/channel/connector_test.go index f9f5cc0640c7..fe6e32991889 100644 --- a/filebeat/channel/connector_test.go +++ b/filebeat/channel/connector_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/actions" + "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" ) func TestProcessorsForConfig(t *testing.T) { diff --git a/filebeat/channel/factory.go b/filebeat/channel/factory.go index d4373beec19d..3bfeccc01505 100644 --- a/filebeat/channel/factory.go +++ b/filebeat/channel/factory.go @@ -18,10 +18,10 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/processors" ) type OutletFactory struct { diff --git a/filebeat/channel/interface.go b/filebeat/channel/interface.go index 30b41ac0461b..0069cda6f020 100644 --- a/filebeat/channel/interface.go +++ b/filebeat/channel/interface.go @@ -18,8 +18,8 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Factory is used to create a new Outlet instance diff --git a/filebeat/channel/outlet.go b/filebeat/channel/outlet.go index ce8e5de79963..3211a9d7293e 100644 --- a/filebeat/channel/outlet.go +++ b/filebeat/channel/outlet.go @@ -18,8 +18,8 @@ package channel import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) type outlet struct { diff --git a/filebeat/channel/util.go b/filebeat/channel/util.go index f7579b341171..2c2125534548 100644 --- a/filebeat/channel/util.go +++ b/filebeat/channel/util.go @@ -20,7 +20,7 @@ package channel import ( "sync" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) type subOutlet struct { diff --git a/filebeat/channel/util_test.go b/filebeat/channel/util_test.go index c3a534f52bd8..49bd2da3094c 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/libbeat/beat" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) type dummyOutletter struct { diff --git a/filebeat/cmd/generate.go b/filebeat/cmd/generate.go index 9b081ff6eeff..822b1acc953b 100644 --- a/filebeat/cmd/generate.go +++ b/filebeat/cmd/generate.go @@ -23,11 +23,11 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/filebeat/generator/fields" - "github.com/elastic/beats/filebeat/generator/fileset" - "github.com/elastic/beats/filebeat/generator/module" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/libbeat/paths" + "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/v7/libbeat/paths" ) var ( diff --git a/filebeat/cmd/modules.go b/filebeat/cmd/modules.go index ea62e2921a2d..d07ebd78fb5d 100644 --- a/filebeat/cmd/modules.go +++ b/filebeat/cmd/modules.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd" ) func buildModulesManager(beat *beat.Beat) (cmd.ModulesManager, error) { diff --git a/filebeat/cmd/root.go b/filebeat/cmd/root.go index 3cb795a2ae17..43b42a56b67f 100644 --- a/filebeat/cmd/root.go +++ b/filebeat/cmd/root.go @@ -22,14 +22,14 @@ import ( "github.com/spf13/pflag" - "github.com/elastic/beats/filebeat/beater" + "github.com/elastic/beats/v7/filebeat/beater" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" // Import processors. - _ "github.com/elastic/beats/libbeat/processors/script" - _ "github.com/elastic/beats/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/libbeat/processors/script" + _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" ) // Name of this beat diff --git a/filebeat/config/config.go b/filebeat/config/config.go index 47faaf442947..db10fa20ba6e 100644 --- a/filebeat/config/config.go +++ b/filebeat/config/config.go @@ -25,12 +25,12 @@ import ( "sort" "time" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" ) // Defaults for config variables which are not set diff --git a/filebeat/config/config_test.go b/filebeat/config/config_test.go index e922f743a2c5..15f9f624b28f 100644 --- a/filebeat/config/config_test.go +++ b/filebeat/config/config_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" ) func TestReadConfig2(t *testing.T) { diff --git a/filebeat/crawler/crawler.go b/filebeat/crawler/crawler.go index d53511b90f0a..29410080061a 100644 --- a/filebeat/crawler/crawler.go +++ b/filebeat/crawler/crawler.go @@ -21,17 +21,17 @@ import ( "fmt" "sync" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/fileset" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - - _ "github.com/elastic/beats/filebeat/include" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/fileset" + "github.com/elastic/beats/v7/filebeat/input" + "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/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + + _ "github.com/elastic/beats/v7/filebeat/include" ) type Crawler struct { diff --git a/filebeat/fileset/config.go b/filebeat/fileset/config.go index 816e696fd08a..4a9937a3392f 100644 --- a/filebeat/fileset/config.go +++ b/filebeat/fileset/config.go @@ -21,9 +21,9 @@ import ( "fmt" "path/filepath" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/paths" ) // ModuleConfig contains the configuration file options for a module diff --git a/filebeat/fileset/config_test.go b/filebeat/fileset/config_test.go index 78a1f6f5edd7..972d7eff6319 100644 --- a/filebeat/fileset/config_test.go +++ b/filebeat/fileset/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestInputSettings(t *testing.T) { diff --git a/filebeat/fileset/factory.go b/filebeat/fileset/factory.go index 2d534e045734..e7e6d30515dd 100644 --- a/filebeat/fileset/factory.go +++ b/filebeat/fileset/factory.go @@ -20,15 +20,15 @@ package fileset import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input" + "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/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" "github.com/mitchellh/hashstructure" ) diff --git a/filebeat/fileset/fileset.go b/filebeat/fileset/fileset.go index e1419ee5a93e..3d3525123fe5 100644 --- a/filebeat/fileset/fileset.go +++ b/filebeat/fileset/fileset.go @@ -37,9 +37,9 @@ import ( errw "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) // Fileset struct is the representation of a fileset. diff --git a/filebeat/fileset/fileset_test.go b/filebeat/fileset/fileset_test.go index e66eafe2b973..9f0309b25f0e 100644 --- a/filebeat/fileset/fileset_test.go +++ b/filebeat/fileset/fileset_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func getModuleForTesting(t *testing.T, module, fileset string) *Fileset { diff --git a/filebeat/fileset/flags.go b/filebeat/fileset/flags.go index 61f126327727..45297d9f3383 100644 --- a/filebeat/fileset/flags.go +++ b/filebeat/fileset/flags.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Modules related command line flags. diff --git a/filebeat/fileset/modules.go b/filebeat/fileset/modules.go index c1d7d969d45a..56ab0359a16e 100644 --- a/filebeat/fileset/modules.go +++ b/filebeat/fileset/modules.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" yaml "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" ) var availableMLModules = map[string]string{ diff --git a/filebeat/fileset/modules_integration_test.go b/filebeat/fileset/modules_integration_test.go index c806ec2c7b7b..ea6d646ede21 100644 --- a/filebeat/fileset/modules_integration_test.go +++ b/filebeat/fileset/modules_integration_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/estest" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/estest" ) func TestLoadPipeline(t *testing.T) { diff --git a/filebeat/fileset/modules_test.go b/filebeat/fileset/modules_test.go index 1c0d1766d360..5a7bc46a53c3 100644 --- a/filebeat/fileset/modules_test.go +++ b/filebeat/fileset/modules_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/paths" ) func load(t *testing.T, from interface{}) *common.Config { diff --git a/filebeat/fileset/pipelines.go b/filebeat/fileset/pipelines.go index 0f21dc4a026d..db1293054632 100644 --- a/filebeat/fileset/pipelines.go +++ b/filebeat/fileset/pipelines.go @@ -24,8 +24,8 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // PipelineLoaderFactory builds and returns a PipelineLoader diff --git a/filebeat/fileset/pipelines_test.go b/filebeat/fileset/pipelines_test.go index a9758df894a2..d808639cda89 100644 --- a/filebeat/fileset/pipelines_test.go +++ b/filebeat/fileset/pipelines_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" ) func TestLoadPipelinesWithMultiPipelineFileset(t *testing.T) { diff --git a/filebeat/fileset/setup.go b/filebeat/fileset/setup.go index f6f4932ccda8..9bdb274da0a9 100644 --- a/filebeat/fileset/setup.go +++ b/filebeat/fileset/setup.go @@ -18,10 +18,10 @@ package fileset import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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/logp" ) // SetupFactory is for loading module assets when running setup subcommand. diff --git a/filebeat/generator/fileset/fileset.go b/filebeat/generator/fileset/fileset.go index c2a49a34bd39..d17219e2c52e 100644 --- a/filebeat/generator/fileset/fileset.go +++ b/filebeat/generator/fileset/fileset.go @@ -21,7 +21,7 @@ import ( "fmt" "path" - "github.com/elastic/beats/filebeat/generator" + "github.com/elastic/beats/v7/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 0a6f25aeaaf6..64a470dcb17e 100644 --- a/filebeat/generator/module/module.go +++ b/filebeat/generator/module/module.go @@ -22,7 +22,7 @@ import ( "os" "path" - "github.com/elastic/beats/filebeat/generator" + "github.com/elastic/beats/v7/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 935555f777f7..3bd5d51bc4c8 100644 --- a/filebeat/harvester/forwarder.go +++ b/filebeat/harvester/forwarder.go @@ -20,8 +20,8 @@ package harvester import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" ) // Outlet interface is used for forwarding events diff --git a/filebeat/harvester/registry.go b/filebeat/harvester/registry.go index 9a6748151a37..d0bfd10ec5cc 100644 --- a/filebeat/harvester/registry.go +++ b/filebeat/harvester/registry.go @@ -23,7 +23,7 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Registry struct manages (start / stop) a list of harvesters diff --git a/filebeat/harvester/util.go b/filebeat/harvester/util.go index e885aab3881b..f39a718573a4 100644 --- a/filebeat/harvester/util.go +++ b/filebeat/harvester/util.go @@ -17,7 +17,7 @@ package harvester -import "github.com/elastic/beats/libbeat/common/match" +import "github.com/elastic/beats/v7/libbeat/common/match" // Contains available input types const ( diff --git a/filebeat/harvester/util_test.go b/filebeat/harvester/util_test.go index 5a3313696b9d..0f0971a8a422 100644 --- a/filebeat/harvester/util_test.go +++ b/filebeat/harvester/util_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" ) // InitMatchers initializes a list of compiled regular expressions. diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go index 5ebc75b7aae2..d19cab68c0cf 100644 --- a/filebeat/include/fields.go +++ b/filebeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/include/list.go b/filebeat/include/list.go index 72d70d9ae242..b2676455413a 100644 --- a/filebeat/include/list.go +++ b/filebeat/include/list.go @@ -21,32 +21,32 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/filebeat/input/container" - _ "github.com/elastic/beats/filebeat/input/docker" - _ "github.com/elastic/beats/filebeat/input/kafka" - _ "github.com/elastic/beats/filebeat/input/log" - _ "github.com/elastic/beats/filebeat/input/redis" - _ "github.com/elastic/beats/filebeat/input/stdin" - _ "github.com/elastic/beats/filebeat/input/syslog" - _ "github.com/elastic/beats/filebeat/input/tcp" - _ "github.com/elastic/beats/filebeat/input/udp" - _ "github.com/elastic/beats/filebeat/module/apache" - _ "github.com/elastic/beats/filebeat/module/auditd" - _ "github.com/elastic/beats/filebeat/module/elasticsearch" - _ "github.com/elastic/beats/filebeat/module/haproxy" - _ "github.com/elastic/beats/filebeat/module/icinga" - _ "github.com/elastic/beats/filebeat/module/iis" - _ "github.com/elastic/beats/filebeat/module/kafka" - _ "github.com/elastic/beats/filebeat/module/kibana" - _ "github.com/elastic/beats/filebeat/module/logstash" - _ "github.com/elastic/beats/filebeat/module/mongodb" - _ "github.com/elastic/beats/filebeat/module/mysql" - _ "github.com/elastic/beats/filebeat/module/nats" - _ "github.com/elastic/beats/filebeat/module/nginx" - _ "github.com/elastic/beats/filebeat/module/osquery" - _ "github.com/elastic/beats/filebeat/module/postgresql" - _ "github.com/elastic/beats/filebeat/module/redis" - _ "github.com/elastic/beats/filebeat/module/santa" - _ "github.com/elastic/beats/filebeat/module/system" - _ "github.com/elastic/beats/filebeat/module/traefik" + _ "github.com/elastic/beats/v7/filebeat/input/container" + _ "github.com/elastic/beats/v7/filebeat/input/docker" + _ "github.com/elastic/beats/v7/filebeat/input/kafka" + _ "github.com/elastic/beats/v7/filebeat/input/log" + _ "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/input/tcp" + _ "github.com/elastic/beats/v7/filebeat/input/udp" + _ "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/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" ) diff --git a/filebeat/input/config.go b/filebeat/input/config.go index 750b370419b6..448a878a607d 100644 --- a/filebeat/input/config.go +++ b/filebeat/input/config.go @@ -20,8 +20,8 @@ package input import ( "time" - cfg "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/libbeat/common/cfgwarn" + cfg "github.com/elastic/beats/v7/filebeat/config" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) var ( diff --git a/filebeat/input/container/input.go b/filebeat/input/container/input.go index 656b93b47fd1..b208cd16013d 100644 --- a/filebeat/input/container/input.go +++ b/filebeat/input/container/input.go @@ -18,10 +18,10 @@ package container import ( - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/log" - "github.com/elastic/beats/libbeat/common" + "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/v7/libbeat/common" "github.com/pkg/errors" ) diff --git a/filebeat/input/docker/input.go b/filebeat/input/docker/input.go index 750d6d8d68c5..70df9ce2238a 100644 --- a/filebeat/input/docker/input.go +++ b/filebeat/input/docker/input.go @@ -21,12 +21,12 @@ import ( "fmt" "path" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/log" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "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/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/pkg/errors" ) diff --git a/filebeat/input/file/file.go b/filebeat/input/file/file.go index c3bc1bb624ad..676a2d5cfcb6 100644 --- a/filebeat/input/file/file.go +++ b/filebeat/input/file/file.go @@ -20,7 +20,7 @@ package file import ( "os" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type File struct { diff --git a/filebeat/input/file/state.go b/filebeat/input/file/state.go index 96c5abf2071f..dde3c6c54217 100644 --- a/filebeat/input/file/state.go +++ b/filebeat/input/file/state.go @@ -25,7 +25,7 @@ import ( "github.com/mitchellh/hashstructure" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) // State is used to communicate the reading state of a file diff --git a/filebeat/input/file/states.go b/filebeat/input/file/states.go index d01026f87768..fc50dd904c0b 100644 --- a/filebeat/input/file/states.go +++ b/filebeat/input/file/states.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // States handles list of FileState. One must use NewStates to instantiate a diff --git a/filebeat/input/input.go b/filebeat/input/input.go index e1931d4e4bfa..06e62e035555 100644 --- a/filebeat/input/input.go +++ b/filebeat/input/input.go @@ -24,11 +24,11 @@ import ( "github.com/mitchellh/hashstructure" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/filebeat/input/kafka/config.go b/filebeat/input/kafka/config.go index 6fb14730aea3..d36b46772333 100644 --- a/filebeat/input/kafka/config.go +++ b/filebeat/input/kafka/config.go @@ -24,12 +24,12 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common/kafka" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" - "github.com/elastic/beats/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/outputs" ) type kafkaInputConfig struct { diff --git a/filebeat/input/kafka/input.go b/filebeat/input/kafka/input.go index 72cb12542840..5dadb0585124 100644 --- a/filebeat/input/kafka/input.go +++ b/filebeat/input/kafka/input.go @@ -27,13 +27,13 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/common/kafka" - "github.com/elastic/beats/libbeat/logp" + "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" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/pkg/errors" ) diff --git a/filebeat/input/kafka/kafka_integration_test.go b/filebeat/input/kafka/kafka_integration_test.go index ca4d03a8d9c5..c7ad9fc999cb 100644 --- a/filebeat/input/kafka/kafka_integration_test.go +++ b/filebeat/input/kafka/kafka_integration_test.go @@ -32,12 +32,12 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" + "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" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/format" + _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" ) const ( diff --git a/filebeat/input/log/config.go b/filebeat/input/log/config.go index 78669b4c107e..835358b4e66d 100644 --- a/filebeat/input/log/config.go +++ b/filebeat/input/log/config.go @@ -24,15 +24,15 @@ import ( "github.com/dustin/go-humanize" - cfg "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader/multiline" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readjson" + 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/logp" + "github.com/elastic/beats/v7/libbeat/reader/multiline" + "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/reader/readjson" ) var ( diff --git a/filebeat/input/log/config_test.go b/filebeat/input/log/config_test.go index bf73d0412b03..7406014d049e 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/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/harvester" ) func TestCleanOlderError(t *testing.T) { diff --git a/filebeat/input/log/file.go b/filebeat/input/log/file.go index 59d408c87adf..27858c0c4c7f 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/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) type File struct { diff --git a/filebeat/input/log/harvester.go b/filebeat/input/log/harvester.go index 5f0c47c98784..94162ebfec97 100644 --- a/filebeat/input/log/harvester.go +++ b/filebeat/input/log/harvester.go @@ -39,21 +39,21 @@ import ( "github.com/gofrs/uuid" "golang.org/x/text/transform" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - file_helper "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/debug" - "github.com/elastic/beats/libbeat/reader/multiline" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" - "github.com/elastic/beats/libbeat/reader/readjson" + "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/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/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" ) var ( diff --git a/filebeat/input/log/harvester_test.go b/filebeat/input/log/harvester_test.go index 2ee03824efbb..96ae5c7e5ed0 100644 --- a/filebeat/input/log/harvester_test.go +++ b/filebeat/input/log/harvester_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) func TestReadLine(t *testing.T) { diff --git a/filebeat/input/log/input.go b/filebeat/input/log/input.go index 24cbdf33abc0..ac0d71cf53d6 100644 --- a/filebeat/input/log/input.go +++ b/filebeat/input/log/input.go @@ -27,15 +27,15 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "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/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) const ( diff --git a/filebeat/input/log/input_other_test.go b/filebeat/input/log/input_other_test.go index 9eb2a7ba4b88..e37b4d0c1f21 100644 --- a/filebeat/input/log/input_other_test.go +++ b/filebeat/input/log/input_other_test.go @@ -22,8 +22,8 @@ package log import ( "testing" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/common/match" "github.com/stretchr/testify/assert" ) diff --git a/filebeat/input/log/input_test.go b/filebeat/input/log/input_test.go index eaf080d39d6b..0eb7d1899d7d 100644 --- a/filebeat/input/log/input_test.go +++ b/filebeat/input/log/input_test.go @@ -29,13 +29,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/tests/resources" + "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/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) func TestInputFileExclude(t *testing.T) { diff --git a/filebeat/input/log/log.go b/filebeat/input/log/log.go index 79bc5f145053..1a89c5bc8d14 100644 --- a/filebeat/input/log/log.go +++ b/filebeat/input/log/log.go @@ -22,9 +22,9 @@ import ( "os" "time" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/logp" ) // Log contains all log related data diff --git a/filebeat/input/log/prospector_windows_test.go b/filebeat/input/log/prospector_windows_test.go index 92183cdb1ed6..2b60fac4c649 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/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" ) var matchTestsWindows = []struct { diff --git a/filebeat/input/plugin.go b/filebeat/input/plugin.go index 364fa57a718b..c0d273d97e2b 100644 --- a/filebeat/input/plugin.go +++ b/filebeat/input/plugin.go @@ -20,7 +20,7 @@ package input import ( "errors" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/plugin" ) type inputPlugin struct { diff --git a/filebeat/input/redis/config.go b/filebeat/input/redis/config.go index b5829b6defc4..1177fd8bb1b2 100644 --- a/filebeat/input/redis/config.go +++ b/filebeat/input/redis/config.go @@ -20,7 +20,7 @@ package redis import ( "time" - "github.com/elastic/beats/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/harvester" ) var defaultConfig = config{ diff --git a/filebeat/input/redis/harvester.go b/filebeat/input/redis/harvester.go index 73b9111a8725..49d153cf26c0 100644 --- a/filebeat/input/redis/harvester.go +++ b/filebeat/input/redis/harvester.go @@ -25,11 +25,11 @@ import ( rd "github.com/garyburd/redigo/redis" "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/harvester" ) // Harvester contains all redis harvester data diff --git a/filebeat/input/redis/input.go b/filebeat/input/redis/input.go index f4909e2c6a5a..a784af74c055 100644 --- a/filebeat/input/redis/input.go +++ b/filebeat/input/redis/input.go @@ -22,14 +22,14 @@ import ( rd "github.com/garyburd/redigo/redis" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "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/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/input/registry.go b/filebeat/input/registry.go index 69e2d942bef4..06b23d3ac189 100644 --- a/filebeat/input/registry.go +++ b/filebeat/input/registry.go @@ -20,10 +20,10 @@ package input import ( "fmt" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/filebeat/input/file" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type Context struct { diff --git a/filebeat/input/registry_test.go b/filebeat/input/registry_test.go index ca6857781868..0532d5ac8bcf 100644 --- a/filebeat/input/registry_test.go +++ b/filebeat/input/registry_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/libbeat/common" ) var fakeFactory = func(_ *common.Config, _ channel.Connector, _ Context) (Input, error) { diff --git a/filebeat/input/runnerfactory.go b/filebeat/input/runnerfactory.go index c4bb0818031c..d41382fe01fb 100644 --- a/filebeat/input/runnerfactory.go +++ b/filebeat/input/runnerfactory.go @@ -18,11 +18,11 @@ package input import ( - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/registrar" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" + "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" ) // RunnerFactory is a factory for registrars diff --git a/filebeat/input/stdin/input.go b/filebeat/input/stdin/input.go index f59c0da521e8..8273da27f622 100644 --- a/filebeat/input/stdin/input.go +++ b/filebeat/input/stdin/input.go @@ -20,14 +20,14 @@ package stdin import ( "fmt" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/input/file" - "github.com/elastic/beats/filebeat/input/log" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/input/syslog/config.go b/filebeat/input/syslog/config.go index 4e8eecc74b40..28590b3ced36 100644 --- a/filebeat/input/syslog/config.go +++ b/filebeat/input/syslog/config.go @@ -23,11 +23,11 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/filebeat/inputsource/tcp" - "github.com/elastic/beats/filebeat/inputsource/udp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource/tcp" + "github.com/elastic/beats/v7/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/libbeat/common" ) type config struct { diff --git a/filebeat/input/syslog/input.go b/filebeat/input/syslog/input.go index b7da399952f5..24271c6fe4b3 100644 --- a/filebeat/input/syslog/input.go +++ b/filebeat/input/syslog/input.go @@ -24,14 +24,14 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "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" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) // Parser is generated from a ragel state machine using the following command: diff --git a/filebeat/input/syslog/input_test.go b/filebeat/input/syslog/input_test.go index f52d235e3a48..b6c29b74a519 100644 --- a/filebeat/input/syslog/input_test.go +++ b/filebeat/input/syslog/input_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestWhenPriorityIsSet(t *testing.T) { diff --git a/filebeat/input/tcp/config.go b/filebeat/input/tcp/config.go index 4e07fa91f896..3bc928ac8c05 100644 --- a/filebeat/input/tcp/config.go +++ b/filebeat/input/tcp/config.go @@ -22,8 +22,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/inputsource/tcp" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/inputsource/tcp" ) type config struct { diff --git a/filebeat/input/tcp/input.go b/filebeat/input/tcp/input.go index 77a7162b0395..9c0b7476f90a 100644 --- a/filebeat/input/tcp/input.go +++ b/filebeat/input/tcp/input.go @@ -22,14 +22,14 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/filebeat/inputsource/tcp" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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/filebeat/inputsource/tcp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/input/tcp/input_test.go b/filebeat/input/tcp/input_test.go index a7ca64ba59d5..d820e0687236 100644 --- a/filebeat/input/tcp/input_test.go +++ b/filebeat/input/tcp/input_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource" ) func TestCreateEvent(t *testing.T) { diff --git a/filebeat/input/udp/config.go b/filebeat/input/udp/config.go index 65e522920b7a..33696dc69c72 100644 --- a/filebeat/input/udp/config.go +++ b/filebeat/input/udp/config.go @@ -22,8 +22,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/filebeat/inputsource/udp" ) var defaultConfig = config{ diff --git a/filebeat/input/udp/input.go b/filebeat/input/udp/input.go index 30bb818d2a57..9d5f45208908 100644 --- a/filebeat/input/udp/input.go +++ b/filebeat/input/udp/input.go @@ -21,14 +21,14 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/filebeat/inputsource/udp" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/filebeat/inputsource/tcp/config.go b/filebeat/inputsource/tcp/config.go index f63481796274..3eb25c42d9aa 100644 --- a/filebeat/inputsource/tcp/config.go +++ b/filebeat/inputsource/tcp/config.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/cfgtype" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/cfgtype" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // Name is the human readable name and identifier. diff --git a/filebeat/inputsource/tcp/handler.go b/filebeat/inputsource/tcp/handler.go index f5454322bc24..e92180732e4b 100644 --- a/filebeat/inputsource/tcp/handler.go +++ b/filebeat/inputsource/tcp/handler.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" ) // splitHandler is a TCP client that has splitting capabilities. diff --git a/filebeat/inputsource/tcp/server.go b/filebeat/inputsource/tcp/server.go index df7343f9947c..04a6df4559c2 100644 --- a/filebeat/inputsource/tcp/server.go +++ b/filebeat/inputsource/tcp/server.go @@ -27,10 +27,10 @@ import ( "golang.org/x/net/netutil" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // Server represent a TCP server diff --git a/filebeat/inputsource/tcp/server_test.go b/filebeat/inputsource/tcp/server_test.go index 82e89fb72a75..4e25ef74892b 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/filebeat/inputsource" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/common" ) var defaultConfig = Config{ diff --git a/filebeat/inputsource/udp/config.go b/filebeat/inputsource/udp/config.go index f269a805cb59..6c8646384555 100644 --- a/filebeat/inputsource/udp/config.go +++ b/filebeat/inputsource/udp/config.go @@ -20,7 +20,7 @@ package udp import ( "time" - "github.com/elastic/beats/libbeat/common/cfgtype" + "github.com/elastic/beats/v7/libbeat/common/cfgtype" ) // Config options for the UDPServer diff --git a/filebeat/inputsource/udp/server.go b/filebeat/inputsource/udp/server.go index 2c8cc9200aad..9df2e57904a4 100644 --- a/filebeat/inputsource/udp/server.go +++ b/filebeat/inputsource/udp/server.go @@ -26,8 +26,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/filebeat/inputsource" + "github.com/elastic/beats/v7/libbeat/logp" ) // Name is the human readable name and identifier. diff --git a/filebeat/inputsource/udp/server_test.go b/filebeat/inputsource/udp/server_test.go index 3c94349fa2b0..766f7d0b7aa5 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/filebeat/inputsource" + "github.com/elastic/beats/v7/filebeat/inputsource" ) const maxMessageSize = 20 diff --git a/filebeat/magefile.go b/filebeat/magefile.go index e82403d361c0..b18450a0f256 100644 --- a/filebeat/magefile.go +++ b/filebeat/magefile.go @@ -26,13 +26,13 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - filebeat "github.com/elastic/beats/filebeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + filebeat "github.com/elastic/beats/v7/filebeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import generate - _ "github.com/elastic/beats/filebeat/scripts/mage/generate" + _ "github.com/elastic/beats/v7/filebeat/scripts/mage/generate" ) func init() { diff --git a/filebeat/main.go b/filebeat/main.go index c0b3c2c0b923..21289acdf6f9 100644 --- a/filebeat/main.go +++ b/filebeat/main.go @@ -20,7 +20,7 @@ package main import ( "os" - "github.com/elastic/beats/filebeat/cmd" + "github.com/elastic/beats/v7/filebeat/cmd" ) // The basic model of execution: diff --git a/filebeat/main_test.go b/filebeat/main_test.go index 075487d60ec5..84f3e686e4c3 100644 --- a/filebeat/main_test.go +++ b/filebeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/filebeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/filebeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/filebeat/module/apache/fields.go b/filebeat/module/apache/fields.go index ba11297c42ff..c1e04806ad5f 100644 --- a/filebeat/module/apache/fields.go +++ b/filebeat/module/apache/fields.go @@ -20,7 +20,7 @@ package apache import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/auditd/fields.go b/filebeat/module/auditd/fields.go index 41ffa6beb71b..6dc1d8a8a5ed 100644 --- a/filebeat/module/auditd/fields.go +++ b/filebeat/module/auditd/fields.go @@ -20,7 +20,7 @@ package auditd import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/elasticsearch/fields.go b/filebeat/module/elasticsearch/fields.go index 2d7b16f74d0f..98808ad5e05a 100644 --- a/filebeat/module/elasticsearch/fields.go +++ b/filebeat/module/elasticsearch/fields.go @@ -20,7 +20,7 @@ package elasticsearch import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/haproxy/fields.go b/filebeat/module/haproxy/fields.go index 9b572b78dbcd..8b9176b7cfe3 100644 --- a/filebeat/module/haproxy/fields.go +++ b/filebeat/module/haproxy/fields.go @@ -20,7 +20,7 @@ package haproxy import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/icinga/fields.go b/filebeat/module/icinga/fields.go index 7307a8522974..a442241f22a4 100644 --- a/filebeat/module/icinga/fields.go +++ b/filebeat/module/icinga/fields.go @@ -20,7 +20,7 @@ package icinga import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/iis/fields.go b/filebeat/module/iis/fields.go index a234fc3847b4..a2638d7ddb88 100644 --- a/filebeat/module/iis/fields.go +++ b/filebeat/module/iis/fields.go @@ -20,7 +20,7 @@ package iis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/kafka/fields.go b/filebeat/module/kafka/fields.go index ed538d21f99b..86950968bf0b 100644 --- a/filebeat/module/kafka/fields.go +++ b/filebeat/module/kafka/fields.go @@ -20,7 +20,7 @@ package kafka import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/kibana/fields.go b/filebeat/module/kibana/fields.go index ab0297c148e5..d5733c14aa17 100644 --- a/filebeat/module/kibana/fields.go +++ b/filebeat/module/kibana/fields.go @@ -20,7 +20,7 @@ package kibana import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/logstash/fields.go b/filebeat/module/logstash/fields.go index 70fb188699e8..2097117ebf70 100644 --- a/filebeat/module/logstash/fields.go +++ b/filebeat/module/logstash/fields.go @@ -20,7 +20,7 @@ package logstash import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/mongodb/fields.go b/filebeat/module/mongodb/fields.go index 564680f6998f..b6e51a3838b7 100644 --- a/filebeat/module/mongodb/fields.go +++ b/filebeat/module/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/mysql/fields.go b/filebeat/module/mysql/fields.go index 0e53ab01b338..fba7746ab833 100644 --- a/filebeat/module/mysql/fields.go +++ b/filebeat/module/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/nats/fields.go b/filebeat/module/nats/fields.go index 825c42644a14..77551238beac 100644 --- a/filebeat/module/nats/fields.go +++ b/filebeat/module/nats/fields.go @@ -20,7 +20,7 @@ package nats import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/nginx/fields.go b/filebeat/module/nginx/fields.go index e45823e11ebd..df2afc9669e4 100644 --- a/filebeat/module/nginx/fields.go +++ b/filebeat/module/nginx/fields.go @@ -20,7 +20,7 @@ package nginx import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/osquery/fields.go b/filebeat/module/osquery/fields.go index 7f423fda95b2..98f1d9db0fb2 100644 --- a/filebeat/module/osquery/fields.go +++ b/filebeat/module/osquery/fields.go @@ -20,7 +20,7 @@ package osquery import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/postgresql/fields.go b/filebeat/module/postgresql/fields.go index 573e617dcd9d..1ef2040d458d 100644 --- a/filebeat/module/postgresql/fields.go +++ b/filebeat/module/postgresql/fields.go @@ -20,7 +20,7 @@ package postgresql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/redis/fields.go b/filebeat/module/redis/fields.go index 49ac22676a45..66298b24738f 100644 --- a/filebeat/module/redis/fields.go +++ b/filebeat/module/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/santa/fields.go b/filebeat/module/santa/fields.go index cc67c59b2b22..06b53e41d848 100644 --- a/filebeat/module/santa/fields.go +++ b/filebeat/module/santa/fields.go @@ -20,7 +20,7 @@ package santa import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/system/fields.go b/filebeat/module/system/fields.go index 4cfa76bf8c71..dcf2568f5e1c 100644 --- a/filebeat/module/system/fields.go +++ b/filebeat/module/system/fields.go @@ -20,7 +20,7 @@ package system import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/module/traefik/fields.go b/filebeat/module/traefik/fields.go index b5b1fc8935e7..f7e75e94d570 100644 --- a/filebeat/module/traefik/fields.go +++ b/filebeat/module/traefik/fields.go @@ -20,7 +20,7 @@ package traefik import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/filebeat/processor/add_kubernetes_metadata/matchers.go b/filebeat/processor/add_kubernetes_metadata/matchers.go index 5f0f6b0a8188..805e55fb43b5 100644 --- a/filebeat/processor/add_kubernetes_metadata/matchers.go +++ b/filebeat/processor/add_kubernetes_metadata/matchers.go @@ -23,9 +23,9 @@ import ( "runtime" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" ) func init() { diff --git a/filebeat/processor/add_kubernetes_metadata/matchers_test.go b/filebeat/processor/add_kubernetes_metadata/matchers_test.go index 0c8c64d5387d..82addc9d3b43 100644 --- a/filebeat/processor/add_kubernetes_metadata/matchers_test.go +++ b/filebeat/processor/add_kubernetes_metadata/matchers_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // A random container ID that we use for our tests diff --git a/filebeat/registrar/migrate.go b/filebeat/registrar/migrate.go index a48df0477c45..64d2b4579a8c 100644 --- a/filebeat/registrar/migrate.go +++ b/filebeat/registrar/migrate.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" - helper "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" + helper "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/filebeat/registrar/registrar.go b/filebeat/registrar/registrar.go index 22fdd1b60662..61b9c2608e1a 100644 --- a/filebeat/registrar/registrar.go +++ b/filebeat/registrar/registrar.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/elastic/beats/filebeat/config" - "github.com/elastic/beats/filebeat/input/file" - helper "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/filebeat/config" + "github.com/elastic/beats/v7/filebeat/input/file" + helper "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/paths" ) type Registrar struct { diff --git a/filebeat/registrar/registrar_test.go b/filebeat/registrar/registrar_test.go index 102b073dffad..58d5d5acff81 100644 --- a/filebeat/registrar/registrar_test.go +++ b/filebeat/registrar/registrar_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/input/file" + "github.com/elastic/beats/v7/filebeat/input/file" ) func TestRegistrarRead(t *testing.T) { diff --git a/filebeat/scripts/mage/config.go b/filebeat/scripts/mage/config.go index 23abad70ac59..7585c62b634a 100644 --- a/filebeat/scripts/mage/config.go +++ b/filebeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const modulesConfigYml = "build/config.modules.yml" diff --git a/filebeat/scripts/mage/docs.go b/filebeat/scripts/mage/docs.go index ae124600ca07..fd12ce859a8d 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/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 9bc8a8af40a1..01bc6a1c46af 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/dev-tools/mage" - genfields "github.com/elastic/beats/filebeat/generator/fields" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + genfields "github.com/elastic/beats/v7/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 612567a11045..ff54b2546324 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/dev-tools/mage" - genfileset "github.com/elastic/beats/filebeat/generator/fileset" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + genfileset "github.com/elastic/beats/v7/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 5d14e3ec09f5..6995d483c779 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/dev-tools/mage" - genmod "github.com/elastic/beats/filebeat/generator/module" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + genmod "github.com/elastic/beats/v7/filebeat/generator/module" ) // Module creates a new Filebeat module. diff --git a/filebeat/scripts/mage/package.go b/filebeat/scripts/mage/package.go index 9de7c6c959c4..8a0819caf5ae 100644 --- a/filebeat/scripts/mage/package.go +++ b/filebeat/scripts/mage/package.go @@ -21,7 +21,7 @@ import ( "github.com/magefile/mage/mg" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/filebeat/scripts/tester/main.go b/filebeat/scripts/tester/main.go index 63ecd2a69aa2..2ae9de443882 100644 --- a/filebeat/scripts/tester/main.go +++ b/filebeat/scripts/tester/main.go @@ -29,12 +29,12 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/multiline" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "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" ) type logReaderConfig struct { diff --git a/generator/_templates/beat/{beat}/beater/{beat}.go b/generator/_templates/beat/{beat}/beater/{beat}.go index 8031896402b7..236c3d663901 100644 --- a/generator/_templates/beat/{beat}/beater/{beat}.go +++ b/generator/_templates/beat/{beat}/beater/{beat}.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "{beat_path}/config" ) diff --git a/generator/_templates/beat/{beat}/cmd/root.go b/generator/_templates/beat/{beat}/cmd/root.go index 21cd202d0790..9607edb86a2f 100644 --- a/generator/_templates/beat/{beat}/cmd/root.go +++ b/generator/_templates/beat/{beat}/cmd/root.go @@ -3,8 +3,8 @@ package cmd import ( "{beat_path}/beater" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) // Name of this beat diff --git a/generator/_templates/beat/{beat}/magefile.go b/generator/_templates/beat/{beat}/magefile.go index 609c191e3969..b79448c2aaa5 100644 --- a/generator/_templates/beat/{beat}/magefile.go +++ b/generator/_templates/beat/{beat}/magefile.go @@ -9,12 +9,12 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/build" - "github.com/elastic/beats/dev-tools/mage/target/common" - "github.com/elastic/beats/dev-tools/mage/target/pkg" - "github.com/elastic/beats/dev-tools/mage/target/unittest" - "github.com/elastic/beats/generator/common/beatgen" + 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/pkg" + "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v7/generator/common/beatgen" ) func init() { @@ -25,7 +25,7 @@ func init() { devtools.BeatProjectType = devtools.CommunityProject } -// VendorUpdate updates elastic/beats in the vendor dir +// VendorUpdate updates elastic/beats/v7 in the vendor dir func VendorUpdate() error { return beatgen.VendorUpdate() } diff --git a/generator/_templates/metricbeat/{beat}/cmd/modules.go b/generator/_templates/metricbeat/{beat}/cmd/modules.go index 84809354f3ef..411a9bdaeff7 100644 --- a/generator/_templates/metricbeat/{beat}/cmd/modules.go +++ b/generator/_templates/metricbeat/{beat}/cmd/modules.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd" ) // BuildModulesManager adds support for modules management to a beat diff --git a/generator/_templates/metricbeat/{beat}/cmd/root.go b/generator/_templates/metricbeat/{beat}/cmd/root.go index 94de89a11048..840e7b1a7cdc 100644 --- a/generator/_templates/metricbeat/{beat}/cmd/root.go +++ b/generator/_templates/metricbeat/{beat}/cmd/root.go @@ -18,11 +18,11 @@ package cmd import ( - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/metricbeat/beater" - "github.com/elastic/beats/metricbeat/cmd/test" - "github.com/elastic/beats/metricbeat/mb/module" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/metricbeat/beater" + "github.com/elastic/beats/v7/metricbeat/cmd/test" + "github.com/elastic/beats/v7/metricbeat/mb/module" ) // Name of this beat diff --git a/generator/_templates/metricbeat/{beat}/magefile.go b/generator/_templates/metricbeat/{beat}/magefile.go index eada92dcd4cd..22b3dcfcc762 100644 --- a/generator/_templates/metricbeat/{beat}/magefile.go +++ b/generator/_templates/metricbeat/{beat}/magefile.go @@ -8,15 +8,15 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/build" - "github.com/elastic/beats/dev-tools/mage/target/collectors" - "github.com/elastic/beats/dev-tools/mage/target/common" - "github.com/elastic/beats/dev-tools/mage/target/pkg" - "github.com/elastic/beats/dev-tools/mage/target/unittest" - "github.com/elastic/beats/dev-tools/mage/target/update" - "github.com/elastic/beats/generator/common/beatgen" - metricbeat "github.com/elastic/beats/metricbeat/scripts/mage" + 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/collectors" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" + "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v7/dev-tools/mage/target/update" + "github.com/elastic/beats/v7/generator/common/beatgen" + metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" ) func init() { @@ -26,7 +26,7 @@ func init() { devtools.BeatVendor = "{full_name}" } -// VendorUpdate updates elastic/beats in the vendor dir +// VendorUpdate updates elastic/beats/v7 in the vendor dir func VendorUpdate() error { return beatgen.VendorUpdate() } diff --git a/generator/common/beatgen/beatgen.go b/generator/common/beatgen/beatgen.go index 62e7c36427d4..cd1d1900e883 100644 --- a/generator/common/beatgen/beatgen.go +++ b/generator/common/beatgen/beatgen.go @@ -29,8 +29,8 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/generator/common/beatgen/setup" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/generator/common/beatgen/setup" ) // ConfigItem represents a value that must be configured for the custom beat diff --git a/generator/common/beatgen/setup/creator.go b/generator/common/beatgen/setup/creator.go index 6685ed938e23..8656bf5a5f1f 100644 --- a/generator/common/beatgen/setup/creator.go +++ b/generator/common/beatgen/setup/creator.go @@ -27,7 +27,7 @@ import ( "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // CfgPrefix specifies the env variable prefix used to configure the beat diff --git a/generator/common/beatgen/setup/setup.go b/generator/common/beatgen/setup/setup.go index 16987a2e55ad..b0bb5427e22d 100644 --- a/generator/common/beatgen/setup/setup.go +++ b/generator/common/beatgen/setup/setup.go @@ -25,7 +25,7 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // RunSetup runs any remaining setup commands after the vendor directory has been setup diff --git a/go.mod b/go.mod index 288e93230aa9..fe38eeb670ce 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/elastic/beats +module github.com/elastic/beats/v7 go 1.13 diff --git a/heartbeat/autodiscover/builder/hints/monitors.go b/heartbeat/autodiscover/builder/hints/monitors.go index bb2a7d16ca70..ba89d81b4563 100644 --- a/heartbeat/autodiscover/builder/hints/monitors.go +++ b/heartbeat/autodiscover/builder/hints/monitors.go @@ -23,12 +23,12 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/heartbeat/autodiscover/builder/hints/monitors_test.go b/heartbeat/autodiscover/builder/hints/monitors_test.go index d3d37f990908..82c4dc6262c8 100644 --- a/heartbeat/autodiscover/builder/hints/monitors_test.go +++ b/heartbeat/autodiscover/builder/hints/monitors_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints(t *testing.T) { diff --git a/heartbeat/autodiscover/include.go b/heartbeat/autodiscover/include.go index cd4bf8bf0b62..2ae869729c49 100644 --- a/heartbeat/autodiscover/include.go +++ b/heartbeat/autodiscover/include.go @@ -19,5 +19,5 @@ package autodiscover import ( // include all heartbeat specific builders - _ "github.com/elastic/beats/heartbeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v7/heartbeat/autodiscover/builder/hints" ) diff --git a/heartbeat/beater/heartbeat.go b/heartbeat/beater/heartbeat.go index 66861a9d94ec..90eef546788f 100644 --- a/heartbeat/beater/heartbeat.go +++ b/heartbeat/beater/heartbeat.go @@ -21,20 +21,20 @@ import ( "fmt" "time" - "github.com/elastic/beats/heartbeat/hbregistry" + "github.com/elastic/beats/v7/heartbeat/hbregistry" "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/config" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/management" + "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/autodiscover" + "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/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/management" ) // Heartbeat represents the root datastructure of this beat. diff --git a/heartbeat/cmd/root.go b/heartbeat/cmd/root.go index 80435dbc4b99..858cc2c0daf6 100644 --- a/heartbeat/cmd/root.go +++ b/heartbeat/cmd/root.go @@ -20,14 +20,14 @@ package cmd import ( "fmt" - _ "github.com/elastic/beats/heartbeat/autodiscover" - "github.com/elastic/beats/heartbeat/beater" + _ "github.com/elastic/beats/v7/heartbeat/autodiscover" + "github.com/elastic/beats/v7/heartbeat/beater" // register default heartbeat monitors - _ "github.com/elastic/beats/heartbeat/monitors/defaults" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/publisher/processing" + _ "github.com/elastic/beats/v7/heartbeat/monitors/defaults" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/publisher/processing" ) // Name of this beat diff --git a/heartbeat/config/config.go b/heartbeat/config/config.go index fd23e1e6af78..5e676c191083 100644 --- a/heartbeat/config/config.go +++ b/heartbeat/config/config.go @@ -21,8 +21,8 @@ package config import ( - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" ) // Config defines the structure of heartbeat.yml. diff --git a/heartbeat/eventext/eventext.go b/heartbeat/eventext/eventext.go index 675fe191c910..122c8ae70e2c 100644 --- a/heartbeat/eventext/eventext.go +++ b/heartbeat/eventext/eventext.go @@ -18,8 +18,8 @@ package eventext import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // MergeEventFields merges the given common.MapStr into the given Event's Fields. diff --git a/heartbeat/hbregistry/hbregistry.go b/heartbeat/hbregistry/hbregistry.go index dfd4c799cabc..66b4ad2117c9 100644 --- a/heartbeat/hbregistry/hbregistry.go +++ b/heartbeat/hbregistry/hbregistry.go @@ -17,7 +17,7 @@ package hbregistry -import "github.com/elastic/beats/libbeat/monitoring" +import "github.com/elastic/beats/v7/libbeat/monitoring" // StatsRegistry contains a singleton instance of the heartbeat stats registry var StatsRegistry = monitoring.Default.NewRegistry("heartbeat") diff --git a/heartbeat/hbtest/hbtestutil.go b/heartbeat/hbtest/hbtestutil.go index 05f09d0f1e90..9bec84ee0b59 100644 --- a/heartbeat/hbtest/hbtestutil.go +++ b/heartbeat/hbtest/hbtestutil.go @@ -30,12 +30,12 @@ import ( "strings" "testing" - "github.com/elastic/beats/heartbeat/hbtestllext" + "github.com/elastic/beats/v7/heartbeat/hbtestllext" "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/common/x509util" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/common/x509util" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/validator" diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go index fbfeda42cea5..5bfb562fe7cd 100644 --- a/heartbeat/include/fields.go +++ b/heartbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/heartbeat/look/look.go b/heartbeat/look/look.go index b22281f64920..d6ea75a395a7 100644 --- a/heartbeat/look/look.go +++ b/heartbeat/look/look.go @@ -22,9 +22,9 @@ package look import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/heartbeat/reason" + "github.com/elastic/beats/v7/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 558337adfc7f..e5b566ebb574 100644 --- a/heartbeat/look/look_test.go +++ b/heartbeat/look/look_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - reason2 "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/common" + reason2 "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/common" ) // helper diff --git a/heartbeat/magefile.go b/heartbeat/magefile.go index b9d954ac643f..79011022869d 100644 --- a/heartbeat/magefile.go +++ b/heartbeat/magefile.go @@ -27,14 +27,14 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/generator/common/beatgen" - heartbeat "github.com/elastic/beats/heartbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/generator/common/beatgen" + heartbeat "github.com/elastic/beats/v7/heartbeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" ) func init() { @@ -45,7 +45,7 @@ func init() { devtools.BeatServiceName = "heartbeat-elastic" } -// VendorUpdate updates elastic/beats in the vendor dir +// VendorUpdate updates elastic/beats/v7 in the vendor dir func VendorUpdate() error { return beatgen.VendorUpdate() } diff --git a/heartbeat/main.go b/heartbeat/main.go index 009752fd20f3..6218bf004322 100644 --- a/heartbeat/main.go +++ b/heartbeat/main.go @@ -20,9 +20,9 @@ package main import ( "os" - "github.com/elastic/beats/heartbeat/cmd" + "github.com/elastic/beats/v7/heartbeat/cmd" - _ "github.com/elastic/beats/heartbeat/include" + _ "github.com/elastic/beats/v7/heartbeat/include" ) func main() { diff --git a/heartbeat/main_test.go b/heartbeat/main_test.go index 7a10fb838ee9..7de20114fa03 100644 --- a/heartbeat/main_test.go +++ b/heartbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/heartbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/heartbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/heartbeat/monitors/active/dialchain/builder.go b/heartbeat/monitors/active/dialchain/builder.go index 301c932db573..72e74aadc921 100644 --- a/heartbeat/monitors/active/dialchain/builder.go +++ b/heartbeat/monitors/active/dialchain/builder.go @@ -23,11 +23,11 @@ import ( "net/url" "time" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // Builder maintains a DialerChain for building dialers and dialer based diff --git a/heartbeat/monitors/active/dialchain/dialchain.go b/heartbeat/monitors/active/dialchain/dialchain.go index 0f0c764e779d..d6d2ea050987 100644 --- a/heartbeat/monitors/active/dialchain/dialchain.go +++ b/heartbeat/monitors/active/dialchain/dialchain.go @@ -18,8 +18,8 @@ package dialchain import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // DialerChain composes builders for multiple network layers, used to build diff --git a/heartbeat/monitors/active/dialchain/net.go b/heartbeat/monitors/active/dialchain/net.go index e31798982b37..01b8b6c49b7e 100644 --- a/heartbeat/monitors/active/dialchain/net.go +++ b/heartbeat/monitors/active/dialchain/net.go @@ -23,12 +23,12 @@ import ( "strconv" "time" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/transport" + "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/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // 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 694b8cd949cd..ce8987a0623c 100644 --- a/heartbeat/monitors/active/dialchain/socks5.go +++ b/heartbeat/monitors/active/dialchain/socks5.go @@ -20,9 +20,9 @@ package dialchain import ( "net" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // SOCKS5Layer configures a SOCKS5 proxy layer in a DialerChain. diff --git a/heartbeat/monitors/active/dialchain/tls.go b/heartbeat/monitors/active/dialchain/tls.go index f7f6de720d37..79ea3aea2597 100644 --- a/heartbeat/monitors/active/dialchain/tls.go +++ b/heartbeat/monitors/active/dialchain/tls.go @@ -24,10 +24,10 @@ import ( "net" "time" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // TLSLayer configures the TLS layer in a DialerChain. diff --git a/heartbeat/monitors/active/dialchain/tls_test.go b/heartbeat/monitors/active/dialchain/tls_test.go index b281bf602e94..8df41fbd3b06 100644 --- a/heartbeat/monitors/active/dialchain/tls_test.go +++ b/heartbeat/monitors/active/dialchain/tls_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func Test_addCertMetdata(t *testing.T) { diff --git a/heartbeat/monitors/active/dialchain/util.go b/heartbeat/monitors/active/dialchain/util.go index f0c8247361a1..fdc6a7843c1b 100644 --- a/heartbeat/monitors/active/dialchain/util.go +++ b/heartbeat/monitors/active/dialchain/util.go @@ -21,8 +21,8 @@ import ( "net" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type timer struct { diff --git a/heartbeat/monitors/active/http/check.go b/heartbeat/monitors/active/http/check.go index 4ff5ab4a4702..327674f7956d 100644 --- a/heartbeat/monitors/active/http/check.go +++ b/heartbeat/monitors/active/http/check.go @@ -27,11 +27,11 @@ import ( pkgerrors "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/jsontransform" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/jsontransform" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/conditions" ) // multiValidator combines multiple validations of each type into a single easy to use object. diff --git a/heartbeat/monitors/active/http/check_test.go b/heartbeat/monitors/active/http/check_test.go index 3c3e42caa060..14f4fb0c2646 100644 --- a/heartbeat/monitors/active/http/check_test.go +++ b/heartbeat/monitors/active/http/check_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/conditions" ) func TestCheckBody(t *testing.T) { diff --git a/heartbeat/monitors/active/http/config.go b/heartbeat/monitors/active/http/config.go index e195f4209e3e..c648cfecfc92 100644 --- a/heartbeat/monitors/active/http/config.go +++ b/heartbeat/monitors/active/http/config.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/conditions" ) type Config struct { diff --git a/heartbeat/monitors/active/http/http.go b/heartbeat/monitors/active/http/http.go index ef6c43b9c58f..c52b07005af1 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/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) func init() { diff --git a/heartbeat/monitors/active/http/http_test.go b/heartbeat/monitors/active/http/http_test.go index bcb372361080..fd3642fbd178 100644 --- a/heartbeat/monitors/active/http/http_test.go +++ b/heartbeat/monitors/active/http/http_test.go @@ -33,14 +33,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/hbtest" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - schedule "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/outputs/transport" - btesting "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/heartbeat/hbtest" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + schedule "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + btesting "github.com/elastic/beats/v7/libbeat/testing" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/active/http/respbody.go b/heartbeat/monitors/active/http/respbody.go index b8b95e5b023d..6aee68417f4b 100644 --- a/heartbeat/monitors/active/http/respbody.go +++ b/heartbeat/monitors/active/http/respbody.go @@ -26,8 +26,8 @@ import ( "github.com/docker/go-units" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/common" ) // maxBufferBodyBytes sets a hard limit on how much we're willing to buffer for any reason internally. diff --git a/heartbeat/monitors/active/http/respbody_test.go b/heartbeat/monitors/active/http/respbody_test.go index 1a3b8accb4ac..071f4e27a47e 100644 --- a/heartbeat/monitors/active/http/respbody_test.go +++ b/heartbeat/monitors/active/http/respbody_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" ) diff --git a/heartbeat/monitors/active/http/simple_transp.go b/heartbeat/monitors/active/http/simple_transp.go index 889baa8e5a1e..56d7fbf3c9ad 100644 --- a/heartbeat/monitors/active/http/simple_transp.go +++ b/heartbeat/monitors/active/http/simple_transp.go @@ -28,7 +28,7 @@ import ( "net/url" "strings" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) const ( diff --git a/heartbeat/monitors/active/http/task.go b/heartbeat/monitors/active/http/task.go index 6a4fe1f9a03d..69ec37932304 100644 --- a/heartbeat/monitors/active/http/task.go +++ b/heartbeat/monitors/active/http/task.go @@ -29,17 +29,17 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/useragent" - - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/active/dialchain" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/useragent" + + "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/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) var userAgent = useragent.UserAgent("Heartbeat") diff --git a/heartbeat/monitors/active/http/task_test.go b/heartbeat/monitors/active/http/task_test.go index 765887302c0a..5d46befc8b12 100644 --- a/heartbeat/monitors/active/http/task_test.go +++ b/heartbeat/monitors/active/http/task_test.go @@ -24,7 +24,7 @@ import ( "reflect" "testing" - "github.com/elastic/beats/libbeat/common/useragent" + "github.com/elastic/beats/v7/libbeat/common/useragent" "github.com/stretchr/testify/require" diff --git a/heartbeat/monitors/active/icmp/config.go b/heartbeat/monitors/active/icmp/config.go index 5ad176d41243..331ff8f45f6c 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/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors" ) type Config struct { diff --git a/heartbeat/monitors/active/icmp/icmp.go b/heartbeat/monitors/active/icmp/icmp.go index be90421fd2f8..66bc0b2adc61 100644 --- a/heartbeat/monitors/active/icmp/icmp.go +++ b/heartbeat/monitors/active/icmp/icmp.go @@ -22,14 +22,14 @@ import ( "net" "net/url" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/heartbeat/monitors/active/tcp/config.go b/heartbeat/monitors/active/tcp/config.go index 749ad1600169..9b6f65fa97b4 100644 --- a/heartbeat/monitors/active/tcp/config.go +++ b/heartbeat/monitors/active/tcp/config.go @@ -21,10 +21,10 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" - "github.com/elastic/beats/heartbeat/monitors" + "github.com/elastic/beats/v7/heartbeat/monitors" ) type Config struct { diff --git a/heartbeat/monitors/active/tcp/task.go b/heartbeat/monitors/active/tcp/task.go index 4c5523f671a5..f583f278aeca 100644 --- a/heartbeat/monitors/active/tcp/task.go +++ b/heartbeat/monitors/active/tcp/task.go @@ -20,12 +20,12 @@ package tcp import ( "time" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/reason" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/heartbeat/look" + "github.com/elastic/beats/v7/heartbeat/reason" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) func pingHost( diff --git a/heartbeat/monitors/active/tcp/tcp.go b/heartbeat/monitors/active/tcp/tcp.go index 0fcc4329b9ce..fb547df58dde 100644 --- a/heartbeat/monitors/active/tcp/tcp.go +++ b/heartbeat/monitors/active/tcp/tcp.go @@ -23,14 +23,14 @@ import ( "strconv" "strings" - "github.com/elastic/beats/heartbeat/monitors" - "github.com/elastic/beats/heartbeat/monitors/active/dialchain" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" + "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/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) func init() { diff --git a/heartbeat/monitors/active/tcp/tcp_test.go b/heartbeat/monitors/active/tcp/tcp_test.go index 22d42b0173fb..4e48b6b6ee60 100644 --- a/heartbeat/monitors/active/tcp/tcp_test.go +++ b/heartbeat/monitors/active/tcp/tcp_test.go @@ -31,12 +31,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/hbtest" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - btesting "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/heartbeat/hbtest" + "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/v7/libbeat/common" + btesting "github.com/elastic/beats/v7/libbeat/testing" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/defaults/default.go b/heartbeat/monitors/defaults/default.go index 5e65d46fab3e..610faf5c452f 100644 --- a/heartbeat/monitors/defaults/default.go +++ b/heartbeat/monitors/defaults/default.go @@ -21,7 +21,7 @@ package defaults import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/heartbeat/monitors/active/http" - _ "github.com/elastic/beats/heartbeat/monitors/active/icmp" - _ "github.com/elastic/beats/heartbeat/monitors/active/tcp" + _ "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" ) diff --git a/heartbeat/monitors/factory.go b/heartbeat/monitors/factory.go index 6f9391a2fdf6..b6c39d14d4d9 100644 --- a/heartbeat/monitors/factory.go +++ b/heartbeat/monitors/factory.go @@ -18,10 +18,10 @@ package monitors import ( - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" + "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" ) // RunnerFactory that can be used to create cfg.Runner cast versions of Monitor diff --git a/heartbeat/monitors/jobs/job.go b/heartbeat/monitors/jobs/job.go index efa387394018..bc41d097f07f 100644 --- a/heartbeat/monitors/jobs/job.go +++ b/heartbeat/monitors/jobs/job.go @@ -18,7 +18,7 @@ package jobs import ( - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/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 ffcbc9d6e911..dbb84c324530 100644 --- a/heartbeat/monitors/jobs/job_test.go +++ b/heartbeat/monitors/jobs/job_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/eventext" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "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 c1ba0362d18a..a60b72e28c3e 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/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) // ExecJobsAndConts recursively executes multiple jobs. diff --git a/heartbeat/monitors/mocks_test.go b/heartbeat/monitors/mocks_test.go index 6fa1793d4f7c..629eeb43a43c 100644 --- a/heartbeat/monitors/mocks_test.go +++ b/heartbeat/monitors/mocks_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/hbtest" - "github.com/elastic/beats/heartbeat/hbtestllext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "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/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/validator" diff --git a/heartbeat/monitors/monitor.go b/heartbeat/monitors/monitor.go index 01213f2ad2d1..0326c4094156 100644 --- a/heartbeat/monitors/monitor.go +++ b/heartbeat/monitors/monitor.go @@ -26,13 +26,13 @@ import ( "github.com/mitchellh/hashstructure" "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/watcher" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/heartbeat/monitors/wrappers" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/watcher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Monitor represents a configured recurring monitoring configuredJob loaded from a config file. Starting it diff --git a/heartbeat/monitors/monitor_test.go b/heartbeat/monitors/monitor_test.go index 8e19ba52df1f..50553a06e89a 100644 --- a/heartbeat/monitors/monitor_test.go +++ b/heartbeat/monitors/monitor_test.go @@ -21,14 +21,14 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/scheduler" ) func TestMonitor(t *testing.T) { diff --git a/heartbeat/monitors/plugin.go b/heartbeat/monitors/plugin.go index 68aaa151cd43..a75f8990477e 100644 --- a/heartbeat/monitors/plugin.go +++ b/heartbeat/monitors/plugin.go @@ -23,10 +23,10 @@ import ( "sort" "strings" - "github.com/elastic/beats/heartbeat/hbregistry" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/heartbeat/hbregistry" + "github.com/elastic/beats/v7/heartbeat/monitors/jobs" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/plugin" ) type pluginBuilder struct { diff --git a/heartbeat/monitors/pluginconf.go b/heartbeat/monitors/pluginconf.go index 20aace700fdb..5df2c192cce5 100644 --- a/heartbeat/monitors/pluginconf.go +++ b/heartbeat/monitors/pluginconf.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/common" ) // ErrPluginDisabled is returned when the monitor plugin is marked as disabled. diff --git a/heartbeat/monitors/regrecord.go b/heartbeat/monitors/regrecord.go index b779d68d0e0e..a7c630deaa1a 100644 --- a/heartbeat/monitors/regrecord.go +++ b/heartbeat/monitors/regrecord.go @@ -18,7 +18,7 @@ package monitors import ( - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type registryRecorder interface { diff --git a/heartbeat/monitors/task.go b/heartbeat/monitors/task.go index 148019f5425c..4c045bf6513c 100644 --- a/heartbeat/monitors/task.go +++ b/heartbeat/monitors/task.go @@ -23,14 +23,14 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "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/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) // configuredJob represents a job combined with its config and any diff --git a/heartbeat/monitors/task_test.go b/heartbeat/monitors/task_test.go index 6358edd9f352..dc0aa7ab23c4 100644 --- a/heartbeat/monitors/task_test.go +++ b/heartbeat/monitors/task_test.go @@ -28,10 +28,10 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "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/v7/libbeat/common" ) func Test_runPublishJob(t *testing.T) { diff --git a/heartbeat/monitors/util.go b/heartbeat/monitors/util.go index df32a928aef9..8cf2679c0d8b 100644 --- a/heartbeat/monitors/util.go +++ b/heartbeat/monitors/util.go @@ -23,12 +23,12 @@ import ( "net" "time" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/monitors/wrappers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "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" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // IPSettings provides common configuration settings for IP resolution and ping diff --git a/heartbeat/monitors/wrappers/monitors.go b/heartbeat/monitors/wrappers/monitors.go index c565d7481c09..5868cdca6364 100644 --- a/heartbeat/monitors/wrappers/monitors.go +++ b/heartbeat/monitors/wrappers/monitors.go @@ -22,18 +22,18 @@ import ( "sync" "time" - "github.com/elastic/beats/heartbeat/scheduler/schedule" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule" "github.com/gofrs/uuid" "github.com/mitchellh/hashstructure" "github.com/pkg/errors" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/look" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // WrapCommon applies the common wrappers that all monitor jobs get. diff --git a/heartbeat/monitors/wrappers/monitors_test.go b/heartbeat/monitors/wrappers/monitors_test.go index 51e17890e495..5cbcb43ebd59 100644 --- a/heartbeat/monitors/wrappers/monitors_test.go +++ b/heartbeat/monitors/wrappers/monitors_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/hbtestllext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/heartbeat/scheduler/schedule" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "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/scheduler/schedule" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/testslike" diff --git a/heartbeat/monitors/wrappers/util.go b/heartbeat/monitors/wrappers/util.go index 83778069d99e..30afb29c444f 100644 --- a/heartbeat/monitors/wrappers/util.go +++ b/heartbeat/monitors/wrappers/util.go @@ -21,10 +21,10 @@ import ( "net/url" "strconv" - "github.com/elastic/beats/heartbeat/eventext" - "github.com/elastic/beats/heartbeat/monitors/jobs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "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/v7/libbeat/common" ) // WithFields wraps a Job and all continuations, updating all events returned with the set of diff --git a/heartbeat/monitors/wrappers/util_test.go b/heartbeat/monitors/wrappers/util_test.go index f87b2a9cbd31..a681d4cedad4 100644 --- a/heartbeat/monitors/wrappers/util_test.go +++ b/heartbeat/monitors/wrappers/util_test.go @@ -26,7 +26,7 @@ import ( "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/testslike" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestURLFields(t *testing.T) { diff --git a/heartbeat/reason/reason.go b/heartbeat/reason/reason.go index d5fc5e456898..677a87a8971f 100644 --- a/heartbeat/reason/reason.go +++ b/heartbeat/reason/reason.go @@ -17,7 +17,7 @@ package reason -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" type Reason interface { error diff --git a/heartbeat/scheduler/schedule/schedule.go b/heartbeat/scheduler/schedule/schedule.go index 696a6b8fa007..51755ae70598 100644 --- a/heartbeat/scheduler/schedule/schedule.go +++ b/heartbeat/scheduler/schedule/schedule.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/scheduler/schedule/cron" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule/cron" ) type Schedule struct { diff --git a/heartbeat/scheduler/schedule/schedule_test.go b/heartbeat/scheduler/schedule/schedule_test.go index 2d0bed8d8362..9665b54d33aa 100644 --- a/heartbeat/scheduler/schedule/schedule_test.go +++ b/heartbeat/scheduler/schedule/schedule_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/elastic/beats/heartbeat/scheduler" - "github.com/elastic/beats/heartbeat/scheduler/schedule/cron" + "github.com/elastic/beats/v7/heartbeat/scheduler" + "github.com/elastic/beats/v7/heartbeat/scheduler/schedule/cron" ) func TestParse(t *testing.T) { diff --git a/heartbeat/scheduler/scheduler.go b/heartbeat/scheduler/scheduler.go index 0fc2d2596f9a..961ade0399bd 100644 --- a/heartbeat/scheduler/scheduler.go +++ b/heartbeat/scheduler/scheduler.go @@ -27,10 +27,10 @@ import ( "golang.org/x/sync/semaphore" - "github.com/elastic/beats/heartbeat/scheduler/timerqueue" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/heartbeat/scheduler/timerqueue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) const ( diff --git a/heartbeat/scheduler/scheduler_test.go b/heartbeat/scheduler/scheduler_test.go index 79e33cbb0703..75cbd3d7544f 100644 --- a/heartbeat/scheduler/scheduler_test.go +++ b/heartbeat/scheduler/scheduler_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/heartbeat/scripts/mage/config.go b/heartbeat/scripts/mage/config.go index e3c9ce6752e2..5128c7d6672b 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // ConfigFileParams returns the default ConfigFileParams for generating diff --git a/heartbeat/watcher/watcher.go b/heartbeat/watcher/watcher.go index d0669127fa0e..cd9866f638e0 100644 --- a/heartbeat/watcher/watcher.go +++ b/heartbeat/watcher/watcher.go @@ -23,7 +23,7 @@ import ( "os" "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type Watch interface { diff --git a/journalbeat/beater/journalbeat.go b/journalbeat/beater/journalbeat.go index 7a54163f832e..a2dcab6d7b63 100644 --- a/journalbeat/beater/journalbeat.go +++ b/journalbeat/beater/journalbeat.go @@ -22,19 +22,19 @@ import ( "sync" "time" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/cmd/instance" - "github.com/elastic/beats/journalbeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/cmd/instance" + "github.com/elastic/beats/v7/journalbeat/input" + "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/libbeat/logp" - "github.com/elastic/beats/journalbeat/config" - _ "github.com/elastic/beats/journalbeat/include" + "github.com/elastic/beats/v7/journalbeat/config" + _ "github.com/elastic/beats/v7/journalbeat/include" // Add dedicated processors - _ "github.com/elastic/beats/libbeat/processors/decode_csv_fields" + _ "github.com/elastic/beats/v7/libbeat/processors/decode_csv_fields" ) // Journalbeat instance diff --git a/journalbeat/checkpoint/checkpoint.go b/journalbeat/checkpoint/checkpoint.go index ff8e702de1cb..2ba4140182a1 100644 --- a/journalbeat/checkpoint/checkpoint.go +++ b/journalbeat/checkpoint/checkpoint.go @@ -32,8 +32,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" ) // Checkpoint persists event log state information to disk. diff --git a/journalbeat/cmd/instance/metrics.go b/journalbeat/cmd/instance/metrics.go index 7c7cf19cb5c3..7b569da8dd26 100644 --- a/journalbeat/cmd/instance/metrics.go +++ b/journalbeat/cmd/instance/metrics.go @@ -24,7 +24,7 @@ import ( "github.com/coreos/go-systemd/v22/sdjournal" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/journalbeat/cmd/root.go b/journalbeat/cmd/root.go index a276788d0849..4393f505bb81 100644 --- a/journalbeat/cmd/root.go +++ b/journalbeat/cmd/root.go @@ -18,14 +18,14 @@ package cmd import ( - "github.com/elastic/beats/journalbeat/beater" + "github.com/elastic/beats/v7/journalbeat/beater" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" // Import processors. - _ "github.com/elastic/beats/libbeat/processors/script" - _ "github.com/elastic/beats/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/libbeat/processors/script" + _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" ) // Name of this beat diff --git a/journalbeat/config/config.go b/journalbeat/config/config.go index 395bf13ec9cb..a5d9127641de 100644 --- a/journalbeat/config/config.go +++ b/journalbeat/config/config.go @@ -23,7 +23,7 @@ package config import ( "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // SeekMode is specifies how a journal is read diff --git a/journalbeat/include/fields.go b/journalbeat/include/fields.go index 6a0700591928..48197826a7f9 100644 --- a/journalbeat/include/fields.go +++ b/journalbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/journalbeat/input/config.go b/journalbeat/input/config.go index 3916f9ad515b..00eb871cb4c6 100644 --- a/journalbeat/input/config.go +++ b/journalbeat/input/config.go @@ -20,10 +20,10 @@ package input import ( "time" - "github.com/elastic/beats/journalbeat/config" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/journalbeat/config" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/processors" ) // Config stores the options of an input. diff --git a/journalbeat/input/input.go b/journalbeat/input/input.go index b3a74dd46b89..ca39b082049e 100644 --- a/journalbeat/input/input.go +++ b/journalbeat/input/input.go @@ -21,18 +21,18 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" "github.com/gofrs/uuid" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/reader" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/reader" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) // Input manages readers and forwards entries from journals. diff --git a/journalbeat/input/input_test.go b/journalbeat/input/input_test.go index 76e99852c9a3..f80688b786ef 100644 --- a/journalbeat/input/input_test.go +++ b/journalbeat/input/input_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - _ "github.com/elastic/beats/libbeat/processors/actions" + "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" ) func TestProcessorsForInput(t *testing.T) { diff --git a/journalbeat/magefile.go b/journalbeat/magefile.go index 74bf0d17931b..03e0d696a1ee 100644 --- a/journalbeat/magefile.go +++ b/journalbeat/magefile.go @@ -29,12 +29,12 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" ) func init() { diff --git a/journalbeat/main.go b/journalbeat/main.go index 6bfbba776b2d..56c0e645406b 100644 --- a/journalbeat/main.go +++ b/journalbeat/main.go @@ -20,7 +20,7 @@ package main import ( "os" - "github.com/elastic/beats/journalbeat/cmd" + "github.com/elastic/beats/v7/journalbeat/cmd" ) func main() { diff --git a/journalbeat/main_test.go b/journalbeat/main_test.go index 7a55116c7f06..63c0e4926046 100644 --- a/journalbeat/main_test.go +++ b/journalbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/journalbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/journalbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/journalbeat/reader/config.go b/journalbeat/reader/config.go index f97390ad0ad6..d9ad57696883 100644 --- a/journalbeat/reader/config.go +++ b/journalbeat/reader/config.go @@ -20,7 +20,7 @@ package reader import ( "time" - "github.com/elastic/beats/journalbeat/config" + "github.com/elastic/beats/v7/journalbeat/config" ) // Config stores the options of a reder. diff --git a/journalbeat/reader/journal.go b/journalbeat/reader/journal.go index c7a34c8bfb2e..9c599d296577 100644 --- a/journalbeat/reader/journal.go +++ b/journalbeat/reader/journal.go @@ -31,13 +31,13 @@ import ( "github.com/coreos/go-systemd/v22/sdjournal" "github.com/pkg/errors" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/cmd/instance" - "github.com/elastic/beats/journalbeat/config" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/cmd/instance" + "github.com/elastic/beats/v7/journalbeat/config" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/logp" ) // Reader reads entries from journal(s). diff --git a/journalbeat/reader/journal_other.go b/journalbeat/reader/journal_other.go index 82ad678c3266..26f0a7b5f1fe 100644 --- a/journalbeat/reader/journal_other.go +++ b/journalbeat/reader/journal_other.go @@ -22,9 +22,9 @@ package reader import ( "errors" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" ) // Reader stub for non linux builds. diff --git a/journalbeat/reader/journal_test.go b/journalbeat/reader/journal_test.go index d7619c45829f..c54ee800c433 100644 --- a/journalbeat/reader/journal_test.go +++ b/journalbeat/reader/journal_test.go @@ -26,10 +26,10 @@ import ( "github.com/coreos/go-systemd/v22/sdjournal" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/journalbeat/checkpoint" - "github.com/elastic/beats/journalbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/journalbeat/checkpoint" + "github.com/elastic/beats/v7/journalbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type ToEventTestCase struct { diff --git a/libbeat/api/make_listener_posix.go b/libbeat/api/make_listener_posix.go index 672af5cc95df..422a1c542911 100644 --- a/libbeat/api/make_listener_posix.go +++ b/libbeat/api/make_listener_posix.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/api/npipe" + "github.com/elastic/beats/v7/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 ef549f46a9af..adc9dff4efd5 100644 --- a/libbeat/api/make_listener_windows.go +++ b/libbeat/api/make_listener_windows.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/api/npipe" + "github.com/elastic/beats/v7/libbeat/api/npipe" ) func makeListener(cfg Config) (net.Listener, error) { diff --git a/libbeat/api/routes.go b/libbeat/api/routes.go index e78dfa16ae84..8cb35cfc23ca 100644 --- a/libbeat/api/routes.go +++ b/libbeat/api/routes.go @@ -22,9 +22,9 @@ import ( "net/http" "net/url" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type handlerFunc func(http.ResponseWriter, *http.Request) diff --git a/libbeat/api/server.go b/libbeat/api/server.go index 44db0baed145..682fd726ce91 100644 --- a/libbeat/api/server.go +++ b/libbeat/api/server.go @@ -24,8 +24,8 @@ import ( "net/url" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Server takes cares of correctly starting the HTTP component of the API diff --git a/libbeat/api/server_test.go b/libbeat/api/server_test.go index c021113ccb13..e4df0f5b4e37 100644 --- a/libbeat/api/server_test.go +++ b/libbeat/api/server_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfiguration(t *testing.T) { diff --git a/libbeat/api/server_windows_test.go b/libbeat/api/server_windows_test.go index 0931da865c33..51efc0f1f819 100644 --- a/libbeat/api/server_windows_test.go +++ b/libbeat/api/server_windows_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/api/npipe" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v7/libbeat/common" ) func TestNamedPipe(t *testing.T) { diff --git a/libbeat/asset/asset.go b/libbeat/asset/asset.go index d005545b5fba..51ebb2032492 100644 --- a/libbeat/asset/asset.go +++ b/libbeat/asset/asset.go @@ -46,7 +46,7 @@ var Template = template.Must(template.New("normalizations").Parse(` package {{ .Package }} import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/libbeat/autodiscover/appender.go b/libbeat/autodiscover/appender.go index 08debb573bac..b82ad0c8e7cd 100644 --- a/libbeat/autodiscover/appender.go +++ b/libbeat/autodiscover/appender.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // Appender provides an interface by which extra configuration can be added into configs diff --git a/libbeat/autodiscover/appender_test.go b/libbeat/autodiscover/appender_test.go index 78e51129a6e0..9dbf455e7b20 100644 --- a/libbeat/autodiscover/appender_test.go +++ b/libbeat/autodiscover/appender_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) type fakeAppender struct{} diff --git a/libbeat/autodiscover/appenders/config/config.go b/libbeat/autodiscover/appenders/config/config.go index 1efaaf14bf8c..018ee1b587d8 100644 --- a/libbeat/autodiscover/appenders/config/config.go +++ b/libbeat/autodiscover/appenders/config/config.go @@ -22,13 +22,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/conditions" - "github.com/elastic/beats/libbeat/logp" + "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/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/autodiscover/appenders/config/config_test.go b/libbeat/autodiscover/appenders/config/config_test.go index e92252883f3e..36b4ee5b390c 100644 --- a/libbeat/autodiscover/appenders/config/config_test.go +++ b/libbeat/autodiscover/appenders/config/config_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestGenerateAppender(t *testing.T) { diff --git a/libbeat/autodiscover/appenders/registry.go b/libbeat/autodiscover/appenders/registry.go index e72700fc368a..8a3bbc2f9ab8 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/libbeat/autodiscover" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/autodiscover" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type appenderPlugin struct { diff --git a/libbeat/autodiscover/autodiscover.go b/libbeat/autodiscover/autodiscover.go index 5ddeb21a0ed7..6ceb46fa794f 100644 --- a/libbeat/autodiscover/autodiscover.go +++ b/libbeat/autodiscover/autodiscover.go @@ -23,13 +23,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover/meta" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" + "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/bus" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/autodiscover/autodiscover_test.go b/libbeat/autodiscover/autodiscover_test.go index c454a8c64adb..c466785d4b95 100644 --- a/libbeat/autodiscover/autodiscover_test.go +++ b/libbeat/autodiscover/autodiscover_test.go @@ -26,11 +26,11 @@ import ( "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/tests/resources" + "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/bus" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) type mockRunner struct { diff --git a/libbeat/autodiscover/builder.go b/libbeat/autodiscover/builder.go index aa966d592c8b..b77ef847a97b 100644 --- a/libbeat/autodiscover/builder.go +++ b/libbeat/autodiscover/builder.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // Builder provides an interface by which configs can be built from provider metadata diff --git a/libbeat/autodiscover/builder/helper.go b/libbeat/autodiscover/builder/helper.go index e9c00abb340a..7aa2c3062ae6 100644 --- a/libbeat/autodiscover/builder/helper.go +++ b/libbeat/autodiscover/builder/helper.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) // GetContainerID returns the id of a container diff --git a/libbeat/autodiscover/builder/helper_test.go b/libbeat/autodiscover/builder/helper_test.go index e64fe5484156..082f9a6f722c 100644 --- a/libbeat/autodiscover/builder/helper_test.go +++ b/libbeat/autodiscover/builder/helper_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestGenerateHints(t *testing.T) { diff --git a/libbeat/autodiscover/builder/plugin.go b/libbeat/autodiscover/builder/plugin.go index 87f33cda3bf2..83abccc2097c 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/libbeat/autodiscover" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/autodiscover" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type builderPlugin struct { diff --git a/libbeat/autodiscover/builder_test.go b/libbeat/autodiscover/builder_test.go index d305dd6fa4a3..75cc0dafaebf 100644 --- a/libbeat/autodiscover/builder_test.go +++ b/libbeat/autodiscover/builder_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) type fakeBuilder struct{} diff --git a/libbeat/autodiscover/config.go b/libbeat/autodiscover/config.go index 7072d5b9d7d9..f4d8081e2928 100644 --- a/libbeat/autodiscover/config.go +++ b/libbeat/autodiscover/config.go @@ -18,7 +18,7 @@ package autodiscover import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Config settings for Autodiscover diff --git a/libbeat/autodiscover/factoryadapter.go b/libbeat/autodiscover/factoryadapter.go index 358addd6bb9f..64dc9f15ca74 100644 --- a/libbeat/autodiscover/factoryadapter.go +++ b/libbeat/autodiscover/factoryadapter.go @@ -20,10 +20,10 @@ package autodiscover import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "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/bus" ) // FactoryAdapter is an adapter that works with any cfgfile.RunnerFactory. diff --git a/libbeat/autodiscover/meta/meta.go b/libbeat/autodiscover/meta/meta.go index 28464dfd9ebb..bf1a2048caed 100644 --- a/libbeat/autodiscover/meta/meta.go +++ b/libbeat/autodiscover/meta/meta.go @@ -20,7 +20,7 @@ package meta import ( "sync" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Map stores a map of id -> MapStrPointer diff --git a/libbeat/autodiscover/meta/meta_test.go b/libbeat/autodiscover/meta/meta_test.go index ea7a31c3eac2..d48351324ebf 100644 --- a/libbeat/autodiscover/meta/meta_test.go +++ b/libbeat/autodiscover/meta/meta_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestStoreNil(t *testing.T) { diff --git a/libbeat/autodiscover/provider.go b/libbeat/autodiscover/provider.go index dc7d416b1307..f7bfefc69d05 100644 --- a/libbeat/autodiscover/provider.go +++ b/libbeat/autodiscover/provider.go @@ -23,9 +23,9 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // Provider for autodiscover diff --git a/libbeat/autodiscover/providers/docker/config.go b/libbeat/autodiscover/providers/docker/config.go index cba67993677c..4780addecbde 100644 --- a/libbeat/autodiscover/providers/docker/config.go +++ b/libbeat/autodiscover/providers/docker/config.go @@ -22,9 +22,9 @@ package docker import ( "time" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" ) // Config for docker autodiscover provider diff --git a/libbeat/autodiscover/providers/docker/docker.go b/libbeat/autodiscover/providers/docker/docker.go index 1189137f608a..3e487a666704 100644 --- a/libbeat/autodiscover/providers/docker/docker.go +++ b/libbeat/autodiscover/providers/docker/docker.go @@ -26,15 +26,15 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/autodiscover/providers/docker/docker_integration_test.go b/libbeat/autodiscover/providers/docker/docker_integration_test.go index 288b004bd468..b8afbafbb62b 100644 --- a/libbeat/autodiscover/providers/docker/docker_integration_test.go +++ b/libbeat/autodiscover/providers/docker/docker_integration_test.go @@ -23,15 +23,15 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - dk "github.com/elastic/beats/libbeat/tests/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + dk "github.com/elastic/beats/v7/libbeat/tests/docker" ) // Test docker start emits an autodiscover event diff --git a/libbeat/autodiscover/providers/docker/docker_test.go b/libbeat/autodiscover/providers/docker/docker_test.go index ba663d30314d..40fef07f1834 100644 --- a/libbeat/autodiscover/providers/docker/docker_test.go +++ b/libbeat/autodiscover/providers/docker/docker_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/docker" ) func TestGenerateHints(t *testing.T) { diff --git a/libbeat/autodiscover/providers/jolokia/config.go b/libbeat/autodiscover/providers/jolokia/config.go index 7bde0b938268..8d81ac2cc8ac 100644 --- a/libbeat/autodiscover/providers/jolokia/config.go +++ b/libbeat/autodiscover/providers/jolokia/config.go @@ -20,8 +20,8 @@ package jolokia import ( "time" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/libbeat/autodiscover/providers/jolokia/config_test.go b/libbeat/autodiscover/providers/jolokia/config_test.go index a72ae0dffa9b..3135a22c4afc 100644 --- a/libbeat/autodiscover/providers/jolokia/config_test.go +++ b/libbeat/autodiscover/providers/jolokia/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestInterfaceConfigsUnpack(t *testing.T) { diff --git a/libbeat/autodiscover/providers/jolokia/discovery.go b/libbeat/autodiscover/providers/jolokia/discovery.go index ed026ec3b078..380369fa9118 100644 --- a/libbeat/autodiscover/providers/jolokia/discovery.go +++ b/libbeat/autodiscover/providers/jolokia/discovery.go @@ -27,11 +27,11 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" + "github.com/elastic/beats/v7/libbeat/logp" ) // Jolokia Discovery query diff --git a/libbeat/autodiscover/providers/jolokia/jolokia.go b/libbeat/autodiscover/providers/jolokia/jolokia.go index f938e4a379a9..b370d747b893 100644 --- a/libbeat/autodiscover/providers/jolokia/jolokia.go +++ b/libbeat/autodiscover/providers/jolokia/jolokia.go @@ -23,10 +23,10 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "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/libbeat/common/bus" ) func init() { diff --git a/libbeat/autodiscover/providers/kubernetes/config.go b/libbeat/autodiscover/providers/kubernetes/config.go index f443439c57f7..a1ec2db5dd51 100644 --- a/libbeat/autodiscover/providers/kubernetes/config.go +++ b/libbeat/autodiscover/providers/kubernetes/config.go @@ -23,12 +23,12 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) // Config for kubernetes autodiscover provider diff --git a/libbeat/autodiscover/providers/kubernetes/config_test.go b/libbeat/autodiscover/providers/kubernetes/config_test.go index 727df2c0388c..55fd601037dd 100644 --- a/libbeat/autodiscover/providers/kubernetes/config_test.go +++ b/libbeat/autodiscover/providers/kubernetes/config_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestConfigWithCustomBuilders(t *testing.T) { diff --git a/libbeat/autodiscover/providers/kubernetes/kubernetes.go b/libbeat/autodiscover/providers/kubernetes/kubernetes.go index 52177f39b2b6..3e1685830e20 100644 --- a/libbeat/autodiscover/providers/kubernetes/kubernetes.go +++ b/libbeat/autodiscover/providers/kubernetes/kubernetes.go @@ -25,13 +25,13 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "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/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/autodiscover/providers/kubernetes/node.go b/libbeat/autodiscover/providers/kubernetes/node.go index 4d83294cd48d..bd529582f0cd 100644 --- a/libbeat/autodiscover/providers/kubernetes/node.go +++ b/libbeat/autodiscover/providers/kubernetes/node.go @@ -25,13 +25,13 @@ import ( v1 "k8s.io/api/core/v1" k8s "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) type node struct { diff --git a/libbeat/autodiscover/providers/kubernetes/node_test.go b/libbeat/autodiscover/providers/kubernetes/node_test.go index 8b0dd7f9a5b7..0685adfe1bdd 100644 --- a/libbeat/autodiscover/providers/kubernetes/node_test.go +++ b/libbeat/autodiscover/providers/kubernetes/node_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" @@ -29,11 +29,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints_Node(t *testing.T) { diff --git a/libbeat/autodiscover/providers/kubernetes/pod.go b/libbeat/autodiscover/providers/kubernetes/pod.go index 9cd5094fa5ab..44f85a2363a3 100644 --- a/libbeat/autodiscover/providers/kubernetes/pod.go +++ b/libbeat/autodiscover/providers/kubernetes/pod.go @@ -24,13 +24,13 @@ import ( "github.com/gofrs/uuid" k8s "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) type pod struct { diff --git a/libbeat/autodiscover/providers/kubernetes/pod_test.go b/libbeat/autodiscover/providers/kubernetes/pod_test.go index 1d3d11b61bd8..b105aa0991fe 100644 --- a/libbeat/autodiscover/providers/kubernetes/pod_test.go +++ b/libbeat/autodiscover/providers/kubernetes/pod_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" @@ -29,11 +29,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints(t *testing.T) { diff --git a/libbeat/autodiscover/providers/kubernetes/service.go b/libbeat/autodiscover/providers/kubernetes/service.go index f840f9c09698..8708833cd8dd 100644 --- a/libbeat/autodiscover/providers/kubernetes/service.go +++ b/libbeat/autodiscover/providers/kubernetes/service.go @@ -21,17 +21,17 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" k8s "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" ) type service struct { diff --git a/libbeat/autodiscover/providers/kubernetes/service_test.go b/libbeat/autodiscover/providers/kubernetes/service_test.go index aa056fc11499..a17ef8a569d7 100644 --- a/libbeat/autodiscover/providers/kubernetes/service_test.go +++ b/libbeat/autodiscover/providers/kubernetes/service_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" @@ -29,11 +29,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestGenerateHints_Service(t *testing.T) { diff --git a/libbeat/autodiscover/providers/plugin.go b/libbeat/autodiscover/providers/plugin.go index 6ace05aaf4b3..2e413032400a 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/libbeat/autodiscover" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/autodiscover" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type providerPlugin struct { diff --git a/libbeat/autodiscover/registry.go b/libbeat/autodiscover/registry.go index a08d637ad424..97955635e502 100644 --- a/libbeat/autodiscover/registry.go +++ b/libbeat/autodiscover/registry.go @@ -20,7 +20,7 @@ package autodiscover import ( "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Register of autodiscover providers diff --git a/libbeat/autodiscover/template/config.go b/libbeat/autodiscover/template/config.go index c1a2c2b6c513..151f76dde0f3 100644 --- a/libbeat/autodiscover/template/config.go +++ b/libbeat/autodiscover/template/config.go @@ -18,10 +18,10 @@ package template import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/conditions" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/go-ucfg" ) diff --git a/libbeat/autodiscover/template/config_test.go b/libbeat/autodiscover/template/config_test.go index 8bf554768474..570de15a840b 100644 --- a/libbeat/autodiscover/template/config_test.go +++ b/libbeat/autodiscover/template/config_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestConfigsMapping(t *testing.T) { diff --git a/libbeat/beat/beat.go b/libbeat/beat/beat.go index 08bbaaf9b6c3..3aaed4c66413 100644 --- a/libbeat/beat/beat.go +++ b/libbeat/beat/beat.go @@ -18,8 +18,8 @@ package beat import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/management" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/management" ) // Creator initializes and configures a new Beater instance used to execute diff --git a/libbeat/beat/event.go b/libbeat/beat/event.go index d156a887a93c..4ef560420396 100644 --- a/libbeat/beat/event.go +++ b/libbeat/beat/event.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // FlagField fields used to keep information or errors when events are parsed. diff --git a/libbeat/beat/event_test.go b/libbeat/beat/event_test.go index 789a3e0a994b..384ece4d1aea 100644 --- a/libbeat/beat/event_test.go +++ b/libbeat/beat/event_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func newEmptyEvent() *Event { diff --git a/libbeat/beat/pipeline.go b/libbeat/beat/pipeline.go index f07d2f0a701b..c4f4665af1b4 100644 --- a/libbeat/beat/pipeline.go +++ b/libbeat/beat/pipeline.go @@ -20,7 +20,7 @@ package beat import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Pipeline interface { diff --git a/libbeat/cfgfile/cfgfile.go b/libbeat/cfgfile/cfgfile.go index b0c9f7ffd220..767cbd34bc57 100644 --- a/libbeat/cfgfile/cfgfile.go +++ b/libbeat/cfgfile/cfgfile.go @@ -22,8 +22,8 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Command line flags. diff --git a/libbeat/cfgfile/glob_watcher.go b/libbeat/cfgfile/glob_watcher.go index 2aff04adad54..fc3e64eafa98 100644 --- a/libbeat/cfgfile/glob_watcher.go +++ b/libbeat/cfgfile/glob_watcher.go @@ -24,7 +24,7 @@ import ( "github.com/mitchellh/hashstructure" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type GlobWatcher struct { diff --git a/libbeat/cfgfile/list.go b/libbeat/cfgfile/list.go index c836c6b10029..db02c56bbdd1 100644 --- a/libbeat/cfgfile/list.go +++ b/libbeat/cfgfile/list.go @@ -24,10 +24,10 @@ import ( "github.com/mitchellh/hashstructure" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" + "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/v7/libbeat/logp" ) // RunnerList implements a reloadable.List of Runners diff --git a/libbeat/cfgfile/list_test.go b/libbeat/cfgfile/list_test.go index e4851e5d1cb9..b9ae56878318 100644 --- a/libbeat/cfgfile/list_test.go +++ b/libbeat/cfgfile/list_test.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" ) type runner struct { diff --git a/libbeat/cfgfile/reload.go b/libbeat/cfgfile/reload.go index 55ee0312bf39..8306f47c9216 100644 --- a/libbeat/cfgfile/reload.go +++ b/libbeat/cfgfile/reload.go @@ -26,12 +26,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/paths" + "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/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/libbeat/cloudid/cloudid.go b/libbeat/cloudid/cloudid.go index 9b0d5102771c..5e39dee27f1d 100644 --- a/libbeat/cloudid/cloudid.go +++ b/libbeat/cloudid/cloudid.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const defaultCloudPort = "443" diff --git a/libbeat/cloudid/cloudid_test.go b/libbeat/cloudid/cloudid_test.go index aea97646d9ec..889fa152a108 100644 --- a/libbeat/cloudid/cloudid_test.go +++ b/libbeat/cloudid/cloudid_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestDecode(t *testing.T) { diff --git a/libbeat/cmd/completion.go b/libbeat/cmd/completion.go index 578d943775ed..7c7ca31a0749 100644 --- a/libbeat/cmd/completion.go +++ b/libbeat/cmd/completion.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/cmd/instance" "github.com/spf13/cobra" ) diff --git a/libbeat/cmd/export.go b/libbeat/cmd/export.go index 82e89bb09ee8..44bb95ab60fb 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/libbeat/cmd/export" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/cmd/export" + "github.com/elastic/beats/v7/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 df9816a00e3c..c89cd29d5dd5 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/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cli" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/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 552fbd6c6e68..9cd63f03366b 100644 --- a/libbeat/cmd/export/dashboard.go +++ b/libbeat/cmd/export/dashboard.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/dashboards" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/dashboards" + "github.com/elastic/beats/v7/libbeat/kibana" ) // GenDashboardCmd is the command used to export a dashboard. diff --git a/libbeat/cmd/export/export.go b/libbeat/cmd/export/export.go index 07ec27edf087..b5bbe4ba1342 100644 --- a/libbeat/cmd/export/export.go +++ b/libbeat/cmd/export/export.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/version" ) type stdoutClient struct { diff --git a/libbeat/cmd/export/ilm_policy.go b/libbeat/cmd/export/ilm_policy.go index 57a3c32103aa..b2a8b8455142 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/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" ) // 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 5fc4e7f45601..86f6d9c966a7 100644 --- a/libbeat/cmd/export/index_pattern.go +++ b/libbeat/cmd/export/index_pattern.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" ) // GenIndexPatternConfigCmd generates an index pattern for Kibana diff --git a/libbeat/cmd/export/template.go b/libbeat/cmd/export/template.go index 6dd145ec4087..23d572fad2af 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/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" ) // 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 b1bf04a1462e..d9d486c62a81 100644 --- a/libbeat/cmd/instance/beat.go +++ b/libbeat/cmd/instance/beat.go @@ -33,7 +33,7 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/kibana" "github.com/gofrs/uuid" errw "github.com/pkg/errors" @@ -43,33 +43,33 @@ import ( "github.com/elastic/go-sysinfo/types" ucfg "github.com/elastic/go-ucfg" - "github.com/elastic/beats/libbeat/api" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cloudid" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/common/seccomp" - "github.com/elastic/beats/libbeat/dashboards" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/keystore" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/logp/configure" - "github.com/elastic/beats/libbeat/management" - "github.com/elastic/beats/libbeat/metric/system/host" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report" - "github.com/elastic/beats/libbeat/monitoring/report/log" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/plugin" - "github.com/elastic/beats/libbeat/publisher/pipeline" - "github.com/elastic/beats/libbeat/publisher/processing" - svc "github.com/elastic/beats/libbeat/service" - "github.com/elastic/beats/libbeat/version" + "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/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "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/idxmgmt" + "github.com/elastic/beats/v7/libbeat/keystore" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp/configure" + "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v7/libbeat/metric/system/host" + "github.com/elastic/beats/v7/libbeat/monitoring" + "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/paths" + "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v7/libbeat/publisher/processing" + svc "github.com/elastic/beats/v7/libbeat/service" + "github.com/elastic/beats/v7/libbeat/version" ) // Beat provides the runnable and configurable instance of a beat. diff --git a/libbeat/cmd/instance/beat_test.go b/libbeat/cmd/instance/beat_test.go index 9ea780ed4b32..8c04e87390f6 100644 --- a/libbeat/cmd/instance/beat_test.go +++ b/libbeat/cmd/instance/beat_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cfgfile" "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" diff --git a/libbeat/cmd/instance/imports_common.go b/libbeat/cmd/instance/imports_common.go index d8fa4b9f0cfa..62ca7d76d7b9 100644 --- a/libbeat/cmd/instance/imports_common.go +++ b/libbeat/cmd/instance/imports_common.go @@ -18,22 +18,22 @@ package instance import ( - _ "github.com/elastic/beats/libbeat/autodiscover/appenders/config" // Register autodiscover appenders - _ "github.com/elastic/beats/libbeat/autodiscover/providers/jolokia" - _ "github.com/elastic/beats/libbeat/monitoring/report/elasticsearch" // Register default monitoring reporting - _ "github.com/elastic/beats/libbeat/processors/actions" // Register default processors. - _ "github.com/elastic/beats/libbeat/processors/add_cloud_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_host_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_id" - _ "github.com/elastic/beats/libbeat/processors/add_locale" - _ "github.com/elastic/beats/libbeat/processors/add_observer_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_process_metadata" - _ "github.com/elastic/beats/libbeat/processors/communityid" - _ "github.com/elastic/beats/libbeat/processors/convert" - _ "github.com/elastic/beats/libbeat/processors/dissect" - _ "github.com/elastic/beats/libbeat/processors/dns" - _ "github.com/elastic/beats/libbeat/processors/extract_array" - _ "github.com/elastic/beats/libbeat/processors/fingerprint" - _ "github.com/elastic/beats/libbeat/processors/registered_domain" - _ "github.com/elastic/beats/libbeat/publisher/includes" // Register publisher pipeline modules + _ "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_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/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/registered_domain" + _ "github.com/elastic/beats/v7/libbeat/publisher/includes" // Register publisher pipeline modules ) diff --git a/libbeat/cmd/instance/imports_docker.go b/libbeat/cmd/instance/imports_docker.go index faca620d087c..12d379714ed1 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/libbeat/autodiscover/providers/docker" // Register autodiscover providers - _ "github.com/elastic/beats/libbeat/autodiscover/providers/kubernetes" - _ "github.com/elastic/beats/libbeat/processors/add_docker_metadata" - _ "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + _ "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" ) diff --git a/libbeat/cmd/instance/locker.go b/libbeat/cmd/instance/locker.go index 9cfe9603880d..9e7f929ef495 100644 --- a/libbeat/cmd/instance/locker.go +++ b/libbeat/cmd/instance/locker.go @@ -23,7 +23,7 @@ import ( "github.com/gofrs/flock" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/libbeat/cmd/instance/locker_test.go b/libbeat/cmd/instance/locker_test.go index e6feab0e7fed..7e15517edb53 100644 --- a/libbeat/cmd/instance/locker_test.go +++ b/libbeat/cmd/instance/locker_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/paths" ) // TestLocker tests that two beats pointing to the same data path cannot diff --git a/libbeat/cmd/instance/metrics.go b/libbeat/cmd/instance/metrics.go index 9b0697d1e0bf..54cd3ab55d83 100644 --- a/libbeat/cmd/instance/metrics.go +++ b/libbeat/cmd/instance/metrics.go @@ -23,11 +23,11 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/libbeat/metric/system/process" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/libbeat/metric/system/process" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/libbeat/cmd/instance/metrics_common.go b/libbeat/cmd/instance/metrics_common.go index ca45f08d53d5..feff54b48411 100644 --- a/libbeat/cmd/instance/metrics_common.go +++ b/libbeat/cmd/instance/metrics_common.go @@ -22,9 +22,9 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report/log" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/report/log" ) var ( diff --git a/libbeat/cmd/instance/metrics_file_descriptors.go b/libbeat/cmd/instance/metrics_file_descriptors.go index d120efabcc77..5d255fd483d1 100644 --- a/libbeat/cmd/instance/metrics_file_descriptors.go +++ b/libbeat/cmd/instance/metrics_file_descriptors.go @@ -22,8 +22,8 @@ package instance import ( "fmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func setupLinuxBSDFDMetrics() { diff --git a/libbeat/cmd/instance/metrics_handles.go b/libbeat/cmd/instance/metrics_handles.go index 6848a20f105c..497fe5edcd6e 100644 --- a/libbeat/cmd/instance/metrics_handles.go +++ b/libbeat/cmd/instance/metrics_handles.go @@ -20,8 +20,8 @@ package instance import ( - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" sysinfo "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/types" ) diff --git a/libbeat/cmd/instance/metrics_other.go b/libbeat/cmd/instance/metrics_other.go index 37e092be4bb4..2ea96cd6c8e8 100644 --- a/libbeat/cmd/instance/metrics_other.go +++ b/libbeat/cmd/instance/metrics_other.go @@ -22,7 +22,7 @@ package instance import ( - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func setupMetrics(name string) error { diff --git a/libbeat/cmd/instance/settings.go b/libbeat/cmd/instance/settings.go index 7b7ab66706d4..ee22dc084e0e 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/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/monitoring/report" - "github.com/elastic/beats/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v7/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 b2cffe2b7ebf..4410f1d4d745 100644 --- a/libbeat/cmd/keystore.go +++ b/libbeat/cmd/keystore.go @@ -29,10 +29,10 @@ import ( "github.com/spf13/cobra" tml "golang.org/x/crypto/ssh/terminal" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/libbeat/common/terminal" - "github.com/elastic/beats/libbeat/keystore" + "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/v7/libbeat/keystore" ) func getKeystore(settings instance.Settings) (keystore.Keystore, error) { diff --git a/libbeat/cmd/modules.go b/libbeat/cmd/modules.go index 4bd6bff137ea..2accdf7a46f6 100644 --- a/libbeat/cmd/modules.go +++ b/libbeat/cmd/modules.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/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 94382eed5bae..b748225fa924 100644 --- a/libbeat/cmd/root.go +++ b/libbeat/cmd/root.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) func init() { diff --git a/libbeat/cmd/run.go b/libbeat/cmd/run.go index 7e52fca3cc64..b078aadaf89c 100644 --- a/libbeat/cmd/run.go +++ b/libbeat/cmd/run.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/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 ff52fcfbaebc..d5fc8e65603c 100644 --- a/libbeat/cmd/setup.go +++ b/libbeat/cmd/setup.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" ) const ( diff --git a/libbeat/cmd/test.go b/libbeat/cmd/test.go index 1b17eca8f03f..95b07ff4ac70 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/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/cmd/test" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/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 e8dfd07dae73..dfc93344acf9 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/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/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 6d4761d65a82..5df48051fc10 100644 --- a/libbeat/cmd/test/output.go +++ b/libbeat/cmd/test/output.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/testing" + "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/v7/libbeat/testing" ) func GenTestOutputCmd(settings instance.Settings) *cobra.Command { diff --git a/libbeat/cmd/version.go b/libbeat/cmd/version.go index 6145c52e7074..7019ccd77c93 100644 --- a/libbeat/cmd/version.go +++ b/libbeat/cmd/version.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v7/libbeat/version" ) // GenVersionCmd generates the command version for a Beat. diff --git a/libbeat/common/bus/bus.go b/libbeat/common/bus/bus.go index cb7393b0c5cb..7b3cf7f9d362 100644 --- a/libbeat/common/bus/bus.go +++ b/libbeat/common/bus/bus.go @@ -20,8 +20,8 @@ package bus import ( "sync" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Event sent to the bus diff --git a/libbeat/common/bus/bus_test.go b/libbeat/common/bus/bus_test.go index c80d3d71a7e2..d87d9522c13b 100644 --- a/libbeat/common/bus/bus_test.go +++ b/libbeat/common/bus/bus_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestEmit(t *testing.T) { diff --git a/libbeat/common/cfgtype/byte_size.go b/libbeat/common/cfgtype/byte_size.go index 72776019afc9..a692cad586d7 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/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) // ByteSize defines a new configuration option that will parse `go-humanize` compatible values into a diff --git a/libbeat/common/cfgwarn/cfgwarn.go b/libbeat/common/cfgwarn/cfgwarn.go index f7ef2fba1d1f..e102ed20e4b6 100644 --- a/libbeat/common/cfgwarn/cfgwarn.go +++ b/libbeat/common/cfgwarn/cfgwarn.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const selector = "cfgwarn" diff --git a/libbeat/common/cfgwarn/removed.go b/libbeat/common/cfgwarn/removed.go index d7060bbada6a..68d3e5468d3b 100644 --- a/libbeat/common/cfgwarn/removed.go +++ b/libbeat/common/cfgwarn/removed.go @@ -23,7 +23,7 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func checkRemovedSettings(cfg *common.Config, settings ...string) error { diff --git a/libbeat/common/cfgwarn/removed_test.go b/libbeat/common/cfgwarn/removed_test.go index 3bbd819b2367..2615cd9e7edb 100644 --- a/libbeat/common/cfgwarn/removed_test.go +++ b/libbeat/common/cfgwarn/removed_test.go @@ -24,7 +24,7 @@ import ( "github.com/joeshaw/multierror" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestRemovedSetting(t *testing.T) { diff --git a/libbeat/common/cleanup/cleanup_test.go b/libbeat/common/cleanup/cleanup_test.go index 5208dc750aa4..6b45b9de0f59 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/libbeat/common/cleanup" + "github.com/elastic/beats/v7/libbeat/common/cleanup" ) func TestIfBool(t *testing.T) { diff --git a/libbeat/common/config.go b/libbeat/common/config.go index 2f779d996bbf..1537d6b7ca44 100644 --- a/libbeat/common/config.go +++ b/libbeat/common/config.go @@ -27,8 +27,8 @@ import ( "runtime" "strings" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" ucfg "github.com/elastic/go-ucfg" "github.com/elastic/go-ucfg/cfgutil" "github.com/elastic/go-ucfg/yaml" diff --git a/libbeat/common/docker/client.go b/libbeat/common/docker/client.go index a86edcfcd109..de29a0f8c22e 100644 --- a/libbeat/common/docker/client.go +++ b/libbeat/common/docker/client.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/client" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // NewClient builds and returns a new Docker client. On the first request the diff --git a/libbeat/common/docker/helpers.go b/libbeat/common/docker/helpers.go index ae9ea0d62898..e53c84997106 100644 --- a/libbeat/common/docker/helpers.go +++ b/libbeat/common/docker/helpers.go @@ -20,8 +20,8 @@ package docker import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" ) // ExtractContainerName strips the `/` characters that frequently appear in container names diff --git a/libbeat/common/docker/watcher.go b/libbeat/common/docker/watcher.go index 388aa2589a46..0543d37e9c33 100644 --- a/libbeat/common/docker/watcher.go +++ b/libbeat/common/docker/watcher.go @@ -31,8 +31,8 @@ import ( "github.com/docker/go-connections/tlsconfig" "golang.org/x/net/context" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" ) // Select Docker API version diff --git a/libbeat/common/docker/watcher_test.go b/libbeat/common/docker/watcher_test.go index 31f33dde9157..a7fb9ca73fb4 100644 --- a/libbeat/common/docker/watcher_test.go +++ b/libbeat/common/docker/watcher_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/context" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type MockClient struct { diff --git a/libbeat/common/event.go b/libbeat/common/event.go index d30136a66ca6..9619a4dee943 100644 --- a/libbeat/common/event.go +++ b/libbeat/common/event.go @@ -28,7 +28,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const eventDebugSelector = "event" diff --git a/libbeat/common/event_test.go b/libbeat/common/event_test.go index 1bf622f38182..c9d3a36e0c94 100644 --- a/libbeat/common/event_test.go +++ b/libbeat/common/event_test.go @@ -25,7 +25,7 @@ import ( "github.com/gofrs/uuid" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestConvertNestedMapStr(t *testing.T) { diff --git a/libbeat/common/file/fileinfo_test.go b/libbeat/common/file/fileinfo_test.go index ce3e43c06ace..9df25ba638a7 100644 --- a/libbeat/common/file/fileinfo_test.go +++ b/libbeat/common/file/fileinfo_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common/file" ) func TestStat(t *testing.T) { diff --git a/libbeat/common/file/rotator_test.go b/libbeat/common/file/rotator_test.go index 8a2c52b3ae38..ccafad556665 100644 --- a/libbeat/common/file/rotator_test.go +++ b/libbeat/common/file/rotator_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" ) const logMessage = "Test file rotator.\n" diff --git a/libbeat/common/flowhash/examples/example.go b/libbeat/common/flowhash/examples/example.go index 467f8fafad79..7930f0ea4633 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/libbeat/common/flowhash" + "github.com/elastic/beats/v7/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 e7950a39d0f7..1861b7a60e40 100644 --- a/libbeat/common/fmtstr/formatevents.go +++ b/libbeat/common/fmtstr/formatevents.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/dtfmt" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/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 01d21dd81e34..6e78eb5713f9 100644 --- a/libbeat/common/fmtstr/formatevents_test.go +++ b/libbeat/common/fmtstr/formatevents_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestEventFormatString(t *testing.T) { diff --git a/libbeat/common/fmtstr/formattimestamp.go b/libbeat/common/fmtstr/formattimestamp.go index 68c22d636496..e58ce8b2cd9f 100644 --- a/libbeat/common/fmtstr/formattimestamp.go +++ b/libbeat/common/fmtstr/formattimestamp.go @@ -20,8 +20,8 @@ package fmtstr import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // TimestampFormatString is a wrapper around EventFormatString for the diff --git a/libbeat/common/fmtstr/formattimestamp_test.go b/libbeat/common/fmtstr/formattimestamp_test.go index d194f597ad5f..4df8e6b3fdc1 100644 --- a/libbeat/common/fmtstr/formattimestamp_test.go +++ b/libbeat/common/fmtstr/formattimestamp_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestTimestampFormatString(t *testing.T) { diff --git a/libbeat/common/jsontransform/jsonhelper.go b/libbeat/common/jsontransform/jsonhelper.go index bd4b4454d312..1490bcff1706 100644 --- a/libbeat/common/jsontransform/jsonhelper.go +++ b/libbeat/common/jsontransform/jsonhelper.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // WriteJSONKeys writes the json keys to the given event based on the overwriteKeys option and the addErrKey diff --git a/libbeat/common/jsontransform/transform.go b/libbeat/common/jsontransform/transform.go index dbb2d27c856d..b6e19a06fe37 100644 --- a/libbeat/common/jsontransform/transform.go +++ b/libbeat/common/jsontransform/transform.go @@ -20,7 +20,7 @@ package jsontransform import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // TransformNumbers walks a json decoded tree an replaces json.Number diff --git a/libbeat/common/kubernetes/metadata/config.go b/libbeat/common/kubernetes/metadata/config.go index 78abe6d8e539..3d3a028d13c5 100644 --- a/libbeat/common/kubernetes/metadata/config.go +++ b/libbeat/common/kubernetes/metadata/config.go @@ -17,7 +17,7 @@ package metadata -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // Config declares supported configuration for metadata generation type Config struct { diff --git a/libbeat/common/kubernetes/metadata/metadata.go b/libbeat/common/kubernetes/metadata/metadata.go index b2205c91dd90..d81f79f28d58 100644 --- a/libbeat/common/kubernetes/metadata/metadata.go +++ b/libbeat/common/kubernetes/metadata/metadata.go @@ -18,9 +18,9 @@ package metadata import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" ) // MetaGen allows creation of metadata from either Kubernetes resources or their Resource names. diff --git a/libbeat/common/kubernetes/metadata/namespace.go b/libbeat/common/kubernetes/metadata/namespace.go index 7eb2d12eb5ad..556d72aed880 100644 --- a/libbeat/common/kubernetes/metadata/namespace.go +++ b/libbeat/common/kubernetes/metadata/namespace.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) const resource = "namespace" diff --git a/libbeat/common/kubernetes/metadata/namespace_test.go b/libbeat/common/kubernetes/metadata/namespace_test.go index 4011a2f00530..5ac460d7ca77 100644 --- a/libbeat/common/kubernetes/metadata/namespace_test.go +++ b/libbeat/common/kubernetes/metadata/namespace_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestNamespace_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/node.go b/libbeat/common/kubernetes/metadata/node.go index 309e7489a8ca..9d15868177f9 100644 --- a/libbeat/common/kubernetes/metadata/node.go +++ b/libbeat/common/kubernetes/metadata/node.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) type node struct { diff --git a/libbeat/common/kubernetes/metadata/node_test.go b/libbeat/common/kubernetes/metadata/node_test.go index 9d198361ab91..226e84710c24 100644 --- a/libbeat/common/kubernetes/metadata/node_test.go +++ b/libbeat/common/kubernetes/metadata/node_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestNode_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/pod.go b/libbeat/common/kubernetes/metadata/pod.go index b42fa005cc05..8f205120ef0c 100644 --- a/libbeat/common/kubernetes/metadata/pod.go +++ b/libbeat/common/kubernetes/metadata/pod.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) type pod struct { diff --git a/libbeat/common/kubernetes/metadata/pod_test.go b/libbeat/common/kubernetes/metadata/pod_test.go index 2c42958a759f..828fdcec706f 100644 --- a/libbeat/common/kubernetes/metadata/pod_test.go +++ b/libbeat/common/kubernetes/metadata/pod_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestPod_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/resource.go b/libbeat/common/kubernetes/metadata/resource.go index eb00455ffabc..d9610a32f37b 100644 --- a/libbeat/common/kubernetes/metadata/resource.go +++ b/libbeat/common/kubernetes/metadata/resource.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" ) // Resource generates metadata for any kubernetes resource diff --git a/libbeat/common/kubernetes/metadata/resource_test.go b/libbeat/common/kubernetes/metadata/resource_test.go index dbf168644af4..01e7280a4f5e 100644 --- a/libbeat/common/kubernetes/metadata/resource_test.go +++ b/libbeat/common/kubernetes/metadata/resource_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestResource_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/metadata/service.go b/libbeat/common/kubernetes/metadata/service.go index 7c2fab68fd37..4577d898ec28 100644 --- a/libbeat/common/kubernetes/metadata/service.go +++ b/libbeat/common/kubernetes/metadata/service.go @@ -20,8 +20,8 @@ package metadata import ( "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) type service struct { diff --git a/libbeat/common/kubernetes/metadata/service_test.go b/libbeat/common/kubernetes/metadata/service_test.go index dfda4e9db27f..a574f1a7b7a1 100644 --- a/libbeat/common/kubernetes/metadata/service_test.go +++ b/libbeat/common/kubernetes/metadata/service_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestService_Generate(t *testing.T) { diff --git a/libbeat/common/kubernetes/util.go b/libbeat/common/kubernetes/util.go index a8f1254b64a2..470d07373eee 100644 --- a/libbeat/common/kubernetes/util.go +++ b/libbeat/common/kubernetes/util.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const defaultNode = "localhost" diff --git a/libbeat/common/kubernetes/watcher.go b/libbeat/common/kubernetes/watcher.go index 79f2b8625794..33cc808358ac 100644 --- a/libbeat/common/kubernetes/watcher.go +++ b/libbeat/common/kubernetes/watcher.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/common/mapstr_test.go b/libbeat/common/mapstr_test.go index 784814bdac38..de633ff162ea 100644 --- a/libbeat/common/mapstr_test.go +++ b/libbeat/common/mapstr_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap/zapcore" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestMapStrUpdate(t *testing.T) { diff --git a/libbeat/common/reload/reload.go b/libbeat/common/reload/reload.go index ceb377274b55..ed2fe528363d 100644 --- a/libbeat/common/reload/reload.go +++ b/libbeat/common/reload/reload.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Register holds a registry of reloadable objects diff --git a/libbeat/common/safemapstr/safemapstr.go b/libbeat/common/safemapstr/safemapstr.go index 75afe81226ed..07d7d95d2eca 100644 --- a/libbeat/common/safemapstr/safemapstr.go +++ b/libbeat/common/safemapstr/safemapstr.go @@ -20,7 +20,7 @@ package safemapstr import ( "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const alternativeKey = "value" diff --git a/libbeat/common/safemapstr/safemapstr_test.go b/libbeat/common/safemapstr/safemapstr_test.go index 0e3a9c95a7b5..ce46d0300ec5 100644 --- a/libbeat/common/safemapstr/safemapstr_test.go +++ b/libbeat/common/safemapstr/safemapstr_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestPut(t *testing.T) { diff --git a/libbeat/common/schema/mapstriface/mapstriface.go b/libbeat/common/schema/mapstriface/mapstriface.go index cda5c093ac9b..d08631f78c47 100644 --- a/libbeat/common/schema/mapstriface/mapstriface.go +++ b/libbeat/common/schema/mapstriface/mapstriface.go @@ -77,9 +77,9 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/schema" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/logp" ) type ConvMap struct { diff --git a/libbeat/common/schema/mapstriface/mapstriface_test.go b/libbeat/common/schema/mapstriface/mapstriface_test.go index 9bd53cb404d9..dcc56b24addb 100644 --- a/libbeat/common/schema/mapstriface/mapstriface_test.go +++ b/libbeat/common/schema/mapstriface/mapstriface_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" ) func TestConversions(t *testing.T) { diff --git a/libbeat/common/schema/mapstrstr/mapstrstr.go b/libbeat/common/schema/mapstrstr/mapstrstr.go index 7b9dae83f14b..0e114a720963 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/libbeat/common" - "github.com/elastic/beats/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/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 240c7db77ec2..486f8e968f68 100644 --- a/libbeat/common/schema/mapstrstr/mapstrstr_test.go +++ b/libbeat/common/schema/mapstrstr/mapstrstr_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" ) func TestConversions(t *testing.T) { diff --git a/libbeat/common/schema/options.go b/libbeat/common/schema/options.go index b7d365367008..0f8b7e28840a 100644 --- a/libbeat/common/schema/options.go +++ b/libbeat/common/schema/options.go @@ -20,7 +20,7 @@ package schema import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // DefaultApplyOptions are the default options for Apply() diff --git a/libbeat/common/schema/options_test.go b/libbeat/common/schema/options_test.go index 0e4271d7c219..ecc65ead7141 100644 --- a/libbeat/common/schema/options_test.go +++ b/libbeat/common/schema/options_test.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestApplyOptions(t *testing.T) { diff --git a/libbeat/common/schema/schema.go b/libbeat/common/schema/schema.go index fe9cd7945882..1df3388d39be 100644 --- a/libbeat/common/schema/schema.go +++ b/libbeat/common/schema/schema.go @@ -20,9 +20,9 @@ package schema import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Schema describes how a map[string]interface{} object can be parsed and converted into diff --git a/libbeat/common/schema/schema_test.go b/libbeat/common/schema/schema_test.go index 58299c3d5d20..3b6b453e8071 100644 --- a/libbeat/common/schema/schema_test.go +++ b/libbeat/common/schema/schema_test.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func nop(key string, data map[string]interface{}) (interface{}, error) { diff --git a/libbeat/common/seccomp/seccomp.go b/libbeat/common/seccomp/seccomp.go index 9971934a9f8f..e877fcbeab1c 100644 --- a/libbeat/common/seccomp/seccomp.go +++ b/libbeat/common/seccomp/seccomp.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/go-seccomp-bpf" ) diff --git a/libbeat/common/streambuf/net.go b/libbeat/common/streambuf/net.go index 10ed41336d31..d6db9d4337d6 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Parse 8bit binary value from Buffer. diff --git a/libbeat/common/transport/tlscommon/ca_pinning_test.go b/libbeat/common/transport/tlscommon/ca_pinning_test.go index a9f95e5c6ac7..c188a20e63a6 100644 --- a/libbeat/common/transport/tlscommon/ca_pinning_test.go +++ b/libbeat/common/transport/tlscommon/ca_pinning_test.go @@ -36,7 +36,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var ser int64 = 1 diff --git a/libbeat/common/transport/tlscommon/server_config.go b/libbeat/common/transport/tlscommon/server_config.go index 8e0e668faa8a..3cea793eaab6 100644 --- a/libbeat/common/transport/tlscommon/server_config.go +++ b/libbeat/common/transport/tlscommon/server_config.go @@ -22,7 +22,7 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // ServerConfig defines the user configurable tls options for any TCP based service. diff --git a/libbeat/common/transport/tlscommon/tls.go b/libbeat/common/transport/tlscommon/tls.go index c239299af4bf..432073226efd 100644 --- a/libbeat/common/transport/tlscommon/tls.go +++ b/libbeat/common/transport/tlscommon/tls.go @@ -26,7 +26,7 @@ import ( "fmt" "io/ioutil" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // LoadCertificate will load a certificate from disk and return a tls.Certificate or error diff --git a/libbeat/common/transport/tlscommon/tls_config.go b/libbeat/common/transport/tlscommon/tls_config.go index 41c574bc078a..647f049c22bc 100644 --- a/libbeat/common/transport/tlscommon/tls_config.go +++ b/libbeat/common/transport/tlscommon/tls_config.go @@ -21,7 +21,7 @@ import ( "crypto/tls" "crypto/x509" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // TLSConfig is the interface used to configure a tcp client or server from a `Config` diff --git a/libbeat/common/transport/tlscommon/tls_test.go b/libbeat/common/transport/tlscommon/tls_test.go index 33233c787c9d..94e74a49b920 100644 --- a/libbeat/common/transport/tlscommon/tls_test.go +++ b/libbeat/common/transport/tlscommon/tls_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // test TLS config loading diff --git a/libbeat/common/useragent/useragent.go b/libbeat/common/useragent/useragent.go index 5275fcdafc25..fdff31c2dc15 100644 --- a/libbeat/common/useragent/useragent.go +++ b/libbeat/common/useragent/useragent.go @@ -21,7 +21,7 @@ import ( "fmt" "runtime" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/version" ) // UserAgent takes the capitalized name of the current beat and returns diff --git a/libbeat/conditions/and_test.go b/libbeat/conditions/and_test.go index 468080c2380d..74d3cf63e901 100644 --- a/libbeat/conditions/and_test.go +++ b/libbeat/conditions/and_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestANDCondition(t *testing.T) { diff --git a/libbeat/conditions/conditions.go b/libbeat/conditions/conditions.go index 9ddd39ac4fed..8a0c823564f9 100644 --- a/libbeat/conditions/conditions.go +++ b/libbeat/conditions/conditions.go @@ -20,8 +20,8 @@ package conditions import ( "errors" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" ) const logName = "conditions" diff --git a/libbeat/conditions/conditions_benchmarks_test.go b/libbeat/conditions/conditions_benchmarks_test.go index dddd3a086008..1ccfe400334a 100644 --- a/libbeat/conditions/conditions_benchmarks_test.go +++ b/libbeat/conditions/conditions_benchmarks_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func BenchmarkSimpleCondition(b *testing.B) { diff --git a/libbeat/conditions/conditions_test.go b/libbeat/conditions/conditions_test.go index 3f91d2f3768d..0977fe313e1b 100644 --- a/libbeat/conditions/conditions_test.go +++ b/libbeat/conditions/conditions_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestCreateNilCondition(t *testing.T) { diff --git a/libbeat/conditions/equals.go b/libbeat/conditions/equals.go index 1cd176276763..6662e34ea635 100644 --- a/libbeat/conditions/equals.go +++ b/libbeat/conditions/equals.go @@ -20,7 +20,7 @@ package conditions import ( "fmt" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type equalsValue struct { diff --git a/libbeat/conditions/matcher.go b/libbeat/conditions/matcher.go index 788546af9a93..5a70df61cb61 100644 --- a/libbeat/conditions/matcher.go +++ b/libbeat/conditions/matcher.go @@ -20,8 +20,8 @@ package conditions import ( "fmt" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" ) type matcherMap map[string]match.Matcher diff --git a/libbeat/conditions/matcher_test.go b/libbeat/conditions/matcher_test.go index cd4986f175c7..13d144625945 100644 --- a/libbeat/conditions/matcher_test.go +++ b/libbeat/conditions/matcher_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestRegxpCreate(t *testing.T) { diff --git a/libbeat/conditions/network.go b/libbeat/conditions/network.go index 2b0b2df42b79..e5c732d469e1 100644 --- a/libbeat/conditions/network.go +++ b/libbeat/conditions/network.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/libbeat/conditions/network_test.go b/libbeat/conditions/network_test.go index 57676eca54dc..9effaf622661 100644 --- a/libbeat/conditions/network_test.go +++ b/libbeat/conditions/network_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestNetworkConfigUnpack(t *testing.T) { diff --git a/libbeat/conditions/not_test.go b/libbeat/conditions/not_test.go index bc8c6f494058..f3a4fe715a5a 100644 --- a/libbeat/conditions/not_test.go +++ b/libbeat/conditions/not_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestNOTCondition(t *testing.T) { diff --git a/libbeat/conditions/or_test.go b/libbeat/conditions/or_test.go index e09fd903bf43..26ddef3cf1a4 100644 --- a/libbeat/conditions/or_test.go +++ b/libbeat/conditions/or_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestORCondition(t *testing.T) { diff --git a/libbeat/conditions/range.go b/libbeat/conditions/range.go index 4ab7bb90d76d..063a98e3152d 100644 --- a/libbeat/conditions/range.go +++ b/libbeat/conditions/range.go @@ -22,8 +22,8 @@ import ( "reflect" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type rangeValue struct { diff --git a/libbeat/conditions/range_test.go b/libbeat/conditions/range_test.go index 4ac99dc01e04..311df2115809 100644 --- a/libbeat/conditions/range_test.go +++ b/libbeat/conditions/range_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestRangeCreateNumeric(t *testing.T) { diff --git a/libbeat/dashboards/dashboards.go b/libbeat/dashboards/dashboards.go index c1ba0ca9b1c4..8049d114dac8 100644 --- a/libbeat/dashboards/dashboards.go +++ b/libbeat/dashboards/dashboards.go @@ -25,8 +25,8 @@ import ( errw "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // ImportDashboards tries to import the kibana dashboards. diff --git a/libbeat/dashboards/decode.go b/libbeat/dashboards/decode.go index 2b659d7251eb..8a0235e38943 100644 --- a/libbeat/dashboards/decode.go +++ b/libbeat/dashboards/decode.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/libbeat/dashboards/export.go b/libbeat/dashboards/export.go index 4e9a91309be8..4bd6ed826f22 100644 --- a/libbeat/dashboards/export.go +++ b/libbeat/dashboards/export.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" ) const ( diff --git a/libbeat/dashboards/importer.go b/libbeat/dashboards/importer.go index 40d0e68a22e2..eb399ba1b3d8 100644 --- a/libbeat/dashboards/importer.go +++ b/libbeat/dashboards/importer.go @@ -31,7 +31,7 @@ import ( errw "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // ErrNotFound returned when we cannot find any dashboard to import. diff --git a/libbeat/dashboards/kibana_loader.go b/libbeat/dashboards/kibana_loader.go index ca7dd345f15b..93dd0e5dc0e3 100644 --- a/libbeat/dashboards/kibana_loader.go +++ b/libbeat/dashboards/kibana_loader.go @@ -25,9 +25,9 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/logp" ) var importAPI = "/api/kibana/dashboards/import" diff --git a/libbeat/dashboards/modify_json.go b/libbeat/dashboards/modify_json.go index f844a0bb19bc..c8b1c79da6b0 100644 --- a/libbeat/dashboards/modify_json.go +++ b/libbeat/dashboards/modify_json.go @@ -22,8 +22,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type JSONObjectAttribute struct { diff --git a/libbeat/dashboards/modify_json_test.go b/libbeat/dashboards/modify_json_test.go index d7e54827ba85..08fedac4df33 100644 --- a/libbeat/dashboards/modify_json_test.go +++ b/libbeat/dashboards/modify_json_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestReplaceStringInDashboard(t *testing.T) { diff --git a/libbeat/feature/registry.go b/libbeat/feature/registry.go index 77d829ac994d..2449654152af 100644 --- a/libbeat/feature/registry.go +++ b/libbeat/feature/registry.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type mapper map[string]map[string]Featurable diff --git a/libbeat/idxmgmt/client_handler.go b/libbeat/idxmgmt/client_handler.go index 9feba65ebd78..ee5b3e22c861 100644 --- a/libbeat/idxmgmt/client_handler.go +++ b/libbeat/idxmgmt/client_handler.go @@ -18,9 +18,9 @@ package idxmgmt import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/template" ) // ClientHandler defines the interface between a remote service and the Manager for ILM and templates. diff --git a/libbeat/idxmgmt/idxmgmt.go b/libbeat/idxmgmt/idxmgmt.go index 6837af03d13d..c6e67cc7540e 100644 --- a/libbeat/idxmgmt/idxmgmt.go +++ b/libbeat/idxmgmt/idxmgmt.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/template" ) // SupportFactory is used to provide custom index management support to libbeat. diff --git a/libbeat/idxmgmt/ilm/client_handler.go b/libbeat/idxmgmt/ilm/client_handler.go index df5ca22a0542..12b739c99467 100644 --- a/libbeat/idxmgmt/ilm/client_handler.go +++ b/libbeat/idxmgmt/ilm/client_handler.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // ClientHandler defines the interface between a remote service and the Manager. diff --git a/libbeat/idxmgmt/ilm/client_handler_integration_test.go b/libbeat/idxmgmt/ilm/client_handler_integration_test.go index a9333ba6adce..2d9c2ca721e5 100644 --- a/libbeat/idxmgmt/ilm/client_handler_integration_test.go +++ b/libbeat/idxmgmt/ilm/client_handler_integration_test.go @@ -30,11 +30,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/version" ) const ( diff --git a/libbeat/idxmgmt/ilm/config.go b/libbeat/idxmgmt/ilm/config.go index 3697d808f4e7..de78cdbce551 100644 --- a/libbeat/idxmgmt/ilm/config.go +++ b/libbeat/idxmgmt/ilm/config.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" ) // Config is used for unpacking a common.Config. diff --git a/libbeat/idxmgmt/ilm/ilm.go b/libbeat/idxmgmt/ilm/ilm.go index d9f6bbe6a06e..ac87161c481c 100644 --- a/libbeat/idxmgmt/ilm/ilm.go +++ b/libbeat/idxmgmt/ilm/ilm.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" ) // SupportFactory is used to define a policy type to be used. diff --git a/libbeat/idxmgmt/ilm/ilm_test.go b/libbeat/idxmgmt/ilm/ilm_test.go index cc751d2bd4b5..e47a9c0d06bc 100644 --- a/libbeat/idxmgmt/ilm/ilm_test.go +++ b/libbeat/idxmgmt/ilm/ilm_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestDefaultSupport_Init(t *testing.T) { diff --git a/libbeat/idxmgmt/ilm/noop.go b/libbeat/idxmgmt/ilm/noop.go index 7acbafbb645b..b516acf8aceb 100644 --- a/libbeat/idxmgmt/ilm/noop.go +++ b/libbeat/idxmgmt/ilm/noop.go @@ -18,8 +18,8 @@ package ilm import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type noopSupport struct{} diff --git a/libbeat/idxmgmt/ilm/std.go b/libbeat/idxmgmt/ilm/std.go index fbb497857f91..0e33fc00f3ed 100644 --- a/libbeat/idxmgmt/ilm/std.go +++ b/libbeat/idxmgmt/ilm/std.go @@ -20,7 +20,7 @@ package ilm import ( "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type stdSupport struct { diff --git a/libbeat/idxmgmt/mockilm_test.go b/libbeat/idxmgmt/mockilm_test.go index a36e17bd4211..6022ad843b42 100644 --- a/libbeat/idxmgmt/mockilm_test.go +++ b/libbeat/idxmgmt/mockilm_test.go @@ -20,10 +20,10 @@ package idxmgmt import ( "github.com/stretchr/testify/mock" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/logp" ) type mockILMSupport struct { diff --git a/libbeat/idxmgmt/std.go b/libbeat/idxmgmt/std.go index bb961712436e..a6aff9af9d34 100644 --- a/libbeat/idxmgmt/std.go +++ b/libbeat/idxmgmt/std.go @@ -21,14 +21,14 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/template" ) type indexSupport struct { diff --git a/libbeat/idxmgmt/std_test.go b/libbeat/idxmgmt/std_test.go index b3ba0b123edf..ea23a53fd848 100644 --- a/libbeat/idxmgmt/std_test.go +++ b/libbeat/idxmgmt/std_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt/ilm" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/libbeat/template" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt/ilm" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/template" ) type mockClientHandler struct { diff --git a/libbeat/keystore/file_keystore.go b/libbeat/keystore/file_keystore.go index 357002cb1510..36a21359043e 100644 --- a/libbeat/keystore/file_keystore.go +++ b/libbeat/keystore/file_keystore.go @@ -34,8 +34,8 @@ import ( "golang.org/x/crypto/pbkdf2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" ) const ( diff --git a/libbeat/keystore/file_keystore_test.go b/libbeat/keystore/file_keystore_test.go index 42eb36f2c4ed..5626a68d5911 100644 --- a/libbeat/keystore/file_keystore_test.go +++ b/libbeat/keystore/file_keystore_test.go @@ -27,7 +27,7 @@ import ( "github.com/docker/docker/pkg/ioutils" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var keyValue = "output.elasticsearch.password" diff --git a/libbeat/keystore/keystore.go b/libbeat/keystore/keystore.go index 15937b5163e8..57f1cd707e8a 100644 --- a/libbeat/keystore/keystore.go +++ b/libbeat/keystore/keystore.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ucfg "github.com/elastic/go-ucfg" "github.com/elastic/go-ucfg/parse" ) diff --git a/libbeat/kibana/client.go b/libbeat/kibana/client.go index 7d424d38eae9..92bca0b71572 100644 --- a/libbeat/kibana/client.go +++ b/libbeat/kibana/client.go @@ -30,10 +30,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type Connection struct { diff --git a/libbeat/kibana/client_config.go b/libbeat/kibana/client_config.go index 3d55c6998bec..07897b9fad9a 100644 --- a/libbeat/kibana/client_config.go +++ b/libbeat/kibana/client_config.go @@ -20,7 +20,7 @@ package kibana import ( "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // ClientConfig to connect to Kibana diff --git a/libbeat/kibana/dashboard.go b/libbeat/kibana/dashboard.go index 6da7f39530cc..d5174b5b1a5a 100644 --- a/libbeat/kibana/dashboard.go +++ b/libbeat/kibana/dashboard.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // RemoveIndexPattern removes the index pattern entry from a given dashboard export diff --git a/libbeat/kibana/fields_transformer.go b/libbeat/kibana/fields_transformer.go index b5ffd82fa043..7009484e573f 100644 --- a/libbeat/kibana/fields_transformer.go +++ b/libbeat/kibana/fields_transformer.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) var v640 = common.MustNewVersion("6.4.0") diff --git a/libbeat/kibana/fields_transformer_test.go b/libbeat/kibana/fields_transformer_test.go index be2fd6864fc9..fc7e9485536f 100644 --- a/libbeat/kibana/fields_transformer_test.go +++ b/libbeat/kibana/fields_transformer_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) var ( diff --git a/libbeat/kibana/index_pattern_generator.go b/libbeat/kibana/index_pattern_generator.go index 93b5406c2de0..abe8634c862b 100644 --- a/libbeat/kibana/index_pattern_generator.go +++ b/libbeat/kibana/index_pattern_generator.go @@ -24,8 +24,8 @@ import ( "path/filepath" "regexp" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) type IndexPatternGenerator struct { diff --git a/libbeat/kibana/index_pattern_generator_test.go b/libbeat/kibana/index_pattern_generator_test.go index 6d327c3e3cb3..f2a7c86784d6 100644 --- a/libbeat/kibana/index_pattern_generator_test.go +++ b/libbeat/kibana/index_pattern_generator_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const ( diff --git a/libbeat/kibana/transformer.go b/libbeat/kibana/transformer.go index f99dd5ff0c07..6e2b086e28bc 100644 --- a/libbeat/kibana/transformer.go +++ b/libbeat/kibana/transformer.go @@ -18,7 +18,7 @@ package kibana import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-ucfg/yaml" ) diff --git a/libbeat/libbeat.go b/libbeat/libbeat.go index 03327a00ec1c..70ebf26a5160 100644 --- a/libbeat/libbeat.go +++ b/libbeat/libbeat.go @@ -20,8 +20,8 @@ package main import ( "os" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/mock" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/mock" ) var RootCmd = cmd.GenRootCmdWithSettings(mock.New, mock.Settings) diff --git a/libbeat/libbeat_test.go b/libbeat/libbeat_test.go index b45fca1d7d20..d1d06506c87e 100644 --- a/libbeat/libbeat_test.go +++ b/libbeat/libbeat_test.go @@ -21,7 +21,7 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/libbeat/logp/configure/logging.go b/libbeat/logp/configure/logging.go index be1a7c5c6ab3..6e4d60ece1f3 100644 --- a/libbeat/logp/configure/logging.go +++ b/libbeat/logp/configure/logging.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // CLI flags for configuring logging. diff --git a/libbeat/logp/core.go b/libbeat/logp/core.go index 5dd990714f41..b0204a62ac76 100644 --- a/libbeat/logp/core.go +++ b/libbeat/logp/core.go @@ -32,8 +32,8 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/paths" ) var ( diff --git a/libbeat/magefile.go b/libbeat/magefile.go index efdbc87d4971..4f38f8e86f24 100644 --- a/libbeat/magefile.go +++ b/libbeat/magefile.go @@ -22,10 +22,10 @@ package main import ( "context" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" ) // Build builds the Beat binary. diff --git a/libbeat/management/management.go b/libbeat/management/management.go index 5725eea77157..acffe3e0ae64 100644 --- a/libbeat/management/management.go +++ b/libbeat/management/management.go @@ -20,9 +20,9 @@ package management import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/feature" ) // Namespace is the feature namespace for queue definition. diff --git a/libbeat/mapping/field_test.go b/libbeat/mapping/field_test.go index 6d2bfe49551e..0236ac4a6ae5 100644 --- a/libbeat/mapping/field_test.go +++ b/libbeat/mapping/field_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-ucfg/yaml" ) diff --git a/libbeat/metric/system/cpu/cpu.go b/libbeat/metric/system/cpu/cpu.go index b5cb6981fb87..abf274ff066c 100644 --- a/libbeat/metric/system/cpu/cpu.go +++ b/libbeat/metric/system/cpu/cpu.go @@ -22,7 +22,7 @@ package cpu import ( "runtime" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" sigar "github.com/elastic/gosigar" ) diff --git a/libbeat/metric/system/host/host.go b/libbeat/metric/system/host/host.go index 25cfb814749c..0d143ed2499e 100644 --- a/libbeat/metric/system/host/host.go +++ b/libbeat/metric/system/host/host.go @@ -18,8 +18,8 @@ package host import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/types" ) diff --git a/libbeat/metric/system/memory/memory.go b/libbeat/metric/system/memory/memory.go index d2833d4b092c..9351ac08e9e5 100644 --- a/libbeat/metric/system/memory/memory.go +++ b/libbeat/metric/system/memory/memory.go @@ -22,8 +22,8 @@ package memory import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" sysinfo "github.com/elastic/go-sysinfo" sysinfotypes "github.com/elastic/go-sysinfo/types" sigar "github.com/elastic/gosigar" diff --git a/libbeat/metric/system/process/process.go b/libbeat/metric/system/process/process.go index 544bacc7ec6d..7c5d70ebbc69 100644 --- a/libbeat/metric/system/process/process.go +++ b/libbeat/metric/system/process/process.go @@ -29,10 +29,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/memory" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/memory" sigar "github.com/elastic/gosigar" ) diff --git a/libbeat/metric/system/process/process_test.go b/libbeat/metric/system/process/process_test.go index 23b19610417b..527f6030716a 100644 --- a/libbeat/metric/system/process/process_test.go +++ b/libbeat/metric/system/process/process_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/gosigar" ) diff --git a/libbeat/mock/mockbeat.go b/libbeat/mock/mockbeat.go index 4a7dd1e01542..6224534c03be 100644 --- a/libbeat/mock/mockbeat.go +++ b/libbeat/mock/mockbeat.go @@ -20,10 +20,10 @@ package mock import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) ///*** Mock Beat Setup ***/// diff --git a/libbeat/monitoring/adapter/filters.go b/libbeat/monitoring/adapter/filters.go index c596a7f8763c..9d0f68e933b6 100644 --- a/libbeat/monitoring/adapter/filters.go +++ b/libbeat/monitoring/adapter/filters.go @@ -20,8 +20,8 @@ package adapter import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // provide filters for filtering and adapting a metric type diff --git a/libbeat/monitoring/adapter/go-metrics-wrapper.go b/libbeat/monitoring/adapter/go-metrics-wrapper.go index 815bc1284870..20f3714aa04d 100644 --- a/libbeat/monitoring/adapter/go-metrics-wrapper.go +++ b/libbeat/monitoring/adapter/go-metrics-wrapper.go @@ -20,7 +20,7 @@ package adapter import ( metrics "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // go-metrics wrapper interface required to unpack the original metric diff --git a/libbeat/monitoring/adapter/go-metrics.go b/libbeat/monitoring/adapter/go-metrics.go index 69b043687971..27fbfbf4aff0 100644 --- a/libbeat/monitoring/adapter/go-metrics.go +++ b/libbeat/monitoring/adapter/go-metrics.go @@ -24,8 +24,8 @@ import ( metrics "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // implement adapter for adding go-metrics based counters diff --git a/libbeat/monitoring/adapter/go-metrics_test.go b/libbeat/monitoring/adapter/go-metrics_test.go index 07aaf0e4a81b..1715b6c69fbe 100644 --- a/libbeat/monitoring/adapter/go-metrics_test.go +++ b/libbeat/monitoring/adapter/go-metrics_test.go @@ -24,7 +24,7 @@ import ( metrics "github.com/rcrowley/go-metrics" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func TestGoMetricsAdapter(t *testing.T) { diff --git a/libbeat/monitoring/cloudid.go b/libbeat/monitoring/cloudid.go index 73e08bed4574..d6a53f7bc143 100644 --- a/libbeat/monitoring/cloudid.go +++ b/libbeat/monitoring/cloudid.go @@ -22,8 +22,8 @@ import ( errw "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/cloudid" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/cloudid" + "github.com/elastic/beats/v7/libbeat/common" ) type cloudConfig struct { diff --git a/libbeat/monitoring/cloudid_test.go b/libbeat/monitoring/cloudid_test.go index 0ac5acf13140..d9935fbb67bd 100644 --- a/libbeat/monitoring/cloudid_test.go +++ b/libbeat/monitoring/cloudid_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestOverrideWithCloudSettings(t *testing.T) { diff --git a/libbeat/monitoring/metrics.go b/libbeat/monitoring/metrics.go index 364ee6b21e5a..22ad0482b1d2 100644 --- a/libbeat/monitoring/metrics.go +++ b/libbeat/monitoring/metrics.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) // makeExpvar wraps a callback for registering a metrics with expvar.Publish. diff --git a/libbeat/monitoring/monitoring.go b/libbeat/monitoring/monitoring.go index 48b854a773e7..04014b818cb4 100644 --- a/libbeat/monitoring/monitoring.go +++ b/libbeat/monitoring/monitoring.go @@ -20,9 +20,9 @@ package monitoring import ( "errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) // BeatConfig represents the part of the $BEAT.yml to do with monitoring settings diff --git a/libbeat/monitoring/report/elasticsearch/client.go b/libbeat/monitoring/report/elasticsearch/client.go index 6f47c6b62095..ca3aeda9566b 100644 --- a/libbeat/monitoring/report/elasticsearch/client.go +++ b/libbeat/monitoring/report/elasticsearch/client.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring/report" - esout "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring/report" + esout "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) var createDocPrivAvailableESVersion = common.MustNewVersion("7.5.0") diff --git a/libbeat/monitoring/report/elasticsearch/config.go b/libbeat/monitoring/report/elasticsearch/config.go index 4f355e270054..a603c73788bd 100644 --- a/libbeat/monitoring/report/elasticsearch/config.go +++ b/libbeat/monitoring/report/elasticsearch/config.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) // config is subset of libbeat/outputs/elasticsearch config tailored diff --git a/libbeat/monitoring/report/elasticsearch/elasticsearch.go b/libbeat/monitoring/report/elasticsearch/elasticsearch.go index ebb14bf28ead..bbf0d46164ae 100644 --- a/libbeat/monitoring/report/elasticsearch/elasticsearch.go +++ b/libbeat/monitoring/report/elasticsearch/elasticsearch.go @@ -27,20 +27,20 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report" - "github.com/elastic/beats/libbeat/outputs" - esout "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher/pipeline" - "github.com/elastic/beats/libbeat/publisher/processing" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/publisher/queue/memqueue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/outputs" + esout "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "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" ) type reporter struct { diff --git a/libbeat/monitoring/report/elasticsearch/snapshot.go b/libbeat/monitoring/report/elasticsearch/snapshot.go index 62766174c2a4..72c4c69fb790 100644 --- a/libbeat/monitoring/report/elasticsearch/snapshot.go +++ b/libbeat/monitoring/report/elasticsearch/snapshot.go @@ -18,8 +18,8 @@ package elasticsearch import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func makeSnapshot(R *monitoring.Registry) common.MapStr { diff --git a/libbeat/monitoring/report/event.go b/libbeat/monitoring/report/event.go index bdcab64ccc08..f7d1e923c1be 100644 --- a/libbeat/monitoring/report/event.go +++ b/libbeat/monitoring/report/event.go @@ -20,7 +20,7 @@ package report import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Event is the format of monitoring events. diff --git a/libbeat/monitoring/report/log/log.go b/libbeat/monitoring/report/log/log.go index bd6bf9e43cc2..2e8ef566bcfd 100644 --- a/libbeat/monitoring/report/log/log.go +++ b/libbeat/monitoring/report/log/log.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) // List of metrics that are gauges. This is used to identify metrics that should diff --git a/libbeat/monitoring/report/log/log_test.go b/libbeat/monitoring/report/log/log_test.go index 3d7091d781c2..4d0e215d6c8c 100644 --- a/libbeat/monitoring/report/log/log_test.go +++ b/libbeat/monitoring/report/log/log_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/libbeat/monitoring/report/report.go b/libbeat/monitoring/report/report.go index 1b05b85bb49e..e6812515af97 100644 --- a/libbeat/monitoring/report/report.go +++ b/libbeat/monitoring/report/report.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Format encodes the type of format to report monitoring data in. This diff --git a/libbeat/outputs/backoff.go b/libbeat/outputs/backoff.go index dca02fc88fc5..256b8029b099 100644 --- a/libbeat/outputs/backoff.go +++ b/libbeat/outputs/backoff.go @@ -21,9 +21,9 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) type backoffClient struct { diff --git a/libbeat/outputs/codec/codec.go b/libbeat/outputs/codec/codec.go index 790611ddaea6..347738d9c5a3 100644 --- a/libbeat/outputs/codec/codec.go +++ b/libbeat/outputs/codec/codec.go @@ -17,7 +17,7 @@ package codec -import "github.com/elastic/beats/libbeat/beat" +import "github.com/elastic/beats/v7/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 7db8aee58f21..b4468bba9328 100644 --- a/libbeat/outputs/codec/codec_reg.go +++ b/libbeat/outputs/codec/codec_reg.go @@ -20,8 +20,8 @@ package codec import ( "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type Factory func(beat.Info, *common.Config) (Codec, error) diff --git a/libbeat/outputs/codec/common.go b/libbeat/outputs/codec/common.go index d3df85dc5346..296e0aff3896 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/libbeat/common" - "github.com/elastic/beats/libbeat/common/dtfmt" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/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 0416222dc2e0..1be9268fa3d1 100644 --- a/libbeat/outputs/codec/format/format.go +++ b/libbeat/outputs/codec/format/format.go @@ -20,10 +20,10 @@ package format import ( "errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/outputs/codec" ) type Encoder struct { diff --git a/libbeat/outputs/codec/format/format_test.go b/libbeat/outputs/codec/format/format_test.go index 191ee5520064..96ded4f78410 100644 --- a/libbeat/outputs/codec/format/format_test.go +++ b/libbeat/outputs/codec/format/format_test.go @@ -20,9 +20,9 @@ package format import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" ) func TestFormatStringWriter(t *testing.T) { diff --git a/libbeat/outputs/codec/json/event.go b/libbeat/outputs/codec/json/event.go index 2f0d2c1217b0..c966df28f5f9 100644 --- a/libbeat/outputs/codec/json/event.go +++ b/libbeat/outputs/codec/json/event.go @@ -20,8 +20,8 @@ package json import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Event describes the event structure for events diff --git a/libbeat/outputs/codec/json/json.go b/libbeat/outputs/codec/json/json.go index 45b875b3ba9f..01d4f324104e 100644 --- a/libbeat/outputs/codec/json/json.go +++ b/libbeat/outputs/codec/json/json.go @@ -21,9 +21,9 @@ import ( "bytes" stdjson "encoding/json" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/codec" "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 8d60362b3d5e..dbdde0fa33e5 100644 --- a/libbeat/outputs/codec/json/json_bench_test.go +++ b/libbeat/outputs/codec/json/json_bench_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var result []byte diff --git a/libbeat/outputs/codec/json/json_test.go b/libbeat/outputs/codec/json/json_test.go index dc01e397e0bd..be2381e38c46 100644 --- a/libbeat/outputs/codec/json/json_test.go +++ b/libbeat/outputs/codec/json/json_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestJsonCodec(t *testing.T) { diff --git a/libbeat/outputs/codec/plugin.go b/libbeat/outputs/codec/plugin.go index 951bae242c09..b99ba36e7ca0 100644 --- a/libbeat/outputs/codec/plugin.go +++ b/libbeat/outputs/codec/plugin.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/plugin" ) type codecPlugin struct { diff --git a/libbeat/outputs/console/config.go b/libbeat/outputs/console/config.go index 09debf38aa84..44869e388fa9 100644 --- a/libbeat/outputs/console/config.go +++ b/libbeat/outputs/console/config.go @@ -17,7 +17,7 @@ package console -import "github.com/elastic/beats/libbeat/outputs/codec" +import "github.com/elastic/beats/v7/libbeat/outputs/codec" type Config struct { Codec codec.Config `config:"codec"` diff --git a/libbeat/outputs/console/console.go b/libbeat/outputs/console/console.go index c91d420674dd..3df69f4e5ba2 100644 --- a/libbeat/outputs/console/console.go +++ b/libbeat/outputs/console/console.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) type console struct { diff --git a/libbeat/outputs/console/console_test.go b/libbeat/outputs/console/console_test.go index 46c655094ab0..29201beee54c 100644 --- a/libbeat/outputs/console/console_test.go +++ b/libbeat/outputs/console/console_test.go @@ -27,15 +27,15 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/codec/format" - "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "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" ) // capture stdout and return captured string diff --git a/libbeat/outputs/elasticsearch/api.go b/libbeat/outputs/elasticsearch/api.go index 91c15cf2a468..d267fb6a98af 100644 --- a/libbeat/outputs/elasticsearch/api.go +++ b/libbeat/outputs/elasticsearch/api.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // QueryResult contains the result of a query. diff --git a/libbeat/outputs/elasticsearch/api_integration_test.go b/libbeat/outputs/elasticsearch/api_integration_test.go index 46020f784de4..41ec6c0634bd 100644 --- a/libbeat/outputs/elasticsearch/api_integration_test.go +++ b/libbeat/outputs/elasticsearch/api_integration_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestIndex(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/api_mock_test.go b/libbeat/outputs/elasticsearch/api_mock_test.go index 2cd92546fd06..65e687548332 100644 --- a/libbeat/outputs/elasticsearch/api_mock_test.go +++ b/libbeat/outputs/elasticsearch/api_mock_test.go @@ -28,7 +28,7 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func ElasticsearchMock(code int, body []byte) *httptest.Server { diff --git a/libbeat/outputs/elasticsearch/api_test.go b/libbeat/outputs/elasticsearch/api_test.go index 9ddff5405372..73eaa7708cc4 100644 --- a/libbeat/outputs/elasticsearch/api_test.go +++ b/libbeat/outputs/elasticsearch/api_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) func GetValidQueryResult() QueryResult { diff --git a/libbeat/outputs/elasticsearch/bulkapi.go b/libbeat/outputs/elasticsearch/bulkapi.go index 48c174624306..1eccdb235bce 100644 --- a/libbeat/outputs/elasticsearch/bulkapi.go +++ b/libbeat/outputs/elasticsearch/bulkapi.go @@ -25,7 +25,7 @@ import ( "net/http" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // MetaBuilder creates meta data for bulk requests diff --git a/libbeat/outputs/elasticsearch/bulkapi_integration_test.go b/libbeat/outputs/elasticsearch/bulkapi_integration_test.go index 594310f666d4..54e2201b398a 100644 --- a/libbeat/outputs/elasticsearch/bulkapi_integration_test.go +++ b/libbeat/outputs/elasticsearch/bulkapi_integration_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestBulk(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/bulkapi_mock_test.go b/libbeat/outputs/elasticsearch/bulkapi_mock_test.go index ca927db61c41..a87d0d1046c7 100644 --- a/libbeat/outputs/elasticsearch/bulkapi_mock_test.go +++ b/libbeat/outputs/elasticsearch/bulkapi_mock_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestOneHostSuccessResp_Bulk(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/client.go b/libbeat/outputs/elasticsearch/client.go index 5c3a1bc7b487..9838f355dd55 100644 --- a/libbeat/outputs/elasticsearch/client.go +++ b/libbeat/outputs/elasticsearch/client.go @@ -29,14 +29,14 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) // Client is an elasticsearch client. diff --git a/libbeat/outputs/elasticsearch/client_integration_test.go b/libbeat/outputs/elasticsearch/client_integration_test.go index b3d2a96d7e70..fb4c62cb86fa 100644 --- a/libbeat/outputs/elasticsearch/client_integration_test.go +++ b/libbeat/outputs/elasticsearch/client_integration_test.go @@ -33,14 +33,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/internal" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/internal" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) func TestClientConnect(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/client_proxy_test.go b/libbeat/outputs/elasticsearch/client_proxy_test.go index 3521a5868e0a..4d57f87fb783 100644 --- a/libbeat/outputs/elasticsearch/client_proxy_test.go +++ b/libbeat/outputs/elasticsearch/client_proxy_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) // These constants are inserted into client http request headers and confirmed diff --git a/libbeat/outputs/elasticsearch/client_test.go b/libbeat/outputs/elasticsearch/client_test.go index 72ad6ee22f9c..7a0ac0e68245 100644 --- a/libbeat/outputs/elasticsearch/client_test.go +++ b/libbeat/outputs/elasticsearch/client_test.go @@ -30,14 +30,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/logp" + "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/version" ) func readStatusItem(in []byte) (int, string, error) { diff --git a/libbeat/outputs/elasticsearch/config.go b/libbeat/outputs/elasticsearch/config.go index 8178d015b108..4cbf449b6ecb 100644 --- a/libbeat/outputs/elasticsearch/config.go +++ b/libbeat/outputs/elasticsearch/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) type elasticsearchConfig struct { diff --git a/libbeat/outputs/elasticsearch/elasticsearch.go b/libbeat/outputs/elasticsearch/elasticsearch.go index 55ef6e82a2c6..0cdad25cbe88 100644 --- a/libbeat/outputs/elasticsearch/elasticsearch.go +++ b/libbeat/outputs/elasticsearch/elasticsearch.go @@ -25,12 +25,12 @@ import ( "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) func init() { diff --git a/libbeat/outputs/elasticsearch/enc.go b/libbeat/outputs/elasticsearch/enc.go index 11d43c8c4797..8d2497e51829 100644 --- a/libbeat/outputs/elasticsearch/enc.go +++ b/libbeat/outputs/elasticsearch/enc.go @@ -24,9 +24,9 @@ import ( "net/http" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/codec" "github.com/elastic/go-structform/gotype" "github.com/elastic/go-structform/json" ) diff --git a/libbeat/outputs/elasticsearch/enc_test.go b/libbeat/outputs/elasticsearch/enc_test.go index 135bdf0d5f58..0ccea8cd0f40 100644 --- a/libbeat/outputs/elasticsearch/enc_test.go +++ b/libbeat/outputs/elasticsearch/enc_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring/report" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring/report" ) func TestJSONEncoderMarshalBeatEvent(t *testing.T) { diff --git a/libbeat/outputs/elasticsearch/estest/estest.go b/libbeat/outputs/elasticsearch/estest/estest.go index b5334edd5251..3aafc7da0d7f 100644 --- a/libbeat/outputs/elasticsearch/estest/estest.go +++ b/libbeat/outputs/elasticsearch/estest/estest.go @@ -20,9 +20,9 @@ package estest import ( "time" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/internal" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/internal" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) // GetTestingElasticsearch creates a test client. diff --git a/libbeat/outputs/elasticsearch/json_read.go b/libbeat/outputs/elasticsearch/json_read.go index 896ec89f2fae..8df87e5cb431 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/libbeat/common/streambuf" + "github.com/elastic/beats/v7/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 99d379a39436..b388a58a61f0 100644 --- a/libbeat/outputs/failover.go +++ b/libbeat/outputs/failover.go @@ -23,8 +23,8 @@ import ( "math/rand" "strings" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) type failoverClient struct { diff --git a/libbeat/outputs/fileout/config.go b/libbeat/outputs/fileout/config.go index 742334ceed0b..4b83cdbab971 100644 --- a/libbeat/outputs/fileout/config.go +++ b/libbeat/outputs/fileout/config.go @@ -20,8 +20,8 @@ package fileout import ( "fmt" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/outputs/codec" ) type config struct { diff --git a/libbeat/outputs/fileout/file.go b/libbeat/outputs/fileout/file.go index ab5b040bea59..5080f9b87e88 100644 --- a/libbeat/outputs/fileout/file.go +++ b/libbeat/outputs/fileout/file.go @@ -21,13 +21,13 @@ import ( "os" "path/filepath" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/publisher" ) func init() { diff --git a/libbeat/outputs/hosts.go b/libbeat/outputs/hosts.go index f8b192dba386..2ece4fc3ab8e 100644 --- a/libbeat/outputs/hosts.go +++ b/libbeat/outputs/hosts.go @@ -17,7 +17,7 @@ package outputs -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // ReadHostList reads a list of hosts to connect to from an configuration // object. If the `workers` settings is > 1, each host is duplicated in the final diff --git a/libbeat/outputs/kafka/client.go b/libbeat/outputs/kafka/client.go index ad1ff3e45de0..e5ab6f2ae858 100644 --- a/libbeat/outputs/kafka/client.go +++ b/libbeat/outputs/kafka/client.go @@ -26,14 +26,14 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" + "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/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/testing" ) type client struct { diff --git a/libbeat/outputs/kafka/config.go b/libbeat/outputs/kafka/config.go index 2ee4b2181ef4..dc6ccf8cda2a 100644 --- a/libbeat/outputs/kafka/config.go +++ b/libbeat/outputs/kafka/config.go @@ -25,15 +25,15 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/common/kafka" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" ) type kafkaConfig struct { diff --git a/libbeat/outputs/kafka/config_test.go b/libbeat/outputs/kafka/config_test.go index dd74b50ed3d7..ee404666e142 100644 --- a/libbeat/outputs/kafka/config_test.go +++ b/libbeat/outputs/kafka/config_test.go @@ -20,7 +20,7 @@ package kafka import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfigAcceptValid(t *testing.T) { diff --git a/libbeat/outputs/kafka/kafka.go b/libbeat/outputs/kafka/kafka.go index 37c478569467..a84d9790b2b8 100644 --- a/libbeat/outputs/kafka/kafka.go +++ b/libbeat/outputs/kafka/kafka.go @@ -23,12 +23,12 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) const ( diff --git a/libbeat/outputs/kafka/kafka_integration_test.go b/libbeat/outputs/kafka/kafka_integration_test.go index 771a402f8d24..58d03d1c1e70 100644 --- a/libbeat/outputs/kafka/kafka_integration_test.go +++ b/libbeat/outputs/kafka/kafka_integration_test.go @@ -32,14 +32,14 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) const ( diff --git a/libbeat/outputs/kafka/log.go b/libbeat/outputs/kafka/log.go index 027f476406ba..11da0e377afc 100644 --- a/libbeat/outputs/kafka/log.go +++ b/libbeat/outputs/kafka/log.go @@ -20,7 +20,7 @@ package kafka import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type kafkaLogger struct{} diff --git a/libbeat/outputs/kafka/message.go b/libbeat/outputs/kafka/message.go index 7254c3908338..16f169b8bd19 100644 --- a/libbeat/outputs/kafka/message.go +++ b/libbeat/outputs/kafka/message.go @@ -22,7 +22,7 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" ) type message struct { diff --git a/libbeat/outputs/kafka/partition.go b/libbeat/outputs/kafka/partition.go index f903becdbf38..399c6d9de96b 100644 --- a/libbeat/outputs/kafka/partition.go +++ b/libbeat/outputs/kafka/partition.go @@ -28,8 +28,8 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type partitionBuilder func(*common.Config) (func() partitioner, error) diff --git a/libbeat/outputs/kafka/partition_test.go b/libbeat/outputs/kafka/partition_test.go index fed71a283fc0..67ea36444e7e 100644 --- a/libbeat/outputs/kafka/partition_test.go +++ b/libbeat/outputs/kafka/partition_test.go @@ -28,9 +28,9 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" ) type partTestScenario func(*testing.T, bool, sarama.Partitioner) error diff --git a/libbeat/outputs/logstash/async.go b/libbeat/outputs/logstash/async.go index 967ae7d0f6c1..b3357f725893 100644 --- a/libbeat/outputs/logstash/async.go +++ b/libbeat/outputs/logstash/async.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" 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 b99fb9a57491..fb70962d3b97 100644 --- a/libbeat/outputs/logstash/async_test.go +++ b/libbeat/outputs/logstash/async_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport" + "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/v7/libbeat/outputs/transport" ) type testAsyncDriver struct { diff --git a/libbeat/outputs/logstash/client_test.go b/libbeat/outputs/logstash/client_test.go index 30e98fd83094..87cf8e50f436 100644 --- a/libbeat/outputs/logstash/client_test.go +++ b/libbeat/outputs/logstash/client_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/outputs/transport/transptest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport/transptest" v2 "github.com/elastic/go-lumber/server/v2" ) diff --git a/libbeat/outputs/logstash/common_test.go b/libbeat/outputs/logstash/common_test.go index 47ae55088fde..75f2aa15e560 100644 --- a/libbeat/outputs/logstash/common_test.go +++ b/libbeat/outputs/logstash/common_test.go @@ -18,7 +18,7 @@ package logstash import ( - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func enableLogging(selectors []string) { diff --git a/libbeat/outputs/logstash/config.go b/libbeat/outputs/logstash/config.go index 6d2a30d39ea6..be6ad1a4f4a5 100644 --- a/libbeat/outputs/logstash/config.go +++ b/libbeat/outputs/logstash/config.go @@ -21,12 +21,12 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type Config struct { diff --git a/libbeat/outputs/logstash/config_test.go b/libbeat/outputs/logstash/config_test.go index ee3ffe179786..572749bc1a3e 100644 --- a/libbeat/outputs/logstash/config_test.go +++ b/libbeat/outputs/logstash/config_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/libbeat/outputs/logstash/enc.go b/libbeat/outputs/logstash/enc.go index fb42626ec5cd..747a7d3fd5be 100644 --- a/libbeat/outputs/logstash/enc.go +++ b/libbeat/outputs/logstash/enc.go @@ -20,8 +20,8 @@ package logstash import ( "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/outputs/codec/json" ) func makeLogstashEventEncoder(info beat.Info, escapeHTML bool, index string) func(interface{}) ([]byte, error) { diff --git a/libbeat/outputs/logstash/logstash.go b/libbeat/outputs/logstash/logstash.go index d1a64a47b269..b2c3bb95565b 100644 --- a/libbeat/outputs/logstash/logstash.go +++ b/libbeat/outputs/logstash/logstash.go @@ -18,12 +18,12 @@ package logstash import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) const ( diff --git a/libbeat/outputs/logstash/logstash_integration_test.go b/libbeat/outputs/logstash/logstash_integration_test.go index 6aca15337fe8..c2170cb25d8a 100644 --- a/libbeat/outputs/logstash/logstash_integration_test.go +++ b/libbeat/outputs/logstash/logstash_integration_test.go @@ -29,14 +29,14 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "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" ) const ( diff --git a/libbeat/outputs/logstash/logstash_test.go b/libbeat/outputs/logstash/logstash_test.go index 027aff78356c..3167b2690558 100644 --- a/libbeat/outputs/logstash/logstash_test.go +++ b/libbeat/outputs/logstash/logstash_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport/transptest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/outputs/transport/transptest" v2 "github.com/elastic/go-lumber/server/v2" ) diff --git a/libbeat/outputs/logstash/sync.go b/libbeat/outputs/logstash/sync.go index 8b47ce691cad..cd37e0bbb317 100644 --- a/libbeat/outputs/logstash/sync.go +++ b/libbeat/outputs/logstash/sync.go @@ -20,11 +20,11 @@ package logstash import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" 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 f9d74cb69cba..5b05c4d0ccc8 100644 --- a/libbeat/outputs/logstash/sync_test.go +++ b/libbeat/outputs/logstash/sync_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/outest" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/outputs/transport/transptest" + "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/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport/transptest" ) type testSyncDriver struct { diff --git a/libbeat/outputs/metrics.go b/libbeat/outputs/metrics.go index 28ac20627da5..602506a1befc 100644 --- a/libbeat/outputs/metrics.go +++ b/libbeat/outputs/metrics.go @@ -17,7 +17,7 @@ package outputs -import "github.com/elastic/beats/libbeat/monitoring" +import "github.com/elastic/beats/v7/libbeat/monitoring" // Stats implements the Observer interface, for collecting metrics on common // outputs events. diff --git a/libbeat/outputs/outest/batch.go b/libbeat/outputs/outest/batch.go index 5cb16f5a830d..11d4bf1a2667 100644 --- a/libbeat/outputs/outest/batch.go +++ b/libbeat/outputs/outest/batch.go @@ -18,8 +18,8 @@ package outest import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/publisher" ) type Batch struct { diff --git a/libbeat/outputs/outil/select.go b/libbeat/outputs/outil/select.go index d06ee4e32091..6ff629c88e75 100644 --- a/libbeat/outputs/outil/select.go +++ b/libbeat/outputs/outil/select.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/conditions" ) // Selector is used to produce a string based on the contents of a Beats event. diff --git a/libbeat/outputs/outil/select_test.go b/libbeat/outputs/outil/select_test.go index f6e837966b2d..e16cb602a96d 100644 --- a/libbeat/outputs/outil/select_test.go +++ b/libbeat/outputs/outil/select_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type node map[string]interface{} diff --git a/libbeat/outputs/output_reg.go b/libbeat/outputs/output_reg.go index 6625f1125b1f..86c1323c505b 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/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var outputReg = map[string]Factory{} diff --git a/libbeat/outputs/outputs.go b/libbeat/outputs/outputs.go index 2dab0adf06ea..c6808321ce76 100644 --- a/libbeat/outputs/outputs.go +++ b/libbeat/outputs/outputs.go @@ -21,7 +21,7 @@ package outputs import ( - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/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 254f93832ce9..b76afedd45a4 100644 --- a/libbeat/outputs/plugin.go +++ b/libbeat/outputs/plugin.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - p "github.com/elastic/beats/libbeat/plugin" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type outputPlugin struct { diff --git a/libbeat/outputs/redis/backoff.go b/libbeat/outputs/redis/backoff.go index 3084522f6af7..30107df90fa5 100644 --- a/libbeat/outputs/redis/backoff.go +++ b/libbeat/outputs/redis/backoff.go @@ -22,8 +22,8 @@ import ( "github.com/garyburd/redigo/redis" - b "github.com/elastic/beats/libbeat/common/backoff" - "github.com/elastic/beats/libbeat/publisher" + b "github.com/elastic/beats/v7/libbeat/common/backoff" + "github.com/elastic/beats/v7/libbeat/publisher" ) type backoffClient struct { diff --git a/libbeat/outputs/redis/client.go b/libbeat/outputs/redis/client.go index 1764d9e60f99..df1c3b91a59c 100644 --- a/libbeat/outputs/redis/client.go +++ b/libbeat/outputs/redis/client.go @@ -26,14 +26,14 @@ import ( "github.com/garyburd/redigo/redis" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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/outputs/transport" + "github.com/elastic/beats/v7/libbeat/publisher" ) var ( diff --git a/libbeat/outputs/redis/config.go b/libbeat/outputs/redis/config.go index bcad44af0969..b92c290c2c90 100644 --- a/libbeat/outputs/redis/config.go +++ b/libbeat/outputs/redis/config.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type redisConfig struct { diff --git a/libbeat/outputs/redis/redis.go b/libbeat/outputs/redis/redis.go index 97a6b9fdafac..eedfcf7d7193 100644 --- a/libbeat/outputs/redis/redis.go +++ b/libbeat/outputs/redis/redis.go @@ -21,15 +21,15 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/outil" - "github.com/elastic/beats/libbeat/outputs/transport" + "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/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "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/outputs/transport" ) type redisOut struct { diff --git a/libbeat/outputs/redis/redis_integration_test.go b/libbeat/outputs/redis/redis_integration_test.go index 5d5a5df9f0c0..51f7962804ce 100644 --- a/libbeat/outputs/redis/redis_integration_test.go +++ b/libbeat/outputs/redis/redis_integration_test.go @@ -30,12 +30,12 @@ import ( "github.com/garyburd/redigo/redis" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs" - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/outputs/outest" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "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" ) const ( diff --git a/libbeat/outputs/tls.go b/libbeat/outputs/tls.go index 468a8f648547..907af8a79fa0 100644 --- a/libbeat/outputs/tls.go +++ b/libbeat/outputs/tls.go @@ -18,7 +18,7 @@ package outputs import ( - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // Managing TLS option with the outputs package is deprecated move your code to use the tlscommon diff --git a/libbeat/outputs/transport/client.go b/libbeat/outputs/transport/client.go index 7855dfc106ef..338801b444d8 100644 --- a/libbeat/outputs/transport/client.go +++ b/libbeat/outputs/transport/client.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/testing" ) type Client struct { diff --git a/libbeat/outputs/transport/proxy.go b/libbeat/outputs/transport/proxy.go index 95bc7f4d00a8..a755a914a671 100644 --- a/libbeat/outputs/transport/proxy.go +++ b/libbeat/outputs/transport/proxy.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/proxy" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // ProxyConfig holds the configuration information required to proxy diff --git a/libbeat/outputs/transport/tcp.go b/libbeat/outputs/transport/tcp.go index b1e6024f8f17..8ffc70debe14 100644 --- a/libbeat/outputs/transport/tcp.go +++ b/libbeat/outputs/transport/tcp.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/testing" ) func NetDialer(timeout time.Duration) Dialer { diff --git a/libbeat/outputs/transport/tls.go b/libbeat/outputs/transport/tls.go index 9bc90b629cef..1ef879e0c89e 100644 --- a/libbeat/outputs/transport/tls.go +++ b/libbeat/outputs/transport/tls.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/testing" ) // TLSConfig is the interface used to configure a tcp client or server from a `Config` diff --git a/libbeat/outputs/transport/transport.go b/libbeat/outputs/transport/transport.go index 28367129d1cf..7ff01c2fa30e 100644 --- a/libbeat/outputs/transport/transport.go +++ b/libbeat/outputs/transport/transport.go @@ -21,7 +21,7 @@ import ( "errors" "net" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type Dialer interface { diff --git a/libbeat/outputs/transport/transptest/testing.go b/libbeat/outputs/transport/transptest/testing.go index 402be992d1df..e676dd1bed54 100644 --- a/libbeat/outputs/transport/transptest/testing.go +++ b/libbeat/outputs/transport/transptest/testing.go @@ -31,8 +31,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) type MockServer struct { diff --git a/libbeat/outputs/transport/transptest/testing_test.go b/libbeat/outputs/transport/transptest/testing_test.go index ac2db723c859..b92f0c786948 100644 --- a/libbeat/outputs/transport/transptest/testing_test.go +++ b/libbeat/outputs/transport/transptest/testing_test.go @@ -29,7 +29,7 @@ import ( socks5 "github.com/armon/go-socks5" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // netSOCKS5Proxy starts a new SOCKS5 proxy server that listens on localhost. diff --git a/libbeat/plugin/cli.go b/libbeat/plugin/cli.go index 425b2b429343..3111d149ea3f 100644 --- a/libbeat/plugin/cli.go +++ b/libbeat/plugin/cli.go @@ -24,8 +24,8 @@ import ( "flag" "strings" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" ) type pluginList struct { diff --git a/libbeat/processors/actions/add_fields.go b/libbeat/processors/actions/add_fields.go index f370b4c5c439..3d39c1afb4db 100644 --- a/libbeat/processors/actions/add_fields.go +++ b/libbeat/processors/actions/add_fields.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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" ) type addFields struct { diff --git a/libbeat/processors/actions/add_fields_test.go b/libbeat/processors/actions/add_fields_test.go index daaa71482179..a0b7b1d37dc8 100644 --- a/libbeat/processors/actions/add_fields_test.go +++ b/libbeat/processors/actions/add_fields_test.go @@ -20,7 +20,7 @@ package actions import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestAddFields(t *testing.T) { diff --git a/libbeat/processors/actions/add_labels.go b/libbeat/processors/actions/add_labels.go index 8d7ddc45d7a7..766966592652 100644 --- a/libbeat/processors/actions/add_labels.go +++ b/libbeat/processors/actions/add_labels.go @@ -20,9 +20,9 @@ package actions import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) // LabelsKey is the default target key for the add_labels processor. diff --git a/libbeat/processors/actions/add_labels_test.go b/libbeat/processors/actions/add_labels_test.go index 50dbbd6ee54c..24ddcbab58f2 100644 --- a/libbeat/processors/actions/add_labels_test.go +++ b/libbeat/processors/actions/add_labels_test.go @@ -20,7 +20,7 @@ package actions import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestAddLabels(t *testing.T) { diff --git a/libbeat/processors/actions/add_tags.go b/libbeat/processors/actions/add_tags.go index d8e6cd9811ca..15161ca8114c 100644 --- a/libbeat/processors/actions/add_tags.go +++ b/libbeat/processors/actions/add_tags.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "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" ) type addTags struct { diff --git a/libbeat/processors/actions/add_tags_test.go b/libbeat/processors/actions/add_tags_test.go index 678d883e5ba2..9ec78b927b11 100644 --- a/libbeat/processors/actions/add_tags_test.go +++ b/libbeat/processors/actions/add_tags_test.go @@ -20,7 +20,7 @@ package actions import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestAddTags(t *testing.T) { diff --git a/libbeat/processors/actions/common_test.go b/libbeat/processors/actions/common_test.go index 70071f508526..4c4a294970b9 100644 --- a/libbeat/processors/actions/common_test.go +++ b/libbeat/processors/actions/common_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) type testCase struct { diff --git a/libbeat/processors/actions/copy_fields.go b/libbeat/processors/actions/copy_fields.go index c67dd996385f..a709a5ecb421 100644 --- a/libbeat/processors/actions/copy_fields.go +++ b/libbeat/processors/actions/copy_fields.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) type copyFields struct { diff --git a/libbeat/processors/actions/copy_fields_test.go b/libbeat/processors/actions/copy_fields_test.go index a3de4ae19470..2c7da0cb02e9 100644 --- a/libbeat/processors/actions/copy_fields_test.go +++ b/libbeat/processors/actions/copy_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestCopyFields(t *testing.T) { diff --git a/libbeat/processors/actions/decode_base64_field.go b/libbeat/processors/actions/decode_base64_field.go index bf2c92dc6e46..4f6b0ff34ab8 100644 --- a/libbeat/processors/actions/decode_base64_field.go +++ b/libbeat/processors/actions/decode_base64_field.go @@ -23,12 +23,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) const ( diff --git a/libbeat/processors/actions/decode_base64_field_test.go b/libbeat/processors/actions/decode_base64_field_test.go index de4f6a42ed34..3941198a565a 100644 --- a/libbeat/processors/actions/decode_base64_field_test.go +++ b/libbeat/processors/actions/decode_base64_field_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestDecodeBase64Run(t *testing.T) { diff --git a/libbeat/processors/actions/decode_json_fields.go b/libbeat/processors/actions/decode_json_fields.go index 078ec38f1ccc..90356ff29789 100644 --- a/libbeat/processors/actions/decode_json_fields.go +++ b/libbeat/processors/actions/decode_json_fields.go @@ -25,13 +25,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/jsontransform" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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/logp" + "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" ) type decodeJSONFields struct { diff --git a/libbeat/processors/actions/decode_json_fields_test.go b/libbeat/processors/actions/decode_json_fields_test.go index 3e801d69e5e4..48c868eec53e 100644 --- a/libbeat/processors/actions/decode_json_fields_test.go +++ b/libbeat/processors/actions/decode_json_fields_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var fields = [1]string{"msg"} diff --git a/libbeat/processors/actions/decompress_gzip_field.go b/libbeat/processors/actions/decompress_gzip_field.go index efa3e04ef829..21c5b7f88b53 100644 --- a/libbeat/processors/actions/decompress_gzip_field.go +++ b/libbeat/processors/actions/decompress_gzip_field.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/checks" ) type decompressGzipField struct { diff --git a/libbeat/processors/actions/decompress_gzip_field_test.go b/libbeat/processors/actions/decompress_gzip_field_test.go index c7b8097997af..0792d60e64d0 100644 --- a/libbeat/processors/actions/decompress_gzip_field_test.go +++ b/libbeat/processors/actions/decompress_gzip_field_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestDecompressGzip(t *testing.T) { diff --git a/libbeat/processors/actions/drop_event.go b/libbeat/processors/actions/drop_event.go index a24db8fc3f15..52c502188db6 100644 --- a/libbeat/processors/actions/drop_event.go +++ b/libbeat/processors/actions/drop_event.go @@ -18,10 +18,10 @@ package actions import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "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" ) type dropEvent struct{} diff --git a/libbeat/processors/actions/drop_fields.go b/libbeat/processors/actions/drop_fields.go index cbdd258c43ac..540880a750a0 100644 --- a/libbeat/processors/actions/drop_fields.go +++ b/libbeat/processors/actions/drop_fields.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "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" ) type dropFields struct { diff --git a/libbeat/processors/actions/extract_field.go b/libbeat/processors/actions/extract_field.go index 4b03f8f8a5ba..58b64caae27d 100644 --- a/libbeat/processors/actions/extract_field.go +++ b/libbeat/processors/actions/extract_field.go @@ -21,9 +21,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) type extract_field struct { diff --git a/libbeat/processors/actions/extract_field_test.go b/libbeat/processors/actions/extract_field_test.go index 4973bbffe068..3cbcf2f714f8 100644 --- a/libbeat/processors/actions/extract_field_test.go +++ b/libbeat/processors/actions/extract_field_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestCommonPaths(t *testing.T) { diff --git a/libbeat/processors/actions/include_fields.go b/libbeat/processors/actions/include_fields.go index ada8d300bef4..32c404d3a78d 100644 --- a/libbeat/processors/actions/include_fields.go +++ b/libbeat/processors/actions/include_fields.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" + "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" ) type includeFields struct { diff --git a/libbeat/processors/actions/include_fields_test.go b/libbeat/processors/actions/include_fields_test.go index d33c934de2e0..1432a2f32f75 100644 --- a/libbeat/processors/actions/include_fields_test.go +++ b/libbeat/processors/actions/include_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestIncludeFields(t *testing.T) { diff --git a/libbeat/processors/actions/rename.go b/libbeat/processors/actions/rename.go index 89e92d2a3e6b..9c8e3d756f19 100644 --- a/libbeat/processors/actions/rename.go +++ b/libbeat/processors/actions/rename.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) type renameFields struct { diff --git a/libbeat/processors/actions/rename_test.go b/libbeat/processors/actions/rename_test.go index 125986e8a15e..a44f97a2e548 100644 --- a/libbeat/processors/actions/rename_test.go +++ b/libbeat/processors/actions/rename_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestRenameRun(t *testing.T) { diff --git a/libbeat/processors/actions/truncate_fields.go b/libbeat/processors/actions/truncate_fields.go index 1c1256f69bcc..ae168312d823 100644 --- a/libbeat/processors/actions/truncate_fields.go +++ b/libbeat/processors/actions/truncate_fields.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) type truncateFieldsConfig struct { diff --git a/libbeat/processors/actions/truncate_fields_test.go b/libbeat/processors/actions/truncate_fields_test.go index 45d8fb642726..ccdc92ae41cc 100644 --- a/libbeat/processors/actions/truncate_fields_test.go +++ b/libbeat/processors/actions/truncate_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestTruncateFields(t *testing.T) { diff --git a/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go b/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go index d4a8ea22baee..e24d71e92655 100644 --- a/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go +++ b/libbeat/processors/add_cloud_metadata/add_cloud_metadata.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/add_cloud_metadata/http_fetcher.go b/libbeat/processors/add_cloud_metadata/http_fetcher.go index 30e312443337..e9b184786614 100644 --- a/libbeat/processors/add_cloud_metadata/http_fetcher.go +++ b/libbeat/processors/add_cloud_metadata/http_fetcher.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type httpMetadataFetcher struct { diff --git a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go index afa502990a20..7d9e9ee986f5 100644 --- a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go +++ b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud.go @@ -17,7 +17,7 @@ package add_cloud_metadata -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // Alibaba Cloud Metadata Service // Document https://help.aliyun.com/knowledge_detail/49122.html 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 7a6b7265d693..8d887245d86a 100644 --- a/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_alibaba_cloud_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func initECSTestServer() *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go b/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go index ed28f3b38aa5..b65d914f10c9 100644 --- a/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go +++ b/libbeat/processors/add_cloud_metadata/provider_aws_ec2.go @@ -18,9 +18,9 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) const ec2InstanceIdentityURI = "/2014-02-25/dynamic/instance-identity/document" 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 69db09c25996..4a54e549c322 100644 --- a/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func createEC2MockAPI(responseMap map[string]string) *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go index 8ee84f417e3b..077e9b610ddb 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm.go @@ -18,9 +18,9 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) // Azure VM Metadata Service 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 23133a4b3877..57f26c8ecd5b 100644 --- a/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_azure_vm_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const azInstanceIdentityDocument = `{ diff --git a/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go b/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go index fe016ffb95e9..cc56ae044bd2 100644 --- a/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go +++ b/libbeat/processors/add_cloud_metadata/provider_digital_ocean.go @@ -18,9 +18,9 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) // DigitalOcean Metadata Service 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 3237b6ec8385..5fb19a98feec 100644 --- a/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_digital_ocean_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const digitalOceanMetadataV1 = `{ diff --git a/libbeat/processors/add_cloud_metadata/provider_google_gce.go b/libbeat/processors/add_cloud_metadata/provider_google_gce.go index 27c574f9f1dc..0fe69e1998d4 100644 --- a/libbeat/processors/add_cloud_metadata/provider_google_gce.go +++ b/libbeat/processors/add_cloud_metadata/provider_google_gce.go @@ -20,9 +20,9 @@ package add_cloud_metadata import ( "path" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) // Google GCE Metadata Service 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 7cac4c4376b0..eccc07d4b30d 100644 --- a/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_google_gce_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const gceMetadataV1 = `{ diff --git a/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go b/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go index cbb516059b9f..17bc5abf6893 100644 --- a/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go +++ b/libbeat/processors/add_cloud_metadata/provider_openstack_nova.go @@ -18,7 +18,7 @@ package add_cloud_metadata import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const ( 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 bb2c0b4b28ad..d5c38a8437b5 100644 --- a/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_openstack_nova_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func initOpenstackNovaTestServer() *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go index d24778c6850c..be5956955353 100644 --- a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go +++ b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud.go @@ -17,7 +17,7 @@ package add_cloud_metadata -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // Tencent Cloud Metadata Service // Document https://www.qcloud.com/document/product/213/4934 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 72be1934c2d6..1615d37a38cc 100644 --- a/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go +++ b/libbeat/processors/add_cloud_metadata/provider_tencent_cloud_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func initQCloudTestServer() *httptest.Server { diff --git a/libbeat/processors/add_cloud_metadata/providers.go b/libbeat/processors/add_cloud_metadata/providers.go index 301e7d4731f6..0fc4c5c783ab 100644 --- a/libbeat/processors/add_cloud_metadata/providers.go +++ b/libbeat/processors/add_cloud_metadata/providers.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type provider struct { diff --git a/libbeat/processors/add_cloud_metadata/providers_test.go b/libbeat/processors/add_cloud_metadata/providers_test.go index e9c8732c54a2..eed1e752278d 100644 --- a/libbeat/processors/add_cloud_metadata/providers_test.go +++ b/libbeat/processors/add_cloud_metadata/providers_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestProvidersFilter(t *testing.T) { diff --git a/libbeat/processors/add_docker_metadata/add_docker_metadata.go b/libbeat/processors/add_docker_metadata/add_docker_metadata.go index 8020955dd591..28f8831bc128 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata.go @@ -30,14 +30,14 @@ import ( "github.com/elastic/gosigar/cgroup" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/actions" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/actions" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( 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 7ed4f486cb59..2d8a5a9e970b 100644 --- a/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go +++ b/libbeat/processors/add_docker_metadata/add_docker_metadata_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/libbeat/processors/add_docker_metadata/config.go b/libbeat/processors/add_docker_metadata/config.go index 930ca4ecdc6e..89e97fa9af42 100644 --- a/libbeat/processors/add_docker_metadata/config.go +++ b/libbeat/processors/add_docker_metadata/config.go @@ -22,7 +22,7 @@ package add_docker_metadata import ( "time" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/docker" ) // Config for docker processor. diff --git a/libbeat/processors/add_formatted_index/add_formatted_index.go b/libbeat/processors/add_formatted_index/add_formatted_index.go index ed947be73491..72be2a89775c 100644 --- a/libbeat/processors/add_formatted_index/add_formatted_index.go +++ b/libbeat/processors/add_formatted_index/add_formatted_index.go @@ -20,9 +20,9 @@ package add_formatted_index import ( "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" ) // AddFormattedIndex is a Processor to set an event's "raw_index" metadata field diff --git a/libbeat/processors/add_host_metadata/add_host_metadata.go b/libbeat/processors/add_host_metadata/add_host_metadata.go index 6cfc938e5f0c..112f59bb5880 100644 --- a/libbeat/processors/add_host_metadata/add_host_metadata.go +++ b/libbeat/processors/add_host_metadata/add_host_metadata.go @@ -24,13 +24,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/host" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" - "github.com/elastic/beats/libbeat/processors/util" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/host" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/processors/util" "github.com/elastic/go-sysinfo" ) 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 57f4358b65d2..045f7459da9c 100644 --- a/libbeat/processors/add_host_metadata/add_host_metadata_test.go +++ b/libbeat/processors/add_host_metadata/add_host_metadata_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/go-sysinfo/types" ) diff --git a/libbeat/processors/add_host_metadata/config.go b/libbeat/processors/add_host_metadata/config.go index 6a3940019c93..539343a16512 100644 --- a/libbeat/processors/add_host_metadata/config.go +++ b/libbeat/processors/add_host_metadata/config.go @@ -20,7 +20,7 @@ package add_host_metadata import ( "time" - "github.com/elastic/beats/libbeat/processors/util" + "github.com/elastic/beats/v7/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 5df081460c33..44d03f6cd7c5 100644 --- a/libbeat/processors/add_id/add_id.go +++ b/libbeat/processors/add_id/add_id.go @@ -20,12 +20,12 @@ package add_id import ( "fmt" - "github.com/elastic/beats/libbeat/processors/add_id/generator" + "github.com/elastic/beats/v7/libbeat/processors/add_id/generator" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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" ) func init() { diff --git a/libbeat/processors/add_id/add_id_test.go b/libbeat/processors/add_id/add_id_test.go index 6a3fb5b3a099..54ad579e9fd2 100644 --- a/libbeat/processors/add_id/add_id_test.go +++ b/libbeat/processors/add_id/add_id_test.go @@ -20,9 +20,9 @@ package add_id import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" "github.com/stretchr/testify/assert" ) diff --git a/libbeat/processors/add_id/config.go b/libbeat/processors/add_id/config.go index ca28d48d68ee..04a1c114219e 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/libbeat/processors/add_id/generator" + "github.com/elastic/beats/v7/libbeat/processors/add_id/generator" ) // configuration for Add ID processor. diff --git a/libbeat/processors/add_kubernetes_metadata/cache.go b/libbeat/processors/add_kubernetes_metadata/cache.go index f5fb4ba52e65..da7492b43a92 100644 --- a/libbeat/processors/add_kubernetes_metadata/cache.go +++ b/libbeat/processors/add_kubernetes_metadata/cache.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type cache struct { diff --git a/libbeat/processors/add_kubernetes_metadata/config.go b/libbeat/processors/add_kubernetes_metadata/config.go index 84d2c246948d..b5e492d8ccc0 100644 --- a/libbeat/processors/add_kubernetes_metadata/config.go +++ b/libbeat/processors/add_kubernetes_metadata/config.go @@ -20,7 +20,7 @@ package add_kubernetes_metadata import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type kubeAnnotatorConfig struct { diff --git a/libbeat/processors/add_kubernetes_metadata/indexers.go b/libbeat/processors/add_kubernetes_metadata/indexers.go index 3d6dd601fcb9..673337fa7936 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexers.go +++ b/libbeat/processors/add_kubernetes_metadata/indexers.go @@ -21,11 +21,11 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/processors/add_kubernetes_metadata/indexers_test.go b/libbeat/processors/add_kubernetes_metadata/indexers_test.go index 0d74cece0122..1a79cb7d2595 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexers_test.go +++ b/libbeat/processors/add_kubernetes_metadata/indexers_test.go @@ -21,15 +21,15 @@ import ( "fmt" "testing" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) var metagen = metadata.NewPodMetadataGenerator(common.NewConfig(), nil, nil, nil) diff --git a/libbeat/processors/add_kubernetes_metadata/indexing.go b/libbeat/processors/add_kubernetes_metadata/indexing.go index e5485abe47b3..d011d0c7a970 100644 --- a/libbeat/processors/add_kubernetes_metadata/indexing.go +++ b/libbeat/processors/add_kubernetes_metadata/indexing.go @@ -20,7 +20,7 @@ package add_kubernetes_metadata import ( "sync" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Indexing is the singleton Register instance where all Indexers and Matchers diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go index 2f6b2a71ae8c..bba99613f1d9 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes.go @@ -24,16 +24,16 @@ import ( "os" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" k8sclient "k8s.io/client-go/kubernetes" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go b/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go index 4da15db969b4..7d18d169e401 100644 --- a/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go +++ b/libbeat/processors/add_kubernetes_metadata/kubernetes_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Test metadata updates don't replace existing pod metrics diff --git a/libbeat/processors/add_kubernetes_metadata/matchers.go b/libbeat/processors/add_kubernetes_metadata/matchers.go index 61590821771f..ca14746f1304 100644 --- a/libbeat/processors/add_kubernetes_metadata/matchers.go +++ b/libbeat/processors/add_kubernetes_metadata/matchers.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/outputs/codec/format" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/outputs/codec/format" ) const ( diff --git a/libbeat/processors/add_kubernetes_metadata/matchers_test.go b/libbeat/processors/add_kubernetes_metadata/matchers_test.go index 0a1c723f6c3e..13e453426e76 100644 --- a/libbeat/processors/add_kubernetes_metadata/matchers_test.go +++ b/libbeat/processors/add_kubernetes_metadata/matchers_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestFieldMatcher(t *testing.T) { diff --git a/libbeat/processors/add_kubernetes_metadata/registry.go b/libbeat/processors/add_kubernetes_metadata/registry.go index 7198f485557c..417cb9e55334 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/libbeat/plugin" + p "github.com/elastic/beats/v7/libbeat/plugin" ) var ( diff --git a/libbeat/processors/add_locale/add_locale.go b/libbeat/processors/add_locale/add_locale.go index 9d98c045df7e..b45682313a30 100644 --- a/libbeat/processors/add_locale/add_locale.go +++ b/libbeat/processors/add_locale/add_locale.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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" ) type addLocale struct { diff --git a/libbeat/processors/add_locale/add_locale_test.go b/libbeat/processors/add_locale/add_locale_test.go index e1b11610984e..66b5cafd4e2a 100644 --- a/libbeat/processors/add_locale/add_locale_test.go +++ b/libbeat/processors/add_locale/add_locale_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestExportTimezone(t *testing.T) { diff --git a/libbeat/processors/add_observer_metadata/add_observer_metadata.go b/libbeat/processors/add_observer_metadata/add_observer_metadata.go index b1740df00670..b61d00536124 100644 --- a/libbeat/processors/add_observer_metadata/add_observer_metadata.go +++ b/libbeat/processors/add_observer_metadata/add_observer_metadata.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" - "github.com/elastic/beats/libbeat/processors/util" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/processors/util" "github.com/elastic/go-sysinfo" ) 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 e686388ccc69..d2d19f035552 100644 --- a/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go +++ b/libbeat/processors/add_observer_metadata/add_observer_metadata_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfigDefault(t *testing.T) { diff --git a/libbeat/processors/add_observer_metadata/config.go b/libbeat/processors/add_observer_metadata/config.go index 111ed9a3f1db..c40b26bfa4c6 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/libbeat/processors/util" + "github.com/elastic/beats/v7/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 2b78fcb817e4..4b6270c9f6e0 100644 --- a/libbeat/processors/add_process_metadata/add_process_metadata.go +++ b/libbeat/processors/add_process_metadata/add_process_metadata.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( 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 8f76c5ec685f..16d3f38fa714 100644 --- a/libbeat/processors/add_process_metadata/add_process_metadata_test.go +++ b/libbeat/processors/add_process_metadata/add_process_metadata_test.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestAddProcessMetadata(t *testing.T) { diff --git a/libbeat/processors/add_process_metadata/config.go b/libbeat/processors/add_process_metadata/config.go index fb42a3e716a3..87d375b0a09a 100644 --- a/libbeat/processors/add_process_metadata/config.go +++ b/libbeat/processors/add_process_metadata/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type config struct { diff --git a/libbeat/processors/checks/checks.go b/libbeat/processors/checks/checks.go index d275278544b8..6291ba57b2be 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/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) // ConfigChecked returns a wrapper that will validate the configuration using diff --git a/libbeat/processors/checks/checks_test.go b/libbeat/processors/checks/checks_test.go index 656f922fccc5..c84965bbb132 100644 --- a/libbeat/processors/checks/checks_test.go +++ b/libbeat/processors/checks/checks_test.go @@ -20,9 +20,9 @@ package checks import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) type mockProcessor struct{} diff --git a/libbeat/processors/communityid/communityid.go b/libbeat/processors/communityid/communityid.go index f5c2812f6b18..db24fe34eaf3 100644 --- a/libbeat/processors/communityid/communityid.go +++ b/libbeat/processors/communityid/communityid.go @@ -26,12 +26,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.community_id" diff --git a/libbeat/processors/communityid/communityid_test.go b/libbeat/processors/communityid/communityid_test.go index 1820c78ba409..97a7644bbe91 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/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestNewDefaults(t *testing.T) { diff --git a/libbeat/processors/conditionals.go b/libbeat/processors/conditionals.go index ca563702f869..70f0c7ef48c7 100644 --- a/libbeat/processors/conditionals.go +++ b/libbeat/processors/conditionals.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/conditions" ) // NewConditional returns a constructor suitable for registering when conditionals as a plugin. diff --git a/libbeat/processors/conditionals_test.go b/libbeat/processors/conditionals_test.go index baf097b2385b..7521d3a72c1a 100644 --- a/libbeat/processors/conditionals_test.go +++ b/libbeat/processors/conditionals_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type countFilter struct { diff --git a/libbeat/processors/config.go b/libbeat/processors/config.go index 46be05753f41..5477626a5987 100644 --- a/libbeat/processors/config.go +++ b/libbeat/processors/config.go @@ -18,7 +18,7 @@ package processors import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // PluginConfig represents the list of processors. diff --git a/libbeat/processors/convert/convert.go b/libbeat/processors/convert/convert.go index 887fbdd02a9f..c6f3e5aea285 100644 --- a/libbeat/processors/convert/convert.go +++ b/libbeat/processors/convert/convert.go @@ -26,11 +26,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.convert" diff --git a/libbeat/processors/convert/convert_test.go b/libbeat/processors/convert/convert_test.go index 141fafc0f8fe..1eba3ff550fe 100644 --- a/libbeat/processors/convert/convert_test.go +++ b/libbeat/processors/convert/convert_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConvert(t *testing.T) { diff --git a/libbeat/processors/decode_csv_fields/decode_csv_fields.go b/libbeat/processors/decode_csv_fields/decode_csv_fields.go index e65fe2231ac8..ff2cdf0938c8 100644 --- a/libbeat/processors/decode_csv_fields/decode_csv_fields.go +++ b/libbeat/processors/decode_csv_fields/decode_csv_fields.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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" ) type decodeCSVFields struct { 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 68a35b6300aa..8a406ca06e6a 100644 --- a/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go +++ b/libbeat/processors/decode_csv_fields/decode_csv_fields_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestDecodeCSVField(t *testing.T) { diff --git a/libbeat/processors/dissect/config_test.go b/libbeat/processors/dissect/config_test.go index dfe93274a881..09d4da5a1805 100644 --- a/libbeat/processors/dissect/config_test.go +++ b/libbeat/processors/dissect/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestConfig(t *testing.T) { diff --git a/libbeat/processors/dissect/processor.go b/libbeat/processors/dissect/processor.go index ab5c18903092..ac812e9ffaeb 100644 --- a/libbeat/processors/dissect/processor.go +++ b/libbeat/processors/dissect/processor.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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" ) const flagParsingError = "dissect_parsing_error" diff --git a/libbeat/processors/dissect/processor_test.go b/libbeat/processors/dissect/processor_test.go index f822db1d6e37..26a579ae6999 100644 --- a/libbeat/processors/dissect/processor_test.go +++ b/libbeat/processors/dissect/processor_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestProcessor(t *testing.T) { diff --git a/libbeat/processors/dns/cache.go b/libbeat/processors/dns/cache.go index 57fa99a17b69..6bd6b373db90 100644 --- a/libbeat/processors/dns/cache.go +++ b/libbeat/processors/dns/cache.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type ptrRecord struct { diff --git a/libbeat/processors/dns/cache_test.go b/libbeat/processors/dns/cache_test.go index b2ad5af75a54..d64dbd460b46 100644 --- a/libbeat/processors/dns/cache_test.go +++ b/libbeat/processors/dns/cache_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) type stubResolver struct{} diff --git a/libbeat/processors/dns/config.go b/libbeat/processors/dns/config.go index 4345d73db0a5..ae447a20c721 100644 --- a/libbeat/processors/dns/config.go +++ b/libbeat/processors/dns/config.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Config defines the configuration options for the DNS processor. diff --git a/libbeat/processors/dns/dns.go b/libbeat/processors/dns/dns.go index 7dc447d44c6e..49b4946733ed 100644 --- a/libbeat/processors/dns/dns.go +++ b/libbeat/processors/dns/dns.go @@ -25,13 +25,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.dns" diff --git a/libbeat/processors/dns/dns_test.go b/libbeat/processors/dns/dns_test.go index d4fe14e28dfa..bdd92e1f088f 100644 --- a/libbeat/processors/dns/dns_test.go +++ b/libbeat/processors/dns/dns_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) func TestDNSProcessorRun(t *testing.T) { diff --git a/libbeat/processors/dns/resolver.go b/libbeat/processors/dns/resolver.go index c4f54c73c87d..701ee8e49ace 100644 --- a/libbeat/processors/dns/resolver.go +++ b/libbeat/processors/dns/resolver.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" ) const etcResolvConf = "/etc/resolv.conf" diff --git a/libbeat/processors/dns/resolver_test.go b/libbeat/processors/dns/resolver_test.go index a8e6e9ad13da..0340da316d7e 100644 --- a/libbeat/processors/dns/resolver_test.go +++ b/libbeat/processors/dns/resolver_test.go @@ -25,7 +25,7 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var _ PTRResolver = (*MiekgResolver)(nil) diff --git a/libbeat/processors/extract_array/extract_array.go b/libbeat/processors/extract_array/extract_array.go index ce76b0962aea..1c9fc05da93e 100644 --- a/libbeat/processors/extract_array/extract_array.go +++ b/libbeat/processors/extract_array/extract_array.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/checks" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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" ) type config struct { diff --git a/libbeat/processors/extract_array/extract_array_test.go b/libbeat/processors/extract_array/extract_array_test.go index 8dbde97a50a8..1707e317530f 100644 --- a/libbeat/processors/extract_array/extract_array_test.go +++ b/libbeat/processors/extract_array/extract_array_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestExtractArrayProcessor_String(t *testing.T) { diff --git a/libbeat/processors/fingerprint/fingerprint.go b/libbeat/processors/fingerprint/fingerprint.go index b0f877dfeb32..90d051cec77a 100644 --- a/libbeat/processors/fingerprint/fingerprint.go +++ b/libbeat/processors/fingerprint/fingerprint.go @@ -23,10 +23,10 @@ import ( "io" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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" ) func init() { diff --git a/libbeat/processors/fingerprint/fingerprint_test.go b/libbeat/processors/fingerprint/fingerprint_test.go index e0cb0475f546..6274af7c0b29 100644 --- a/libbeat/processors/fingerprint/fingerprint_test.go +++ b/libbeat/processors/fingerprint/fingerprint_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestHashMethods(t *testing.T) { diff --git a/libbeat/processors/namespace.go b/libbeat/processors/namespace.go index 1dd10f4b5172..5bd8a0635ce1 100644 --- a/libbeat/processors/namespace.go +++ b/libbeat/processors/namespace.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Namespace struct { diff --git a/libbeat/processors/namespace_test.go b/libbeat/processors/namespace_test.go index 73b71ad36ad2..43698ebdf4a9 100644 --- a/libbeat/processors/namespace_test.go +++ b/libbeat/processors/namespace_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type testFilterRule struct { diff --git a/libbeat/processors/processor.go b/libbeat/processors/processor.go index 5eaa6dd2fb4c..c5002b7cebd5 100644 --- a/libbeat/processors/processor.go +++ b/libbeat/processors/processor.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const logName = "processors" diff --git a/libbeat/processors/processor_test.go b/libbeat/processors/processor_test.go index b6168aa41181..e4fe0d58481d 100644 --- a/libbeat/processors/processor_test.go +++ b/libbeat/processors/processor_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - _ "github.com/elastic/beats/libbeat/processors/actions" - _ "github.com/elastic/beats/libbeat/processors/add_cloud_metadata" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) func GetProcessors(t testing.TB, yml []map[string]interface{}) *processors.Processors { diff --git a/libbeat/processors/registered_domain/registered_domain.go b/libbeat/processors/registered_domain/registered_domain.go index b378da752339..047ef4472347 100644 --- a/libbeat/processors/registered_domain/registered_domain.go +++ b/libbeat/processors/registered_domain/registered_domain.go @@ -23,12 +23,12 @@ import ( "github.com/pkg/errors" "golang.org/x/net/publicsuffix" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "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/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const ( diff --git a/libbeat/processors/registered_domain/registered_domain_test.go b/libbeat/processors/registered_domain/registered_domain_test.go index 8434242d7b09..53d1184d7476 100644 --- a/libbeat/processors/registered_domain/registered_domain_test.go +++ b/libbeat/processors/registered_domain/registered_domain_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestProcessorRun(t *testing.T) { diff --git a/libbeat/processors/registry.go b/libbeat/processors/registry.go index f8e32c5c78ff..2e771bc331d0 100644 --- a/libbeat/processors/registry.go +++ b/libbeat/processors/registry.go @@ -20,9 +20,9 @@ package processors import ( "errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - p "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + p "github.com/elastic/beats/v7/libbeat/plugin" ) type processorPlugin struct { diff --git a/libbeat/processors/script/javascript/beatevent_v0.go b/libbeat/processors/script/javascript/beatevent_v0.go index fa9420793364..a24135f30dac 100644 --- a/libbeat/processors/script/javascript/beatevent_v0.go +++ b/libbeat/processors/script/javascript/beatevent_v0.go @@ -21,8 +21,8 @@ import ( "github.com/dop251/goja" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // IMPORTANT: diff --git a/libbeat/processors/script/javascript/beatevent_v0_test.go b/libbeat/processors/script/javascript/beatevent_v0_test.go index dc1f66bb71d0..030a260d4240 100644 --- a/libbeat/processors/script/javascript/beatevent_v0_test.go +++ b/libbeat/processors/script/javascript/beatevent_v0_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) const ( diff --git a/libbeat/processors/script/javascript/javascript.go b/libbeat/processors/script/javascript/javascript.go index 4f222fe3e346..e23ee3b83b40 100644 --- a/libbeat/processors/script/javascript/javascript.go +++ b/libbeat/processors/script/javascript/javascript.go @@ -30,12 +30,12 @@ import ( "github.com/pkg/errors" "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/monitoring/adapter" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring/adapter" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/processors" ) type jsProcessor struct { diff --git a/libbeat/processors/script/javascript/module/console/console.go b/libbeat/processors/script/javascript/module/console/console.go index 92188f230c43..281ba3d12409 100644 --- a/libbeat/processors/script/javascript/module/console/console.go +++ b/libbeat/processors/script/javascript/module/console/console.go @@ -22,7 +22,7 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" // Require the util module for handling the log format arguments. _ "github.com/dop251/goja_nodejs/util" diff --git a/libbeat/processors/script/javascript/module/console/console_test.go b/libbeat/processors/script/javascript/module/console/console_test.go index 48fe4165c076..aa4c00ce6c1f 100644 --- a/libbeat/processors/script/javascript/module/console/console_test.go +++ b/libbeat/processors/script/javascript/module/console/console_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" // Register require module. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/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 6b4608a51eae..f30e423e7a23 100644 --- a/libbeat/processors/script/javascript/module/include.go +++ b/libbeat/processors/script/javascript/module/include.go @@ -19,9 +19,9 @@ package module import ( // Register javascript modules. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/console" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/net" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/path" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "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" ) diff --git a/libbeat/processors/script/javascript/module/net/net_test.go b/libbeat/processors/script/javascript/module/net/net_test.go index f54014036439..559fff00d503 100644 --- a/libbeat/processors/script/javascript/module/net/net_test.go +++ b/libbeat/processors/script/javascript/module/net/net_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/net" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/net" + _ "github.com/elastic/beats/v7/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 f1288d92aa3c..4ad47de13a53 100644 --- a/libbeat/processors/script/javascript/module/path/path_test.go +++ b/libbeat/processors/script/javascript/module/path/path_test.go @@ -22,12 +22,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/path" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/path" + _ "github.com/elastic/beats/v7/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 947903c57ef5..e58aac293720 100644 --- a/libbeat/processors/script/javascript/module/processor/chain.go +++ b/libbeat/processors/script/javascript/module/processor/chain.go @@ -21,9 +21,9 @@ import ( "github.com/dop251/goja" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" ) // chainBuilder builds a new processor chain. diff --git a/libbeat/processors/script/javascript/module/processor/processor.go b/libbeat/processors/script/javascript/module/processor/processor.go index da5a914cd924..31fecc0cdd67 100644 --- a/libbeat/processors/script/javascript/module/processor/processor.go +++ b/libbeat/processors/script/javascript/module/processor/processor.go @@ -22,9 +22,9 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" ) // Create constructors for most of the Beat processors. diff --git a/libbeat/processors/script/javascript/module/processor/processor_test.go b/libbeat/processors/script/javascript/module/processor/processor_test.go index 7faddd241c51..6ea66f409ffe 100644 --- a/libbeat/processors/script/javascript/module/processor/processor_test.go +++ b/libbeat/processors/script/javascript/module/processor/processor_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module/require" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/require" ) func init() { diff --git a/libbeat/processors/script/javascript/module/require/require.go b/libbeat/processors/script/javascript/module/require/require.go index e9da5e9076e6..db0dcaaa4efc 100644 --- a/libbeat/processors/script/javascript/module/require/require.go +++ b/libbeat/processors/script/javascript/module/require/require.go @@ -21,7 +21,7 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" ) func init() { diff --git a/libbeat/processors/script/javascript/session.go b/libbeat/processors/script/javascript/session.go index ca892fc5537e..1bade0cc2ba3 100644 --- a/libbeat/processors/script/javascript/session.go +++ b/libbeat/processors/script/javascript/session.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/processors/script/javascript/session_test.go b/libbeat/processors/script/javascript/session_test.go index 7f7443394aaa..043253c93d66 100644 --- a/libbeat/processors/script/javascript/session_test.go +++ b/libbeat/processors/script/javascript/session_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/stretchr/testify/assert" ) diff --git a/libbeat/processors/script/processor.go b/libbeat/processors/script/processor.go index 640659ecbfb2..7f61c7cfae5a 100644 --- a/libbeat/processors/script/processor.go +++ b/libbeat/processors/script/processor.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" // Register javascript modules with the processor. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module" ) func init() { diff --git a/libbeat/processors/timeseries/timeseries.go b/libbeat/processors/timeseries/timeseries.go index 79e68edb5336..45b71ce79bfe 100644 --- a/libbeat/processors/timeseries/timeseries.go +++ b/libbeat/processors/timeseries/timeseries.go @@ -20,11 +20,11 @@ package timeseries import ( "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/libbeat/processors" + "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/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/processors" "github.com/mitchellh/hashstructure" ) diff --git a/libbeat/processors/timeseries/timeseries_test.go b/libbeat/processors/timeseries/timeseries_test.go index f25c56030b59..18dedb5b88a6 100644 --- a/libbeat/processors/timeseries/timeseries_test.go +++ b/libbeat/processors/timeseries/timeseries_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) var ( diff --git a/libbeat/processors/timestamp/timestamp.go b/libbeat/processors/timestamp/timestamp.go index 4971c24cc441..20da35fdb7a2 100644 --- a/libbeat/processors/timestamp/timestamp.go +++ b/libbeat/processors/timestamp/timestamp.go @@ -24,11 +24,11 @@ import ( "4d63.com/tz" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - jsprocessor "github.com/elastic/beats/libbeat/processors/script/javascript/module/processor" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + jsprocessor "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module/processor" ) const logName = "processor.timestamp" diff --git a/libbeat/processors/timestamp/timestamp_test.go b/libbeat/processors/timestamp/timestamp_test.go index 814f91637129..4b7e8dd09939 100644 --- a/libbeat/processors/timestamp/timestamp_test.go +++ b/libbeat/processors/timestamp/timestamp_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var expected = time.Date(2015, 3, 7, 11, 6, 39, 0, time.UTC) diff --git a/libbeat/processors/util/geo.go b/libbeat/processors/util/geo.go index d8decf0de9c1..48d39780d22a 100644 --- a/libbeat/processors/util/geo.go +++ b/libbeat/processors/util/geo.go @@ -21,7 +21,7 @@ import ( "fmt" "regexp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // GeoConfig contains geo configuration data. diff --git a/libbeat/processors/util/geo_test.go b/libbeat/processors/util/geo_test.go index cd7334c766cc..aa8754c2c329 100644 --- a/libbeat/processors/util/geo_test.go +++ b/libbeat/processors/util/geo_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // parseGeoConfig converts the map into a GeoConfig. diff --git a/libbeat/publisher/event.go b/libbeat/publisher/event.go index 8edc2e9db7f3..29625319e7c1 100644 --- a/libbeat/publisher/event.go +++ b/libbeat/publisher/event.go @@ -18,8 +18,8 @@ package publisher import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Batch is used to pass a batch of events to the outputs and asynchronously listening diff --git a/libbeat/publisher/includes/includes.go b/libbeat/publisher/includes/includes.go index be42bdbabcac..e6f3ded0beea 100644 --- a/libbeat/publisher/includes/includes.go +++ b/libbeat/publisher/includes/includes.go @@ -19,14 +19,14 @@ package includes import ( // import queue types - _ "github.com/elastic/beats/libbeat/outputs/codec/format" - _ "github.com/elastic/beats/libbeat/outputs/codec/json" - _ "github.com/elastic/beats/libbeat/outputs/console" - _ "github.com/elastic/beats/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/libbeat/outputs/fileout" - _ "github.com/elastic/beats/libbeat/outputs/kafka" - _ "github.com/elastic/beats/libbeat/outputs/logstash" - _ "github.com/elastic/beats/libbeat/outputs/redis" - _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" - _ "github.com/elastic/beats/libbeat/publisher/queue/spool" + _ "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/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/libbeat/publisher/queue/spool" ) diff --git a/libbeat/publisher/pipeline/acker.go b/libbeat/publisher/pipeline/acker.go index 3436f7a25289..ad0b0366416d 100644 --- a/libbeat/publisher/pipeline/acker.go +++ b/libbeat/publisher/pipeline/acker.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) // acker is used to account for published and non-published events to be ACKed diff --git a/libbeat/publisher/pipeline/batch.go b/libbeat/publisher/pipeline/batch.go index 7ce87bd77a58..5a8903c58140 100644 --- a/libbeat/publisher/pipeline/batch.go +++ b/libbeat/publisher/pipeline/batch.go @@ -20,8 +20,8 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type Batch struct { diff --git a/libbeat/publisher/pipeline/client.go b/libbeat/publisher/pipeline/client.go index c508c66db62c..d8413d97b30b 100644 --- a/libbeat/publisher/pipeline/client.go +++ b/libbeat/publisher/pipeline/client.go @@ -20,11 +20,11 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // client connects a beat with the processors and pipeline queue. diff --git a/libbeat/publisher/pipeline/client_ack.go b/libbeat/publisher/pipeline/client_ack.go index 5ace3de7fcef..cbd8fc9bb2da 100644 --- a/libbeat/publisher/pipeline/client_ack.go +++ b/libbeat/publisher/pipeline/client_ack.go @@ -20,8 +20,8 @@ package pipeline import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) type clientACKer struct { diff --git a/libbeat/publisher/pipeline/client_test.go b/libbeat/publisher/pipeline/client_test.go index c7b83835c9cb..90b29c7c848e 100644 --- a/libbeat/publisher/pipeline/client_test.go +++ b/libbeat/publisher/pipeline/client_test.go @@ -22,11 +22,11 @@ import ( "sync" "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/tests/resources" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) func TestClient(t *testing.T) { diff --git a/libbeat/publisher/pipeline/config.go b/libbeat/publisher/pipeline/config.go index 70006d417c6d..775e75d95e22 100644 --- a/libbeat/publisher/pipeline/config.go +++ b/libbeat/publisher/pipeline/config.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) // Config object for loading a pipeline instance via Load. diff --git a/libbeat/publisher/pipeline/consumer.go b/libbeat/publisher/pipeline/consumer.go index cba643c94ee7..4dd211052c25 100644 --- a/libbeat/publisher/pipeline/consumer.go +++ b/libbeat/publisher/pipeline/consumer.go @@ -18,9 +18,9 @@ package pipeline import ( - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // eventConsumer collects and forwards events from the queue to the outputs work queue. diff --git a/libbeat/publisher/pipeline/controller.go b/libbeat/publisher/pipeline/controller.go index 885d0cd02941..05bd65338a98 100644 --- a/libbeat/publisher/pipeline/controller.go +++ b/libbeat/publisher/pipeline/controller.go @@ -18,11 +18,11 @@ package pipeline import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/queue" + "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/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // outputController manages the pipelines output capabilities, like: diff --git a/libbeat/publisher/pipeline/module.go b/libbeat/publisher/pipeline/module.go index 60da37f1d456..572ed7f6c8a5 100644 --- a/libbeat/publisher/pipeline/module.go +++ b/libbeat/publisher/pipeline/module.go @@ -21,13 +21,13 @@ import ( "flag" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/processing" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // Global pipeline module for loading the main pipeline from a configuration object diff --git a/libbeat/publisher/pipeline/monitoring.go b/libbeat/publisher/pipeline/monitoring.go index 4fbf3ff8da02..b41baed1785d 100644 --- a/libbeat/publisher/pipeline/monitoring.go +++ b/libbeat/publisher/pipeline/monitoring.go @@ -17,7 +17,7 @@ package pipeline -import "github.com/elastic/beats/libbeat/monitoring" +import "github.com/elastic/beats/v7/libbeat/monitoring" type observer interface { pipelineObserver diff --git a/libbeat/publisher/pipeline/output.go b/libbeat/publisher/pipeline/output.go index a82750d4f262..405fc7cc432b 100644 --- a/libbeat/publisher/pipeline/output.go +++ b/libbeat/publisher/pipeline/output.go @@ -18,9 +18,9 @@ package pipeline import ( - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" ) // clientWorker manages output client of type outputs.Client, not supporting reconnect. diff --git a/libbeat/publisher/pipeline/pipeline.go b/libbeat/publisher/pipeline/pipeline.go index 688b7315c748..857e80f9bd8d 100644 --- a/libbeat/publisher/pipeline/pipeline.go +++ b/libbeat/publisher/pipeline/pipeline.go @@ -26,15 +26,15 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/processing" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) // Pipeline implementation providint all beats publisher functionality. diff --git a/libbeat/publisher/pipeline/pipeline_ack.go b/libbeat/publisher/pipeline/pipeline_ack.go index b9be8c42e495..e9efb390f4f6 100644 --- a/libbeat/publisher/pipeline/pipeline_ack.go +++ b/libbeat/publisher/pipeline/pipeline_ack.go @@ -20,7 +20,7 @@ package pipeline import ( "errors" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) type ackBuilder interface { diff --git a/libbeat/publisher/pipeline/pipeline_test.go b/libbeat/publisher/pipeline/pipeline_test.go index c5ff791bf681..88a0c21f6315 100644 --- a/libbeat/publisher/pipeline/pipeline_test.go +++ b/libbeat/publisher/pipeline/pipeline_test.go @@ -20,9 +20,9 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type testQueue struct { diff --git a/libbeat/publisher/pipeline/retry.go b/libbeat/publisher/pipeline/retry.go index 9dd3385c40ee..a65a7d227c8c 100644 --- a/libbeat/publisher/pipeline/retry.go +++ b/libbeat/publisher/pipeline/retry.go @@ -20,7 +20,7 @@ package pipeline import ( "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // retryer is responsible for accepting and managing failed send attempts. It diff --git a/libbeat/publisher/pipeline/stress/gen.go b/libbeat/publisher/pipeline/stress/gen.go index d33049bc3903..e5a18ceaef62 100644 --- a/libbeat/publisher/pipeline/stress/gen.go +++ b/libbeat/publisher/pipeline/stress/gen.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" ) type generateConfig struct { diff --git a/libbeat/publisher/pipeline/stress/out.go b/libbeat/publisher/pipeline/stress/out.go index 211e056ce602..692d62f98ab3 100644 --- a/libbeat/publisher/pipeline/stress/out.go +++ b/libbeat/publisher/pipeline/stress/out.go @@ -21,10 +21,10 @@ import ( "math/rand" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher" ) type testOutput struct { diff --git a/libbeat/publisher/pipeline/stress/run.go b/libbeat/publisher/pipeline/stress/run.go index 902d303e94f4..8a46489ae6cf 100644 --- a/libbeat/publisher/pipeline/stress/run.go +++ b/libbeat/publisher/pipeline/stress/run.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/pipeline" - "github.com/elastic/beats/libbeat/publisher/processing" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline" + "github.com/elastic/beats/v7/libbeat/publisher/processing" ) type config struct { diff --git a/libbeat/publisher/pipeline/stress/sig.go b/libbeat/publisher/pipeline/stress/sig.go index 913e4b7aa014..537fc9c633bb 100644 --- a/libbeat/publisher/pipeline/stress/sig.go +++ b/libbeat/publisher/pipeline/stress/sig.go @@ -17,7 +17,7 @@ package stress -import "github.com/elastic/beats/libbeat/common/atomic" +import "github.com/elastic/beats/v7/libbeat/common/atomic" type closeSignaler struct { active atomic.Bool diff --git a/libbeat/publisher/pipeline/stress/stress_test.go b/libbeat/publisher/pipeline/stress/stress_test.go index 2f0899d8a18b..04f39e49afda 100644 --- a/libbeat/publisher/pipeline/stress/stress_test.go +++ b/libbeat/publisher/pipeline/stress/stress_test.go @@ -29,11 +29,11 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher/pipeline/stress" - _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" - _ "github.com/elastic/beats/libbeat/publisher/queue/spool" + "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/v7/libbeat/publisher/queue/spool" ) // additional flags diff --git a/libbeat/publisher/processing/default.go b/libbeat/publisher/processing/default.go index cd15a0750fd8..dea3fe88fd8b 100644 --- a/libbeat/publisher/processing/default.go +++ b/libbeat/publisher/processing/default.go @@ -22,14 +22,14 @@ import ( "github.com/elastic/ecs/code/go/ecs" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/actions" - "github.com/elastic/beats/libbeat/processors/timeseries" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/actions" + "github.com/elastic/beats/v7/libbeat/processors/timeseries" ) // builder is used to create the event processing pipeline in Beats. The diff --git a/libbeat/publisher/processing/default_test.go b/libbeat/publisher/processing/default_test.go index c21345d27014..ba6a6042993f 100644 --- a/libbeat/publisher/processing/default_test.go +++ b/libbeat/publisher/processing/default_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors/actions" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors/actions" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/libbeat/publisher/processing/processing.go b/libbeat/publisher/processing/processing.go index ff1be24fc453..4f615fb1422f 100644 --- a/libbeat/publisher/processing/processing.go +++ b/libbeat/publisher/processing/processing.go @@ -18,9 +18,9 @@ package processing import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // SupportFactory creates a new processing Supporter that can be used with diff --git a/libbeat/publisher/processing/processors.go b/libbeat/publisher/processing/processors.go index bb0b2c7ccf03..0125008c39fc 100644 --- a/libbeat/publisher/processing/processors.go +++ b/libbeat/publisher/processing/processors.go @@ -22,11 +22,11 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/codec/json" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/codec/json" + "github.com/elastic/beats/v7/libbeat/processors" ) type group struct { diff --git a/libbeat/publisher/queue/memqueue/batchbuf.go b/libbeat/publisher/queue/memqueue/batchbuf.go index d84c8717acfc..30019cadeb63 100644 --- a/libbeat/publisher/queue/memqueue/batchbuf.go +++ b/libbeat/publisher/queue/memqueue/batchbuf.go @@ -17,7 +17,7 @@ package memqueue -import "github.com/elastic/beats/libbeat/publisher" +import "github.com/elastic/beats/v7/libbeat/publisher" type batchBuffer struct { next *batchBuffer diff --git a/libbeat/publisher/queue/memqueue/broker.go b/libbeat/publisher/queue/memqueue/broker.go index 34cefd6ef2a3..6937176af7c9 100644 --- a/libbeat/publisher/queue/memqueue/broker.go +++ b/libbeat/publisher/queue/memqueue/broker.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // Feature exposes a memory queue. diff --git a/libbeat/publisher/queue/memqueue/consume.go b/libbeat/publisher/queue/memqueue/consume.go index 013642eadc8f..a209a499b75d 100644 --- a/libbeat/publisher/queue/memqueue/consume.go +++ b/libbeat/publisher/queue/memqueue/consume.go @@ -21,9 +21,9 @@ import ( "errors" "io" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type consumer struct { diff --git a/libbeat/publisher/queue/memqueue/internal_api.go b/libbeat/publisher/queue/memqueue/internal_api.go index c73260c2150a..d693645587f6 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/libbeat/publisher" +import "github.com/elastic/beats/v7/libbeat/publisher" // producer -> broker API diff --git a/libbeat/publisher/queue/memqueue/produce.go b/libbeat/publisher/queue/memqueue/produce.go index 1409ea9941f5..4655d508d077 100644 --- a/libbeat/publisher/queue/memqueue/produce.go +++ b/libbeat/publisher/queue/memqueue/produce.go @@ -18,10 +18,10 @@ package memqueue import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type forgetfulProducer struct { diff --git a/libbeat/publisher/queue/memqueue/queue_test.go b/libbeat/publisher/queue/memqueue/queue_test.go index b65ad96ea26a..16f140b8d494 100644 --- a/libbeat/publisher/queue/memqueue/queue_test.go +++ b/libbeat/publisher/queue/memqueue/queue_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/publisher/queue/queuetest" + "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher/queue/queuetest" ) var seed int64 diff --git a/libbeat/publisher/queue/memqueue/ringbuf.go b/libbeat/publisher/queue/memqueue/ringbuf.go index 24af319c283d..202411c9c432 100644 --- a/libbeat/publisher/queue/memqueue/ringbuf.go +++ b/libbeat/publisher/queue/memqueue/ringbuf.go @@ -20,7 +20,7 @@ package memqueue import ( "fmt" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" ) // Internal event ring buffer. diff --git a/libbeat/publisher/queue/queue.go b/libbeat/publisher/queue/queue.go index eca5c0c499d6..a71304ec8b73 100644 --- a/libbeat/publisher/queue/queue.go +++ b/libbeat/publisher/queue/queue.go @@ -20,10 +20,10 @@ package queue import ( "io" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher" ) // Factory for creating a queue used by a pipeline instance. diff --git a/libbeat/publisher/queue/queue_reg.go b/libbeat/publisher/queue/queue_reg.go index 2703bcd75878..b1e6ca67b38d 100644 --- a/libbeat/publisher/queue/queue_reg.go +++ b/libbeat/publisher/queue/queue_reg.go @@ -18,7 +18,7 @@ package queue import ( - "github.com/elastic/beats/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/feature" ) // Namespace is the feature namespace for queue definition. diff --git a/libbeat/publisher/queue/queuetest/event.go b/libbeat/publisher/queue/queuetest/event.go index ff30f9609ab9..5a66fe050e23 100644 --- a/libbeat/publisher/queue/queuetest/event.go +++ b/libbeat/publisher/queue/queuetest/event.go @@ -20,9 +20,9 @@ package queuetest import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" ) func makeEvent(fields common.MapStr) publisher.Event { diff --git a/libbeat/publisher/queue/queuetest/log.go b/libbeat/publisher/queue/queuetest/log.go index af893a0cf08f..ba2c8e1f1ff6 100644 --- a/libbeat/publisher/queue/queuetest/log.go +++ b/libbeat/publisher/queue/queuetest/log.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var debug bool diff --git a/libbeat/publisher/queue/queuetest/producer_cancel.go b/libbeat/publisher/queue/queuetest/producer_cancel.go index baa0021bbe86..195c2de79f75 100644 --- a/libbeat/publisher/queue/queuetest/producer_cancel.go +++ b/libbeat/publisher/queue/queuetest/producer_cancel.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // TestSingleProducerConsumer tests buffered events for a producer getting diff --git a/libbeat/publisher/queue/queuetest/queuetest.go b/libbeat/publisher/queue/queuetest/queuetest.go index 4e4fefa81ade..fb5b04666b99 100644 --- a/libbeat/publisher/queue/queuetest/queuetest.go +++ b/libbeat/publisher/queue/queuetest/queuetest.go @@ -21,8 +21,8 @@ import ( "sync" "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // QueueFactory is used to create a per test queue instance. diff --git a/libbeat/publisher/queue/spool/codec.go b/libbeat/publisher/queue/spool/codec.go index ea51e930b980..69f693a4817e 100644 --- a/libbeat/publisher/queue/spool/codec.go +++ b/libbeat/publisher/queue/spool/codec.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/codec" + "github.com/elastic/beats/v7/libbeat/publisher" "github.com/elastic/go-structform" "github.com/elastic/go-structform/cborl" "github.com/elastic/go-structform/gotype" diff --git a/libbeat/publisher/queue/spool/codec_test.go b/libbeat/publisher/queue/spool/codec_test.go index 3588d3e2f21c..6460985f6c30 100644 --- a/libbeat/publisher/queue/spool/codec_test.go +++ b/libbeat/publisher/queue/spool/codec_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/publisher" ) func TestEncodeDecode(t *testing.T) { diff --git a/libbeat/publisher/queue/spool/config.go b/libbeat/publisher/queue/spool/config.go index e936bae1f7bf..1d9d9a3299d4 100644 --- a/libbeat/publisher/queue/spool/config.go +++ b/libbeat/publisher/queue/spool/config.go @@ -27,7 +27,7 @@ import ( "github.com/dustin/go-humanize" "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common/cfgtype" + "github.com/elastic/beats/v7/libbeat/common/cfgtype" ) type config struct { diff --git a/libbeat/publisher/queue/spool/consume.go b/libbeat/publisher/queue/spool/consume.go index a8f55775cb92..74f3058f739f 100644 --- a/libbeat/publisher/queue/spool/consume.go +++ b/libbeat/publisher/queue/spool/consume.go @@ -21,9 +21,9 @@ import ( "errors" "io" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) type consumer struct { diff --git a/libbeat/publisher/queue/spool/inbroker.go b/libbeat/publisher/queue/spool/inbroker.go index 784880ea847e..529c13c00c68 100644 --- a/libbeat/publisher/queue/spool/inbroker.go +++ b/libbeat/publisher/queue/spool/inbroker.go @@ -22,7 +22,7 @@ import ( "math" "time" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher/queue" "github.com/elastic/go-txfile/pq" ) diff --git a/libbeat/publisher/queue/spool/internal_api.go b/libbeat/publisher/queue/spool/internal_api.go index e4a38b317d3c..a6fd97102d4b 100644 --- a/libbeat/publisher/queue/spool/internal_api.go +++ b/libbeat/publisher/queue/spool/internal_api.go @@ -18,7 +18,7 @@ package spool import ( - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" ) // producer -> broker API diff --git a/libbeat/publisher/queue/spool/log.go b/libbeat/publisher/queue/spool/log.go index f85bc035ec12..64150366b531 100644 --- a/libbeat/publisher/queue/spool/log.go +++ b/libbeat/publisher/queue/spool/log.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type logger interface { diff --git a/libbeat/publisher/queue/spool/module.go b/libbeat/publisher/queue/spool/module.go index 71a43c421ecb..076b76bbb9a1 100644 --- a/libbeat/publisher/queue/spool/module.go +++ b/libbeat/publisher/queue/spool/module.go @@ -18,12 +18,12 @@ package spool import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/publisher/queue" "github.com/elastic/go-txfile" ) diff --git a/libbeat/publisher/queue/spool/outbroker.go b/libbeat/publisher/queue/spool/outbroker.go index e29a2b4edbb7..409b2cde3885 100644 --- a/libbeat/publisher/queue/spool/outbroker.go +++ b/libbeat/publisher/queue/spool/outbroker.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher" "github.com/elastic/go-txfile/pq" ) diff --git a/libbeat/publisher/queue/spool/produce.go b/libbeat/publisher/queue/spool/produce.go index fb2efb8d5841..81e12a18d02e 100644 --- a/libbeat/publisher/queue/spool/produce.go +++ b/libbeat/publisher/queue/spool/produce.go @@ -20,10 +20,10 @@ package spool import ( "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher" + "github.com/elastic/beats/v7/libbeat/publisher/queue" ) // forgetfulProducer forwards event to the inBroker. The forgetfulProducer diff --git a/libbeat/publisher/queue/spool/spool.go b/libbeat/publisher/queue/spool/spool.go index fe3d260a9b7c..69ae19ecd156 100644 --- a/libbeat/publisher/queue/spool/spool.go +++ b/libbeat/publisher/queue/spool/spool.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/publisher/queue" "github.com/elastic/go-txfile" "github.com/elastic/go-txfile/pq" ) diff --git a/libbeat/publisher/queue/spool/spool_test.go b/libbeat/publisher/queue/spool/spool_test.go index 612fc0247811..8a8b466c2a1c 100644 --- a/libbeat/publisher/queue/spool/spool_test.go +++ b/libbeat/publisher/queue/spool/spool_test.go @@ -26,8 +26,8 @@ import ( humanize "github.com/dustin/go-humanize" - "github.com/elastic/beats/libbeat/publisher/queue" - "github.com/elastic/beats/libbeat/publisher/queue/queuetest" + "github.com/elastic/beats/v7/libbeat/publisher/queue" + "github.com/elastic/beats/v7/libbeat/publisher/queue/queuetest" "github.com/elastic/go-txfile" "github.com/elastic/go-txfile/txfiletest" ) diff --git a/libbeat/publisher/testing/testing.go b/libbeat/publisher/testing/testing.go index 87a1ac2c0bd6..401aa833c9d5 100644 --- a/libbeat/publisher/testing/testing.go +++ b/libbeat/publisher/testing/testing.go @@ -19,7 +19,7 @@ package testing // ChanClient implements Client interface, forwarding published events to some import ( - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) type TestPublisher struct { diff --git a/libbeat/publisher/testing/testing_test.go b/libbeat/publisher/testing/testing_test.go index 6ade86c0d3ec..a7bffe0bb361 100644 --- a/libbeat/publisher/testing/testing_test.go +++ b/libbeat/publisher/testing/testing_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var cnt = 0 diff --git a/libbeat/reader/debug/debug.go b/libbeat/reader/debug/debug.go index 31012158dc57..5e0b1e7c93a5 100644 --- a/libbeat/reader/debug/debug.go +++ b/libbeat/reader/debug/debug.go @@ -21,7 +21,7 @@ import ( "bytes" "io" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/libbeat/reader/debug/debug_test.go b/libbeat/reader/debug/debug_test.go index deb89eb08349..ac6b6878c9b1 100644 --- a/libbeat/reader/debug/debug_test.go +++ b/libbeat/reader/debug/debug_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestMakeNullCheck(t *testing.T) { diff --git a/libbeat/reader/message.go b/libbeat/reader/message.go index a92bc9092ccf..344eacd54dfc 100644 --- a/libbeat/reader/message.go +++ b/libbeat/reader/message.go @@ -20,7 +20,7 @@ package reader import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Message represents a reader event with timestamp, content and actual number diff --git a/libbeat/reader/multiline/multiline.go b/libbeat/reader/multiline/multiline.go index cf3b586d1caa..a6054c765502 100644 --- a/libbeat/reader/multiline/multiline.go +++ b/libbeat/reader/multiline/multiline.go @@ -22,10 +22,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/readfile" ) // MultiLine reader combining multiple line events into one multi-line event. diff --git a/libbeat/reader/multiline/multiline_config.go b/libbeat/reader/multiline/multiline_config.go index 94e9c447e9be..93c155c39071 100644 --- a/libbeat/reader/multiline/multiline_config.go +++ b/libbeat/reader/multiline/multiline_config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/match" + "github.com/elastic/beats/v7/libbeat/common/match" ) // Config holds the options of multiline readers. diff --git a/libbeat/reader/multiline/multiline_test.go b/libbeat/reader/multiline/multiline_test.go index dd9071804c19..a17c79c53d6e 100644 --- a/libbeat/reader/multiline/multiline_test.go +++ b/libbeat/reader/multiline/multiline_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "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" ) type bufferSource struct{ buf *bytes.Buffer } diff --git a/libbeat/reader/readfile/encode.go b/libbeat/reader/readfile/encode.go index ada4ae91947b..d2cf3cce4be0 100644 --- a/libbeat/reader/readfile/encode.go +++ b/libbeat/reader/readfile/encode.go @@ -22,8 +22,8 @@ import ( "io" "time" - "github.com/elastic/beats/libbeat/reader" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) // Reader produces lines by reading lines from an io.Reader diff --git a/libbeat/reader/readfile/encode_test.go b/libbeat/reader/readfile/encode_test.go index 36d3df433ec5..9d6205c229fa 100644 --- a/libbeat/reader/readfile/encode_test.go +++ b/libbeat/reader/readfile/encode_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) func TestEncodeLines(t *testing.T) { diff --git a/libbeat/reader/readfile/limit.go b/libbeat/reader/readfile/limit.go index 403dea958476..d547ff09dfe1 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/libbeat/reader" + "github.com/elastic/beats/v7/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 9f72d297475b..e310e151cf8a 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/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader" ) type mockReader struct { diff --git a/libbeat/reader/readfile/line.go b/libbeat/reader/readfile/line.go index 698aa3cff110..21d902c6eb84 100644 --- a/libbeat/reader/readfile/line.go +++ b/libbeat/reader/readfile/line.go @@ -24,8 +24,8 @@ import ( "golang.org/x/text/transform" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) // lineReader reads lines from underlying reader, decoding the input stream diff --git a/libbeat/reader/readfile/line_test.go b/libbeat/reader/readfile/line_test.go index 7ac684163c9c..13b13127a86a 100644 --- a/libbeat/reader/readfile/line_test.go +++ b/libbeat/reader/readfile/line_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/transform" - "github.com/elastic/beats/libbeat/reader/readfile/encoding" + "github.com/elastic/beats/v7/libbeat/reader/readfile/encoding" ) // Sample texts are from http://www.columbia.edu/~kermit/utf8.html diff --git a/libbeat/reader/readfile/strip_newline.go b/libbeat/reader/readfile/strip_newline.go index e815020dc6b1..97cc005da92c 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/libbeat/reader" + "github.com/elastic/beats/v7/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 80a3270ce05c..fd3d1c8ba7c9 100644 --- a/libbeat/reader/readfile/timeout.go +++ b/libbeat/reader/readfile/timeout.go @@ -21,7 +21,7 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/reader" ) var ( diff --git a/libbeat/reader/readjson/docker_json.go b/libbeat/reader/readjson/docker_json.go index 57040d0b27ab..95c98bddbb88 100644 --- a/libbeat/reader/readjson/docker_json.go +++ b/libbeat/reader/readjson/docker_json.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/reader" ) // DockerJSONReader processor renames a given field diff --git a/libbeat/reader/readjson/docker_json_test.go b/libbeat/reader/readjson/docker_json_test.go index f87c138587f9..23cc862d9646 100644 --- a/libbeat/reader/readjson/docker_json_test.go +++ b/libbeat/reader/readjson/docker_json_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/reader" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/reader" ) func TestDockerJSON(t *testing.T) { diff --git a/libbeat/reader/readjson/json.go b/libbeat/reader/readjson/json.go index a669b3f49ae0..3567c372ed81 100644 --- a/libbeat/reader/readjson/json.go +++ b/libbeat/reader/readjson/json.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/jsontransform" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/reader" + "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/logp" + "github.com/elastic/beats/v7/libbeat/reader" ) // JSONReader parses JSON inputs diff --git a/libbeat/reader/readjson/json_test.go b/libbeat/reader/readjson/json_test.go index d6f82585e492..7d88b032c971 100644 --- a/libbeat/reader/readjson/json_test.go +++ b/libbeat/reader/readjson/json_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestUnmarshal(t *testing.T) { diff --git a/libbeat/scripts/cmd/global_fields/main.go b/libbeat/scripts/cmd/global_fields/main.go index b71a848d845a..914556e350ac 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/libbeat/generator/fields" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/generator/fields" + "github.com/elastic/beats/v7/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 cef6b68faeba..9c1e0b633f93 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/libbeat/generator/fields" + "github.com/elastic/beats/v7/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 a0c0d81dbb62..49ba19c686c0 100644 --- a/libbeat/scripts/cmd/stress_pipeline/main.go +++ b/libbeat/scripts/cmd/stress_pipeline/main.go @@ -25,18 +25,18 @@ import ( _ "net/http/pprof" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - logpcfg "github.com/elastic/beats/libbeat/logp/configure" - _ "github.com/elastic/beats/libbeat/outputs/console" - _ "github.com/elastic/beats/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/libbeat/outputs/fileout" - _ "github.com/elastic/beats/libbeat/outputs/logstash" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/libbeat/publisher/pipeline/stress" - _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" - _ "github.com/elastic/beats/libbeat/publisher/queue/spool" - "github.com/elastic/beats/libbeat/service" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + logpcfg "github.com/elastic/beats/v7/libbeat/logp/configure" + _ "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/paths" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline/stress" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue" + _ "github.com/elastic/beats/v7/libbeat/publisher/queue/spool" + "github.com/elastic/beats/v7/libbeat/service" ) var ( diff --git a/libbeat/service/service.go b/libbeat/service/service.go index 4063e5e6be79..2d88b25f7823 100644 --- a/libbeat/service/service.go +++ b/libbeat/service/service.go @@ -32,8 +32,8 @@ import ( "sync" "syscall" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // HandleSignals manages OS signals that ask the service/daemon to stop. diff --git a/libbeat/service/service_windows.go b/libbeat/service/service_windows.go index 74d1f8f4ea8d..649bf85cfa88 100644 --- a/libbeat/service/service_windows.go +++ b/libbeat/service/service_windows.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type beatService struct{} diff --git a/libbeat/template/config.go b/libbeat/template/config.go index 6d6d8426df9e..c9e963d6135f 100644 --- a/libbeat/template/config.go +++ b/libbeat/template/config.go @@ -17,7 +17,7 @@ package template -import "github.com/elastic/beats/libbeat/mapping" +import "github.com/elastic/beats/v7/libbeat/mapping" // TemplateConfig holds config information about the Elasticsearch template type TemplateConfig struct { diff --git a/libbeat/template/load.go b/libbeat/template/load.go index 2a63c9efb397..88244fb11510 100644 --- a/libbeat/template/load.go +++ b/libbeat/template/load.go @@ -25,10 +25,10 @@ import ( "os" "strings" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" ) //Loader interface for loading templates diff --git a/libbeat/template/load_integration_test.go b/libbeat/template/load_integration_test.go index ae393010f0db..958b311057f7 100644 --- a/libbeat/template/load_integration_test.go +++ b/libbeat/template/load_integration_test.go @@ -32,11 +32,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/elasticsearch/estest" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch/estest" + "github.com/elastic/beats/v7/libbeat/version" ) func init() { diff --git a/libbeat/template/load_test.go b/libbeat/template/load_test.go index 97c11b8dfce7..75096e559f29 100644 --- a/libbeat/template/load_test.go +++ b/libbeat/template/load_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/libbeat/template/processor.go b/libbeat/template/processor.go index 48593ad4317c..30e8bdd8b1c6 100644 --- a/libbeat/template/processor.go +++ b/libbeat/template/processor.go @@ -21,8 +21,8 @@ import ( "errors" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) // Processor struct to process fields to template diff --git a/libbeat/template/processor_test.go b/libbeat/template/processor_test.go index dd316957e24e..55859403ec56 100644 --- a/libbeat/template/processor_test.go +++ b/libbeat/template/processor_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" ) func TestProcessor(t *testing.T) { diff --git a/libbeat/template/template.go b/libbeat/template/template.go index fa4ee37a6e54..2dadcc28f2df 100644 --- a/libbeat/template/template.go +++ b/libbeat/template/template.go @@ -24,11 +24,11 @@ import ( "github.com/elastic/go-ucfg/yaml" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/mapping" + "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/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/mapping" ) var ( diff --git a/libbeat/template/template_test.go b/libbeat/template/template_test.go index 70cd3e14ad7e..7e6a688db5d6 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/libbeat/common" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/version" ) type testTemplate struct { diff --git a/libbeat/tests/compose/project.go b/libbeat/tests/compose/project.go index f4ebfb904e58..566f12bb7d86 100644 --- a/libbeat/tests/compose/project.go +++ b/libbeat/tests/compose/project.go @@ -27,7 +27,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // CreateOptions are the options when containers are created diff --git a/libbeat/tests/compose/wrapper.go b/libbeat/tests/compose/wrapper.go index 35e37098a38c..b36e48b2346c 100644 --- a/libbeat/tests/compose/wrapper.go +++ b/libbeat/tests/compose/wrapper.go @@ -37,7 +37,7 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/docker" ) const ( diff --git a/libbeat/tests/docker/docker.go b/libbeat/tests/docker/docker.go index afa18317eb9d..b81ffa285ea4 100644 --- a/libbeat/tests/docker/docker.go +++ b/libbeat/tests/docker/docker.go @@ -26,7 +26,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common/docker" ) // Client for Docker diff --git a/libbeat/tests/system/template/template.go b/libbeat/tests/system/template/template.go index 33d690e6ad61..3005662d195b 100644 --- a/libbeat/tests/system/template/template.go +++ b/libbeat/tests/system/template/template.go @@ -21,10 +21,10 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/template" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/template" + "github.com/elastic/beats/v7/libbeat/version" ) // MaxDefaultFieldLength is the limit on the number of default_field values diff --git a/magefile.go b/magefile.go index 2ac043da2394..6806d57d4041 100644 --- a/magefile.go +++ b/magefile.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" - "github.com/elastic/beats/generator/common/beatgen" + "github.com/elastic/beats/v7/generator/common/beatgen" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/gotool" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) var ( diff --git a/metricbeat/autodiscover/appender/kubernetes/token/config.go b/metricbeat/autodiscover/appender/kubernetes/token/config.go index 7e1271a6e3f1..7363c600b07c 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/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/conditions" ) type config struct { diff --git a/metricbeat/autodiscover/appender/kubernetes/token/token.go b/metricbeat/autodiscover/appender/kubernetes/token/token.go index 5471f874ca9b..9f4f99c45833 100644 --- a/metricbeat/autodiscover/appender/kubernetes/token/token.go +++ b/metricbeat/autodiscover/appender/kubernetes/token/token.go @@ -21,12 +21,12 @@ import ( "fmt" "io/ioutil" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/conditions" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/conditions" + "github.com/elastic/beats/v7/libbeat/logp" ) func init() { diff --git a/metricbeat/autodiscover/appender/kubernetes/token/token_test.go b/metricbeat/autodiscover/appender/kubernetes/token/token_test.go index 4a9f80592e8b..28b0ecb611ea 100644 --- a/metricbeat/autodiscover/appender/kubernetes/token/token_test.go +++ b/metricbeat/autodiscover/appender/kubernetes/token/token_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" ) func TestTokenAppender(t *testing.T) { diff --git a/metricbeat/autodiscover/builder/hints/config.go b/metricbeat/autodiscover/builder/hints/config.go index f3a33b128d04..957ec278d7d0 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/metricbeat/mb" +import "github.com/elastic/beats/v7/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 247d30468604..3e859b23d118 100644 --- a/metricbeat/autodiscover/builder/hints/metrics.go +++ b/metricbeat/autodiscover/builder/hints/metrics.go @@ -22,13 +22,13 @@ import ( "strings" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/builder" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/autodiscover/builder" + "github.com/elastic/beats/v7/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/autodiscover/builder/hints/metrics_test.go b/metricbeat/autodiscover/builder/hints/metrics_test.go index 1f3d37c86bf6..f3f9d5a5200a 100644 --- a/metricbeat/autodiscover/builder/hints/metrics_test.go +++ b/metricbeat/autodiscover/builder/hints/metrics_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestGenerateHints(t *testing.T) { diff --git a/metricbeat/autodiscover/include.go b/metricbeat/autodiscover/include.go index 37d6a683ac7a..0843fe6c156f 100644 --- a/metricbeat/autodiscover/include.go +++ b/metricbeat/autodiscover/include.go @@ -19,8 +19,8 @@ package autodiscover import ( // include all metricbeat specific builders - _ "github.com/elastic/beats/metricbeat/autodiscover/builder/hints" + _ "github.com/elastic/beats/v7/metricbeat/autodiscover/builder/hints" // include all metricbeat specific appenders - _ "github.com/elastic/beats/metricbeat/autodiscover/appender/kubernetes/token" + _ "github.com/elastic/beats/v7/metricbeat/autodiscover/appender/kubernetes/token" ) diff --git a/metricbeat/beater/config.go b/metricbeat/beater/config.go index bdf0786ade4d..51ac82aaa2da 100644 --- a/metricbeat/beater/config.go +++ b/metricbeat/beater/config.go @@ -20,8 +20,8 @@ package beater import ( "time" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/autodiscover" + "github.com/elastic/beats/v7/libbeat/common" ) // Config is the root of the Metricbeat configuration hierarchy. diff --git a/metricbeat/beater/doc.go b/metricbeat/beater/doc.go index e63709050029..21d475c77e6a 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/metricbeat/mb package. +the github.com/elastic/beats/v7/metricbeat/mb package. Event Format diff --git a/metricbeat/beater/metricbeat.go b/metricbeat/beater/metricbeat.go index f7f79f7e42a0..b396ac19c4bf 100644 --- a/metricbeat/beater/metricbeat.go +++ b/metricbeat/beater/metricbeat.go @@ -22,22 +22,22 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/management" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "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" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/management" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/module" // Add autodiscover builders / appenders - _ "github.com/elastic/beats/metricbeat/autodiscover" + _ "github.com/elastic/beats/v7/metricbeat/autodiscover" // Add metricbeat default processors - _ "github.com/elastic/beats/metricbeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v7/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 608eb47fc7b7..f137a91c37b7 100644 --- a/metricbeat/cmd/modules.go +++ b/metricbeat/cmd/modules.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd" ) // BuildModulesManager adds support for modules management to a beat diff --git a/metricbeat/cmd/root.go b/metricbeat/cmd/root.go index 8fb81dc82627..892d734b8e24 100644 --- a/metricbeat/cmd/root.go +++ b/metricbeat/cmd/root.go @@ -22,17 +22,17 @@ import ( "github.com/spf13/pflag" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/metricbeat/beater" - "github.com/elastic/beats/metricbeat/cmd/test" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/metricbeat/beater" + "github.com/elastic/beats/v7/metricbeat/cmd/test" // import modules - _ "github.com/elastic/beats/metricbeat/include" - _ "github.com/elastic/beats/metricbeat/include/fields" + _ "github.com/elastic/beats/v7/metricbeat/include" + _ "github.com/elastic/beats/v7/metricbeat/include/fields" // Import processors. - _ "github.com/elastic/beats/libbeat/processors/script" + _ "github.com/elastic/beats/v7/libbeat/processors/script" ) // Name of this beat diff --git a/metricbeat/cmd/test/modules.go b/metricbeat/cmd/test/modules.go index f2cafc5b43cd..93950973a5dc 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/libbeat/beat" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/testing" - "github.com/elastic/beats/metricbeat/beater" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/testing" + "github.com/elastic/beats/v7/metricbeat/beater" ) func GenTestModulesCmd(name, beatVersion string, create beat.Creator) *cobra.Command { diff --git a/metricbeat/helper/config.go b/metricbeat/helper/config.go index 1c4c8fd6ddcd..8581c45a0155 100644 --- a/metricbeat/helper/config.go +++ b/metricbeat/helper/config.go @@ -20,7 +20,7 @@ package helper import ( "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // Config for an HTTP helper diff --git a/metricbeat/helper/dialer/dialer.go b/metricbeat/helper/dialer/dialer.go index d2aaf0b6ed9b..05c723fff4ff 100644 --- a/metricbeat/helper/dialer/dialer.go +++ b/metricbeat/helper/dialer/dialer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // Builder is a dialer builder. diff --git a/metricbeat/helper/dialer/dialer_posix.go b/metricbeat/helper/dialer/dialer_posix.go index 4b6f61d1bfb0..2a320ce2525b 100644 --- a/metricbeat/helper/dialer/dialer_posix.go +++ b/metricbeat/helper/dialer/dialer_posix.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // UnixDialerBuilder creates a builder to dial over unix domain socket. diff --git a/metricbeat/helper/dialer/dialer_windows.go b/metricbeat/helper/dialer/dialer_windows.go index 421f91a6017d..873a853e593e 100644 --- a/metricbeat/helper/dialer/dialer_windows.go +++ b/metricbeat/helper/dialer/dialer_windows.go @@ -28,8 +28,8 @@ import ( winio "github.com/Microsoft/go-winio" - "github.com/elastic/beats/libbeat/api/npipe" - "github.com/elastic/beats/libbeat/outputs/transport" + "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) // UnixDialerBuilder creates a builder to dial over a unix domain socket. diff --git a/metricbeat/helper/elastic/elastic.go b/metricbeat/helper/elastic/elastic.go index 46cb9d48de58..b4b9f6195ab7 100644 --- a/metricbeat/helper/elastic/elastic.go +++ b/metricbeat/helper/elastic/elastic.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Product supported by X-Pack Monitoring diff --git a/metricbeat/helper/elastic/elastic_test.go b/metricbeat/helper/elastic/elastic_test.go index c0de5ea8809b..14f6a119eb79 100644 --- a/metricbeat/helper/elastic/elastic_test.go +++ b/metricbeat/helper/elastic/elastic_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestMakeXPackMonitoringIndexName(t *testing.T) { diff --git a/metricbeat/helper/http.go b/metricbeat/helper/http.go index 1dde8cd3a622..5b969fab404e 100644 --- a/metricbeat/helper/http.go +++ b/metricbeat/helper/http.go @@ -28,10 +28,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/outputs/transport" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/outputs/transport" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" ) // HTTP is a custom HTTP Client that handle the complexity of connection and retrieving information diff --git a/metricbeat/helper/http_test.go b/metricbeat/helper/http_test.go index bb6781eb9163..efbecffd93fe 100644 --- a/metricbeat/helper/http_test.go +++ b/metricbeat/helper/http_test.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestGetAuthHeaderFromToken(t *testing.T) { diff --git a/metricbeat/helper/http_windows_test.go b/metricbeat/helper/http_windows_test.go index 3d01f9c9a3b5..388eace429bb 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/libbeat/api/npipe" - "github.com/elastic/beats/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/api/npipe" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestOverNamedpipe(t *testing.T) { diff --git a/metricbeat/helper/privileges_windows.go b/metricbeat/helper/privileges_windows.go index 9e182a8cde3f..625daf59748a 100644 --- a/metricbeat/helper/privileges_windows.go +++ b/metricbeat/helper/privileges_windows.go @@ -25,7 +25,7 @@ import ( "github.com/elastic/gosigar/sys/windows" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var once sync.Once diff --git a/metricbeat/helper/prometheus/hash.go b/metricbeat/helper/prometheus/hash.go index de55ac787d9e..2efe5f195920 100644 --- a/metricbeat/helper/prometheus/hash.go +++ b/metricbeat/helper/prometheus/hash.go @@ -25,7 +25,7 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const sep = '\xff' diff --git a/metricbeat/helper/prometheus/hash_benchmark_test.go b/metricbeat/helper/prometheus/hash_benchmark_test.go index cd41d2af976c..edecb5cb54b7 100644 --- a/metricbeat/helper/prometheus/hash_benchmark_test.go +++ b/metricbeat/helper/prometheus/hash_benchmark_test.go @@ -20,7 +20,7 @@ package prometheus import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var testLabels = common.MapStr{ diff --git a/metricbeat/helper/prometheus/metric.go b/metricbeat/helper/prometheus/metric.go index 57cd395724c7..ee34c1137468 100644 --- a/metricbeat/helper/prometheus/metric.go +++ b/metricbeat/helper/prometheus/metric.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" dto "github.com/prometheus/client_model/go" ) diff --git a/metricbeat/helper/prometheus/module.go b/metricbeat/helper/prometheus/module.go index da1ea895f257..cc6b7d2a068c 100644 --- a/metricbeat/helper/prometheus/module.go +++ b/metricbeat/helper/prometheus/module.go @@ -18,8 +18,8 @@ package prometheus import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/helper/prometheus/prometheus.go b/metricbeat/helper/prometheus/prometheus.go index 6709e6c93eff..6da2b91c4f34 100644 --- a/metricbeat/helper/prometheus/prometheus.go +++ b/metricbeat/helper/prometheus/prometheus.go @@ -27,10 +27,10 @@ import ( dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Prometheus helper retrieves prometheus formatted metrics diff --git a/metricbeat/helper/prometheus/prometheus_test.go b/metricbeat/helper/prometheus/prometheus_test.go index 20715b67750d..b1557115d83e 100644 --- a/metricbeat/helper/prometheus/prometheus_test.go +++ b/metricbeat/helper/prometheus/prometheus_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const ( diff --git a/metricbeat/helper/prometheus/ptest/ptest.go b/metricbeat/helper/prometheus/ptest/ptest.go index ab7940cc2210..c59c62c40505 100644 --- a/metricbeat/helper/prometheus/ptest/ptest.go +++ b/metricbeat/helper/prometheus/ptest/ptest.go @@ -30,10 +30,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/mb/testing/flags" ) // TestCases holds the list of test cases to test a metricset diff --git a/metricbeat/helper/server/http/config.go b/metricbeat/helper/server/http/config.go index 5f70317fcc79..726e1ca4dbbf 100644 --- a/metricbeat/helper/server/http/config.go +++ b/metricbeat/helper/server/http/config.go @@ -17,7 +17,7 @@ package http -import "github.com/elastic/beats/libbeat/common/transport/tlscommon" +import "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" type HttpConfig struct { Host string `config:"host"` diff --git a/metricbeat/helper/server/http/http.go b/metricbeat/helper/server/http/http.go index 5ecfb32c70a4..b67209c53440 100644 --- a/metricbeat/helper/server/http/http.go +++ b/metricbeat/helper/server/http/http.go @@ -24,11 +24,11 @@ import ( "net/http" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type HttpServer struct { diff --git a/metricbeat/helper/server/http/http_test.go b/metricbeat/helper/server/http/http_test.go index 501bfb0d98d9..7b7a0a2c7f3c 100644 --- a/metricbeat/helper/server/http/http_test.go +++ b/metricbeat/helper/server/http/http_test.go @@ -34,7 +34,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/helper/server" ) func TestHTTPServers(t *testing.T) { diff --git a/metricbeat/helper/server/server.go b/metricbeat/helper/server/server.go index 70e903f9db83..3f3fb52c4911 100644 --- a/metricbeat/helper/server/server.go +++ b/metricbeat/helper/server/server.go @@ -17,7 +17,7 @@ package server -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" type Meta common.MapStr diff --git a/metricbeat/helper/server/tcp/tcp.go b/metricbeat/helper/server/tcp/tcp.go index e4455758368c..a0afc51fb09f 100644 --- a/metricbeat/helper/server/tcp/tcp.go +++ b/metricbeat/helper/server/tcp/tcp.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type TcpServer struct { diff --git a/metricbeat/helper/server/tcp/tcp_test.go b/metricbeat/helper/server/tcp/tcp_test.go index 27ad81a060fc..637dba54159e 100644 --- a/metricbeat/helper/server/tcp/tcp_test.go +++ b/metricbeat/helper/server/tcp/tcp_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" ) func GetTestTcpServer(host string, port int) (server.Server, error) { diff --git a/metricbeat/helper/server/udp/udp.go b/metricbeat/helper/server/udp/udp.go index 3d53fdde9aa2..e19f86975196 100644 --- a/metricbeat/helper/server/udp/udp.go +++ b/metricbeat/helper/server/udp/udp.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type UdpServer struct { diff --git a/metricbeat/helper/server/udp/udp_test.go b/metricbeat/helper/server/udp/udp_test.go index 6d288e8bc88b..2ead3294237f 100644 --- a/metricbeat/helper/server/udp/udp_test.go +++ b/metricbeat/helper/server/udp/udp_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" ) func GetTestUdpServer(host string, port int) (server.Server, error) { diff --git a/metricbeat/helper/socket/ptable_linux.go b/metricbeat/helper/socket/ptable_linux.go index 091efe60bfea..f08e9fe61440 100644 --- a/metricbeat/helper/socket/ptable_linux.go +++ b/metricbeat/helper/socket/ptable_linux.go @@ -20,7 +20,7 @@ package socket import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var requiredCapabilities = []string{"sys_ptrace", "dac_read_search"} diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go index e3118dc71bb0..9b6155f7150d 100644 --- a/metricbeat/include/fields/fields.go +++ b/metricbeat/include/fields/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/include/list_common.go b/metricbeat/include/list_common.go index 17318c683e8c..0903128c7bfe 100644 --- a/metricbeat/include/list_common.go +++ b/metricbeat/include/list_common.go @@ -21,144 +21,144 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/metricbeat/module/aerospike" - _ "github.com/elastic/beats/metricbeat/module/aerospike/namespace" - _ "github.com/elastic/beats/metricbeat/module/apache" - _ "github.com/elastic/beats/metricbeat/module/apache/status" - _ "github.com/elastic/beats/metricbeat/module/beat" - _ "github.com/elastic/beats/metricbeat/module/beat/state" - _ "github.com/elastic/beats/metricbeat/module/beat/stats" - _ "github.com/elastic/beats/metricbeat/module/ceph" - _ "github.com/elastic/beats/metricbeat/module/ceph/cluster_disk" - _ "github.com/elastic/beats/metricbeat/module/ceph/cluster_health" - _ "github.com/elastic/beats/metricbeat/module/ceph/cluster_status" - _ "github.com/elastic/beats/metricbeat/module/ceph/monitor_health" - _ "github.com/elastic/beats/metricbeat/module/ceph/osd_df" - _ "github.com/elastic/beats/metricbeat/module/ceph/osd_tree" - _ "github.com/elastic/beats/metricbeat/module/ceph/pool_disk" - _ "github.com/elastic/beats/metricbeat/module/consul" - _ "github.com/elastic/beats/metricbeat/module/consul/agent" - _ "github.com/elastic/beats/metricbeat/module/couchbase" - _ "github.com/elastic/beats/metricbeat/module/couchbase/bucket" - _ "github.com/elastic/beats/metricbeat/module/couchbase/cluster" - _ "github.com/elastic/beats/metricbeat/module/couchbase/node" - _ "github.com/elastic/beats/metricbeat/module/couchdb" - _ "github.com/elastic/beats/metricbeat/module/couchdb/server" - _ "github.com/elastic/beats/metricbeat/module/dropwizard" - _ "github.com/elastic/beats/metricbeat/module/dropwizard/collector" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ccr" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/cluster_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/enrich" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_recovery" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_summary" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ml_job" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/pending_tasks" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/shard" - _ "github.com/elastic/beats/metricbeat/module/envoyproxy" - _ "github.com/elastic/beats/metricbeat/module/envoyproxy/server" - _ "github.com/elastic/beats/metricbeat/module/etcd" - _ "github.com/elastic/beats/metricbeat/module/etcd/leader" - _ "github.com/elastic/beats/metricbeat/module/etcd/metrics" - _ "github.com/elastic/beats/metricbeat/module/etcd/self" - _ "github.com/elastic/beats/metricbeat/module/etcd/store" - _ "github.com/elastic/beats/metricbeat/module/golang" - _ "github.com/elastic/beats/metricbeat/module/golang/expvar" - _ "github.com/elastic/beats/metricbeat/module/golang/heap" - _ "github.com/elastic/beats/metricbeat/module/graphite" - _ "github.com/elastic/beats/metricbeat/module/graphite/server" - _ "github.com/elastic/beats/metricbeat/module/haproxy" - _ "github.com/elastic/beats/metricbeat/module/haproxy/info" - _ "github.com/elastic/beats/metricbeat/module/haproxy/stat" - _ "github.com/elastic/beats/metricbeat/module/http" - _ "github.com/elastic/beats/metricbeat/module/http/json" - _ "github.com/elastic/beats/metricbeat/module/http/server" - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" - _ "github.com/elastic/beats/metricbeat/module/kafka" - _ "github.com/elastic/beats/metricbeat/module/kafka/consumergroup" - _ "github.com/elastic/beats/metricbeat/module/kafka/partition" - _ "github.com/elastic/beats/metricbeat/module/kibana" - _ "github.com/elastic/beats/metricbeat/module/kibana/stats" - _ "github.com/elastic/beats/metricbeat/module/kibana/status" - _ "github.com/elastic/beats/metricbeat/module/kvm" - _ "github.com/elastic/beats/metricbeat/module/kvm/dommemstat" - _ "github.com/elastic/beats/metricbeat/module/logstash" - _ "github.com/elastic/beats/metricbeat/module/logstash/node" - _ "github.com/elastic/beats/metricbeat/module/logstash/node_stats" - _ "github.com/elastic/beats/metricbeat/module/memcached" - _ "github.com/elastic/beats/metricbeat/module/memcached/stats" - _ "github.com/elastic/beats/metricbeat/module/mongodb" - _ "github.com/elastic/beats/metricbeat/module/mongodb/collstats" - _ "github.com/elastic/beats/metricbeat/module/mongodb/dbstats" - _ "github.com/elastic/beats/metricbeat/module/mongodb/metrics" - _ "github.com/elastic/beats/metricbeat/module/mongodb/replstatus" - _ "github.com/elastic/beats/metricbeat/module/mongodb/status" - _ "github.com/elastic/beats/metricbeat/module/munin" - _ "github.com/elastic/beats/metricbeat/module/munin/node" - _ "github.com/elastic/beats/metricbeat/module/mysql" - _ "github.com/elastic/beats/metricbeat/module/mysql/galera_status" - _ "github.com/elastic/beats/metricbeat/module/mysql/status" - _ "github.com/elastic/beats/metricbeat/module/nats" - _ "github.com/elastic/beats/metricbeat/module/nats/connections" - _ "github.com/elastic/beats/metricbeat/module/nats/routes" - _ "github.com/elastic/beats/metricbeat/module/nats/stats" - _ "github.com/elastic/beats/metricbeat/module/nats/subscriptions" - _ "github.com/elastic/beats/metricbeat/module/nginx" - _ "github.com/elastic/beats/metricbeat/module/nginx/stubstatus" - _ "github.com/elastic/beats/metricbeat/module/php_fpm" - _ "github.com/elastic/beats/metricbeat/module/php_fpm/pool" - _ "github.com/elastic/beats/metricbeat/module/php_fpm/process" - _ "github.com/elastic/beats/metricbeat/module/postgresql" - _ "github.com/elastic/beats/metricbeat/module/postgresql/activity" - _ "github.com/elastic/beats/metricbeat/module/postgresql/bgwriter" - _ "github.com/elastic/beats/metricbeat/module/postgresql/database" - _ "github.com/elastic/beats/metricbeat/module/postgresql/statement" - _ "github.com/elastic/beats/metricbeat/module/prometheus" - _ "github.com/elastic/beats/metricbeat/module/prometheus/collector" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/connection" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/exchange" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/node" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq/queue" - _ "github.com/elastic/beats/metricbeat/module/redis" - _ "github.com/elastic/beats/metricbeat/module/redis/info" - _ "github.com/elastic/beats/metricbeat/module/redis/key" - _ "github.com/elastic/beats/metricbeat/module/redis/keyspace" - _ "github.com/elastic/beats/metricbeat/module/system" - _ "github.com/elastic/beats/metricbeat/module/system/core" - _ "github.com/elastic/beats/metricbeat/module/system/cpu" - _ "github.com/elastic/beats/metricbeat/module/system/diskio" - _ "github.com/elastic/beats/metricbeat/module/system/entropy" - _ "github.com/elastic/beats/metricbeat/module/system/filesystem" - _ "github.com/elastic/beats/metricbeat/module/system/fsstat" - _ "github.com/elastic/beats/metricbeat/module/system/load" - _ "github.com/elastic/beats/metricbeat/module/system/memory" - _ "github.com/elastic/beats/metricbeat/module/system/network" - _ "github.com/elastic/beats/metricbeat/module/system/network_summary" - _ "github.com/elastic/beats/metricbeat/module/system/process" - _ "github.com/elastic/beats/metricbeat/module/system/process_summary" - _ "github.com/elastic/beats/metricbeat/module/system/raid" - _ "github.com/elastic/beats/metricbeat/module/system/service" - _ "github.com/elastic/beats/metricbeat/module/system/socket" - _ "github.com/elastic/beats/metricbeat/module/system/socket_summary" - _ "github.com/elastic/beats/metricbeat/module/system/uptime" - _ "github.com/elastic/beats/metricbeat/module/traefik" - _ "github.com/elastic/beats/metricbeat/module/traefik/health" - _ "github.com/elastic/beats/metricbeat/module/uwsgi" - _ "github.com/elastic/beats/metricbeat/module/uwsgi/status" - _ "github.com/elastic/beats/metricbeat/module/vsphere" - _ "github.com/elastic/beats/metricbeat/module/vsphere/datastore" - _ "github.com/elastic/beats/metricbeat/module/vsphere/host" - _ "github.com/elastic/beats/metricbeat/module/vsphere/virtualmachine" - _ "github.com/elastic/beats/metricbeat/module/windows" - _ "github.com/elastic/beats/metricbeat/module/windows/perfmon" - _ "github.com/elastic/beats/metricbeat/module/windows/service" - _ "github.com/elastic/beats/metricbeat/module/zookeeper" - _ "github.com/elastic/beats/metricbeat/module/zookeeper/connection" - _ "github.com/elastic/beats/metricbeat/module/zookeeper/mntr" - _ "github.com/elastic/beats/metricbeat/module/zookeeper/server" + _ "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/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/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/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/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/status" + _ "github.com/elastic/beats/v7/metricbeat/module/nats" + _ "github.com/elastic/beats/v7/metricbeat/module/nats/connections" + _ "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/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/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/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/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/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/datastore" + _ "github.com/elastic/beats/v7/metricbeat/module/vsphere/host" + _ "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/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" ) diff --git a/metricbeat/include/list_docker.go b/metricbeat/include/list_docker.go index f0015d31b3b6..18a34924bd84 100644 --- a/metricbeat/include/list_docker.go +++ b/metricbeat/include/list_docker.go @@ -23,35 +23,35 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/metricbeat/module/docker/container" - _ "github.com/elastic/beats/metricbeat/module/docker/cpu" - _ "github.com/elastic/beats/metricbeat/module/docker/diskio" - _ "github.com/elastic/beats/metricbeat/module/docker/event" - _ "github.com/elastic/beats/metricbeat/module/docker/healthcheck" - _ "github.com/elastic/beats/metricbeat/module/docker/image" - _ "github.com/elastic/beats/metricbeat/module/docker/info" - _ "github.com/elastic/beats/metricbeat/module/docker/memory" - _ "github.com/elastic/beats/metricbeat/module/docker/network" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/apiserver" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/container" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/controllermanager" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/event" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/node" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/pod" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/proxy" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/scheduler" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_container" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_cronjob" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_deployment" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_node" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_persistentvolume" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_persistentvolumeclaim" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_pod" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_replicaset" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_resourcequota" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_service" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_statefulset" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/state_storageclass" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/system" - _ "github.com/elastic/beats/metricbeat/module/kubernetes/volume" + _ "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/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_deployment" + _ "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" ) diff --git a/metricbeat/magefile.go b/metricbeat/magefile.go index 1b84d3cc3dc4..2f955efb7253 100644 --- a/metricbeat/magefile.go +++ b/metricbeat/magefile.go @@ -28,27 +28,27 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - metricbeat "github.com/elastic/beats/metricbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" // mage:import - build "github.com/elastic/beats/dev-tools/mage/target/build" + build "github.com/elastic/beats/v7/dev-tools/mage/target/build" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/dashboards" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/docs" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/docs" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" // mage:import - update "github.com/elastic/beats/dev-tools/mage/target/update" + update "github.com/elastic/beats/v7/dev-tools/mage/target/update" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/compose" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/compose" ) func init() { @@ -114,7 +114,7 @@ func configYML() error { func MockedTests(ctx context.Context) error { params := devtools.DefaultGoTestUnitArgs() - params.ExtraFlags = []string{"github.com/elastic/beats/metricbeat/mb/testing/data/."} + params.ExtraFlags = []string{"github.com/elastic/beats/v7/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 bba266fd14b9..749ec8001bdd 100644 --- a/metricbeat/main.go +++ b/metricbeat/main.go @@ -27,7 +27,7 @@ package main import ( "os" - "github.com/elastic/beats/metricbeat/cmd" + "github.com/elastic/beats/v7/metricbeat/cmd" ) func main() { diff --git a/metricbeat/main_test.go b/metricbeat/main_test.go index 5f8d0d1a6eac..1c0033a2b2d5 100644 --- a/metricbeat/main_test.go +++ b/metricbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" - "github.com/elastic/beats/metricbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/metricbeat/cmd" ) var systemTest *bool diff --git a/metricbeat/mb/builders.go b/metricbeat/mb/builders.go index 04b32f5638aa..48683e05e8ab 100644 --- a/metricbeat/mb/builders.go +++ b/metricbeat/mb/builders.go @@ -25,9 +25,9 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/metricbeat/mb/event.go b/metricbeat/mb/event.go index f502299ce8d2..f92615462fa1 100644 --- a/metricbeat/mb/event.go +++ b/metricbeat/mb/event.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // EventModifier is a function that can modifies an Event. This is typically diff --git a/metricbeat/mb/event_test.go b/metricbeat/mb/event_test.go index 1040102de8c2..3de07034fca6 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestEventConversionToBeatEvent(t *testing.T) { diff --git a/metricbeat/mb/example_metricset_test.go b/metricbeat/mb/example_metricset_test.go index 35267d3c7d63..af7a2dfcb6a4 100644 --- a/metricbeat/mb/example_metricset_test.go +++ b/metricbeat/mb/example_metricset_test.go @@ -20,9 +20,9 @@ package mb_test import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var hostParser = parse.URLHostParserBuilder{ diff --git a/metricbeat/mb/example_module_test.go b/metricbeat/mb/example_module_test.go index 5c3ca2ff0f59..b4520f719714 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/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/mb/lightmetricset.go b/metricbeat/mb/lightmetricset.go index 11e49cd5c772..2354187b4eaf 100644 --- a/metricbeat/mb/lightmetricset.go +++ b/metricbeat/mb/lightmetricset.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) // LightMetricSet contains the definition of a non-registered metric set diff --git a/metricbeat/mb/lightmetricset_test.go b/metricbeat/mb/lightmetricset_test.go index ecb3f374d481..ebdf9e1bf759 100644 --- a/metricbeat/mb/lightmetricset_test.go +++ b/metricbeat/mb/lightmetricset_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestLightMetricSetRegistration(t *testing.T) { diff --git a/metricbeat/mb/lightmodules.go b/metricbeat/mb/lightmodules.go index 0f0fb9f23cfa..bffbfbe026e4 100644 --- a/metricbeat/mb/lightmodules.go +++ b/metricbeat/mb/lightmodules.go @@ -26,9 +26,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) const ( diff --git a/metricbeat/mb/lightmodules_test.go b/metricbeat/mb/lightmodules_test.go index 287b7bfc6714..07a4ceeb54f9 100644 --- a/metricbeat/mb/lightmodules_test.go +++ b/metricbeat/mb/lightmodules_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - _ "github.com/elastic/beats/libbeat/processors/add_id" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + _ "github.com/elastic/beats/v7/libbeat/processors/add_id" ) // TestLightModulesAsModuleSource checks that registry correctly lists diff --git a/metricbeat/mb/mb.go b/metricbeat/mb/mb.go index 24475e0e01a6..b22b09debed9 100644 --- a/metricbeat/mb/mb.go +++ b/metricbeat/mb/mb.go @@ -27,10 +27,10 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" ) const ( diff --git a/metricbeat/mb/mb_test.go b/metricbeat/mb/mb_test.go index f93721d8a81e..3b734ae9208a 100644 --- a/metricbeat/mb/mb_test.go +++ b/metricbeat/mb/mb_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/mb/module/configuration.go b/metricbeat/mb/module/configuration.go index 2ccd0bd99aca..8b0701c0ae9f 100644 --- a/metricbeat/mb/module/configuration.go +++ b/metricbeat/mb/module/configuration.go @@ -20,9 +20,9 @@ package module import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // ConfiguredModules returns a list of all configured modules, including anyone present under dynamic config settings. diff --git a/metricbeat/mb/module/connector.go b/metricbeat/mb/module/connector.go index 15456c160a8e..5d9c75a573c9 100644 --- a/metricbeat/mb/module/connector.go +++ b/metricbeat/mb/module/connector.go @@ -20,11 +20,11 @@ package module import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "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" ) // Connector configures and establishes a beat.Client for publishing events diff --git a/metricbeat/mb/module/connector_test.go b/metricbeat/mb/module/connector_test.go index 9ca3e48cd17e..3695d1c61bea 100644 --- a/metricbeat/mb/module/connector_test.go +++ b/metricbeat/mb/module/connector_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" ) func TestProcessorsForConfig(t *testing.T) { diff --git a/metricbeat/mb/module/doc.go b/metricbeat/mb/module/doc.go index 1b6b13b13ba6..c67256697371 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/metricbeat/beater +// Metricbeat framework see the github.com/elastic/beats/v7/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 e5fc7e81e830..eee9dda60b8b 100644 --- a/metricbeat/mb/module/example_test.go +++ b/metricbeat/mb/module/example_test.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/outputs/codec/json" + "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/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/module" ) // ExampleWrapper demonstrates how to create a single Wrapper diff --git a/metricbeat/mb/module/factory.go b/metricbeat/mb/module/factory.go index 08aafb36875f..5392701ccb0f 100644 --- a/metricbeat/mb/module/factory.go +++ b/metricbeat/mb/module/factory.go @@ -18,10 +18,10 @@ package module import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "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/metricbeat/mb" ) // Factory creates new Runner instances from configuration objects. diff --git a/metricbeat/mb/module/options.go b/metricbeat/mb/module/options.go index 2d25e363b3cd..273db92b7189 100644 --- a/metricbeat/mb/module/options.go +++ b/metricbeat/mb/module/options.go @@ -20,8 +20,8 @@ package module import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Option specifies some optional arguments used for configuring the behavior diff --git a/metricbeat/mb/module/options_test.go b/metricbeat/mb/module/options_test.go index 795fd4961895..5cc0f17be98e 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/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func TestWithMaxStartDelay(t *testing.T) { diff --git a/metricbeat/mb/module/publish.go b/metricbeat/mb/module/publish.go index 40ce01549fe4..6f9c200eac6c 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/libbeat/beat" + "github.com/elastic/beats/v7/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 c60a009caea3..0e4bd78c9978 100644 --- a/metricbeat/mb/module/runner.go +++ b/metricbeat/mb/module/runner.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/monitoring" ) var ( diff --git a/metricbeat/mb/module/runner_group_test.go b/metricbeat/mb/module/runner_group_test.go index cbf2f310a87f..dd7babee0d79 100644 --- a/metricbeat/mb/module/runner_group_test.go +++ b/metricbeat/mb/module/runner_group_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common/atomic" ) const ( diff --git a/metricbeat/mb/module/runner_test.go b/metricbeat/mb/module/runner_test.go index 140e6333400d..6b8b2d705ef2 100644 --- a/metricbeat/mb/module/runner_test.go +++ b/metricbeat/mb/module/runner_test.go @@ -22,11 +22,11 @@ package module_test import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - pubtest "github.com/elastic/beats/libbeat/publisher/testing" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + 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/stretchr/testify/assert" ) diff --git a/metricbeat/mb/module/testing.go b/metricbeat/mb/module/testing.go index c7ac928ea76c..12a5891b7552 100644 --- a/metricbeat/mb/module/testing.go +++ b/metricbeat/mb/module/testing.go @@ -22,9 +22,9 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/testing" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/testing" ) // receiveOneEvent receives one event from the events channel then closes the diff --git a/metricbeat/mb/module/wrapper.go b/metricbeat/mb/module/wrapper.go index dfb547dcd27d..f8375b4adf67 100644 --- a/metricbeat/mb/module/wrapper.go +++ b/metricbeat/mb/module/wrapper.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/testing" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/testing" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Expvar metric names. diff --git a/metricbeat/mb/module/wrapper_test.go b/metricbeat/mb/module/wrapper_test.go index b83db1ff6bf8..1108b5bd737b 100644 --- a/metricbeat/mb/module/wrapper_test.go +++ b/metricbeat/mb/module/wrapper_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/module" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/module" ) const ( diff --git a/metricbeat/mb/parse/hostparsers.go b/metricbeat/mb/parse/hostparsers.go index 5e193e1b103e..e499de9a1d86 100644 --- a/metricbeat/mb/parse/hostparsers.go +++ b/metricbeat/mb/parse/hostparsers.go @@ -20,7 +20,7 @@ package parse import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/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 cf9a7511bceb..0bcbfa2cac02 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/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" ) diff --git a/metricbeat/mb/parse/url_test.go b/metricbeat/mb/parse/url_test.go index d7ff295b3757..997385b443f5 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/metricbeat/helper/dialer" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/dialer" + "github.com/elastic/beats/v7/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/mb/registry.go b/metricbeat/mb/registry.go index c7b13b3a60bc..780213d2392a 100644 --- a/metricbeat/mb/registry.go +++ b/metricbeat/mb/registry.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" ) const initialSize = 20 // initialSize specifies the initial size of the Register. diff --git a/metricbeat/mb/testing/data/data_test.go b/metricbeat/mb/testing/data/data_test.go index 3102780e66fa..f9dc647d138a 100644 --- a/metricbeat/mb/testing/data/data_test.go +++ b/metricbeat/mb/testing/data/data_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/include" + _ "github.com/elastic/beats/v7/metricbeat/include" ) func TestAll(t *testing.T) { diff --git a/metricbeat/mb/testing/data_generator.go b/metricbeat/mb/testing/data_generator.go index d890364cf870..10ab9b76e34c 100644 --- a/metricbeat/mb/testing/data_generator.go +++ b/metricbeat/mb/testing/data_generator.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/testing/flags" + "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/testing/flags" ) // WriteEvent fetches a single event writes the output to a ./_meta/data.json diff --git a/metricbeat/mb/testing/fetcher.go b/metricbeat/mb/testing/fetcher.go index 5b01e1b81382..e80101c0918e 100644 --- a/metricbeat/mb/testing/fetcher.go +++ b/metricbeat/mb/testing/fetcher.go @@ -20,9 +20,9 @@ package testing import ( "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Fetcher is an interface implemented by all fetchers for testing purpouses diff --git a/metricbeat/mb/testing/modules.go b/metricbeat/mb/testing/modules.go index 3edd1baeef9b..673deef850d7 100644 --- a/metricbeat/mb/testing/modules.go +++ b/metricbeat/mb/testing/modules.go @@ -28,7 +28,7 @@ that Metricbeat does it and with the same validations. package mymetricset_test import ( - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { @@ -59,8 +59,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) type TestModule struct { diff --git a/metricbeat/mb/testing/testdata.go b/metricbeat/mb/testing/testdata.go index c400be0a3045..39ff777beefd 100644 --- a/metricbeat/mb/testing/testdata.go +++ b/metricbeat/mb/testing/testdata.go @@ -32,13 +32,13 @@ import ( "github.com/mitchellh/hashstructure" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/testing/flags" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/common" + "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/metricbeat/include/fields" + _ "github.com/elastic/beats/v7/metricbeat/include/fields" ) const ( diff --git a/metricbeat/module/aerospike/fields.go b/metricbeat/module/aerospike/fields.go index 2a325a2a214c..4e03f23d432b 100644 --- a/metricbeat/module/aerospike/fields.go +++ b/metricbeat/module/aerospike/fields.go @@ -20,7 +20,7 @@ package aerospike import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/aerospike/namespace/data.go b/metricbeat/module/aerospike/namespace/data.go index 9a0b3bd3b38f..e774d2e9ec94 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 61b80a405306..2ac8a632626b 100644 --- a/metricbeat/module/aerospike/namespace/namespace.go +++ b/metricbeat/module/aerospike/namespace/namespace.go @@ -23,9 +23,9 @@ import ( as "github.com/aerospike/aerospike-client-go" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/aerospike" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/aerospike" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/aerospike/namespace/namespace_integration_test.go b/metricbeat/module/aerospike/namespace/namespace_integration_test.go index 1e0d1cdcd06c..547a49986a60 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/apache/fields.go b/metricbeat/module/apache/fields.go index 4dcc41db0513..619e56f1a831 100644 --- a/metricbeat/module/apache/fields.go +++ b/metricbeat/module/apache/fields.go @@ -20,7 +20,7 @@ package apache import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/apache/status/data.go b/metricbeat/module/apache/status/data.go index 7659d161d2e3..0c57bc34357c 100644 --- a/metricbeat/module/apache/status/data.go +++ b/metricbeat/module/apache/status/data.go @@ -22,9 +22,9 @@ import ( "regexp" "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "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/mapstrstr" ) var ( diff --git a/metricbeat/module/apache/status/status.go b/metricbeat/module/apache/status/status.go index ddd132841deb..92053f2373db 100644 --- a/metricbeat/module/apache/status/status.go +++ b/metricbeat/module/apache/status/status.go @@ -21,10 +21,10 @@ package status import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 ffb563135085..96ab5439b98f 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/apache/status/status_test.go b/metricbeat/module/apache/status/status_test.go index e0eba14252a2..182b41e1af3c 100644 --- a/metricbeat/module/apache/status/status_test.go +++ b/metricbeat/module/apache/status/status_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/metricbeat/module/apache" + _ "github.com/elastic/beats/v7/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 941885e6e921..42927977b0f5 100644 --- a/metricbeat/module/beat/beat.go +++ b/metricbeat/module/beat/beat.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/beat/beat_integration_test.go b/metricbeat/module/beat/beat_integration_test.go index ba13a54cf622..d96bba4be0f2 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/beat" - _ "github.com/elastic/beats/metricbeat/module/beat/state" - _ "github.com/elastic/beats/metricbeat/module/beat/stats" + "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" ) var metricSets = []string{ diff --git a/metricbeat/module/beat/fields.go b/metricbeat/module/beat/fields.go index 53102ecb26ce..33bbffd7dc09 100644 --- a/metricbeat/module/beat/fields.go +++ b/metricbeat/module/beat/fields.go @@ -20,7 +20,7 @@ package beat import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/beat/metricset.go b/metricbeat/module/beat/metricset.go index ba4957b47c68..fe0d2d9acf8e 100644 --- a/metricbeat/module/beat/metricset.go +++ b/metricbeat/module/beat/metricset.go @@ -18,8 +18,8 @@ package beat import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/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 15a258389590..97a714cd9e09 100644 --- a/metricbeat/module/beat/state/data.go +++ b/metricbeat/module/beat/state/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/beat" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) var ( diff --git a/metricbeat/module/beat/state/data_test.go b/metricbeat/module/beat/state/data_test.go index 468e986f91a0..606853c02065 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/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/module/beat" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/beat/state/data_xpack.go b/metricbeat/module/beat/state/data_xpack.go index e92bdd924d97..2dc2bebff880 100644 --- a/metricbeat/module/beat/state/data_xpack.go +++ b/metricbeat/module/beat/state/data_xpack.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - b "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + b "github.com/elastic/beats/v7/metricbeat/module/beat" ) func eventMappingXPack(r mb.ReporterV2, m *MetricSet, info b.Info, content []byte) error { diff --git a/metricbeat/module/beat/state/state.go b/metricbeat/module/beat/state/state.go index 218686abce39..eb6a41ff8bfb 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/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) func init() { diff --git a/metricbeat/module/beat/stats/data.go b/metricbeat/module/beat/stats/data.go index 8c868e1d5b29..acc595745cd6 100644 --- a/metricbeat/module/beat/stats/data.go +++ b/metricbeat/module/beat/stats/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/beat" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) var ( diff --git a/metricbeat/module/beat/stats/data_test.go b/metricbeat/module/beat/stats/data_test.go index 78a87e2d4ae2..2a2feb408a45 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/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/module/beat" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/beat/stats/data_xpack.go b/metricbeat/module/beat/stats/data_xpack.go index 8b0da8a84e65..d0b81dbe29db 100644 --- a/metricbeat/module/beat/stats/data_xpack.go +++ b/metricbeat/module/beat/stats/data_xpack.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/beat" ) func eventMappingXPack(r mb.ReporterV2, m *MetricSet, info beat.Info, content []byte) error { diff --git a/metricbeat/module/beat/stats/stats.go b/metricbeat/module/beat/stats/stats.go index fcab548c5a37..6cee03e426ad 100644 --- a/metricbeat/module/beat/stats/stats.go +++ b/metricbeat/module/beat/stats/stats.go @@ -18,9 +18,9 @@ package stats import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/beat" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 37f68f37a6cb..8f33d0e847b1 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/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 7f3fa8116083..90b44ad37994 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk_integration_test.go @@ -22,8 +22,8 @@ package cluster_disk import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) 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 b073f4be6b67..b6aa3b97bded 100644 --- a/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go +++ b/metricbeat/module/ceph/cluster_disk/cluster_disk_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/cluster_disk/data.go b/metricbeat/module/ceph/cluster_disk/data.go index 259d712f8c9e..b75daa31b0e6 100644 --- a/metricbeat/module/ceph/cluster_disk/data.go +++ b/metricbeat/module/ceph/cluster_disk/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type StatsCluster struct { diff --git a/metricbeat/module/ceph/cluster_health/cluster_health.go b/metricbeat/module/ceph/cluster_health/cluster_health.go index e651a7332d79..887cb9a5de27 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 ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 a02999f92ee1..159c591cac70 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health_integration_test.go @@ -22,8 +22,8 @@ package cluster_health import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) 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 9f1d15fb2a54..e5514e94682a 100644 --- a/metricbeat/module/ceph/cluster_health/cluster_health_test.go +++ b/metricbeat/module/ceph/cluster_health/cluster_health_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/cluster_health/data.go b/metricbeat/module/ceph/cluster_health/data.go index cb827e0975fe..bd94c44be2e4 100644 --- a/metricbeat/module/ceph/cluster_health/data.go +++ b/metricbeat/module/ceph/cluster_health/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Timecheck contains part of the response from a HealthRequest diff --git a/metricbeat/module/ceph/cluster_status/cluster_status.go b/metricbeat/module/ceph/cluster_status/cluster_status.go index b7a9eaa469b9..69c11a084f32 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 ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 5948dc4366e2..cef6e52fdc56 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status_integration_test.go @@ -22,8 +22,8 @@ package cluster_status import ( "testing" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) 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 c9066e707225..3f6cd3ed7bd3 100644 --- a/metricbeat/module/ceph/cluster_status/cluster_status_test.go +++ b/metricbeat/module/ceph/cluster_status/cluster_status_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/cluster_status/data.go b/metricbeat/module/ceph/cluster_status/data.go index 064026355fec..c19a75b44d39 100644 --- a/metricbeat/module/ceph/cluster_status/data.go +++ b/metricbeat/module/ceph/cluster_status/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // PgState represents placement group state diff --git a/metricbeat/module/ceph/fields.go b/metricbeat/module/ceph/fields.go index 8f8636152e87..ef7a1c6db623 100644 --- a/metricbeat/module/ceph/fields.go +++ b/metricbeat/module/ceph/fields.go @@ -20,7 +20,7 @@ package ceph import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/ceph/monitor_health/data.go b/metricbeat/module/ceph/monitor_health/data.go index 7ca509ea212e..a40612e339df 100644 --- a/metricbeat/module/ceph/monitor_health/data.go +++ b/metricbeat/module/ceph/monitor_health/data.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Tick struct { diff --git a/metricbeat/module/ceph/monitor_health/monitor_health.go b/metricbeat/module/ceph/monitor_health/monitor_health.go index 16f7b4373243..f726969da9ee 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/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 6790e258f077..e6a464b2543d 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" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/metricbeat/module/ceph" + _ "github.com/elastic/beats/v7/metricbeat/module/ceph" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/ceph/osd_df/data.go b/metricbeat/module/ceph/osd_df/data.go index fa0422afa519..9b48e4f89f31 100644 --- a/metricbeat/module/ceph/osd_df/data.go +++ b/metricbeat/module/ceph/osd_df/data.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // Node represents a node object diff --git a/metricbeat/module/ceph/osd_df/osd_df.go b/metricbeat/module/ceph/osd_df/osd_df.go index 79139ed89fa1..333f259b9d96 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 ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 7c828d0bd0c4..f2d64e2b5737 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 cc9683956970..bef039597dd5 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/osd_tree/data.go b/metricbeat/module/ceph/osd_tree/data.go index 5f7d32056f0a..f88426fa2787 100644 --- a/metricbeat/module/ceph/osd_tree/data.go +++ b/metricbeat/module/ceph/osd_tree/data.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Node represents a node object diff --git a/metricbeat/module/ceph/osd_tree/osd_tree.go b/metricbeat/module/ceph/osd_tree/osd_tree.go index 85192cff2920..6417ca59d9b0 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 ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 07bb5ab4fbdf..39f78ffea68f 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 a92f40a8135e..872da2d32c91 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/ceph/pool_disk/data.go b/metricbeat/module/ceph/pool_disk/data.go index d2bef377dc11..e3758c94816c 100644 --- a/metricbeat/module/ceph/pool_disk/data.go +++ b/metricbeat/module/ceph/pool_disk/data.go @@ -20,8 +20,8 @@ package pool_disk import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Stats represents the statistics for a pool diff --git a/metricbeat/module/ceph/pool_disk/pool_disk.go b/metricbeat/module/ceph/pool_disk/pool_disk.go index dfcbf79c97a3..4fda029bff46 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 ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 b6a9d9ed3f86..07d6b34c5bb5 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 f2367401f8f7..4f153dd9d5a5 100644 --- a/metricbeat/module/ceph/pool_disk/pool_disk_test.go +++ b/metricbeat/module/ceph/pool_disk/pool_disk_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/consul/agent/agent.go b/metricbeat/module/consul/agent/agent.go index c1fa03ae127f..2eedcfb5506a 100644 --- a/metricbeat/module/consul/agent/agent.go +++ b/metricbeat/module/consul/agent/agent.go @@ -20,10 +20,10 @@ package agent import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "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" ) var ( diff --git a/metricbeat/module/consul/agent/agent_integration_test.go b/metricbeat/module/consul/agent/agent_integration_test.go index 43c4358df903..e4e4a585e300 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/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/module/consul" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/module/consul" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/consul/agent/agent_test.go b/metricbeat/module/consul/agent/agent_test.go index 523c2449b0ff..8e47bd0b9cd6 100644 --- a/metricbeat/module/consul/agent/agent_test.go +++ b/metricbeat/module/consul/agent/agent_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var jsonExample = `{ diff --git a/metricbeat/module/consul/agent/data.go b/metricbeat/module/consul/agent/data.go index 022e066b861f..a8e45a06bab5 100644 --- a/metricbeat/module/consul/agent/data.go +++ b/metricbeat/module/consul/agent/data.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type valueConverter interface { diff --git a/metricbeat/module/consul/agent/data_integration_test.go b/metricbeat/module/consul/agent/data_integration_test.go index 5dfc8a32514c..b93677235c7b 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/denisenkom/go-mssqldb" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/consul" + "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" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/consul/fields.go b/metricbeat/module/consul/fields.go index 5bd61822219a..3e396c8a0b35 100644 --- a/metricbeat/module/consul/fields.go +++ b/metricbeat/module/consul/fields.go @@ -20,7 +20,7 @@ package consul import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchbase/bucket/bucket.go b/metricbeat/module/couchbase/bucket/bucket.go index 3f06a9760f7d..643b1ecf41c6 100644 --- a/metricbeat/module/couchbase/bucket/bucket.go +++ b/metricbeat/module/couchbase/bucket/bucket.go @@ -20,9 +20,9 @@ package bucket import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 9f498bb52621..4311b07f06b5 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/couchbase" + "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" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/bucket/bucket_test.go b/metricbeat/module/couchbase/bucket/bucket_test.go index 62934d6472b2..0d39b4bb5fe7 100644 --- a/metricbeat/module/couchbase/bucket/bucket_test.go +++ b/metricbeat/module/couchbase/bucket/bucket_test.go @@ -26,8 +26,8 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/couchbase/bucket/data.go b/metricbeat/module/couchbase/bucket/data.go index 432bcf38cd84..2aa6ab328c8b 100644 --- a/metricbeat/module/couchbase/bucket/data.go +++ b/metricbeat/module/couchbase/bucket/data.go @@ -20,8 +20,8 @@ package bucket import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type BucketQuota struct { diff --git a/metricbeat/module/couchbase/cluster/cluster.go b/metricbeat/module/couchbase/cluster/cluster.go index 556b37669821..2d18856c090e 100644 --- a/metricbeat/module/couchbase/cluster/cluster.go +++ b/metricbeat/module/couchbase/cluster/cluster.go @@ -20,9 +20,9 @@ package cluster import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 d2eb6c8d72e5..11b136f0bb35 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/couchbase" + "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" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/cluster/cluster_test.go b/metricbeat/module/couchbase/cluster/cluster_test.go index 0733e9fbc7f4..8a7c6f5338cf 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/couchbase/cluster/data.go b/metricbeat/module/couchbase/cluster/data.go index e099c3e5a9f0..5195f6d708c4 100644 --- a/metricbeat/module/couchbase/cluster/data.go +++ b/metricbeat/module/couchbase/cluster/data.go @@ -20,8 +20,8 @@ package cluster import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type StorageTotals_Ram struct { diff --git a/metricbeat/module/couchbase/fields.go b/metricbeat/module/couchbase/fields.go index 8cc55dafee70..5168ad706776 100644 --- a/metricbeat/module/couchbase/fields.go +++ b/metricbeat/module/couchbase/fields.go @@ -20,7 +20,7 @@ package couchbase import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchbase/node/data.go b/metricbeat/module/couchbase/node/data.go index 046226bce5fb..b4a2d107e3fa 100644 --- a/metricbeat/module/couchbase/node/data.go +++ b/metricbeat/module/couchbase/node/data.go @@ -22,8 +22,8 @@ import ( "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type NodeSystemStats struct { diff --git a/metricbeat/module/couchbase/node/node.go b/metricbeat/module/couchbase/node/node.go index 5ad637aa8b49..cbb1ba7ce068 100644 --- a/metricbeat/module/couchbase/node/node.go +++ b/metricbeat/module/couchbase/node/node.go @@ -20,9 +20,9 @@ package node import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 2ed90e6c86fa..63c47e1c565d 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/couchbase" + "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" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchbase/node/node_test.go b/metricbeat/module/couchbase/node/node_test.go index 4245bd3589c3..b99a2c0b76fd 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/couchbase" + _ "github.com/elastic/beats/v7/metricbeat/module/couchbase" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/couchdb/fields.go b/metricbeat/module/couchdb/fields.go index 0b4759ade514..fb4182e2dbd5 100644 --- a/metricbeat/module/couchdb/fields.go +++ b/metricbeat/module/couchdb/fields.go @@ -20,7 +20,7 @@ package couchdb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/couchdb/server/data.go b/metricbeat/module/couchdb/server/data.go index 0d971f40a1d7..9b6c3c25cd73 100644 --- a/metricbeat/module/couchdb/server/data.go +++ b/metricbeat/module/couchdb/server/data.go @@ -20,8 +20,8 @@ package server import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // Server type defines all fields of the Server Metricset diff --git a/metricbeat/module/couchdb/server/server.go b/metricbeat/module/couchdb/server/server.go index e32d827f4d27..7207fbf08eab 100644 --- a/metricbeat/module/couchdb/server/server.go +++ b/metricbeat/module/couchdb/server/server.go @@ -20,9 +20,9 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/couchdb/server/server_integration_test.go b/metricbeat/module/couchdb/server/server_integration_test.go index 08f443d78027..22c7a841a34d 100644 --- a/metricbeat/module/couchdb/server/server_integration_test.go +++ b/metricbeat/module/couchdb/server/server_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/couchdb/server/server_test.go b/metricbeat/module/couchdb/server/server_test.go index dd13ee45bed8..d76b2f2c9041 100644 --- a/metricbeat/module/couchdb/server/server_test.go +++ b/metricbeat/module/couchdb/server/server_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/docker/container/container.go b/metricbeat/module/docker/container/container.go index 543e46947da3..de8413cb1cd0 100644 --- a/metricbeat/module/docker/container/container.go +++ b/metricbeat/module/docker/container/container.go @@ -26,8 +26,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 146d31d25f86..47b9dff36f63 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 d693f988e296..abda8657e7da 100644 --- a/metricbeat/module/docker/container/data.go +++ b/metricbeat/module/docker/container/data.go @@ -22,9 +22,9 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, containersList []types.Container, dedot bool) { diff --git a/metricbeat/module/docker/cpu/cpu.go b/metricbeat/module/docker/cpu/cpu.go index a07b4f8466f0..0f13fab22484 100644 --- a/metricbeat/module/docker/cpu/cpu.go +++ b/metricbeat/module/docker/cpu/cpu.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 d781791849e7..7ef25eb1a4b4 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 bcce353343d0..d14fda678d9b 100644 --- a/metricbeat/module/docker/cpu/cpu_test.go +++ b/metricbeat/module/docker/cpu/cpu_test.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) var cpuService CPUService diff --git a/metricbeat/module/docker/cpu/data.go b/metricbeat/module/docker/cpu/data.go index 3614d55e4ca0..d69d3aa78288 100644 --- a/metricbeat/module/docker/cpu/data.go +++ b/metricbeat/module/docker/cpu/data.go @@ -18,8 +18,8 @@ package cpu import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, cpuStatsList []CPUStats) { diff --git a/metricbeat/module/docker/cpu/helper.go b/metricbeat/module/docker/cpu/helper.go index 02d045f30b74..75527285f1ee 100644 --- a/metricbeat/module/docker/cpu/helper.go +++ b/metricbeat/module/docker/cpu/helper.go @@ -20,9 +20,9 @@ package cpu import ( "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) type CPUStats struct { diff --git a/metricbeat/module/docker/diskio/data.go b/metricbeat/module/docker/diskio/data.go index 2a7d4cb9569a..85b975ffeae2 100644 --- a/metricbeat/module/docker/diskio/data.go +++ b/metricbeat/module/docker/diskio/data.go @@ -18,8 +18,8 @@ package diskio import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, blkioStatsList []BlkioStats) { diff --git a/metricbeat/module/docker/diskio/diskio.go b/metricbeat/module/docker/diskio/diskio.go index dacf86374c30..8868d1607f7b 100644 --- a/metricbeat/module/docker/diskio/diskio.go +++ b/metricbeat/module/docker/diskio/diskio.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 875815ff1828..0c5cd6a27c6a 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 a10db61221cd..520ec7bd2658 100644 --- a/metricbeat/module/docker/diskio/diskio_test.go +++ b/metricbeat/module/docker/diskio/diskio_test.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/api/types" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) var blkioService BlkioService diff --git a/metricbeat/module/docker/diskio/helper.go b/metricbeat/module/docker/diskio/helper.go index e75c21b886fb..5873a3615b3f 100644 --- a/metricbeat/module/docker/diskio/helper.go +++ b/metricbeat/module/docker/diskio/helper.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) type BlkioStats struct { diff --git a/metricbeat/module/docker/docker.go b/metricbeat/module/docker/docker.go index 2957dabefcd4..b4a7b91a1cf3 100644 --- a/metricbeat/module/docker/docker.go +++ b/metricbeat/module/docker/docker.go @@ -30,9 +30,9 @@ import ( "github.com/docker/docker/client" "github.com/docker/go-connections/tlsconfig" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // Select Docker API version diff --git a/metricbeat/module/docker/event/event.go b/metricbeat/module/docker/event/event.go index c8ab896de6bb..ad9421cb8f06 100644 --- a/metricbeat/module/docker/event/event.go +++ b/metricbeat/module/docker/event/event.go @@ -28,10 +28,10 @@ import ( "github.com/docker/docker/api/types/events" "github.com/docker/docker/client" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/docker/event/event_integration_test.go b/metricbeat/module/docker/event/event_integration_test.go index 51666efe579c..5d4b7ce79893 100644 --- a/metricbeat/module/docker/event/event_integration_test.go +++ b/metricbeat/module/docker/event/event_integration_test.go @@ -30,10 +30,10 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go index d2fd8a42eaae..31e6287f9a81 100644 --- a/metricbeat/module/docker/fields.go +++ b/metricbeat/module/docker/fields.go @@ -20,7 +20,7 @@ package docker import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/docker/healthcheck/data.go b/metricbeat/module/docker/healthcheck/data.go index 5f0c8dbc9cc0..6ced97223289 100644 --- a/metricbeat/module/docker/healthcheck/data.go +++ b/metricbeat/module/docker/healthcheck/data.go @@ -24,9 +24,9 @@ import ( "github.com/docker/docker/api/types" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func eventsMapping(r mb.ReporterV2, containers []types.Container, m *MetricSet) { diff --git a/metricbeat/module/docker/healthcheck/healthcheck.go b/metricbeat/module/docker/healthcheck/healthcheck.go index 1b90ccd5471a..1033af8d692f 100644 --- a/metricbeat/module/docker/healthcheck/healthcheck.go +++ b/metricbeat/module/docker/healthcheck/healthcheck.go @@ -26,8 +26,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 600fcb926a60..2f0012ef5e48 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/helper.go b/metricbeat/module/docker/helper.go index 6813ef2a4317..fd2343d6f259 100644 --- a/metricbeat/module/docker/helper.go +++ b/metricbeat/module/docker/helper.go @@ -20,8 +20,8 @@ package docker import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - helpers "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common" + helpers "github.com/elastic/beats/v7/libbeat/common/docker" ) // Container is a struct representation of a container diff --git a/metricbeat/module/docker/helper_test.go b/metricbeat/module/docker/helper_test.go index c9fc5a18f70a..556c75e54f70 100644 --- a/metricbeat/module/docker/helper_test.go +++ b/metricbeat/module/docker/helper_test.go @@ -20,11 +20,11 @@ package docker import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" - helpers "github.com/elastic/beats/libbeat/common/docker" + helpers "github.com/elastic/beats/v7/libbeat/common/docker" ) func TestDeDotLabels(t *testing.T) { diff --git a/metricbeat/module/docker/image/data.go b/metricbeat/module/docker/image/data.go index bf2fa4e96ba6..e809450f241f 100644 --- a/metricbeat/module/docker/image/data.go +++ b/metricbeat/module/docker/image/data.go @@ -22,8 +22,8 @@ import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/docker" ) func eventsMapping(imagesList []types.ImageSummary, dedot bool) []common.MapStr { diff --git a/metricbeat/module/docker/image/image.go b/metricbeat/module/docker/image/image.go index 7dead12f42f8..62ea612f83c0 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" "github.com/docker/docker/client" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 591656810848..1dd56b6d177c 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/docker/info/data.go b/metricbeat/module/docker/info/data.go index 65d2738db6bc..6b3f2e628cf8 100644 --- a/metricbeat/module/docker/info/data.go +++ b/metricbeat/module/docker/info/data.go @@ -20,7 +20,7 @@ package info import ( "github.com/docker/docker/api/types" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func eventMapping(info *types.Info) common.MapStr { diff --git a/metricbeat/module/docker/info/info.go b/metricbeat/module/docker/info/info.go index 5a6fd0f04efb..e4ea3765de70 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/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 452651b142a8..3ec84b09128c 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 25737be8b351..0a418e48c5ba 100644 --- a/metricbeat/module/docker/memory/data.go +++ b/metricbeat/module/docker/memory/data.go @@ -18,8 +18,8 @@ package memory import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, memoryDataList []MemoryData) { diff --git a/metricbeat/module/docker/memory/helper.go b/metricbeat/module/docker/memory/helper.go index 7c3b86845e0c..459c26cccebc 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/libbeat/common" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) // MemoryData contains parsed container memory info diff --git a/metricbeat/module/docker/memory/memory.go b/metricbeat/module/docker/memory/memory.go index 8108b30d46ce..3a56adba57a7 100644 --- a/metricbeat/module/docker/memory/memory.go +++ b/metricbeat/module/docker/memory/memory.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 d751841c6b94..6d21e07eb728 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 05f742417a77..695e6770de12 100644 --- a/metricbeat/module/docker/memory/memory_test.go +++ b/metricbeat/module/docker/memory/memory_test.go @@ -25,9 +25,9 @@ import ( "github.com/docker/docker/api/types" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) func TestMemoryService_GetMemoryStats(t *testing.T) { diff --git a/metricbeat/module/docker/network/data.go b/metricbeat/module/docker/network/data.go index 94567f08f390..b4a2b90c4056 100644 --- a/metricbeat/module/docker/network/data.go +++ b/metricbeat/module/docker/network/data.go @@ -18,8 +18,8 @@ package network import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventsMapping(r mb.ReporterV2, netsStatsList []NetStats) { diff --git a/metricbeat/module/docker/network/helper.go b/metricbeat/module/docker/network/helper.go index 794574bace1b..0f980fc2ab94 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" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/module/docker" ) type NetService struct { diff --git a/metricbeat/module/docker/network/network.go b/metricbeat/module/docker/network/network.go index 84cdd4d1c59b..04e67c954129 100644 --- a/metricbeat/module/docker/network/network.go +++ b/metricbeat/module/docker/network/network.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/client" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/docker" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 015bf40a5faa..418d057e247a 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 dd1f922baf99..eb1f6439abaf 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/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 fc09de69354d..470cabd18e83 100644 --- a/metricbeat/module/dropwizard/collector/collector_integration_test.go +++ b/metricbeat/module/dropwizard/collector/collector_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/dropwizard/collector/collector_test.go b/metricbeat/module/dropwizard/collector/collector_test.go index ff0e7a41e0d2..181b6e0812e0 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/dropwizard" + _ "github.com/elastic/beats/v7/metricbeat/module/dropwizard" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/dropwizard/collector/data.go b/metricbeat/module/dropwizard/collector/data.go index d191a35e4cff..59c8ad5a275b 100644 --- a/metricbeat/module/dropwizard/collector/data.go +++ b/metricbeat/module/dropwizard/collector/data.go @@ -21,7 +21,7 @@ import ( "encoding/json" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type DropWizardEvent struct { diff --git a/metricbeat/module/dropwizard/collector/data_test.go b/metricbeat/module/dropwizard/collector/data_test.go index 959edd1df5ab..823b81b3131b 100644 --- a/metricbeat/module/dropwizard/collector/data_test.go +++ b/metricbeat/module/dropwizard/collector/data_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestSplitTagsFromMetricName(t *testing.T) { diff --git a/metricbeat/module/dropwizard/fields.go b/metricbeat/module/dropwizard/fields.go index 81235e54d5fe..3143c53ee41d 100644 --- a/metricbeat/module/dropwizard/fields.go +++ b/metricbeat/module/dropwizard/fields.go @@ -20,7 +20,7 @@ package dropwizard import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/elasticsearch/ccr/ccr.go b/metricbeat/module/elasticsearch/ccr/ccr.go index d67d3b01f3d4..20d5cc657796 100644 --- a/metricbeat/module/elasticsearch/ccr/ccr.go +++ b/metricbeat/module/elasticsearch/ccr/ccr.go @@ -20,13 +20,13 @@ package ccr import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/ccr/data.go b/metricbeat/module/elasticsearch/ccr/data.go index 748e42ca7033..8d7d11bffa39 100644 --- a/metricbeat/module/elasticsearch/ccr/data.go +++ b/metricbeat/module/elasticsearch/ccr/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/ccr/data_test.go b/metricbeat/module/elasticsearch/ccr/data_test.go index 45f7c89464fa..c75bcdda5044 100644 --- a/metricbeat/module/elasticsearch/ccr/data_test.go +++ b/metricbeat/module/elasticsearch/ccr/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/ccr/data_xpack.go b/metricbeat/module/elasticsearch/ccr/data_xpack.go index 990f5a4043f3..547397f18a0c 100644 --- a/metricbeat/module/elasticsearch/ccr/data_xpack.go +++ b/metricbeat/module/elasticsearch/ccr/data_xpack.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go b/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go index d50def84528d..425ef0abacfc 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go +++ b/metricbeat/module/elasticsearch/cluster_stats/cluster_stats.go @@ -20,8 +20,8 @@ package cluster_stats import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/cluster_stats/data.go b/metricbeat/module/elasticsearch/cluster_stats/data.go index 23c3cef1508d..281eb1410063 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/cluster_stats/data_test.go b/metricbeat/module/elasticsearch/cluster_stats/data_test.go index 6a4c35ebad06..0078712d787e 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data_test.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data_test.go @@ -22,7 +22,7 @@ package cluster_stats import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go b/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go index 0dacb45d56fb..37ec8018b0af 100644 --- a/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/cluster_stats/data_xpack.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func clusterNeedsTLSEnabled(license *elasticsearch.License, stackStats common.MapStr) (bool, error) { diff --git a/metricbeat/module/elasticsearch/elasticsearch.go b/metricbeat/module/elasticsearch/elasticsearch.go index ca797c18402e..9698f6ce0037 100644 --- a/metricbeat/module/elasticsearch/elasticsearch.go +++ b/metricbeat/module/elasticsearch/elasticsearch.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" ) func init() { diff --git a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go index af75edb41ff4..ec302d68da88 100644 --- a/metricbeat/module/elasticsearch/elasticsearch_integration_test.go +++ b/metricbeat/module/elasticsearch/elasticsearch_integration_test.go @@ -32,21 +32,21 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/helper/elastic" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ccr" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/cluster_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/enrich" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_recovery" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/index_summary" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/ml_job" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/node_stats" - _ "github.com/elastic/beats/metricbeat/module/elasticsearch/shard" + "github.com/elastic/beats/v7/libbeat/common" + "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" ) var metricSets = []string{ diff --git a/metricbeat/module/elasticsearch/enrich/data.go b/metricbeat/module/elasticsearch/enrich/data.go index cc4fb5a24eaf..722ff41d6c38 100644 --- a/metricbeat/module/elasticsearch/enrich/data.go +++ b/metricbeat/module/elasticsearch/enrich/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/enrich/data_test.go b/metricbeat/module/elasticsearch/enrich/data_test.go index 3d3f5f6017a3..3e7fcbb97341 100644 --- a/metricbeat/module/elasticsearch/enrich/data_test.go +++ b/metricbeat/module/elasticsearch/enrich/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/enrich/data_xpack.go b/metricbeat/module/elasticsearch/enrich/data_xpack.go index 6b3029f43612..39309fd79fca 100644 --- a/metricbeat/module/elasticsearch/enrich/data_xpack.go +++ b/metricbeat/module/elasticsearch/enrich/data_xpack.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/enrich/enrich.go b/metricbeat/module/elasticsearch/enrich/enrich.go index d2acf780b9ad..6b60394a23e8 100644 --- a/metricbeat/module/elasticsearch/enrich/enrich.go +++ b/metricbeat/module/elasticsearch/enrich/enrich.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/fields.go b/metricbeat/module/elasticsearch/fields.go index c107604bfb34..b08f0c8122cb 100644 --- a/metricbeat/module/elasticsearch/fields.go +++ b/metricbeat/module/elasticsearch/fields.go @@ -20,7 +20,7 @@ package elasticsearch import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/elasticsearch/index/data.go b/metricbeat/module/elasticsearch/index/data.go index 0d5bc4688dfb..d16d8ae21900 100644 --- a/metricbeat/module/elasticsearch/index/data.go +++ b/metricbeat/module/elasticsearch/index/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) type IndicesStruct struct { diff --git a/metricbeat/module/elasticsearch/index/data_test.go b/metricbeat/module/elasticsearch/index/data_test.go index 5040c7dac4f5..b0dd46cf96e1 100644 --- a/metricbeat/module/elasticsearch/index/data_test.go +++ b/metricbeat/module/elasticsearch/index/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/index/data_xpack.go b/metricbeat/module/elasticsearch/index/data_xpack.go index 2860d509d0b1..e70bf6adb764 100644 --- a/metricbeat/module/elasticsearch/index/data_xpack.go +++ b/metricbeat/module/elasticsearch/index/data_xpack.go @@ -26,12 +26,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index/index.go b/metricbeat/module/elasticsearch/index/index.go index cdf7ddd02d82..6936b836b160 100644 --- a/metricbeat/module/elasticsearch/index/index.go +++ b/metricbeat/module/elasticsearch/index/index.go @@ -20,8 +20,8 @@ package index import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/index_recovery/data.go b/metricbeat/module/elasticsearch/index_recovery/data.go index b71a4cecf46f..1aaa731bba1e 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data.go +++ b/metricbeat/module/elasticsearch/index_recovery/data.go @@ -23,12 +23,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index_recovery/data_test.go b/metricbeat/module/elasticsearch/index_recovery/data_test.go index c06e01ca23be..19194e3161d3 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_test.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_test.go @@ -22,7 +22,7 @@ package index_recovery import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/index_recovery/data_xpack.go b/metricbeat/module/elasticsearch/index_recovery/data_xpack.go index bbef1654a84c..e8bbc3dcad5d 100644 --- a/metricbeat/module/elasticsearch/index_recovery/data_xpack.go +++ b/metricbeat/module/elasticsearch/index_recovery/data_xpack.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go index 86ed23adc00b..68d1ee295d34 100644 --- a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go +++ b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go @@ -20,8 +20,8 @@ package index_recovery import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/index_summary/data.go b/metricbeat/module/elasticsearch/index_summary/data.go index 8335f2cf018b..fe75162bf737 100644 --- a/metricbeat/module/elasticsearch/index_summary/data.go +++ b/metricbeat/module/elasticsearch/index_summary/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index_summary/data_test.go b/metricbeat/module/elasticsearch/index_summary/data_test.go index 57bd8a43b28a..e96c72bce309 100644 --- a/metricbeat/module/elasticsearch/index_summary/data_test.go +++ b/metricbeat/module/elasticsearch/index_summary/data_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/index_summary/data_xpack.go b/metricbeat/module/elasticsearch/index_summary/data_xpack.go index 8cf8a5a7b06c..d1e00ea64b86 100644 --- a/metricbeat/module/elasticsearch/index_summary/data_xpack.go +++ b/metricbeat/module/elasticsearch/index_summary/data_xpack.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/index_summary/index_summary.go b/metricbeat/module/elasticsearch/index_summary/index_summary.go index 527e796ca5d2..569e23492cb3 100644 --- a/metricbeat/module/elasticsearch/index_summary/index_summary.go +++ b/metricbeat/module/elasticsearch/index_summary/index_summary.go @@ -20,9 +20,9 @@ package index_summary import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/metricset.go b/metricbeat/module/elasticsearch/metricset.go index 7477337adf76..c1daae4f577c 100644 --- a/metricbeat/module/elasticsearch/metricset.go +++ b/metricbeat/module/elasticsearch/metricset.go @@ -18,9 +18,9 @@ package elasticsearch import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/elasticsearch/ml_job/data.go b/metricbeat/module/elasticsearch/ml_job/data.go index 9f8fe74a1c87..b914a4bd5647 100644 --- a/metricbeat/module/elasticsearch/ml_job/data.go +++ b/metricbeat/module/elasticsearch/ml_job/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/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 b6081642b9f4..07198d996fcb 100644 --- a/metricbeat/module/elasticsearch/ml_job/data_test.go +++ b/metricbeat/module/elasticsearch/ml_job/data_test.go @@ -22,7 +22,7 @@ package ml_job import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestMapper(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/ml_job/data_xpack.go b/metricbeat/module/elasticsearch/ml_job/data_xpack.go index 79e0703dff8c..04c4cec29332 100644 --- a/metricbeat/module/elasticsearch/ml_job/data_xpack.go +++ b/metricbeat/module/elasticsearch/ml_job/data_xpack.go @@ -25,10 +25,10 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, info elasticsearch.Info, content []byte) error { diff --git a/metricbeat/module/elasticsearch/ml_job/ml_job.go b/metricbeat/module/elasticsearch/ml_job/ml_job.go index f6eac74f17e2..506b1fade852 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 ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/node/data.go b/metricbeat/module/elasticsearch/node/data.go index 0670edfbcc75..56acc36752a5 100644 --- a/metricbeat/module/elasticsearch/node/data.go +++ b/metricbeat/module/elasticsearch/node/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/node/data_test.go b/metricbeat/module/elasticsearch/node/data_test.go index 9921a16fe08d..2d45181d48b4 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/node/node.go b/metricbeat/module/elasticsearch/node/node.go index 17337553ce66..29587a1dd3e8 100644 --- a/metricbeat/module/elasticsearch/node/node.go +++ b/metricbeat/module/elasticsearch/node/node.go @@ -20,9 +20,9 @@ package node import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 ca41c7b935fc..0b843fc04778 100644 --- a/metricbeat/module/elasticsearch/node/node_test.go +++ b/metricbeat/module/elasticsearch/node/node_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 94b6b965c2d6..4e860d0b52e6 100644 --- a/metricbeat/module/elasticsearch/node_stats/data.go +++ b/metricbeat/module/elasticsearch/node_stats/data.go @@ -21,16 +21,16 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/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 670b67cf2891..043a1447f253 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_test.go +++ b/metricbeat/module/elasticsearch/node_stats/data_test.go @@ -22,7 +22,7 @@ package node_stats import ( "testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func TestStats(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/node_stats/data_xpack.go b/metricbeat/module/elasticsearch/node_stats/data_xpack.go index 4f0b34269eb3..f7f612b11eef 100644 --- a/metricbeat/module/elasticsearch/node_stats/data_xpack.go +++ b/metricbeat/module/elasticsearch/node_stats/data_xpack.go @@ -25,12 +25,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/node_stats/node_stats.go b/metricbeat/module/elasticsearch/node_stats/node_stats.go index 53dc8a6fd0c4..7498948fd76a 100644 --- a/metricbeat/module/elasticsearch/node_stats/node_stats.go +++ b/metricbeat/module/elasticsearch/node_stats/node_stats.go @@ -18,8 +18,8 @@ package node_stats import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/elasticsearch/pending_tasks/data.go b/metricbeat/module/elasticsearch/pending_tasks/data.go index 9a44852d7a9d..0f414750bd65 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/data.go +++ b/metricbeat/module/elasticsearch/pending_tasks/data.go @@ -23,12 +23,12 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/pending_tasks/data_test.go b/metricbeat/module/elasticsearch/pending_tasks/data_test.go index 3d2cbfeefd2a..e38c202386cb 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/data_test.go +++ b/metricbeat/module/elasticsearch/pending_tasks/data_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var info = elasticsearch.Info{ diff --git a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go index 1dabb03da99b..01f11e763185 100644 --- a/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go +++ b/metricbeat/module/elasticsearch/pending_tasks/pending_tasks.go @@ -20,8 +20,8 @@ package pending_tasks import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 b601aa3449fa..73486638f1b5 100644 --- a/metricbeat/module/elasticsearch/shard/data.go +++ b/metricbeat/module/elasticsearch/shard/data.go @@ -23,11 +23,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "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/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) var ( diff --git a/metricbeat/module/elasticsearch/shard/data_test.go b/metricbeat/module/elasticsearch/shard/data_test.go index 35b854688762..377b73617f35 100644 --- a/metricbeat/module/elasticsearch/shard/data_test.go +++ b/metricbeat/module/elasticsearch/shard/data_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestStats(t *testing.T) { diff --git a/metricbeat/module/elasticsearch/shard/data_xpack.go b/metricbeat/module/elasticsearch/shard/data_xpack.go index bf7b443fd599..30e0e92b4dc7 100644 --- a/metricbeat/module/elasticsearch/shard/data_xpack.go +++ b/metricbeat/module/elasticsearch/shard/data_xpack.go @@ -25,10 +25,10 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func eventsMappingXPack(r mb.ReporterV2, m *MetricSet, content []byte) error { diff --git a/metricbeat/module/elasticsearch/shard/shard.go b/metricbeat/module/elasticsearch/shard/shard.go index 43c032170c35..fa46777dffde 100644 --- a/metricbeat/module/elasticsearch/shard/shard.go +++ b/metricbeat/module/elasticsearch/shard/shard.go @@ -20,8 +20,8 @@ package shard import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/elasticsearch" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/elasticsearch" ) func init() { diff --git a/metricbeat/module/elasticsearch/testing.go b/metricbeat/module/elasticsearch/testing.go index 4ea87c120bdd..a68685dd62d3 100644 --- a/metricbeat/module/elasticsearch/testing.go +++ b/metricbeat/module/elasticsearch/testing.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) // TestMapper tests mapping methods diff --git a/metricbeat/module/envoyproxy/fields.go b/metricbeat/module/envoyproxy/fields.go index a9bde3cc50b0..06afeacdf12e 100644 --- a/metricbeat/module/envoyproxy/fields.go +++ b/metricbeat/module/envoyproxy/fields.go @@ -20,7 +20,7 @@ package envoyproxy import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/envoyproxy/server/data.go b/metricbeat/module/envoyproxy/server/data.go index 37db7e0405f1..850d8c53914d 100644 --- a/metricbeat/module/envoyproxy/server/data.go +++ b/metricbeat/module/envoyproxy/server/data.go @@ -21,9 +21,9 @@ import ( "regexp" "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "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/mapstrstr" ) var ( diff --git a/metricbeat/module/envoyproxy/server/server.go b/metricbeat/module/envoyproxy/server/server.go index 4ae21ba062af..b37cd6dbcfd8 100644 --- a/metricbeat/module/envoyproxy/server/server.go +++ b/metricbeat/module/envoyproxy/server/server.go @@ -20,9 +20,9 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 b7d8a235a8e6..24e331be8c01 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 4f0e3d43516d..c4f8eb775949 100644 --- a/metricbeat/module/envoyproxy/server/server_test.go +++ b/metricbeat/module/envoyproxy/server/server_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/etcd/fields.go b/metricbeat/module/etcd/fields.go index a5007b95794f..b2d735b99088 100644 --- a/metricbeat/module/etcd/fields.go +++ b/metricbeat/module/etcd/fields.go @@ -20,7 +20,7 @@ package etcd import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/etcd/leader/data.go b/metricbeat/module/etcd/leader/data.go index e2f2f6ed2bea..15322921b37a 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type Counts struct { diff --git a/metricbeat/module/etcd/leader/leader.go b/metricbeat/module/etcd/leader/leader.go index 16a635554109..940be4a0f795 100644 --- a/metricbeat/module/etcd/leader/leader.go +++ b/metricbeat/module/etcd/leader/leader.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 cc6aaf29dee4..fb8814410457 100644 --- a/metricbeat/module/etcd/leader/leader_integration_test.go +++ b/metricbeat/module/etcd/leader/leader_integration_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 31dfa2e718ea..7fd42c3038a3 100644 --- a/metricbeat/module/etcd/leader/leader_test.go +++ b/metricbeat/module/etcd/leader/leader_test.go @@ -28,7 +28,7 @@ import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 ce4e9591338b..e6c2c1fe96be 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/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 ff323c59b695..2faa820a7446 100644 --- a/metricbeat/module/etcd/metrics/metrics_integration_test.go +++ b/metricbeat/module/etcd/metrics/metrics_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 68198bdf49a2..9be6c8b95f3a 100644 --- a/metricbeat/module/etcd/metrics/metrics_test.go +++ b/metricbeat/module/etcd/metrics/metrics_test.go @@ -22,10 +22,10 @@ package metrics import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/etcd" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/etcd" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/etcd/self/data.go b/metricbeat/module/etcd/self/data.go index e6c655c1c2bc..fd3bfe23e05d 100644 --- a/metricbeat/module/etcd/self/data.go +++ b/metricbeat/module/etcd/self/data.go @@ -20,7 +20,7 @@ package self import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type LeaderInfo struct { diff --git a/metricbeat/module/etcd/self/self.go b/metricbeat/module/etcd/self/self.go index 39e42d32e0a6..30f649db4c8c 100644 --- a/metricbeat/module/etcd/self/self.go +++ b/metricbeat/module/etcd/self/self.go @@ -20,10 +20,10 @@ package self import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/etcd/self/self_integration_test.go b/metricbeat/module/etcd/self/self_integration_test.go index d83057859061..dfbfff22f154 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 2640107659cf..9d1b8f2d2664 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "testing" ) diff --git a/metricbeat/module/etcd/store/data.go b/metricbeat/module/etcd/store/data.go index 202fcefea685..de8271d6f201 100644 --- a/metricbeat/module/etcd/store/data.go +++ b/metricbeat/module/etcd/store/data.go @@ -20,10 +20,10 @@ package store import ( "encoding/json" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/etcd/store/store.go b/metricbeat/module/etcd/store/store.go index 513cf2f42882..44baaf873fde 100644 --- a/metricbeat/module/etcd/store/store.go +++ b/metricbeat/module/etcd/store/store.go @@ -20,10 +20,10 @@ package store import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/etcd/store/store_integration_test.go b/metricbeat/module/etcd/store/store_integration_test.go index 20e954031289..ad455c4eafba 100644 --- a/metricbeat/module/etcd/store/store_integration_test.go +++ b/metricbeat/module/etcd/store/store_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 7d0353280fc7..cb1173e3eb4c 100644 --- a/metricbeat/module/etcd/store/store_test.go +++ b/metricbeat/module/etcd/store/store_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "testing" ) diff --git a/metricbeat/module/golang/expvar/expvar.go b/metricbeat/module/golang/expvar/expvar.go index 78fdbc0ff7b4..bf026f3f50ed 100644 --- a/metricbeat/module/golang/expvar/expvar.go +++ b/metricbeat/module/golang/expvar/expvar.go @@ -20,10 +20,10 @@ package expvar import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/golang" + "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" ) const ( diff --git a/metricbeat/module/golang/expvar/expvar_integration_test.go b/metricbeat/module/golang/expvar/expvar_integration_test.go index a16b97fab42b..2e722225cbde 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/golang/fields.go b/metricbeat/module/golang/fields.go index 5f4b47833d74..3a81eac50236 100644 --- a/metricbeat/module/golang/fields.go +++ b/metricbeat/module/golang/fields.go @@ -20,7 +20,7 @@ package golang import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/golang/heap/data.go b/metricbeat/module/golang/heap/data.go index 8e6134d4879b..ad052e4348eb 100644 --- a/metricbeat/module/golang/heap/data.go +++ b/metricbeat/module/golang/heap/data.go @@ -20,8 +20,8 @@ package heap import ( "runtime" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/golang" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/golang" ) //Stats contains the memory info that we get from the fetch request diff --git a/metricbeat/module/golang/heap/heap.go b/metricbeat/module/golang/heap/heap.go index 206f84dd56d1..e30142b6c916 100644 --- a/metricbeat/module/golang/heap/heap.go +++ b/metricbeat/module/golang/heap/heap.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var logger = logp.NewLogger("golang.heap") diff --git a/metricbeat/module/golang/heap/heap_integration_test.go b/metricbeat/module/golang/heap/heap_integration_test.go index 11fcff59ec1d..8214a11c686e 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/golang/util.go b/metricbeat/module/golang/util.go index 18a118d956bf..db04ae7e01ef 100644 --- a/metricbeat/module/golang/util.go +++ b/metricbeat/module/golang/util.go @@ -21,7 +21,7 @@ import ( "bytes" "strings" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) /** diff --git a/metricbeat/module/graphite/fields.go b/metricbeat/module/graphite/fields.go index c46a6148ef2b..a4845943868d 100644 --- a/metricbeat/module/graphite/fields.go +++ b/metricbeat/module/graphite/fields.go @@ -20,7 +20,7 @@ package graphite import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/graphite/server/data.go b/metricbeat/module/graphite/server/data.go index 6e6c164ea681..df6fb7ee515b 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/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) type template struct { diff --git a/metricbeat/module/graphite/server/data_test.go b/metricbeat/module/graphite/server/data_test.go index 813b7e58805d..a29dbccf426d 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func GetMetricProcessor() *metricProcessor { diff --git a/metricbeat/module/graphite/server/server.go b/metricbeat/module/graphite/server/server.go index 43007faac45f..cf29141c6835 100644 --- a/metricbeat/module/graphite/server/server.go +++ b/metricbeat/module/graphite/server/server.go @@ -20,11 +20,11 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - serverhelper "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/helper/server/tcp" - "github.com/elastic/beats/metricbeat/helper/server/udp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + 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" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/haproxy/fields.go b/metricbeat/module/haproxy/fields.go index 92f7291881be..2dcf7ca46df5 100644 --- a/metricbeat/module/haproxy/fields.go +++ b/metricbeat/module/haproxy/fields.go @@ -20,7 +20,7 @@ package haproxy import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/haproxy/haproxy.go b/metricbeat/module/haproxy/haproxy.go index 8a7089f13232..8152cb51e3f9 100644 --- a/metricbeat/module/haproxy/haproxy.go +++ b/metricbeat/module/haproxy/haproxy.go @@ -27,7 +27,7 @@ import ( "net/url" "strings" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/gocarina/gocsv" "github.com/mitchellh/mapstructure" diff --git a/metricbeat/module/haproxy/haproxy_test.go b/metricbeat/module/haproxy/haproxy_test.go index 149b89ecd90f..0eb921ccd3b6 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 c66c90542de4..1503945cb447 100644 --- a/metricbeat/module/haproxy/info/data.go +++ b/metricbeat/module/haproxy/info/data.go @@ -20,11 +20,11 @@ package info import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "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/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" "reflect" "strconv" diff --git a/metricbeat/module/haproxy/info/info.go b/metricbeat/module/haproxy/info/info.go index 4a361efb204a..a0966d1bdc78 100644 --- a/metricbeat/module/haproxy/info/info.go +++ b/metricbeat/module/haproxy/info/info.go @@ -18,9 +18,9 @@ package info import ( - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" "github.com/pkg/errors" ) diff --git a/metricbeat/module/haproxy/info/info_integration_test.go b/metricbeat/module/haproxy/info/info_integration_test.go index 209f3051f7db..aaa653e9791a 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 7a92d9ceb34b..5911180be4fb 100644 --- a/metricbeat/module/haproxy/stat/data.go +++ b/metricbeat/module/haproxy/stat/data.go @@ -20,11 +20,11 @@ package stat import ( "reflect" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "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/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" ) var ( diff --git a/metricbeat/module/haproxy/stat/stat.go b/metricbeat/module/haproxy/stat/stat.go index 8e39bd6148df..aaf68632df5c 100644 --- a/metricbeat/module/haproxy/stat/stat.go +++ b/metricbeat/module/haproxy/stat/stat.go @@ -18,9 +18,9 @@ package stat import ( - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/haproxy" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/haproxy" "github.com/pkg/errors" ) diff --git a/metricbeat/module/haproxy/stat/stat_integration_test.go b/metricbeat/module/haproxy/stat/stat_integration_test.go index f50cd7b6f6c9..8edeece69cf7 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/http/fields.go b/metricbeat/module/http/fields.go index 68862c3e815a..d8c94f37f071 100644 --- a/metricbeat/module/http/fields.go +++ b/metricbeat/module/http/fields.go @@ -20,7 +20,7 @@ package http import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/http/json/data.go b/metricbeat/module/http/json/data.go index 235baf6cd145..feabe8657f57 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/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func (m *MetricSet) processBody(response *http.Response, jsonBody interface{}) mb.Event { diff --git a/metricbeat/module/http/json/json.go b/metricbeat/module/http/json/json.go index fdfdf500a031..7803efe2f1e9 100644 --- a/metricbeat/module/http/json/json.go +++ b/metricbeat/module/http/json/json.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/http/json/json_integration_test.go b/metricbeat/module/http/json/json_integration_test.go index 4f0645001e2d..597dca2c9b6a 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 b8f21b4ae9e7..c39503e84708 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/http" + _ "github.com/elastic/beats/v7/metricbeat/module/http" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/http/server/config.go b/metricbeat/module/http/server/config.go index cb601fc74f0c..065001b06dfc 100644 --- a/metricbeat/module/http/server/config.go +++ b/metricbeat/module/http/server/config.go @@ -20,7 +20,7 @@ package server import ( "errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type HttpServerConfig struct { diff --git a/metricbeat/module/http/server/data.go b/metricbeat/module/http/server/data.go index b3c4d6655b65..a65c95e3cae1 100644 --- a/metricbeat/module/http/server/data.go +++ b/metricbeat/module/http/server/data.go @@ -24,9 +24,9 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/server" + "github.com/elastic/beats/v7/metricbeat/mb" ) type metricProcessor struct { diff --git a/metricbeat/module/http/server/data_test.go b/metricbeat/module/http/server/data_test.go index 94ab3024e132..b4ef1be5e1a9 100644 --- a/metricbeat/module/http/server/data_test.go +++ b/metricbeat/module/http/server/data_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func GetMetricProcessor() *metricProcessor { diff --git a/metricbeat/module/http/server/server.go b/metricbeat/module/http/server/server.go index ab16bd060a97..a22857dfbcec 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/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/helper/server/http" - "github.com/elastic/beats/metricbeat/mb" + 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" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/jolokia/fields.go b/metricbeat/module/jolokia/fields.go index 62f2b0fd69ba..241a0320e411 100644 --- a/metricbeat/module/jolokia/fields.go +++ b/metricbeat/module/jolokia/fields.go @@ -20,7 +20,7 @@ package jolokia import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/jolokia/jmx/config.go b/metricbeat/module/jolokia/jmx/config.go index 60b9a60ff631..4925ee6a2937 100644 --- a/metricbeat/module/jolokia/jmx/config.go +++ b/metricbeat/module/jolokia/jmx/config.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type JMXMapping struct { diff --git a/metricbeat/module/jolokia/jmx/data.go b/metricbeat/module/jolokia/jmx/data.go index 2ce2c73a8627..b7e0913fec95 100644 --- a/metricbeat/module/jolokia/jmx/data.go +++ b/metricbeat/module/jolokia/jmx/data.go @@ -23,8 +23,8 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/metricbeat/module/jolokia/jmx/data_test.go b/metricbeat/module/jolokia/jmx/data_test.go index 2fa8dd1429e9..b9b3c9d5275a 100644 --- a/metricbeat/module/jolokia/jmx/data_test.go +++ b/metricbeat/module/jolokia/jmx/data_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestEventMapper(t *testing.T) { diff --git a/metricbeat/module/jolokia/jmx/jmx.go b/metricbeat/module/jolokia/jmx/jmx.go index 187be18128a1..909a0db21665 100644 --- a/metricbeat/module/jolokia/jmx/jmx.go +++ b/metricbeat/module/jolokia/jmx/jmx.go @@ -18,12 +18,12 @@ package jmx import ( - "github.com/elastic/beats/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) var ( diff --git a/metricbeat/module/jolokia/jmx/jmx_integration_test.go b/metricbeat/module/jolokia/jmx/jmx_integration_test.go index 3fe9c31f3d75..407ecd9f9700 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kafka/broker.go b/metricbeat/module/kafka/broker.go index fa61b2dc0c51..b9e78c7dacc2 100644 --- a/metricbeat/module/kafka/broker.go +++ b/metricbeat/module/kafka/broker.go @@ -30,8 +30,8 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kafka" ) // Version returns a kafka version from its string representation diff --git a/metricbeat/module/kafka/broker/broker_integration_test.go b/metricbeat/module/kafka/broker/broker_integration_test.go index decbe5c50c99..ed16252d3d52 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/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 baa751cafd06..a863a28e2e66 100644 --- a/metricbeat/module/kafka/broker/broker_test.go +++ b/metricbeat/module/kafka/broker/broker_test.go @@ -20,10 +20,10 @@ package broker import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kafka/config.go b/metricbeat/module/kafka/config.go index f3a9ae829fb1..8d42af9982b6 100644 --- a/metricbeat/module/kafka/config.go +++ b/metricbeat/module/kafka/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) type metricsetConfig struct { diff --git a/metricbeat/module/kafka/consumer/consumer_integration_test.go b/metricbeat/module/kafka/consumer/consumer_integration_test.go index c36555426f0f..aa4dd6d4dcc6 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/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 e3dd80155668..eafda045d0d4 100644 --- a/metricbeat/module/kafka/consumer/consumer_test.go +++ b/metricbeat/module/kafka/consumer/consumer_test.go @@ -20,10 +20,10 @@ package consumer import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kafka/consumergroup/consumergroup.go b/metricbeat/module/kafka/consumergroup/consumergroup.go index 045276ed9d5b..25c0205a9f3b 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go b/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go index a30b5d108282..ee2ca076e231 100644 --- a/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go +++ b/metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go @@ -27,9 +27,9 @@ import ( saramacluster "github.com/bsm/sarama-cluster" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const ( diff --git a/metricbeat/module/kafka/consumergroup/mock_test.go b/metricbeat/module/kafka/consumergroup/mock_test.go index 030af091bff5..e25abf46a075 100644 --- a/metricbeat/module/kafka/consumergroup/mock_test.go +++ b/metricbeat/module/kafka/consumergroup/mock_test.go @@ -23,7 +23,7 @@ import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) type mockClient struct { diff --git a/metricbeat/module/kafka/consumergroup/query.go b/metricbeat/module/kafka/consumergroup/query.go index 8b9b98e3ec0b..cb200db83b50 100644 --- a/metricbeat/module/kafka/consumergroup/query.go +++ b/metricbeat/module/kafka/consumergroup/query.go @@ -20,9 +20,9 @@ package consumergroup import ( "github.com/Shopify/sarama" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) type client interface { diff --git a/metricbeat/module/kafka/consumergroup/query_test.go b/metricbeat/module/kafka/consumergroup/query_test.go index febf616b67e7..6c913fb9428e 100644 --- a/metricbeat/module/kafka/consumergroup/query_test.go +++ b/metricbeat/module/kafka/consumergroup/query_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestFetchGroupInfo(t *testing.T) { diff --git a/metricbeat/module/kafka/fields.go b/metricbeat/module/kafka/fields.go index 38e2bfb076b1..7920163da93d 100644 --- a/metricbeat/module/kafka/fields.go +++ b/metricbeat/module/kafka/fields.go @@ -20,7 +20,7 @@ package kafka import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kafka/kafka.go b/metricbeat/module/kafka/kafka.go index fac3108470eb..c610c126f50f 100644 --- a/metricbeat/module/kafka/kafka.go +++ b/metricbeat/module/kafka/kafka.go @@ -17,6 +17,6 @@ package kafka -import "github.com/elastic/beats/libbeat/logp" +import "github.com/elastic/beats/v7/libbeat/logp" var debugf = logp.MakeDebug("kafka") diff --git a/metricbeat/module/kafka/metricset.go b/metricbeat/module/kafka/metricset.go index 624e1aa8d348..73c1be02218c 100644 --- a/metricbeat/module/kafka/metricset.go +++ b/metricbeat/module/kafka/metricset.go @@ -20,8 +20,8 @@ package kafka import ( "crypto/tls" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet is the base metricset for all Kafka metricsets diff --git a/metricbeat/module/kafka/partition/partition.go b/metricbeat/module/kafka/partition/partition.go index 4aa5c3a5721a..7a1e8aeebf9d 100644 --- a/metricbeat/module/kafka/partition/partition.go +++ b/metricbeat/module/kafka/partition/partition.go @@ -24,11 +24,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kafka" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/kafka" ) // init registers the partition MetricSet with the central registry. diff --git a/metricbeat/module/kafka/partition/partition_integration_test.go b/metricbeat/module/kafka/partition/partition_integration_test.go index af5b0f72ea5b..a78634cb59be 100644 --- a/metricbeat/module/kafka/partition/partition_integration_test.go +++ b/metricbeat/module/kafka/partition/partition_integration_test.go @@ -29,10 +29,10 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const ( diff --git a/metricbeat/module/kafka/producer/producer_integration_test.go b/metricbeat/module/kafka/producer/producer_integration_test.go index 711b516e9f28..b66f58385438 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/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 2cf33e994a56..0469ea57ced9 100644 --- a/metricbeat/module/kafka/producer/producer_test.go +++ b/metricbeat/module/kafka/producer/producer_test.go @@ -20,10 +20,10 @@ package producer import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/jolokia" - _ "github.com/elastic/beats/metricbeat/module/jolokia/jmx" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia" + _ "github.com/elastic/beats/v7/metricbeat/module/jolokia/jmx" ) func init() { diff --git a/metricbeat/module/kibana/fields.go b/metricbeat/module/kibana/fields.go index 5fa5228de54e..eeddf8d856a3 100644 --- a/metricbeat/module/kibana/fields.go +++ b/metricbeat/module/kibana/fields.go @@ -20,7 +20,7 @@ package kibana import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kibana/kibana.go b/metricbeat/module/kibana/kibana.go index 24a49559d51f..4acb124695be 100644 --- a/metricbeat/module/kibana/kibana.go +++ b/metricbeat/module/kibana/kibana.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kibana/kibana_test.go b/metricbeat/module/kibana/kibana_test.go index ca4e2b562617..be2158019aae 100644 --- a/metricbeat/module/kibana/kibana_test.go +++ b/metricbeat/module/kibana/kibana_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestIsStatsAPIAvailable(t *testing.T) { diff --git a/metricbeat/module/kibana/metricset.go b/metricbeat/module/kibana/metricset.go index f099bd775753..1a68669fe58e 100644 --- a/metricbeat/module/kibana/metricset.go +++ b/metricbeat/module/kibana/metricset.go @@ -18,7 +18,7 @@ package kibana import ( - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet can be used to build other metricsets within the Kibana module. diff --git a/metricbeat/module/kibana/stats/data.go b/metricbeat/module/kibana/stats/data.go index 6f776e306a0e..e560e7d5cffe 100644 --- a/metricbeat/module/kibana/stats/data.go +++ b/metricbeat/module/kibana/stats/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kibana" + "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/kibana" ) var ( diff --git a/metricbeat/module/kibana/stats/data_test.go b/metricbeat/module/kibana/stats/data_test.go index b5101c3349a8..98c38c44d3cd 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/data_xpack.go b/metricbeat/module/kibana/stats/data_xpack.go index 5dc2cf8f241e..30c3c75190ad 100644 --- a/metricbeat/module/kibana/stats/data_xpack.go +++ b/metricbeat/module/kibana/stats/data_xpack.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "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" ) var ( diff --git a/metricbeat/module/kibana/stats/data_xpack_test.go b/metricbeat/module/kibana/stats/data_xpack_test.go index db7605f8e23c..d5c36fef1f0d 100644 --- a/metricbeat/module/kibana/stats/data_xpack_test.go +++ b/metricbeat/module/kibana/stats/data_xpack_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMappingStatsXPack(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go index d84c1dfcfe74..526a525951c2 100644 --- a/metricbeat/module/kibana/stats/stats.go +++ b/metricbeat/module/kibana/stats/stats.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kibana" + "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" ) // 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 c8c19e57e245..8bbf584000de 100644 --- a/metricbeat/module/kibana/stats/stats_integration_test.go +++ b/metricbeat/module/kibana/stats/stats_integration_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/kibana" - "github.com/elastic/beats/metricbeat/module/kibana/mtest" + 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" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kibana/stats/stats_test.go b/metricbeat/module/kibana/stats/stats_test.go index 291f60352d2e..b6757e5ecb21 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/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/kibana/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/kibana/mtest" ) func TestFetchUsage(t *testing.T) { diff --git a/metricbeat/module/kibana/status/data.go b/metricbeat/module/kibana/status/data.go index 9aa93cf72cff..93173165fb60 100644 --- a/metricbeat/module/kibana/status/data.go +++ b/metricbeat/module/kibana/status/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kibana" + "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/kibana" ) var ( diff --git a/metricbeat/module/kibana/status/data_test.go b/metricbeat/module/kibana/status/data_test.go index 2acaf056e728..73cfcfd09106 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 3d9bae94c0c7..c386ccb00101 100644 --- a/metricbeat/module/kibana/status/status.go +++ b/metricbeat/module/kibana/status/status.go @@ -20,10 +20,10 @@ package status import ( "fmt" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kibana" + "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" ) // 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 b6413ea9b9aa..003dd34f4524 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/kibana/mtest" + "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" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/kibana/status/status_test.go b/metricbeat/module/kibana/status/status_test.go index 8bfb45fa6c6e..406619a4ccb2 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kibana" + _ "github.com/elastic/beats/v7/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 c14accf31236..c49f80c8b768 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/apiserver/apiserver_test.go b/metricbeat/module/kubernetes/apiserver/apiserver_test.go index 01ab59603ead..42d8b2231434 100644 --- a/metricbeat/module/kubernetes/apiserver/apiserver_test.go +++ b/metricbeat/module/kubernetes/apiserver/apiserver_test.go @@ -22,9 +22,9 @@ package apiserver import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + "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" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/apiserver/metricset.go b/metricbeat/module/kubernetes/apiserver/metricset.go index 81a4c5e43c07..75cf428157c7 100644 --- a/metricbeat/module/kubernetes/apiserver/metricset.go +++ b/metricbeat/module/kubernetes/apiserver/metricset.go @@ -20,8 +20,8 @@ package apiserver import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Metricset for apiserver is a prometheus based metricset diff --git a/metricbeat/module/kubernetes/container/container.go b/metricbeat/module/kubernetes/container/container.go index acbf437163dd..718696a0a4f9 100644 --- a/metricbeat/module/kubernetes/container/container.go +++ b/metricbeat/module/kubernetes/container/container.go @@ -20,11 +20,11 @@ package container import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/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/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/container/container_test.go b/metricbeat/module/kubernetes/container/container_test.go index 5d622b3ffed2..42f1fe710f30 100644 --- a/metricbeat/module/kubernetes/container/container_test.go +++ b/metricbeat/module/kubernetes/container/container_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/container/data.go b/metricbeat/module/kubernetes/container/data.go index 93e6f9bc620c..53a795624d98 100644 --- a/metricbeat/module/kubernetes/container/data.go +++ b/metricbeat/module/kubernetes/container/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager.go b/metricbeat/module/kubernetes/controllermanager/controllermanager.go index db90b4dee712..dee40ebfcff4 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager.go @@ -18,8 +18,8 @@ package controllermanager import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go b/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go index c121a557d6ab..daa65789b756 100644 --- a/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go +++ b/metricbeat/module/kubernetes/controllermanager/controllermanager_test.go @@ -22,7 +22,7 @@ package controllermanager import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/event/event.go b/metricbeat/module/kubernetes/event/event.go index 81f6b237697a..89be60274524 100644 --- a/metricbeat/module/kubernetes/event/event.go +++ b/metricbeat/module/kubernetes/event/event.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/common/safemapstr" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common/safemapstr" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/kubernetes/event/event_test.go b/metricbeat/module/kubernetes/event/event_test.go index 2086a2d03ef5..6b441f13b065 100644 --- a/metricbeat/module/kubernetes/event/event_test.go +++ b/metricbeat/module/kubernetes/event/event_test.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestGenerateMapStrFromEvent(t *testing.T) { diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go index a45bbe916f6e..8042c638052a 100644 --- a/metricbeat/module/kubernetes/fields.go +++ b/metricbeat/module/kubernetes/fields.go @@ -20,7 +20,7 @@ package kubernetes import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/kubernetes/node/data.go b/metricbeat/module/kubernetes/node/data.go index 0d055880ee6d..9c2ab8eaec5a 100644 --- a/metricbeat/module/kubernetes/node/data.go +++ b/metricbeat/module/kubernetes/node/data.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func eventMapping(content []byte) (common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/node/node.go b/metricbeat/module/kubernetes/node/node.go index 804600ecb690..9868f3ec2cde 100644 --- a/metricbeat/module/kubernetes/node/node.go +++ b/metricbeat/module/kubernetes/node/node.go @@ -20,13 +20,13 @@ package node import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/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/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/node/node_test.go b/metricbeat/module/kubernetes/node/node_test.go index 2a27f186fae6..e240c31d174f 100644 --- a/metricbeat/module/kubernetes/node/node_test.go +++ b/metricbeat/module/kubernetes/node/node_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/pod/data.go b/metricbeat/module/kubernetes/pod/data.go index ccfa3a8ef518..ff53f4dbb1dd 100644 --- a/metricbeat/module/kubernetes/pod/data.go +++ b/metricbeat/module/kubernetes/pod/data.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/pod/pod.go b/metricbeat/module/kubernetes/pod/pod.go index 8762f6ad1dd7..4c47cb6863c8 100644 --- a/metricbeat/module/kubernetes/pod/pod.go +++ b/metricbeat/module/kubernetes/pod/pod.go @@ -20,12 +20,12 @@ package pod import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/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/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/pod/pod_test.go b/metricbeat/module/kubernetes/pod/pod_test.go index 6b0a5069c590..d6333b0776e6 100644 --- a/metricbeat/module/kubernetes/pod/pod_test.go +++ b/metricbeat/module/kubernetes/pod/pod_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/proxy/proxy.go b/metricbeat/module/kubernetes/proxy/proxy.go index c675f7a7110e..520a708f31d6 100644 --- a/metricbeat/module/kubernetes/proxy/proxy.go +++ b/metricbeat/module/kubernetes/proxy/proxy.go @@ -18,8 +18,8 @@ package proxy import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/proxy/proxy_test.go b/metricbeat/module/kubernetes/proxy/proxy_test.go index 99838d8562d3..79a940dced0c 100644 --- a/metricbeat/module/kubernetes/proxy/proxy_test.go +++ b/metricbeat/module/kubernetes/proxy/proxy_test.go @@ -22,7 +22,7 @@ package proxy import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/scheduler/scheduler.go b/metricbeat/module/kubernetes/scheduler/scheduler.go index 123b0f7eef1b..201e4fdb6d5a 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler.go @@ -18,8 +18,8 @@ package scheduler import ( - "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/scheduler/scheduler_test.go b/metricbeat/module/kubernetes/scheduler/scheduler_test.go index e3dbbf5d6769..301319d9d5ae 100644 --- a/metricbeat/module/kubernetes/scheduler/scheduler_test.go +++ b/metricbeat/module/kubernetes/scheduler/scheduler_test.go @@ -22,7 +22,7 @@ package scheduler import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) const testFile = "_meta/test/metrics" diff --git a/metricbeat/module/kubernetes/state_container/state_container.go b/metricbeat/module/kubernetes/state_container/state_container.go index e2771ac9cd6e..647fcff8b4fe 100644 --- a/metricbeat/module/kubernetes/state_container/state_container.go +++ b/metricbeat/module/kubernetes/state_container/state_container.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + p "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/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_container/state_container_test.go b/metricbeat/module/kubernetes/state_container/state_container_test.go index a74fc8836e9d..d3bbe08f92b6 100644 --- a/metricbeat/module/kubernetes/state_container/state_container_test.go +++ b/metricbeat/module/kubernetes/state_container/state_container_test.go @@ -22,10 +22,10 @@ package state_container import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go b/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go index 58d61d5ccccf..a0fc4f120c8f 100644 --- a/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go +++ b/metricbeat/module/kubernetes/state_cronjob/state_cronjob.go @@ -20,9 +20,9 @@ package state_cronjob import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go index a767226c2799..c04acbce0d01 100644 --- a/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go +++ b/metricbeat/module/kubernetes/state_cronjob/state_cronjob_test.go @@ -22,7 +22,7 @@ package state_cronjob import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment.go b/metricbeat/module/kubernetes/state_deployment/state_deployment.go index 3ce8b7d382a6..ded9115d1cec 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment.go @@ -18,12 +18,12 @@ package state_deployment import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/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" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go b/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go index 98781161d20b..8d70c8ac3b18 100644 --- a/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go +++ b/metricbeat/module/kubernetes/state_deployment/state_deployment_test.go @@ -22,9 +22,9 @@ package state_deployment import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + "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" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_node/state_node.go b/metricbeat/module/kubernetes/state_node/state_node.go index 8835f3f09cd6..bd3349152402 100644 --- a/metricbeat/module/kubernetes/state_node/state_node.go +++ b/metricbeat/module/kubernetes/state_node/state_node.go @@ -20,11 +20,11 @@ package state_node import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common/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" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_node/state_node_test.go b/metricbeat/module/kubernetes/state_node/state_node_test.go index 780617d13a0d..9cb46fa715b7 100644 --- a/metricbeat/module/kubernetes/state_node/state_node_test.go +++ b/metricbeat/module/kubernetes/state_node/state_node_test.go @@ -22,10 +22,10 @@ package state_node import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go index 7c55729374de..6505e1e0be63 100644 --- a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go +++ b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go @@ -18,8 +18,8 @@ package state_persistentvolume import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go index f3f700a64c19..fc7f93507af6 100644 --- a/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume_test.go @@ -22,7 +22,7 @@ package state_persistentvolume import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go index 25b2c7616571..b7685089a83e 100644 --- a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go +++ b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go @@ -18,8 +18,8 @@ package state_persistentvolumeclaim import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go index 210cd91826bd..71e3c282ddc0 100644 --- a/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go +++ b/metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim_test.go @@ -22,7 +22,7 @@ package state_persistentvolumeclaim import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_pod/state_pod.go b/metricbeat/module/kubernetes/state_pod/state_pod.go index 543fa946e2a3..7a531e0a5e80 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod.go @@ -18,12 +18,12 @@ package state_pod import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/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" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_pod/state_pod_test.go b/metricbeat/module/kubernetes/state_pod/state_pod_test.go index 2848865d59ae..068c5fdc9a7b 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod_test.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod_test.go @@ -22,10 +22,10 @@ package state_pod import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go index fe387e7a53bd..cc24af630bd7 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset.go @@ -18,12 +18,12 @@ package state_replicaset import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/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" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go index f8311dcf932b..ea32d7257745 100644 --- a/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go +++ b/metricbeat/module/kubernetes/state_replicaset/state_replicaset_test.go @@ -22,10 +22,10 @@ package state_replicaset import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go index 0cd31adf8ac1..8901714bf330 100644 --- a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go +++ b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go @@ -18,8 +18,8 @@ package state_resourcequota import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go index 4f8f9a197a43..b32130eaa5d1 100644 --- a/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go +++ b/metricbeat/module/kubernetes/state_resourcequota/state_resourcequota_test.go @@ -22,7 +22,7 @@ package state_resourcequota import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_service/state_service.go b/metricbeat/module/kubernetes/state_service/state_service.go index 9de1bc270af8..4cadbb5aa747 100644 --- a/metricbeat/module/kubernetes/state_service/state_service.go +++ b/metricbeat/module/kubernetes/state_service/state_service.go @@ -18,8 +18,8 @@ package state_service import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_service/state_service_test.go b/metricbeat/module/kubernetes/state_service/state_service_test.go index 8b2e9e42e7f6..cae6735c6e5c 100644 --- a/metricbeat/module/kubernetes/state_service/state_service_test.go +++ b/metricbeat/module/kubernetes/state_service/state_service_test.go @@ -22,7 +22,7 @@ package state_service import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go b/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go index 172069103a80..cadaf4a72383 100644 --- a/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go +++ b/metricbeat/module/kubernetes/state_statefulset/state_statefulset.go @@ -18,12 +18,12 @@ package state_statefulset import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/kubernetes/util" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/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" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes/util" ) const ( diff --git a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go index a618a8bdea14..119e4d16e4bb 100644 --- a/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go +++ b/metricbeat/module/kubernetes/state_statefulset/state_statefulset_test.go @@ -22,11 +22,11 @@ package state_statefulset import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/kubernetes" + _ "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go b/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go index 356485d49a1d..98db701cfeb1 100644 --- a/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go +++ b/metricbeat/module/kubernetes/state_storageclass/state_storageclass.go @@ -18,8 +18,8 @@ package state_storageclass import ( - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go index 524121ce6faa..c8552663dda6 100644 --- a/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go +++ b/metricbeat/module/kubernetes/state_storageclass/state_storageclass_test.go @@ -22,7 +22,7 @@ package state_storageclass import ( "testing" - "github.com/elastic/beats/metricbeat/helper/prometheus/ptest" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus/ptest" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/kubernetes/system/data.go b/metricbeat/module/kubernetes/system/data.go index 6cf09f85335b..7e839211bfc7 100644 --- a/metricbeat/module/kubernetes/system/data.go +++ b/metricbeat/module/kubernetes/system/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func eventMapping(content []byte) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/system/system.go b/metricbeat/module/kubernetes/system/system.go index fd9495b392e0..b10c9c4afb3b 100644 --- a/metricbeat/module/kubernetes/system/system.go +++ b/metricbeat/module/kubernetes/system/system.go @@ -20,10 +20,10 @@ package system import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/kubernetes/system/system_test.go b/metricbeat/module/kubernetes/system/system_test.go index 23db40d9973c..657c4c1903b8 100644 --- a/metricbeat/module/kubernetes/system/system_test.go +++ b/metricbeat/module/kubernetes/system/system_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kubernetes/util/kubernetes.go b/metricbeat/module/kubernetes/util/kubernetes.go index df88096f810a..7f8317daa351 100644 --- a/metricbeat/module/kubernetes/util/kubernetes.go +++ b/metricbeat/module/kubernetes/util/kubernetes.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/kubernetes/metadata" + "github.com/elastic/beats/v7/libbeat/common/kubernetes/metadata" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/resource" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Enricher takes Kubernetes events and enrich them with k8s metadata diff --git a/metricbeat/module/kubernetes/util/kubernetes_test.go b/metricbeat/module/kubernetes/util/kubernetes_test.go index 210baa3801cf..bab34ef6cd30 100644 --- a/metricbeat/module/kubernetes/util/kubernetes_test.go +++ b/metricbeat/module/kubernetes/util/kubernetes_test.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/kubernetes" ) func TestBuildMetadataEnricher(t *testing.T) { diff --git a/metricbeat/module/kubernetes/util/metrics_cache.go b/metricbeat/module/kubernetes/util/metrics_cache.go index 7ffff06edfea..3fdf59d8b16f 100644 --- a/metricbeat/module/kubernetes/util/metrics_cache.go +++ b/metricbeat/module/kubernetes/util/metrics_cache.go @@ -20,7 +20,7 @@ package util import ( "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // PerfMetrics stores known metrics from Kubernetes nodes and containers diff --git a/metricbeat/module/kubernetes/volume/data.go b/metricbeat/module/kubernetes/volume/data.go index 756d998a98d4..ae0f5d891f49 100644 --- a/metricbeat/module/kubernetes/volume/data.go +++ b/metricbeat/module/kubernetes/volume/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/kubernetes" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/kubernetes" ) func eventMapping(content []byte) ([]common.MapStr, error) { diff --git a/metricbeat/module/kubernetes/volume/volume.go b/metricbeat/module/kubernetes/volume/volume.go index b4a9589ca9aa..102d8edfabca 100644 --- a/metricbeat/module/kubernetes/volume/volume.go +++ b/metricbeat/module/kubernetes/volume/volume.go @@ -20,10 +20,10 @@ package volume import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/kubernetes/volume/volume_test.go b/metricbeat/module/kubernetes/volume/volume_test.go index fea2d75e83b4..e527a64d452c 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const testFile = "../_meta/test/stats_summary.json" diff --git a/metricbeat/module/kvm/dommemstat/dommemstat.go b/metricbeat/module/kvm/dommemstat/dommemstat.go index b198719e8477..8beb22d433c7 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat.go @@ -22,15 +22,15 @@ import ( "net/url" "time" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/pkg/errors" "github.com/digitalocean/go-libvirt" "github.com/digitalocean/go-libvirt/libvirttest" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/metricbeat/module/kvm/dommemstat/dommemstat_test.go b/metricbeat/module/kvm/dommemstat/dommemstat_test.go index 3aa4c0ff6377..087b941dbfa5 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat_test.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/digitalocean/go-libvirt/libvirttest" ) diff --git a/metricbeat/module/kvm/fields.go b/metricbeat/module/kvm/fields.go index 9b4f2e7e211d..7dd21356f954 100644 --- a/metricbeat/module/kvm/fields.go +++ b/metricbeat/module/kvm/fields.go @@ -20,7 +20,7 @@ package kvm import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/logstash/fields.go b/metricbeat/module/logstash/fields.go index 8bf468ea3718..a1f6963e9c00 100644 --- a/metricbeat/module/logstash/fields.go +++ b/metricbeat/module/logstash/fields.go @@ -20,7 +20,7 @@ package logstash import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/logstash/logstash.go b/metricbeat/module/logstash/logstash.go index d53933421243..3e5e57ac1c20 100644 --- a/metricbeat/module/logstash/logstash.go +++ b/metricbeat/module/logstash/logstash.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/metricbeat/module/logstash/logstash_integration_test.go b/metricbeat/module/logstash/logstash_integration_test.go index 379d6aabaf26..30dca909a1ea 100644 --- a/metricbeat/module/logstash/logstash_integration_test.go +++ b/metricbeat/module/logstash/logstash_integration_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/logstash" - _ "github.com/elastic/beats/metricbeat/module/logstash/node" - _ "github.com/elastic/beats/metricbeat/module/logstash/node_stats" + "github.com/elastic/beats/v7/libbeat/tests/compose" + 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" ) var metricSets = []string{ diff --git a/metricbeat/module/logstash/node/data.go b/metricbeat/module/logstash/node/data.go index 525ea1b014e7..b1a6ef97ae41 100644 --- a/metricbeat/module/logstash/node/data.go +++ b/metricbeat/module/logstash/node/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/logstash" + "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" ) var ( diff --git a/metricbeat/module/logstash/node/data_test.go b/metricbeat/module/logstash/node/data_test.go index d9f72a642d81..65539432d8a8 100644 --- a/metricbeat/module/logstash/node/data_test.go +++ b/metricbeat/module/logstash/node/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/logstash/node/data_xpack.go b/metricbeat/module/logstash/node/data_xpack.go index c076cf3a41ae..96fc252158c4 100644 --- a/metricbeat/module/logstash/node/data_xpack.go +++ b/metricbeat/module/logstash/node/data_xpack.go @@ -20,10 +20,10 @@ package node import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/logstash" ) func eventMappingXPack(r mb.ReporterV2, m *MetricSet, pipelines []logstash.PipelineState, overrideClusterUUID string) error { diff --git a/metricbeat/module/logstash/node/node.go b/metricbeat/module/logstash/node/node.go index e076e990ac24..025d013e7566 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/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 052a5b4ad315..da2f2f3b7c36 100644 --- a/metricbeat/module/logstash/node_stats/data.go +++ b/metricbeat/module/logstash/node_stats/data.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/logstash" + "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" ) var ( diff --git a/metricbeat/module/logstash/node_stats/data_test.go b/metricbeat/module/logstash/node_stats/data_test.go index dc824ac68173..2ae2407ca9e6 100644 --- a/metricbeat/module/logstash/node_stats/data_test.go +++ b/metricbeat/module/logstash/node_stats/data_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/logstash/node_stats/data_xpack.go b/metricbeat/module/logstash/node_stats/data_xpack.go index 4d9e071f4009..0394d0719d93 100644 --- a/metricbeat/module/logstash/node_stats/data_xpack.go +++ b/metricbeat/module/logstash/node_stats/data_xpack.go @@ -21,13 +21,13 @@ import ( "encoding/json" "time" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/metricbeat/module/logstash" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/elastic" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/elastic" + "github.com/elastic/beats/v7/metricbeat/mb" ) type jvm struct { diff --git a/metricbeat/module/logstash/node_stats/node_stats.go b/metricbeat/module/logstash/node_stats/node_stats.go index 7e212585b551..29a5a7d59c3b 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 ( "sync" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/logstash" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 c675dce5afe9..d9fa12ddab89 100644 --- a/metricbeat/module/memcached/fields.go +++ b/metricbeat/module/memcached/fields.go @@ -20,7 +20,7 @@ package memcached import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/memcached/stats/data.go b/metricbeat/module/memcached/stats/data.go index e3b1b57ea0b5..9d7bf9fac6d7 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/metricbeat/module/memcached/stats/stats.go b/metricbeat/module/memcached/stats/stats.go index 52c938a63428..fc0e0f3d084a 100644 --- a/metricbeat/module/memcached/stats/stats.go +++ b/metricbeat/module/memcached/stats/stats.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 cc3e21e028aa..7c3a6222ae66 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/mongodb/collstats/collstats.go b/metricbeat/module/mongodb/collstats/collstats.go index c39de01a18aa..ebf7db992cef 100644 --- a/metricbeat/module/mongodb/collstats/collstats.go +++ b/metricbeat/module/mongodb/collstats/collstats.go @@ -20,9 +20,9 @@ package collstats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" ) func init() { diff --git a/metricbeat/module/mongodb/collstats/collstats_integration_test.go b/metricbeat/module/mongodb/collstats/collstats_integration_test.go index 2ef510797dca..7d135fb51a35 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/collstats/data.go b/metricbeat/module/mongodb/collstats/data.go index b07e9d8a6d80..5d70c68f7f36 100644 --- a/metricbeat/module/mongodb/collstats/data.go +++ b/metricbeat/module/mongodb/collstats/data.go @@ -21,7 +21,7 @@ import ( "errors" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func eventMapping(key string, data common.MapStr) (common.MapStr, error) { diff --git a/metricbeat/module/mongodb/collstats/data_test.go b/metricbeat/module/mongodb/collstats/data_test.go index 8b0cbf220b22..5c2c7ae36d51 100644 --- a/metricbeat/module/mongodb/collstats/data_test.go +++ b/metricbeat/module/mongodb/collstats/data_test.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mongodb/dbstats/data.go b/metricbeat/module/mongodb/dbstats/data.go index 05514a0eca8a..15b57fef448a 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 6325b98342a8..4153793ed26b 100644 --- a/metricbeat/module/mongodb/dbstats/dbstats.go +++ b/metricbeat/module/mongodb/dbstats/dbstats.go @@ -20,10 +20,10 @@ package dbstats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" ) var logger = logp.NewLogger("mongodb.dbstats") diff --git a/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go b/metricbeat/module/mongodb/dbstats/dbstats_integration_test.go index 6eb2b47d7f0f..70c34006ac8d 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/fields.go b/metricbeat/module/mongodb/fields.go index d58cbd012548..ae38c9b87248 100644 --- a/metricbeat/module/mongodb/fields.go +++ b/metricbeat/module/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/mongodb/metrics/data.go b/metricbeat/module/mongodb/metrics/data.go index 920cf6f07777..30f166e7d6eb 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 5681b160a2b6..da2b0ddb6759 100644 --- a/metricbeat/module/mongodb/metrics/metrics.go +++ b/metricbeat/module/mongodb/metrics/metrics.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" "gopkg.in/mgo.v2/bson" - "github.com/elastic/beats/libbeat/common/schema" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 8100c9adb17d..c5415356afbf 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/metricset.go b/metricbeat/module/mongodb/metricset.go index cc75df8048ea..b1b09a7ac4da 100644 --- a/metricbeat/module/mongodb/metricset.go +++ b/metricbeat/module/mongodb/metricset.go @@ -23,9 +23,9 @@ import ( "gopkg.in/mgo.v2" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // ModuleConfig contains the common configuration for this module diff --git a/metricbeat/module/mongodb/mongodb.go b/metricbeat/module/mongodb/mongodb.go index 57747684e399..23f9ceb5b225 100644 --- a/metricbeat/module/mongodb/mongodb.go +++ b/metricbeat/module/mongodb/mongodb.go @@ -22,9 +22,9 @@ import ( "net/url" "strings" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" mgo "gopkg.in/mgo.v2" ) diff --git a/metricbeat/module/mongodb/mongodb_test.go b/metricbeat/module/mongodb/mongodb_test.go index 6b5a46a036a2..61756b1e6bd8 100644 --- a/metricbeat/module/mongodb/mongodb_test.go +++ b/metricbeat/module/mongodb/mongodb_test.go @@ -20,7 +20,7 @@ package mongodb import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mongodb/replstatus/data.go b/metricbeat/module/mongodb/replstatus/data.go index cf2539c1eecc..fdeeb2b53814 100644 --- a/metricbeat/module/mongodb/replstatus/data.go +++ b/metricbeat/module/mongodb/replstatus/data.go @@ -18,7 +18,7 @@ package replstatus import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func eventMapping(oplogInfo oplogInfo, replStatus MongoReplStatus) common.MapStr { diff --git a/metricbeat/module/mongodb/replstatus/replstatus.go b/metricbeat/module/mongodb/replstatus/replstatus.go index 8e693ea11176..fd734823490f 100644 --- a/metricbeat/module/mongodb/replstatus/replstatus.go +++ b/metricbeat/module/mongodb/replstatus/replstatus.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 afb1b082b3ce..12f010ee3540 100644 --- a/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go +++ b/metricbeat/module/mongodb/replstatus/replstatus_integration_test.go @@ -27,10 +27,10 @@ import ( mgo "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "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" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mongodb/status/data.go b/metricbeat/module/mongodb/status/data.go index 749a69768ca0..ef254eca56c2 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 c874ad3e9db6..8615d84e3582 100644 --- a/metricbeat/module/mongodb/status/status.go +++ b/metricbeat/module/mongodb/status/status.go @@ -20,9 +20,9 @@ package status import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mongodb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mongodb" "gopkg.in/mgo.v2/bson" ) diff --git a/metricbeat/module/mongodb/status/status_integration_test.go b/metricbeat/module/mongodb/status/status_integration_test.go index c13f47073ab1..0d69a03d3f74 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/munin/fields.go b/metricbeat/module/munin/fields.go index 3d879b85f9ed..4201760b3982 100644 --- a/metricbeat/module/munin/fields.go +++ b/metricbeat/module/munin/fields.go @@ -20,7 +20,7 @@ package munin import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/munin/munin.go b/metricbeat/module/munin/munin.go index 7c2fd40c0d82..39837a42bcd1 100644 --- a/metricbeat/module/munin/munin.go +++ b/metricbeat/module/munin/munin.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/metricbeat/module/munin/munin_test.go b/metricbeat/module/munin/munin_test.go index 1da93165ddb9..9ae6407d7ee8 100644 --- a/metricbeat/module/munin/munin_test.go +++ b/metricbeat/module/munin/munin_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func dummyNode(response string) *Node { diff --git a/metricbeat/module/munin/node/node.go b/metricbeat/module/munin/node/node.go index 62c15bd77e9d..529031a500c7 100644 --- a/metricbeat/module/munin/node/node.go +++ b/metricbeat/module/munin/node/node.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/munin" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/munin" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/munin/node/node_integration_test.go b/metricbeat/module/munin/node/node_integration_test.go index 72fe1bf38b69..2fd4f0396ae3 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/mysql/fields.go b/metricbeat/module/mysql/fields.go index 86d1346e1131..166d37fe7578 100644 --- a/metricbeat/module/mysql/fields.go +++ b/metricbeat/module/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/mysql/galera_status/data.go b/metricbeat/module/mysql/galera_status/data.go index a15c010c85ae..82fa64c44b7c 100644 --- a/metricbeat/module/mysql/galera_status/data.go +++ b/metricbeat/module/mysql/galera_status/data.go @@ -18,9 +18,9 @@ package galera_status import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "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/mapstrstr" ) var ( diff --git a/metricbeat/module/mysql/galera_status/status.go b/metricbeat/module/mysql/galera_status/status.go index ba95a43f3a10..54b4d8a90d88 100644 --- a/metricbeat/module/mysql/galera_status/status.go +++ b/metricbeat/module/mysql/galera_status/status.go @@ -27,9 +27,9 @@ package galera_status import ( "database/sql" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mysql" + "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/pkg/errors" ) diff --git a/metricbeat/module/mysql/mysql.go b/metricbeat/module/mysql/mysql.go index 5497f92cc935..a98530ebd205 100644 --- a/metricbeat/module/mysql/mysql.go +++ b/metricbeat/module/mysql/mysql.go @@ -23,7 +23,7 @@ package mysql import ( "database/sql" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/go-sql-driver/mysql" "github.com/pkg/errors" diff --git a/metricbeat/module/mysql/mysql_integration_test.go b/metricbeat/module/mysql/mysql_integration_test.go index ff97f2d4ed8a..585cf011f9ea 100644 --- a/metricbeat/module/mysql/mysql_integration_test.go +++ b/metricbeat/module/mysql/mysql_integration_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - _ "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + _ "github.com/elastic/beats/v7/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 58f463d7f6de..1497dc78c355 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/mysql/status/data.go b/metricbeat/module/mysql/status/data.go index 79a4bc17266f..de1f9579e952 100644 --- a/metricbeat/module/mysql/status/data.go +++ b/metricbeat/module/mysql/status/data.go @@ -18,9 +18,9 @@ package status import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + "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/mapstrstr" ) var ( diff --git a/metricbeat/module/mysql/status/status.go b/metricbeat/module/mysql/status/status.go index e8fd6a9ee00e..b2da6ec3551e 100644 --- a/metricbeat/module/mysql/status/status.go +++ b/metricbeat/module/mysql/status/status.go @@ -26,8 +26,8 @@ package status import ( "database/sql" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/mysql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/mysql" "github.com/pkg/errors" ) diff --git a/metricbeat/module/mysql/status/status_integration_test.go b/metricbeat/module/mysql/status/status_integration_test.go index 687d70337a88..2b0b2a510d99 100644 --- a/metricbeat/module/mysql/status/status_integration_test.go +++ b/metricbeat/module/mysql/status/status_integration_test.go @@ -22,10 +22,10 @@ package status import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/mysql" + "github.com/elastic/beats/v7/libbeat/common" + "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/stretchr/testify/assert" ) diff --git a/metricbeat/module/mysql/status/status_test.go b/metricbeat/module/mysql/status/status_test.go index f679f9eca3e2..f3e976ee0c5f 100644 --- a/metricbeat/module/mysql/status/status_test.go +++ b/metricbeat/module/mysql/status/status_test.go @@ -20,8 +20,8 @@ package status import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/nats/connections/connections.go b/metricbeat/module/nats/connections/connections.go index b331ec6e6283..4a158180bf4c 100644 --- a/metricbeat/module/nats/connections/connections.go +++ b/metricbeat/module/nats/connections/connections.go @@ -20,10 +20,10 @@ package connections import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/connections/connections_integration_test.go b/metricbeat/module/nats/connections/connections_integration_test.go index d5ea5c8dc122..a9758e42e698 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 1261a1499f5d..8c32d6c92910 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 2966f8afd8d5..1efe616cb766 100644 --- a/metricbeat/module/nats/connections/data.go +++ b/metricbeat/module/nats/connections/data.go @@ -20,12 +20,12 @@ package connections import ( "encoding/json" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/nats/fields.go b/metricbeat/module/nats/fields.go index d18374ff8593..215ffc0c5d22 100644 --- a/metricbeat/module/nats/fields.go +++ b/metricbeat/module/nats/fields.go @@ -20,7 +20,7 @@ package nats import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/nats/routes/data.go b/metricbeat/module/nats/routes/data.go index b33c51dd5b90..83581a16a311 100644 --- a/metricbeat/module/nats/routes/data.go +++ b/metricbeat/module/nats/routes/data.go @@ -20,12 +20,12 @@ package routes import ( "encoding/json" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/nats/routes/routes.go b/metricbeat/module/nats/routes/routes.go index ac3337b5a3a2..91b3ad33930f 100644 --- a/metricbeat/module/nats/routes/routes.go +++ b/metricbeat/module/nats/routes/routes.go @@ -20,10 +20,10 @@ package routes import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/routes/routes_integration_test.go b/metricbeat/module/nats/routes/routes_integration_test.go index 306ee96a344c..a10e4be938ee 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 eed113547fa5..a76b35c5e1d5 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 3ec5865b8c58..594276d35bec 100644 --- a/metricbeat/module/nats/stats/data.go +++ b/metricbeat/module/nats/stats/data.go @@ -20,16 +20,16 @@ package stats import ( "encoding/json" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) var ( diff --git a/metricbeat/module/nats/stats/stats.go b/metricbeat/module/nats/stats/stats.go index e571661e4b51..f146e3f64455 100644 --- a/metricbeat/module/nats/stats/stats.go +++ b/metricbeat/module/nats/stats/stats.go @@ -20,10 +20,10 @@ package stats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/stats/stats_integration_test.go b/metricbeat/module/nats/stats/stats_integration_test.go index 87585d8a17f0..b95447e9c9d9 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 42c3872df7e9..922ccaf65f40 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 202faa3677da..a92bcae4b14c 100644 --- a/metricbeat/module/nats/subscriptions/data.go +++ b/metricbeat/module/nats/subscriptions/data.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + 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" ) var ( diff --git a/metricbeat/module/nats/subscriptions/subscriptions.go b/metricbeat/module/nats/subscriptions/subscriptions.go index 6333a295a6f1..f1cdfbaa0409 100644 --- a/metricbeat/module/nats/subscriptions/subscriptions.go +++ b/metricbeat/module/nats/subscriptions/subscriptions.go @@ -20,10 +20,10 @@ package subscriptions import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go b/metricbeat/module/nats/subscriptions/subscriptions_integration_test.go index 3b67d32a3ecc..909537b34754 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 434800913462..d0b7e567b4e3 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestEventMapping(t *testing.T) { diff --git a/metricbeat/module/nginx/fields.go b/metricbeat/module/nginx/fields.go index 0cb1749cd560..3cd6e0856eeb 100644 --- a/metricbeat/module/nginx/fields.go +++ b/metricbeat/module/nginx/fields.go @@ -20,7 +20,7 @@ package nginx import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/nginx/stubstatus/data.go b/metricbeat/module/nginx/stubstatus/data.go index 76044507e21c..c58cabe43dab 100644 --- a/metricbeat/module/nginx/stubstatus/data.go +++ b/metricbeat/module/nginx/stubstatus/data.go @@ -23,7 +23,7 @@ import ( "regexp" "strconv" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/metricbeat/module/nginx/stubstatus/stubstatus.go b/metricbeat/module/nginx/stubstatus/stubstatus.go index df613b20453e..e9696b971663 100644 --- a/metricbeat/module/nginx/stubstatus/stubstatus.go +++ b/metricbeat/module/nginx/stubstatus/stubstatus.go @@ -21,10 +21,10 @@ package stubstatus import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 82d25943075f..c1024f918f04 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/php_fpm/fields.go b/metricbeat/module/php_fpm/fields.go index 15f4d09fe511..7293bc9e2e2d 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/php_fpm/pool/data.go b/metricbeat/module/php_fpm/pool/data.go index 356498116f55..a2d6c29a9dac 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstriface" ) var ( diff --git a/metricbeat/module/php_fpm/pool/pool.go b/metricbeat/module/php_fpm/pool/pool.go index ae346086d420..ec15fb46915a 100644 --- a/metricbeat/module/php_fpm/pool/pool.go +++ b/metricbeat/module/php_fpm/pool/pool.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/php_fpm" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 caeaaa823a6d..84be99e00fb8 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 026cb72c04b8..ec3ea2f5a71e 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v7/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 705041b101b3..8a5d142ed051 100644 --- a/metricbeat/module/php_fpm/process/data.go +++ b/metricbeat/module/php_fpm/process/data.go @@ -21,9 +21,9 @@ import ( "encoding/json" "strings" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type phpFpmStatus struct { diff --git a/metricbeat/module/php_fpm/process/process.go b/metricbeat/module/php_fpm/process/process.go index 85dde711ae3e..73a78e4ff13e 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/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/php_fpm" + "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" ) // 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 6fed9acf0cf4..0cb8f3fa1a5f 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 490a3bd2c201..7726226a27de 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/php_fpm" + _ "github.com/elastic/beats/v7/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 7cb590309f81..544f18a089a1 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/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/plugin.go b/metricbeat/module/plugin.go index e96175de6f63..a1c408a2388f 100644 --- a/metricbeat/module/plugin.go +++ b/metricbeat/module/plugin.go @@ -20,9 +20,9 @@ package module import ( "errors" - "github.com/elastic/beats/libbeat/plugin" + "github.com/elastic/beats/v7/libbeat/plugin" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) type modulePlugin struct { diff --git a/metricbeat/module/postgresql/activity/activity.go b/metricbeat/module/postgresql/activity/activity.go index ca519dc4442a..38c8f0ec6213 100644 --- a/metricbeat/module/postgresql/activity/activity.go +++ b/metricbeat/module/postgresql/activity/activity.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/postgresql" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/postgresql/activity/activity_integration_test.go b/metricbeat/module/postgresql/activity/activity_integration_test.go index ab7c48d4fbd6..47a91c18ad40 100644 --- a/metricbeat/module/postgresql/activity/activity_integration_test.go +++ b/metricbeat/module/postgresql/activity/activity_integration_test.go @@ -22,10 +22,10 @@ package activity import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "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/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/activity/data.go b/metricbeat/module/postgresql/activity/data.go index b410d1ada611..7307c4467bfe 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 464c87dd6d30..bb7dd702b936 100644 --- a/metricbeat/module/postgresql/bgwriter/bgwriter.go +++ b/metricbeat/module/postgresql/bgwriter/bgwriter.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 d4d5c290e799..0302e6bf292c 100644 --- a/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go +++ b/metricbeat/module/postgresql/bgwriter/bgwriter_integration_test.go @@ -22,10 +22,10 @@ package bgwriter import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "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/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/bgwriter/data.go b/metricbeat/module/postgresql/bgwriter/data.go index a1ab39404e7f..998a558ecc5d 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 90bee79f9763..99d2bdb643fb 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 4a960b81ead9..0b23a25d27b9 100644 --- a/metricbeat/module/postgresql/database/database.go +++ b/metricbeat/module/postgresql/database/database.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 9593ec2683c3..b64e410e73aa 100644 --- a/metricbeat/module/postgresql/database/database_integration_test.go +++ b/metricbeat/module/postgresql/database/database_integration_test.go @@ -22,10 +22,10 @@ package database import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "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/stretchr/testify/assert" ) diff --git a/metricbeat/module/postgresql/fields.go b/metricbeat/module/postgresql/fields.go index 2ded1e5f4ec3..065acbda7230 100644 --- a/metricbeat/module/postgresql/fields.go +++ b/metricbeat/module/postgresql/fields.go @@ -20,7 +20,7 @@ package postgresql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/postgresql/metricset.go b/metricbeat/module/postgresql/metricset.go index 07cd29f35049..0e591398cde5 100644 --- a/metricbeat/module/postgresql/metricset.go +++ b/metricbeat/module/postgresql/metricset.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/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 043aec486917..61bd5b1e9c41 100644 --- a/metricbeat/module/postgresql/postgresql.go +++ b/metricbeat/module/postgresql/postgresql.go @@ -28,8 +28,8 @@ import ( "github.com/lib/pq" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/postgresql/postgresql_test.go b/metricbeat/module/postgresql/postgresql_test.go index ff4f2ff63aee..85e3c7a332ee 100644 --- a/metricbeat/module/postgresql/postgresql_test.go +++ b/metricbeat/module/postgresql/postgresql_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 bb1c9ac0b742..6dbb9959a0e5 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/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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/statement/statement.go b/metricbeat/module/postgresql/statement/statement.go index ed58361702d9..c874ec81adac 100644 --- a/metricbeat/module/postgresql/statement/statement.go +++ b/metricbeat/module/postgresql/statement/statement.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 3a707114cdc7..365a5acbdb87 100644 --- a/metricbeat/module/postgresql/statement/statement_integration_test.go +++ b/metricbeat/module/postgresql/statement/statement_integration_test.go @@ -22,10 +22,10 @@ package statement import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/postgresql" + "github.com/elastic/beats/v7/libbeat/common" + "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/stretchr/testify/assert" ) diff --git a/metricbeat/module/prometheus/collector/collector.go b/metricbeat/module/prometheus/collector/collector.go index a189ed1c4088..8c1cc826d34a 100644 --- a/metricbeat/module/prometheus/collector/collector.go +++ b/metricbeat/module/prometheus/collector/collector.go @@ -20,10 +20,10 @@ package collector import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - p "github.com/elastic/beats/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + p "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/metricbeat/module/prometheus/collector/collector_test.go b/metricbeat/module/prometheus/collector/collector_test.go index d8a96b925175..877560ed16ee 100644 --- a/metricbeat/module/prometheus/collector/collector_test.go +++ b/metricbeat/module/prometheus/collector/collector_test.go @@ -26,10 +26,10 @@ import ( dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v7/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 2ace395590e8..1651bf3752e9 100644 --- a/metricbeat/module/prometheus/collector/data.go +++ b/metricbeat/module/prometheus/collector/data.go @@ -21,8 +21,8 @@ import ( "math" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" dto "github.com/prometheus/client_model/go" ) diff --git a/metricbeat/module/prometheus/fields.go b/metricbeat/module/prometheus/fields.go index 5123688cad5e..244b9b62dd6b 100644 --- a/metricbeat/module/prometheus/fields.go +++ b/metricbeat/module/prometheus/fields.go @@ -20,7 +20,7 @@ package prometheus import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/rabbitmq/connection/connection.go b/metricbeat/module/rabbitmq/connection/connection.go index 76773460a7f6..e9cb4bce96ef 100644 --- a/metricbeat/module/rabbitmq/connection/connection.go +++ b/metricbeat/module/rabbitmq/connection/connection.go @@ -20,8 +20,8 @@ package connection import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/connection/connection_test.go b/metricbeat/module/rabbitmq/connection/connection_test.go index 9dac8fb0661d..d5acf1abbb69 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" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" - _ "github.com/elastic/beats/metricbeat/module/rabbitmq" + _ "github.com/elastic/beats/v7/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 955f44dac7bc..1649319acf52 100644 --- a/metricbeat/module/rabbitmq/connection/data.go +++ b/metricbeat/module/rabbitmq/connection/data.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + "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/mb" ) var ( diff --git a/metricbeat/module/rabbitmq/exchange/data.go b/metricbeat/module/rabbitmq/exchange/data.go index 73c398ee2fef..1ccda5060638 100644 --- a/metricbeat/module/rabbitmq/exchange/data.go +++ b/metricbeat/module/rabbitmq/exchange/data.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + "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/mb" ) var ( diff --git a/metricbeat/module/rabbitmq/exchange/exchange.go b/metricbeat/module/rabbitmq/exchange/exchange.go index 38353a89d827..969414b96222 100644 --- a/metricbeat/module/rabbitmq/exchange/exchange.go +++ b/metricbeat/module/rabbitmq/exchange/exchange.go @@ -20,8 +20,8 @@ package exchange import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/exchange/exchange_test.go b/metricbeat/module/rabbitmq/exchange/exchange_test.go index cc550e34b597..6bb9136a634c 100644 --- a/metricbeat/module/rabbitmq/exchange/exchange_test.go +++ b/metricbeat/module/rabbitmq/exchange/exchange_test.go @@ -20,9 +20,9 @@ package exchange import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/rabbitmq/fields.go b/metricbeat/module/rabbitmq/fields.go index 5aec2be67281..e737f5f5808c 100644 --- a/metricbeat/module/rabbitmq/fields.go +++ b/metricbeat/module/rabbitmq/fields.go @@ -20,7 +20,7 @@ package rabbitmq import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/rabbitmq/metricset.go b/metricbeat/module/rabbitmq/metricset.go index e3de5c62104f..ab747dbc673e 100644 --- a/metricbeat/module/rabbitmq/metricset.go +++ b/metricbeat/module/rabbitmq/metricset.go @@ -18,8 +18,8 @@ package rabbitmq import ( - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/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 0c34908660b1..2d9d0c51cb5f 100644 --- a/metricbeat/module/rabbitmq/metricset_test.go +++ b/metricbeat/module/rabbitmq/metricset_test.go @@ -20,11 +20,11 @@ package rabbitmq import ( "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "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" ) var logger = logp.NewLogger("rabbitmq") diff --git a/metricbeat/module/rabbitmq/node/data.go b/metricbeat/module/rabbitmq/node/data.go index 4c5dc41d8701..2a84a1db029b 100644 --- a/metricbeat/module/rabbitmq/node/data.go +++ b/metricbeat/module/rabbitmq/node/data.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + 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" ) var ( diff --git a/metricbeat/module/rabbitmq/node/node.go b/metricbeat/module/rabbitmq/node/node.go index ac93f4d080bf..bd6a56f1b979 100644 --- a/metricbeat/module/rabbitmq/node/node.go +++ b/metricbeat/module/rabbitmq/node/node.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 3a0760a67723..76d13ce863fa 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "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" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/rabbitmq/node/node_test.go b/metricbeat/module/rabbitmq/node/node_test.go index e8786aaa678f..bc68b824ebc7 100644 --- a/metricbeat/module/rabbitmq/node/node_test.go +++ b/metricbeat/module/rabbitmq/node/node_test.go @@ -20,9 +20,9 @@ package node import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/rabbitmq/queue/data.go b/metricbeat/module/rabbitmq/queue/data.go index 2399f48e013b..a1d4b15a5c1c 100644 --- a/metricbeat/module/rabbitmq/queue/data.go +++ b/metricbeat/module/rabbitmq/queue/data.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) var ( diff --git a/metricbeat/module/rabbitmq/queue/queue.go b/metricbeat/module/rabbitmq/queue/queue.go index 36346ceab1e0..b10b0ca00106 100644 --- a/metricbeat/module/rabbitmq/queue/queue.go +++ b/metricbeat/module/rabbitmq/queue/queue.go @@ -20,8 +20,8 @@ package queue import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/rabbitmq" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq" ) func init() { diff --git a/metricbeat/module/rabbitmq/queue/queue_test.go b/metricbeat/module/rabbitmq/queue/queue_test.go index 41b5cd58b006..5c9438c2a641 100644 --- a/metricbeat/module/rabbitmq/queue/queue_test.go +++ b/metricbeat/module/rabbitmq/queue/queue_test.go @@ -20,9 +20,9 @@ package queue import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/rabbitmq/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/rabbitmq/mtest" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/rabbitmq/url.go b/metricbeat/module/rabbitmq/url.go index a50f73acd7dc..299901811e86 100644 --- a/metricbeat/module/rabbitmq/url.go +++ b/metricbeat/module/rabbitmq/url.go @@ -18,7 +18,7 @@ package rabbitmq import ( - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // Subpaths to management plugin endpoints diff --git a/metricbeat/module/redis/fields.go b/metricbeat/module/redis/fields.go index fd28937ec4b0..5ec77a243184 100644 --- a/metricbeat/module/redis/fields.go +++ b/metricbeat/module/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/redis/info/data.go b/metricbeat/module/redis/info/data.go index d1ac1bcc0f57..2e3b4e4b32f2 100644 --- a/metricbeat/module/redis/info/data.go +++ b/metricbeat/module/redis/info/data.go @@ -18,10 +18,10 @@ package info import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" + "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/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/redis/info/info.go b/metricbeat/module/redis/info/info.go index 0570710b2019..2d1f88c775de 100644 --- a/metricbeat/module/redis/info/info.go +++ b/metricbeat/module/redis/info/info.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/redis" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 576103c75d31..044685d4885c 100644 --- a/metricbeat/module/redis/info/info_integration_test.go +++ b/metricbeat/module/redis/info/info_integration_test.go @@ -22,9 +22,9 @@ package info import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/redis/info/info_test.go b/metricbeat/module/redis/info/info_test.go index bb02fc296922..99798bc95096 100644 --- a/metricbeat/module/redis/info/info_test.go +++ b/metricbeat/module/redis/info/info_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestNewMetricSet(t *testing.T) { diff --git a/metricbeat/module/redis/key/data.go b/metricbeat/module/redis/key/data.go index 076a5bce3490..d6fd8134d876 100644 --- a/metricbeat/module/redis/key/data.go +++ b/metricbeat/module/redis/key/data.go @@ -20,8 +20,8 @@ package key import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) func eventMapping(keyspace uint, info map[string]interface{}) mb.Event { diff --git a/metricbeat/module/redis/key/key.go b/metricbeat/module/redis/key/key.go index 6eab8d0aeaaf..c01fe25a3185 100644 --- a/metricbeat/module/redis/key/key.go +++ b/metricbeat/module/redis/key/key.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/redis" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 2a804d9a63b6..bbe7b4831dca 100644 --- a/metricbeat/module/redis/key/key_integration_test.go +++ b/metricbeat/module/redis/key/key_integration_test.go @@ -26,9 +26,9 @@ import ( rd "github.com/garyburd/redigo/redis" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/redis/keyspace/data.go b/metricbeat/module/redis/keyspace/data.go index e5050e4f4004..91f181305a96 100644 --- a/metricbeat/module/redis/keyspace/data.go +++ b/metricbeat/module/redis/keyspace/data.go @@ -20,11 +20,11 @@ package keyspace import ( "strings" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/redis" + "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/mapstrstr" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/redis" ) // Map data to MapStr diff --git a/metricbeat/module/redis/keyspace/keyspace.go b/metricbeat/module/redis/keyspace/keyspace.go index fba7166341f2..a9710fa67f9b 100644 --- a/metricbeat/module/redis/keyspace/keyspace.go +++ b/metricbeat/module/redis/keyspace/keyspace.go @@ -20,9 +20,9 @@ package keyspace import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/redis" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 e0b51c25dde7..239283f0f688 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" rd "github.com/garyburd/redigo/redis" "github.com/stretchr/testify/assert" diff --git a/metricbeat/module/redis/metricset.go b/metricbeat/module/redis/metricset.go index 72e3a9f1e5f6..dbd600f48389 100644 --- a/metricbeat/module/redis/metricset.go +++ b/metricbeat/module/redis/metricset.go @@ -26,7 +26,7 @@ import ( rd "github.com/garyburd/redigo/redis" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MetricSet for fetching Redis server information and statistics. diff --git a/metricbeat/module/redis/metricset_integration_test.go b/metricbeat/module/redis/metricset_integration_test.go index 7d972030bb37..6f59508c323d 100644 --- a/metricbeat/module/redis/metricset_integration_test.go +++ b/metricbeat/module/redis/metricset_integration_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( @@ -37,7 +37,7 @@ const ( ) func TestPasswords(t *testing.T) { - t.Skip("Changing password affects other tests, see https://github.com/elastic/beats/issues/10955") + t.Skip("Changing password affects other tests, see https://github.com/elastic/beats/v7/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 9f9f5024f185..6e0235154068 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/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/redis/redis.go b/metricbeat/module/redis/redis.go index 11d55279f51d..2167a95fd7a5 100644 --- a/metricbeat/module/redis/redis.go +++ b/metricbeat/module/redis/redis.go @@ -26,7 +26,7 @@ import ( rd "github.com/garyburd/redigo/redis" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Redis types diff --git a/metricbeat/module/redis/redis_integration_test.go b/metricbeat/module/redis/redis_integration_test.go index c33df1556f0d..ccf6e59d46f4 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/libbeat/tests/compose" - _ "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + _ "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetchRedisInfo(t *testing.T) { diff --git a/metricbeat/module/system/core/config.go b/metricbeat/module/system/core/config.go index 1e8e0e11be95..e47b7d7cd5cc 100644 --- a/metricbeat/module/system/core/config.go +++ b/metricbeat/module/system/core/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) // Core metric types. diff --git a/metricbeat/module/system/core/core.go b/metricbeat/module/system/core/core.go index 4c91b144cddc..9fdb3178a16c 100644 --- a/metricbeat/module/system/core/core.go +++ b/metricbeat/module/system/core/core.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/system/core/core_test.go b/metricbeat/module/system/core/core_test.go index c3c6c09a3b9c..3e8a66f7bd8a 100644 --- a/metricbeat/module/system/core/core_test.go +++ b/metricbeat/module/system/core/core_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/cpu/config.go b/metricbeat/module/system/cpu/config.go index 291ee7963ef0..4e19f25f512a 100644 --- a/metricbeat/module/system/cpu/config.go +++ b/metricbeat/module/system/cpu/config.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) // CPU metric types. diff --git a/metricbeat/module/system/cpu/cpu.go b/metricbeat/module/system/cpu/cpu.go index d743cb5a2524..8d017f0d3733 100644 --- a/metricbeat/module/system/cpu/cpu.go +++ b/metricbeat/module/system/cpu/cpu.go @@ -24,10 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/system/cpu/cpu_test.go b/metricbeat/module/system/cpu/cpu_test.go index e218399c0356..e3b7ba6645cb 100644 --- a/metricbeat/module/system/cpu/cpu_test.go +++ b/metricbeat/module/system/cpu/cpu_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/diskio/diskio.go b/metricbeat/module/system/diskio/diskio.go index d60d6f8bd5b5..80c494409a3b 100644 --- a/metricbeat/module/system/diskio/diskio.go +++ b/metricbeat/module/system/diskio/diskio.go @@ -20,9 +20,9 @@ package diskio import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/diskio/diskio_test.go b/metricbeat/module/system/diskio/diskio_test.go index 945fbe63785f..aabc44c374b8 100644 --- a/metricbeat/module/system/diskio/diskio_test.go +++ b/metricbeat/module/system/diskio/diskio_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/diskio/diskstat_linux.go b/metricbeat/module/system/diskio/diskstat_linux.go index edff3df61a54..4ecfdf700ac6 100644 --- a/metricbeat/module/system/diskio/diskstat_linux.go +++ b/metricbeat/module/system/diskio/diskstat_linux.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/shirou/gopsutil/disk" - "github.com/elastic/beats/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" ) func Get_CLK_TCK() uint32 { diff --git a/metricbeat/module/system/diskio/diskstat_linux_test.go b/metricbeat/module/system/diskio/diskstat_linux_test.go index 9687f278b871..56a8d9dc7cce 100644 --- a/metricbeat/module/system/diskio/diskstat_linux_test.go +++ b/metricbeat/module/system/diskio/diskstat_linux_test.go @@ -28,8 +28,8 @@ import ( sigar "github.com/elastic/gosigar" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/system" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/system" ) func Test_Get_CLK_TCK(t *testing.T) { diff --git a/metricbeat/module/system/diskio/diskstat_windows_helper.go b/metricbeat/module/system/diskio/diskstat_windows_helper.go index 55b0d2d292fd..8f218b81b8c5 100644 --- a/metricbeat/module/system/diskio/diskstat_windows_helper.go +++ b/metricbeat/module/system/diskio/diskstat_windows_helper.go @@ -29,7 +29,7 @@ import ( "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/metricbeat/module/system/diskio/diskstat_windows_test.go b/metricbeat/module/system/diskio/diskstat_windows_test.go index c7536c4e7511..0f20f581212c 100644 --- a/metricbeat/module/system/diskio/diskstat_windows_test.go +++ b/metricbeat/module/system/diskio/diskstat_windows_test.go @@ -23,11 +23,11 @@ package diskio import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestCDriveFilterOnWindowsTestEnv(t *testing.T) { diff --git a/metricbeat/module/system/entropy/entropy.go b/metricbeat/module/system/entropy/entropy.go index 2e11973c0172..15792ae07efd 100644 --- a/metricbeat/module/system/entropy/entropy.go +++ b/metricbeat/module/system/entropy/entropy.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/system" + "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/metricbeat/module/system" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/system/entropy/entropy_test.go b/metricbeat/module/system/entropy/entropy_test.go index 4f5c85417177..ed4f94595ea7 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/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/system" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/module/system" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/fields.go b/metricbeat/module/system/fields.go index f2800f92a1be..31eb04eb4e78 100644 --- a/metricbeat/module/system/fields.go +++ b/metricbeat/module/system/fields.go @@ -20,7 +20,7 @@ package system import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/system/filesystem/filesystem.go b/metricbeat/module/system/filesystem/filesystem.go index 0513e5d68d03..765a874cb75a 100644 --- a/metricbeat/module/system/filesystem/filesystem.go +++ b/metricbeat/module/system/filesystem/filesystem.go @@ -22,9 +22,9 @@ package filesystem import ( "strings" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/filesystem/filesystem_test.go b/metricbeat/module/system/filesystem/filesystem_test.go index 2baa16c3f492..87ea5c072f32 100644 --- a/metricbeat/module/system/filesystem/filesystem_test.go +++ b/metricbeat/module/system/filesystem/filesystem_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/filesystem/helper.go b/metricbeat/module/system/filesystem/helper.go index b9386188747c..d64ef95f5627 100644 --- a/metricbeat/module/system/filesystem/helper.go +++ b/metricbeat/module/system/filesystem/helper.go @@ -29,8 +29,8 @@ import ( "runtime" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/system" sigar "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/system/fsstat/fsstat.go b/metricbeat/module/system/fsstat/fsstat.go index 84b08ab518a2..a8a1eaa0c94b 100644 --- a/metricbeat/module/system/fsstat/fsstat.go +++ b/metricbeat/module/system/fsstat/fsstat.go @@ -22,10 +22,10 @@ package fsstat import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system/filesystem" + "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/v7/metricbeat/module/system/filesystem" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/fsstat/fsstat_test.go b/metricbeat/module/system/fsstat/fsstat_test.go index 8a69c6e21827..df591a108989 100644 --- a/metricbeat/module/system/fsstat/fsstat_test.go +++ b/metricbeat/module/system/fsstat/fsstat_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/load/load.go b/metricbeat/module/system/load/load.go index ead230272d5b..1e7a6fe2b3bc 100644 --- a/metricbeat/module/system/load/load.go +++ b/metricbeat/module/system/load/load.go @@ -22,10 +22,10 @@ package load import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/metric/system/cpu" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/metric/system/cpu" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) func init() { diff --git a/metricbeat/module/system/load/load_test.go b/metricbeat/module/system/load/load_test.go index 82e2d5d09302..6a8fadcc797e 100644 --- a/metricbeat/module/system/load/load_test.go +++ b/metricbeat/module/system/load/load_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/memory/memory.go b/metricbeat/module/system/memory/memory.go index 76b3e6c0541b..90283f801bef 100644 --- a/metricbeat/module/system/memory/memory.go +++ b/metricbeat/module/system/memory/memory.go @@ -20,10 +20,10 @@ package memory import ( - "github.com/elastic/beats/libbeat/common" - mem "github.com/elastic/beats/libbeat/metric/system/memory" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + mem "github.com/elastic/beats/v7/libbeat/metric/system/memory" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" ) diff --git a/metricbeat/module/system/memory/memory_test.go b/metricbeat/module/system/memory/memory_test.go index 9d91c38fe501..978d2de8ae1e 100644 --- a/metricbeat/module/system/memory/memory_test.go +++ b/metricbeat/module/system/memory/memory_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/network/network.go b/metricbeat/module/system/network/network.go index abdcda11a984..d9c04d834202 100644 --- a/metricbeat/module/system/network/network.go +++ b/metricbeat/module/system/network/network.go @@ -22,10 +22,10 @@ package network import ( "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" "github.com/shirou/gopsutil/net" diff --git a/metricbeat/module/system/network/network_test.go b/metricbeat/module/system/network/network_test.go index 28fb3aca809f..999a1b91cde8 100644 --- a/metricbeat/module/system/network/network_test.go +++ b/metricbeat/module/system/network/network_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/network_summary/data.go b/metricbeat/module/system/network_summary/data.go index 883f0c0d3170..95b530c93252 100644 --- a/metricbeat/module/system/network_summary/data.go +++ b/metricbeat/module/system/network_summary/data.go @@ -18,7 +18,7 @@ package network_summary import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" sysinfotypes "github.com/elastic/go-sysinfo/types" ) diff --git a/metricbeat/module/system/network_summary/network_summary.go b/metricbeat/module/system/network_summary/network_summary.go index ff2c7e163bff..bbb27d589b04 100644 --- a/metricbeat/module/system/network_summary/network_summary.go +++ b/metricbeat/module/system/network_summary/network_summary.go @@ -20,8 +20,8 @@ package network_summary import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" 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 85eef635b7ca..bd2ba95d0068 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" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/go-sysinfo/types" ) diff --git a/metricbeat/module/system/process/cgroup.go b/metricbeat/module/system/process/cgroup.go index bd46e1addea1..c71dc7fe34d3 100644 --- a/metricbeat/module/system/process/cgroup.go +++ b/metricbeat/module/system/process/cgroup.go @@ -20,7 +20,7 @@ package process import ( "strconv" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/gosigar/cgroup" ) diff --git a/metricbeat/module/system/process/config.go b/metricbeat/module/system/process/config.go index 43caeb8b22ef..317515b93f08 100644 --- a/metricbeat/module/system/process/config.go +++ b/metricbeat/module/system/process/config.go @@ -18,8 +18,8 @@ package process import ( - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/metric/system/process" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/metric/system/process" ) // Config stores the system/process config options diff --git a/metricbeat/module/system/process/process.go b/metricbeat/module/system/process/process.go index 98d941cc4f87..9c7541773726 100644 --- a/metricbeat/module/system/process/process.go +++ b/metricbeat/module/system/process/process.go @@ -25,12 +25,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/process" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/process" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/system" "github.com/elastic/gosigar/cgroup" ) diff --git a/metricbeat/module/system/process/process_test.go b/metricbeat/module/system/process/process_test.go index 0ee4c76e00a3..c997410a4bb3 100644 --- a/metricbeat/module/system/process/process_test.go +++ b/metricbeat/module/system/process/process_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/system/process_summary/process_summary.go b/metricbeat/module/system/process_summary/process_summary.go index 4759869a2343..071a7b2a6608 100644 --- a/metricbeat/module/system/process_summary/process_summary.go +++ b/metricbeat/module/system/process_summary/process_summary.go @@ -22,11 +22,11 @@ package process_summary import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/metric/system/process" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/metric/system/process" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" sigar "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/system/process_summary/process_summary_test.go b/metricbeat/module/system/process_summary/process_summary_test.go index 868ccf9542c1..55afce8f190e 100644 --- a/metricbeat/module/system/process_summary/process_summary_test.go +++ b/metricbeat/module/system/process_summary/process_summary_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/raid/blockinfo/blockinfo.go b/metricbeat/module/system/raid/blockinfo/blockinfo.go index cb5a62b6067c..f0dbd982238f 100644 --- a/metricbeat/module/system/raid/blockinfo/blockinfo.go +++ b/metricbeat/module/system/raid/blockinfo/blockinfo.go @@ -17,7 +17,7 @@ package blockinfo -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" // SyncStatus represents the status of a sync action as Complete/Total. Will be 0/0 if no sync action is going on type SyncStatus struct { diff --git a/metricbeat/module/system/raid/blockinfo/parser.go b/metricbeat/module/system/raid/blockinfo/parser.go index 35dff46bd891..7d0eb7561dba 100644 --- a/metricbeat/module/system/raid/blockinfo/parser.go +++ b/metricbeat/module/system/raid/blockinfo/parser.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var debugf = logp.MakeDebug("system.raid") diff --git a/metricbeat/module/system/raid/raid.go b/metricbeat/module/system/raid/raid.go index 78f497ba0f01..bf542dbb93b9 100644 --- a/metricbeat/module/system/raid/raid.go +++ b/metricbeat/module/system/raid/raid.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" "github.com/prometheus/procfs" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system" - "github.com/elastic/beats/metricbeat/module/system/raid/blockinfo" + "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/v7/metricbeat/module/system" + "github.com/elastic/beats/v7/metricbeat/module/system/raid/blockinfo" ) func init() { diff --git a/metricbeat/module/system/raid/raid_test.go b/metricbeat/module/system/raid/raid_test.go index cfbd2881d64e..f1ebaa97270b 100644 --- a/metricbeat/module/system/raid/raid_test.go +++ b/metricbeat/module/system/raid/raid_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/service/data.go b/metricbeat/module/system/service/data.go index 6dfdd5f7a6a3..eda9eae0f6ab 100644 --- a/metricbeat/module/system/service/data.go +++ b/metricbeat/module/system/service/data.go @@ -25,8 +25,8 @@ import ( "github.com/coreos/go-systemd/v22/dbus" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Properties is a struct representation of the dbus returns from GetAllProperties diff --git a/metricbeat/module/system/service/service.go b/metricbeat/module/system/service/service.go index 6c454adcef95..d29859418943 100644 --- a/metricbeat/module/system/service/service.go +++ b/metricbeat/module/system/service/service.go @@ -24,8 +24,8 @@ import ( "github.com/mitchellh/mapstructure" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/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 f94cb6e1e430..53f4343981dc 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestFormProps(t *testing.T) { diff --git a/metricbeat/module/system/socket/socket.go b/metricbeat/module/system/socket/socket.go index 72d6b31184c6..bca2b795af19 100644 --- a/metricbeat/module/system/socket/socket.go +++ b/metricbeat/module/system/socket/socket.go @@ -30,12 +30,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - sock "github.com/elastic/beats/metricbeat/helper/socket" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + sock "github.com/elastic/beats/v7/metricbeat/helper/socket" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/system" "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 7430e7f2c37d..ccf23d99d7ab 100644 --- a/metricbeat/module/system/socket/socket_test.go +++ b/metricbeat/module/system/socket/socket_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - sock "github.com/elastic/beats/metricbeat/helper/socket" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + sock "github.com/elastic/beats/v7/metricbeat/helper/socket" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/system/socket_summary/socket_summary.go b/metricbeat/module/system/socket_summary/socket_summary.go index 6a1e3f73411f..928b5fe91f16 100644 --- a/metricbeat/module/system/socket_summary/socket_summary.go +++ b/metricbeat/module/system/socket_summary/socket_summary.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" "github.com/shirou/gopsutil/net" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry as soon as the program diff --git a/metricbeat/module/system/socket_summary/sockstat_linux.go b/metricbeat/module/system/socket_summary/sockstat_linux.go index 799456b66705..60836b6c1c28 100644 --- a/metricbeat/module/system/socket_summary/sockstat_linux.go +++ b/metricbeat/module/system/socket_summary/sockstat_linux.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" "github.com/shirou/gopsutil/net" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/module/system" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/module/system" ) // SockStat contains data from /proc/net/sockstat diff --git a/metricbeat/module/system/socket_summary/sockstat_other.go b/metricbeat/module/system/socket_summary/sockstat_other.go index eabaa26ead8b..495c7d31c7b3 100644 --- a/metricbeat/module/system/socket_summary/sockstat_other.go +++ b/metricbeat/module/system/socket_summary/sockstat_other.go @@ -22,7 +22,7 @@ package socket_summary import ( "github.com/shirou/gopsutil/net" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) //a stub function for non-linux systems diff --git a/metricbeat/module/system/system.go b/metricbeat/module/system/system.go index 6f0ac639694e..edb9f55bf6b4 100644 --- a/metricbeat/module/system/system.go +++ b/metricbeat/module/system/system.go @@ -21,7 +21,7 @@ import ( "flag" "sync" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/system/system_windows.go b/metricbeat/module/system/system_windows.go index b59e6c94bbba..154481eb657e 100644 --- a/metricbeat/module/system/system_windows.go +++ b/metricbeat/module/system/system_windows.go @@ -18,8 +18,8 @@ package system import ( - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" ) func initModule() { diff --git a/metricbeat/module/system/uptime/uptime.go b/metricbeat/module/system/uptime/uptime.go index 1e4ebeada431..cbefa8bd4b46 100644 --- a/metricbeat/module/system/uptime/uptime.go +++ b/metricbeat/module/system/uptime/uptime.go @@ -22,9 +22,9 @@ package uptime import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" sigar "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/system/uptime/uptime_test.go b/metricbeat/module/system/uptime/uptime_test.go index f7262b51003f..d0542c50db09 100644 --- a/metricbeat/module/system/uptime/uptime_test.go +++ b/metricbeat/module/system/uptime/uptime_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/traefik/fields.go b/metricbeat/module/traefik/fields.go index 435d812f901d..d18ad7398e8c 100644 --- a/metricbeat/module/traefik/fields.go +++ b/metricbeat/module/traefik/fields.go @@ -20,7 +20,7 @@ package traefik import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/traefik/health/data.go b/metricbeat/module/traefik/health/data.go index 5cc5bc5020d9..5d00a02399da 100644 --- a/metricbeat/module/traefik/health/data.go +++ b/metricbeat/module/traefik/health/data.go @@ -18,9 +18,9 @@ package health import ( - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) var ( diff --git a/metricbeat/module/traefik/health/data_test.go b/metricbeat/module/traefik/health/data_test.go index 1b0d2731ad11..ad710e43d2ed 100644 --- a/metricbeat/module/traefik/health/data_test.go +++ b/metricbeat/module/traefik/health/data_test.go @@ -22,7 +22,7 @@ package health import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/traefik/health/health.go b/metricbeat/module/traefik/health/health.go index 619d4444db9b..23e94e9619c8 100644 --- a/metricbeat/module/traefik/health/health.go +++ b/metricbeat/module/traefik/health/health.go @@ -20,10 +20,10 @@ package health import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/traefik/health/health_integration_test.go b/metricbeat/module/traefik/health/health_integration_test.go index cb97424ce293..6f9aa36f48b4 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/traefik/mtest" + "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/stretchr/testify/assert" ) diff --git a/metricbeat/module/traefik/health/health_test.go b/metricbeat/module/traefik/health/health_test.go index a0de08d6a7fa..7d96d7d88fa0 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" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/metricbeat/module/traefik" + _ "github.com/elastic/beats/v7/metricbeat/module/traefik" ) func TestFetchEventContents(t *testing.T) { diff --git a/metricbeat/module/uwsgi/fields.go b/metricbeat/module/uwsgi/fields.go index ae4bbd43f230..120cb4a8a24d 100644 --- a/metricbeat/module/uwsgi/fields.go +++ b/metricbeat/module/uwsgi/fields.go @@ -20,7 +20,7 @@ package uwsgi import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/uwsgi/status/data.go b/metricbeat/module/uwsgi/status/data.go index 437fdcbb0ee9..7b371a44b780 100644 --- a/metricbeat/module/uwsgi/status/data.go +++ b/metricbeat/module/uwsgi/status/data.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) type uwsgiCore struct { diff --git a/metricbeat/module/uwsgi/status/status.go b/metricbeat/module/uwsgi/status/status.go index 84971e553999..334662d89794 100644 --- a/metricbeat/module/uwsgi/status/status.go +++ b/metricbeat/module/uwsgi/status/status.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/module/uwsgi" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/module/uwsgi" ) func init() { diff --git a/metricbeat/module/uwsgi/status/status_integration_test.go b/metricbeat/module/uwsgi/status/status_integration_test.go index 97b869f4a3e5..cfcf9271dc6e 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetchTCP(t *testing.T) { diff --git a/metricbeat/module/uwsgi/status/status_linux_test.go b/metricbeat/module/uwsgi/status/status_linux_test.go index 68934f4d6f3a..bbd84faf85a7 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 9bb4b55dfb4d..30fc0867a47d 100644 --- a/metricbeat/module/uwsgi/status/status_test.go +++ b/metricbeat/module/uwsgi/status/status_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func testData(t *testing.T) (data []byte) { diff --git a/metricbeat/module/uwsgi/uwsgi.go b/metricbeat/module/uwsgi/uwsgi.go index 4455955cc342..42f8be1eabf9 100644 --- a/metricbeat/module/uwsgi/uwsgi.go +++ b/metricbeat/module/uwsgi/uwsgi.go @@ -18,8 +18,8 @@ package uwsgi import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 af19fe437e98..79ebf0eac667 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/vsphere/datastore/datastore.go b/metricbeat/module/vsphere/datastore/datastore.go index e3e87ffebb1b..44ddb1ac65bd 100644 --- a/metricbeat/module/vsphere/datastore/datastore.go +++ b/metricbeat/module/vsphere/datastore/datastore.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/vmware/govmomi" "github.com/vmware/govmomi/view" diff --git a/metricbeat/module/vsphere/datastore/datastore_test.go b/metricbeat/module/vsphere/datastore/datastore_test.go index c8891fdfc466..30f1d32e8e37 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" "github.com/vmware/govmomi/simulator" diff --git a/metricbeat/module/vsphere/fields.go b/metricbeat/module/vsphere/fields.go index 22e671f12f5d..cf49cbee27ff 100644 --- a/metricbeat/module/vsphere/fields.go +++ b/metricbeat/module/vsphere/fields.go @@ -20,7 +20,7 @@ package vsphere import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/vsphere/host/data.go b/metricbeat/module/vsphere/host/data.go index 642f1230298f..81ceba8c43a5 100644 --- a/metricbeat/module/vsphere/host/data.go +++ b/metricbeat/module/vsphere/host/data.go @@ -18,7 +18,7 @@ package host import ( - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/vmware/govmomi/vim25/mo" ) diff --git a/metricbeat/module/vsphere/host/host.go b/metricbeat/module/vsphere/host/host.go index 1a2f7f69c86a..90f5e89a6f77 100644 --- a/metricbeat/module/vsphere/host/host.go +++ b/metricbeat/module/vsphere/host/host.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/vmware/govmomi" "github.com/vmware/govmomi/property" diff --git a/metricbeat/module/vsphere/host/host_test.go b/metricbeat/module/vsphere/host/host_test.go index da5b97f799e2..ce9ee1ba80f1 100644 --- a/metricbeat/module/vsphere/host/host_test.go +++ b/metricbeat/module/vsphere/host/host_test.go @@ -20,8 +20,8 @@ package host import ( "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" "github.com/vmware/govmomi/simulator" diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go index fae77b32fe88..5dd2a99675fc 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine.go @@ -23,9 +23,9 @@ import ( "net/url" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/pkg/errors" "github.com/vmware/govmomi" diff --git a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go index fb640c48fdce..e3b12feaf4b7 100644 --- a/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go +++ b/metricbeat/module/vsphere/virtualmachine/virtualmachine_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/stretchr/testify/assert" "github.com/vmware/govmomi/simulator" diff --git a/metricbeat/module/windows/fields.go b/metricbeat/module/windows/fields.go index db3aaeccc64c..34f9f8b78612 100644 --- a/metricbeat/module/windows/fields.go +++ b/metricbeat/module/windows/fields.go @@ -20,7 +20,7 @@ package windows import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/windows/perfmon/perfmon.go b/metricbeat/module/windows/perfmon/perfmon.go index a3d048ebcf73..48527a9c691d 100644 --- a/metricbeat/module/windows/perfmon/perfmon.go +++ b/metricbeat/module/windows/perfmon/perfmon.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // CounterConfig for perfmon counters. diff --git a/metricbeat/module/windows/perfmon/perfmon_test.go b/metricbeat/module/windows/perfmon/perfmon_test.go index 1d43286e1517..cd882131b541 100644 --- a/metricbeat/module/windows/perfmon/perfmon_test.go +++ b/metricbeat/module/windows/perfmon/perfmon_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/elastic/beats/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) const processorTimeCounter = `\Processor Information(_Total)\% Processor Time` diff --git a/metricbeat/module/windows/perfmon/reader.go b/metricbeat/module/windows/perfmon/reader.go index 51eef6b7e957..26bd317c0f12 100644 --- a/metricbeat/module/windows/perfmon/reader.go +++ b/metricbeat/module/windows/perfmon/reader.go @@ -24,13 +24,13 @@ import ( "strconv" "strings" - "github.com/elastic/beats/metricbeat/helper/windows/pdh" + "github.com/elastic/beats/v7/metricbeat/helper/windows/pdh" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/windows/service/service.go b/metricbeat/module/windows/service/service.go index 628ec8d35c73..fce48ab6cff6 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/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // init registers the MetricSet with the central registry. diff --git a/metricbeat/module/windows/service/service_integration_windows_test.go b/metricbeat/module/windows/service/service_integration_windows_test.go index c3ac032c03b1..51306fe5c37e 100644 --- a/metricbeat/module/windows/service/service_integration_windows_test.go +++ b/metricbeat/module/windows/service/service_integration_windows_test.go @@ -22,12 +22,12 @@ package service import ( "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/StackExchange/wmi" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) type Win32Service struct { diff --git a/metricbeat/module/windows/service/service_windows.go b/metricbeat/module/windows/service/service_windows.go index a96b1c386868..877be4e854f2 100644 --- a/metricbeat/module/windows/service/service_windows.go +++ b/metricbeat/module/windows/service/service_windows.go @@ -33,9 +33,9 @@ import ( "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/winlogbeat/sys" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/winlogbeat/sys" "github.com/elastic/gosigar" ) diff --git a/metricbeat/module/windows/windows.go b/metricbeat/module/windows/windows.go index 6629e00ecc6d..584817e6a369 100644 --- a/metricbeat/module/windows/windows.go +++ b/metricbeat/module/windows/windows.go @@ -22,9 +22,9 @@ package windows import ( "sync" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" ) var once sync.Once diff --git a/metricbeat/module/zookeeper/connection/connection.go b/metricbeat/module/zookeeper/connection/connection.go index 31540d00b880..dea21844c7ca 100644 --- a/metricbeat/module/zookeeper/connection/connection.go +++ b/metricbeat/module/zookeeper/connection/connection.go @@ -20,10 +20,10 @@ package connection import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/zookeeper" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/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 257268f26b18..f774f36c202f 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/metricbeat/module/zookeeper/connection/connection_test.go b/metricbeat/module/zookeeper/connection/connection_test.go index 253153d3422e..6477a7776320 100644 --- a/metricbeat/module/zookeeper/connection/connection_test.go +++ b/metricbeat/module/zookeeper/connection/connection_test.go @@ -21,7 +21,7 @@ import ( "bytes" "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/metricbeat/module/zookeeper/connection/data.go b/metricbeat/module/zookeeper/connection/data.go index a30c61e62ba8..e205ba8594f9 100644 --- a/metricbeat/module/zookeeper/connection/data.go +++ b/metricbeat/module/zookeeper/connection/data.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var capturer = regexp.MustCompile(`/(?P.*):(?P\d+)\[(?P\d*)]\(queued=(?P\d*),recved=(?P\d*),sent=(?P\d*)\)`) diff --git a/metricbeat/module/zookeeper/fields.go b/metricbeat/module/zookeeper/fields.go index 41a234d28608..c275c78c4798 100644 --- a/metricbeat/module/zookeeper/fields.go +++ b/metricbeat/module/zookeeper/fields.go @@ -20,7 +20,7 @@ package zookeeper import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/metricbeat/module/zookeeper/mntr/data.go b/metricbeat/module/zookeeper/mntr/data.go index f116984eb898..5dc2dd3b4725 100644 --- a/metricbeat/module/zookeeper/mntr/data.go +++ b/metricbeat/module/zookeeper/mntr/data.go @@ -22,12 +22,12 @@ import ( "io" "regexp" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/metricbeat/module/zookeeper/mntr/mntr.go b/metricbeat/module/zookeeper/mntr/mntr.go index 13fd8770afa2..af5831b8007f 100644 --- a/metricbeat/module/zookeeper/mntr/mntr.go +++ b/metricbeat/module/zookeeper/mntr/mntr.go @@ -44,9 +44,9 @@ ZooKeeper mntr Command Output package mntr import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/zookeeper" + "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/pkg/errors" ) diff --git a/metricbeat/module/zookeeper/mntr/mntr_integration_test.go b/metricbeat/module/zookeeper/mntr/mntr_integration_test.go index 7e530c802ce4..34e36321a5df 100644 --- a/metricbeat/module/zookeeper/mntr/mntr_integration_test.go +++ b/metricbeat/module/zookeeper/mntr/mntr_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/zookeeper/server/data.go b/metricbeat/module/zookeeper/server/data.go index ef74f1aee3ba..9f185e3a218d 100644 --- a/metricbeat/module/zookeeper/server/data.go +++ b/metricbeat/module/zookeeper/server/data.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var latencyCapturer = regexp.MustCompile(`(\d+)/(\d+)/(\d+)`) diff --git a/metricbeat/module/zookeeper/server/server.go b/metricbeat/module/zookeeper/server/server.go index 7b9d275382db..af57d4e77b82 100644 --- a/metricbeat/module/zookeeper/server/server.go +++ b/metricbeat/module/zookeeper/server/server.go @@ -42,11 +42,11 @@ package server import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" - "github.com/elastic/beats/metricbeat/module/zookeeper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/module/zookeeper" ) func init() { diff --git a/metricbeat/module/zookeeper/server/server_integration_test.go b/metricbeat/module/zookeeper/server/server_integration_test.go index 4cd1764ad168..6f23559033bc 100644 --- a/metricbeat/module/zookeeper/server/server_integration_test.go +++ b/metricbeat/module/zookeeper/server/server_integration_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/metricbeat/module/zookeeper/server/server_test.go b/metricbeat/module/zookeeper/server/server_test.go index 0ac31050f013..442770ce613e 100644 --- a/metricbeat/module/zookeeper/server/server_test.go +++ b/metricbeat/module/zookeeper/server/server_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var srvrTestInput = `Zookeeper version: 3.5.5-390fe37ea45dee01bf87dc1c042b5e3dcce88653, built on 05/03/2019 12:07 GMT diff --git a/metricbeat/processor/add_kubernetes_metadata/indexers.go b/metricbeat/processor/add_kubernetes_metadata/indexers.go index a86b4b8f211d..b169b93f481a 100644 --- a/metricbeat/processor/add_kubernetes_metadata/indexers.go +++ b/metricbeat/processor/add_kubernetes_metadata/indexers.go @@ -18,8 +18,8 @@ package add_kubernetes_metadata import ( - "github.com/elastic/beats/libbeat/common" - kubernetes "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v7/libbeat/common" + kubernetes "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" ) func init() { diff --git a/metricbeat/scripts/assets/assets.go b/metricbeat/scripts/assets/assets.go index 45ebfe46969b..51c24afe4528 100644 --- a/metricbeat/scripts/assets/assets.go +++ b/metricbeat/scripts/assets/assets.go @@ -24,9 +24,9 @@ import ( "os" "path" - "github.com/elastic/beats/libbeat/asset" - "github.com/elastic/beats/libbeat/generator/fields" - "github.com/elastic/beats/licenses" + "github.com/elastic/beats/v7/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/generator/fields" + "github.com/elastic/beats/v7/licenses" ) func main() { diff --git a/metricbeat/scripts/mage/config.go b/metricbeat/scripts/mage/config.go index d9e8c5fc581a..ffa30d27bad3 100644 --- a/metricbeat/scripts/mage/config.go +++ b/metricbeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const modulesConfigYml = "build/config.modules.yml" diff --git a/metricbeat/scripts/mage/docs_collector.go b/metricbeat/scripts/mage/docs_collector.go index 57651dee0bae..3c92e9fb9ca1 100644 --- a/metricbeat/scripts/mage/docs_collector.go +++ b/metricbeat/scripts/mage/docs_collector.go @@ -32,7 +32,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/elastic/beats/dev-tools/mage" + "github.com/elastic/beats/v7/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 df3441ecf861..a46110fee928 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/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 1f527114f02d..15498e8028f7 100644 --- a/metricbeat/scripts/mage/package.go +++ b/metricbeat/scripts/mage/package.go @@ -28,7 +28,7 @@ import ( "github.com/magefile/mage/mg" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/metricbeat/scripts/module/metricset/metricset.go.tmpl b/metricbeat/scripts/module/metricset/metricset.go.tmpl index e2c455cb6497..a156abd916f0 100644 --- a/metricbeat/scripts/module/metricset/metricset.go.tmpl +++ b/metricbeat/scripts/module/metricset/metricset.go.tmpl @@ -1,9 +1,9 @@ package {metricset} import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/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 d964f79b0d2b..fec8aa0f1e1d 100644 --- a/metricbeat/scripts/msetlists/cmd/main.go +++ b/metricbeat/scripts/msetlists/cmd/main.go @@ -22,10 +22,10 @@ import ( "fmt" "os" - "github.com/elastic/beats/libbeat/paths" - _ "github.com/elastic/beats/metricbeat/include" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/scripts/msetlists" + "github.com/elastic/beats/v7/libbeat/paths" + _ "github.com/elastic/beats/v7/metricbeat/include" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/scripts/msetlists" ) func main() { diff --git a/metricbeat/scripts/msetlists/msetlists.go b/metricbeat/scripts/msetlists/msetlists.go index 7ede799ab10e..2280bcf2b6db 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/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // DefaultMetricsets returns a JSON array of all registered default metricsets diff --git a/packetbeat/beater/packetbeat.go b/packetbeat/beater/packetbeat.go index c7c6d53046fd..b862bd3ee112 100644 --- a/packetbeat/beater/packetbeat.go +++ b/packetbeat/beater/packetbeat.go @@ -26,25 +26,25 @@ import ( "github.com/tsg/gopacket/layers" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/service" - - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/decoder" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/icmp" - "github.com/elastic/beats/packetbeat/protos/tcp" - "github.com/elastic/beats/packetbeat/protos/udp" - "github.com/elastic/beats/packetbeat/publish" - "github.com/elastic/beats/packetbeat/sniffer" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/service" + + "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/v7/packetbeat/sniffer" // Add packetbeat default processors - _ "github.com/elastic/beats/packetbeat/processor/add_kubernetes_metadata" + _ "github.com/elastic/beats/v7/packetbeat/processor/add_kubernetes_metadata" ) // Beater object. Contains all objects needed to run the beat diff --git a/packetbeat/cmd/devices.go b/packetbeat/cmd/devices.go index 388232064c24..4635b822ab4b 100644 --- a/packetbeat/cmd/devices.go +++ b/packetbeat/cmd/devices.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/packetbeat/sniffer" + "github.com/elastic/beats/v7/packetbeat/sniffer" ) func genDevicesCommand() *cobra.Command { diff --git a/packetbeat/cmd/root.go b/packetbeat/cmd/root.go index bb8479f5e5f6..addc5fe5ad67 100644 --- a/packetbeat/cmd/root.go +++ b/packetbeat/cmd/root.go @@ -23,11 +23,11 @@ import ( "github.com/spf13/pflag" // import protocol modules - _ "github.com/elastic/beats/packetbeat/include" + _ "github.com/elastic/beats/v7/packetbeat/include" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/packetbeat/beater" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/packetbeat/beater" ) // Name of this beat diff --git a/packetbeat/config/config.go b/packetbeat/config/config.go index 45d79efd1d28..893e4828ab8f 100644 --- a/packetbeat/config/config.go +++ b/packetbeat/config/config.go @@ -20,9 +20,9 @@ package config import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/packetbeat/procs" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/packetbeat/procs" ) type Config struct { diff --git a/packetbeat/decoder/decoder.go b/packetbeat/decoder/decoder.go index 3aba33b7f88a..50e8f5954818 100644 --- a/packetbeat/decoder/decoder.go +++ b/packetbeat/decoder/decoder.go @@ -20,12 +20,12 @@ package decoder import ( "fmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/icmp" - "github.com/elastic/beats/packetbeat/protos/tcp" - "github.com/elastic/beats/packetbeat/protos/udp" + "github.com/elastic/beats/v7/libbeat/logp" + "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/tsg/gopacket" "github.com/tsg/gopacket/layers" diff --git a/packetbeat/decoder/decoder_test.go b/packetbeat/decoder/decoder_test.go index 90a33024fff4..954be381da03 100644 --- a/packetbeat/decoder/decoder_test.go +++ b/packetbeat/decoder/decoder_test.go @@ -23,9 +23,9 @@ import ( "strings" "testing" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/stretchr/testify/assert" "github.com/tsg/gopacket" diff --git a/packetbeat/flows/flows.go b/packetbeat/flows/flows.go index e3efb1a8ef8e..fb292b92bf2e 100644 --- a/packetbeat/flows/flows.go +++ b/packetbeat/flows/flows.go @@ -20,9 +20,9 @@ package flows import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/config" ) type Flows struct { diff --git a/packetbeat/flows/flows_test.go b/packetbeat/flows/flows_test.go index 06c903bd2a42..b1c3a5b83b93 100644 --- a/packetbeat/flows/flows_test.go +++ b/packetbeat/flows/flows_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/config" ) type flowsChan struct { diff --git a/packetbeat/flows/util.go b/packetbeat/flows/util.go index ab68c6ac446c..c5b928fae426 100644 --- a/packetbeat/flows/util.go +++ b/packetbeat/flows/util.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" ) type worker struct { diff --git a/packetbeat/flows/worker.go b/packetbeat/flows/worker.go index 80fbeb025654..8bfce02084a3 100644 --- a/packetbeat/flows/worker.go +++ b/packetbeat/flows/worker.go @@ -23,11 +23,11 @@ import ( "net" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos/applayer" + "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" ) type flowsProcessor struct { diff --git a/packetbeat/flows/worker_test.go b/packetbeat/flows/worker_test.go index c6d59c849a64..dab0d11eb14d 100644 --- a/packetbeat/flows/worker_test.go +++ b/packetbeat/flows/worker_test.go @@ -28,8 +28,8 @@ import ( "github.com/elastic/go-lookslike" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/packetbeat/include/fields.go b/packetbeat/include/fields.go index e2740da68745..ae2ce473d868 100644 --- a/packetbeat/include/fields.go +++ b/packetbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/include/list.go b/packetbeat/include/list.go index b5210f59448d..0dc1f0bd053c 100644 --- a/packetbeat/include/list.go +++ b/packetbeat/include/list.go @@ -21,18 +21,18 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/packetbeat/protos/amqp" - _ "github.com/elastic/beats/packetbeat/protos/cassandra" - _ "github.com/elastic/beats/packetbeat/protos/dhcpv4" - _ "github.com/elastic/beats/packetbeat/protos/dns" - _ "github.com/elastic/beats/packetbeat/protos/http" - _ "github.com/elastic/beats/packetbeat/protos/icmp" - _ "github.com/elastic/beats/packetbeat/protos/memcache" - _ "github.com/elastic/beats/packetbeat/protos/mongodb" - _ "github.com/elastic/beats/packetbeat/protos/mysql" - _ "github.com/elastic/beats/packetbeat/protos/nfs" - _ "github.com/elastic/beats/packetbeat/protos/pgsql" - _ "github.com/elastic/beats/packetbeat/protos/redis" - _ "github.com/elastic/beats/packetbeat/protos/thrift" - _ "github.com/elastic/beats/packetbeat/protos/tls" + _ "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/thrift" + _ "github.com/elastic/beats/v7/packetbeat/protos/tls" ) diff --git a/packetbeat/magefile.go b/packetbeat/magefile.go index e7a3afd24314..7793ed32ec07 100644 --- a/packetbeat/magefile.go +++ b/packetbeat/magefile.go @@ -31,13 +31,13 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" - packetbeat "github.com/elastic/beats/packetbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + packetbeat "github.com/elastic/beats/v7/packetbeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" ) func init() { @@ -280,7 +280,7 @@ var crossBuildDeps = map[string]func() error{ // buildLibpcapFromSource builds libpcap from source because the library needs // to be compiled with -fPIC. -// See https://github.com/elastic/beats/pull/4217. +// See https://github.com/elastic/beats/v7/pull/4217. func buildLibpcapFromSource(params map[string]string) error { tarFile, err := devtools.DownloadFile(libpcapURL, "/libpcap") if err != nil { @@ -422,7 +422,7 @@ func generateWin64StaticWinpcap() error { // Notes: We are using absolute path to make sure the files // are available for x-pack build. - // Ref: https://github.com/elastic/beats/issues/1259 + // Ref: https://github.com/elastic/beats/v7/issues/1259 defer devtools.DockerChown(devtools.MustExpand("{{elastic_beats_dir}}/{{.BeatName}}/lib")) return devtools.RunCmds( // Requires mingw-w64-tools. diff --git a/packetbeat/main.go b/packetbeat/main.go index aa6ec0921494..c2b064f21881 100644 --- a/packetbeat/main.go +++ b/packetbeat/main.go @@ -20,7 +20,7 @@ package main import ( "os" - "github.com/elastic/beats/packetbeat/cmd" + "github.com/elastic/beats/v7/packetbeat/cmd" ) var Name = "packetbeat" diff --git a/packetbeat/main_test.go b/packetbeat/main_test.go index 93697593f25d..80c9d76920d4 100644 --- a/packetbeat/main_test.go +++ b/packetbeat/main_test.go @@ -23,8 +23,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" - "github.com/elastic/beats/packetbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/packetbeat/cmd" ) var systemTest *bool diff --git a/packetbeat/pb/event.go b/packetbeat/pb/event.go index ebed6ebb708d..d4330b542eac 100644 --- a/packetbeat/pb/event.go +++ b/packetbeat/pb/event.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" + "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/ecs/code/go/ecs" ) diff --git a/packetbeat/pb/event_test.go b/packetbeat/pb/event_test.go index 788003d7691d..b44bd4c5c4c3 100644 --- a/packetbeat/pb/event_test.go +++ b/packetbeat/pb/event_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/processor/add_kubernetes_metadata/indexers.go b/packetbeat/processor/add_kubernetes_metadata/indexers.go index 5283f299e619..474f111e97fe 100644 --- a/packetbeat/processor/add_kubernetes_metadata/indexers.go +++ b/packetbeat/processor/add_kubernetes_metadata/indexers.go @@ -18,8 +18,8 @@ package add_kubernetes_metadata import ( - "github.com/elastic/beats/libbeat/common" - kubernetes "github.com/elastic/beats/libbeat/processors/add_kubernetes_metadata" + "github.com/elastic/beats/v7/libbeat/common" + kubernetes "github.com/elastic/beats/v7/libbeat/processors/add_kubernetes_metadata" ) func init() { diff --git a/packetbeat/procs/procs.go b/packetbeat/procs/procs.go index b94cdaa5b825..dfead47d93cb 100644 --- a/packetbeat/procs/procs.go +++ b/packetbeat/procs/procs.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" "github.com/elastic/go-sysinfo" ) diff --git a/packetbeat/procs/procs_linux.go b/packetbeat/procs/procs_linux.go index e9a48ccfdada..944924c88b16 100644 --- a/packetbeat/procs/procs_linux.go +++ b/packetbeat/procs/procs_linux.go @@ -31,8 +31,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" "github.com/elastic/gosigar" ) diff --git a/packetbeat/procs/procs_linux_test.go b/packetbeat/procs/procs_linux_test.go index 72fdd4c0fb5e..25a856ed2f8b 100644 --- a/packetbeat/procs/procs_linux_test.go +++ b/packetbeat/procs/procs_linux_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type testProcFile struct { diff --git a/packetbeat/procs/procs_other.go b/packetbeat/procs/procs_other.go index 50c7d1e100fd..0e401806aba7 100644 --- a/packetbeat/procs/procs_other.go +++ b/packetbeat/procs/procs_other.go @@ -19,7 +19,7 @@ package procs -import "github.com/elastic/beats/packetbeat/protos/applayer" +import "github.com/elastic/beats/v7/packetbeat/protos/applayer" // GetLocalPortToPIDMapping returns the list of local port numbers and the PID // that owns them. diff --git a/packetbeat/procs/procs_test.go b/packetbeat/procs/procs_test.go index ca71152c8233..359640d0bcb6 100644 --- a/packetbeat/procs/procs_test.go +++ b/packetbeat/procs/procs_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type testingImpl struct { diff --git a/packetbeat/procs/procs_windows.go b/packetbeat/procs/procs_windows.go index 87919d18af99..b18bd792841c 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/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) var machineEndiannes = getMachineEndiannes() diff --git a/packetbeat/protocols/plugin.go b/packetbeat/protocols/plugin.go index 565850981814..46fd784e64b0 100644 --- a/packetbeat/protocols/plugin.go +++ b/packetbeat/protocols/plugin.go @@ -20,8 +20,8 @@ package protocols import ( "errors" - "github.com/elastic/beats/libbeat/plugin" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/plugin" + "github.com/elastic/beats/v7/packetbeat/protos" ) type protocolPlugin struct { diff --git a/packetbeat/protos/amqp/amqp.go b/packetbeat/protos/amqp/amqp.go index f2a2ca026012..8b5689e4f2e7 100644 --- a/packetbeat/protos/amqp/amqp.go +++ b/packetbeat/protos/amqp/amqp.go @@ -22,13 +22,13 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) var ( diff --git a/packetbeat/protos/amqp/amqp_fields.go b/packetbeat/protos/amqp/amqp_fields.go index 1926e734558e..ff4f7c382b5c 100644 --- a/packetbeat/protos/amqp/amqp_fields.go +++ b/packetbeat/protos/amqp/amqp_fields.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func getTable(fields common.MapStr, data []byte, offset uint32) (next uint32, err bool, exists bool) { diff --git a/packetbeat/protos/amqp/amqp_methods.go b/packetbeat/protos/amqp/amqp_methods.go index b3936e973828..93cec5f27474 100644 --- a/packetbeat/protos/amqp/amqp_methods.go +++ b/packetbeat/protos/amqp/amqp_methods.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func connectionStartMethod(m *amqpMessage, args []byte) (bool, bool) { diff --git a/packetbeat/protos/amqp/amqp_parser.go b/packetbeat/protos/amqp/amqp_parser.go index 2e59641bd903..eeaaf2a94646 100644 --- a/packetbeat/protos/amqp/amqp_parser.go +++ b/packetbeat/protos/amqp/amqp_parser.go @@ -21,9 +21,9 @@ import ( "encoding/binary" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/procs" ) func (amqp *amqpPlugin) amqpMessageParser(s *amqpStream) (ok bool, complete bool) { diff --git a/packetbeat/protos/amqp/amqp_structs.go b/packetbeat/protos/amqp/amqp_structs.go index 17d253994e72..387e8df6fcb4 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type amqpMethod func(*amqpMessage, []byte) (bool, bool) diff --git a/packetbeat/protos/amqp/amqp_test.go b/packetbeat/protos/amqp/amqp_test.go index 6a17068ac4c0..d9f583cdc22b 100644 --- a/packetbeat/protos/amqp/amqp_test.go +++ b/packetbeat/protos/amqp/amqp_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/amqp/config.go b/packetbeat/protos/amqp/config.go index 67db3ec2b541..2939530046ee 100644 --- a/packetbeat/protos/amqp/config.go +++ b/packetbeat/protos/amqp/config.go @@ -18,8 +18,8 @@ package amqp import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type amqpConfig struct { diff --git a/packetbeat/protos/amqp/fields.go b/packetbeat/protos/amqp/fields.go index 863436c0a293..d8f3457a9afa 100644 --- a/packetbeat/protos/amqp/fields.go +++ b/packetbeat/protos/amqp/fields.go @@ -20,7 +20,7 @@ package amqp import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/applayer/applayer.go b/packetbeat/protos/applayer/applayer.go index 21b740c73e12..597edb0d0eb2 100644 --- a/packetbeat/protos/applayer/applayer.go +++ b/packetbeat/protos/applayer/applayer.go @@ -23,11 +23,11 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "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/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/pb" ) // A Message its direction indicator diff --git a/packetbeat/protos/cassandra/cassandra.go b/packetbeat/protos/cassandra/cassandra.go index 495095ae9e4f..ed0f48e91a44 100644 --- a/packetbeat/protos/cassandra/cassandra.go +++ b/packetbeat/protos/cassandra/cassandra.go @@ -20,13 +20,13 @@ package cassandra import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" - gocql "github.com/elastic/beats/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v7/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 74262631c40e..0eafddcd1ee0 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/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" - gocql "github.com/elastic/beats/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" ) type cassandraConfig struct { diff --git a/packetbeat/protos/cassandra/fields.go b/packetbeat/protos/cassandra/fields.go index 8fbec81bde79..f8730fd902e3 100644 --- a/packetbeat/protos/cassandra/fields.go +++ b/packetbeat/protos/cassandra/fields.go @@ -20,7 +20,7 @@ package cassandra import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/cassandra/internal/gocql/frame.go b/packetbeat/protos/cassandra/internal/gocql/frame.go index 52ded24d5ccb..25e7df5bac88 100644 --- a/packetbeat/protos/cassandra/internal/gocql/frame.go +++ b/packetbeat/protos/cassandra/internal/gocql/frame.go @@ -23,8 +23,8 @@ import ( "runtime" "sync" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/packetbeat/protos/cassandra/internal/gocql/marshal.go b/packetbeat/protos/cassandra/internal/gocql/marshal.go index 207d52928390..2061bb2f11e8 100644 --- a/packetbeat/protos/cassandra/internal/gocql/marshal.go +++ b/packetbeat/protos/cassandra/internal/gocql/marshal.go @@ -28,7 +28,7 @@ import ( "gopkg.in/inf.v0" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // TypeInfo describes a Cassandra specific data type. diff --git a/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go b/packetbeat/protos/cassandra/internal/gocql/stream_decoder.go index 0450b5368789..ae107a95e9ed 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/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type StreamDecoder struct { diff --git a/packetbeat/protos/cassandra/parser.go b/packetbeat/protos/cassandra/parser.go index 7729b1ee619f..f699187b03f3 100644 --- a/packetbeat/protos/cassandra/parser.go +++ b/packetbeat/protos/cassandra/parser.go @@ -21,11 +21,11 @@ import ( "errors" "time" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" - gocql "github.com/elastic/beats/packetbeat/protos/cassandra/internal/gocql" + gocql "github.com/elastic/beats/v7/packetbeat/protos/cassandra/internal/gocql" ) type parser struct { diff --git a/packetbeat/protos/cassandra/pub.go b/packetbeat/protos/cassandra/pub.go index 2f79295ee03b..c4d0164310e4 100644 --- a/packetbeat/protos/cassandra/pub.go +++ b/packetbeat/protos/cassandra/pub.go @@ -20,11 +20,11 @@ package cassandra import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" ) // Transaction Publisher. diff --git a/packetbeat/protos/cassandra/trans.go b/packetbeat/protos/cassandra/trans.go index 49eb7be7cafd..62d36ee36955 100644 --- a/packetbeat/protos/cassandra/trans.go +++ b/packetbeat/protos/cassandra/trans.go @@ -20,10 +20,10 @@ package cassandra import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type transactions struct { diff --git a/packetbeat/protos/dhcpv4/config.go b/packetbeat/protos/dhcpv4/config.go index 7f2825de9637..4121ee66ba75 100644 --- a/packetbeat/protos/dhcpv4/config.go +++ b/packetbeat/protos/dhcpv4/config.go @@ -18,7 +18,7 @@ package dhcpv4 import ( - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/config" ) type dhcpv4Config struct { diff --git a/packetbeat/protos/dhcpv4/dhcpv4.go b/packetbeat/protos/dhcpv4/dhcpv4.go index 19b81c0717e1..a50108a83c6b 100644 --- a/packetbeat/protos/dhcpv4/dhcpv4.go +++ b/packetbeat/protos/dhcpv4/dhcpv4.go @@ -23,12 +23,12 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/protos/dhcpv4/dhcpv4_test.go b/packetbeat/protos/dhcpv4/dhcpv4_test.go index 56d9428ebe2b..72aade5014e3 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/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) var _ protos.UDPPlugin = &dhcpv4Plugin{} diff --git a/packetbeat/protos/dhcpv4/fields.go b/packetbeat/protos/dhcpv4/fields.go index b63c2a7e4c4e..19fae17fd5fd 100644 --- a/packetbeat/protos/dhcpv4/fields.go +++ b/packetbeat/protos/dhcpv4/fields.go @@ -20,7 +20,7 @@ package dhcpv4 import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/dhcpv4/options.go b/packetbeat/protos/dhcpv4/options.go index fcee2bc3c3b1..68ec4e8c32ce 100644 --- a/packetbeat/protos/dhcpv4/options.go +++ b/packetbeat/protos/dhcpv4/options.go @@ -26,7 +26,7 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func optionsToMap(options []dhcpv4.Option) (common.MapStr, error) { diff --git a/packetbeat/protos/dns/config.go b/packetbeat/protos/dns/config.go index d8e43be7e105..c98d52f8257f 100644 --- a/packetbeat/protos/dns/config.go +++ b/packetbeat/protos/dns/config.go @@ -18,8 +18,8 @@ package dns import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type dnsConfig struct { diff --git a/packetbeat/protos/dns/dns.go b/packetbeat/protos/dns/dns.go index 83720dad92e0..29efcc9bcdcc 100644 --- a/packetbeat/protos/dns/dns.go +++ b/packetbeat/protos/dns/dns.go @@ -34,11 +34,11 @@ import ( mkdns "github.com/miekg/dns" "golang.org/x/net/publicsuffix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" ) type dnsPlugin struct { diff --git a/packetbeat/protos/dns/dns_tcp.go b/packetbeat/protos/dns/dns_tcp.go index bce95d6c7660..310cf43553e3 100644 --- a/packetbeat/protos/dns/dns_tcp.go +++ b/packetbeat/protos/dns/dns_tcp.go @@ -20,12 +20,12 @@ package dns import ( "encoding/binary" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/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 a3a66965514c..826ba451c32f 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/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/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 edb5f48368e6..c5ee52eb5ebd 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/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) // Test Constants diff --git a/packetbeat/protos/dns/dns_udp.go b/packetbeat/protos/dns/dns_udp.go index d563a97837b7..652e03bb7174 100644 --- a/packetbeat/protos/dns/dns_udp.go +++ b/packetbeat/protos/dns/dns_udp.go @@ -18,10 +18,10 @@ package dns import ( - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" ) // Only EDNS packets should have their size beyond this value diff --git a/packetbeat/protos/dns/dns_udp_test.go b/packetbeat/protos/dns/dns_udp_test.go index 0861f0a5ba17..fb482b556767 100644 --- a/packetbeat/protos/dns/dns_udp_test.go +++ b/packetbeat/protos/dns/dns_udp_test.go @@ -40,8 +40,8 @@ import ( mkdns "github.com/miekg/dns" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/protos" ) // Verify that the interface for UDP has been satisfied. diff --git a/packetbeat/protos/dns/fields.go b/packetbeat/protos/dns/fields.go index ac3d950bea21..2c20d2faa00d 100644 --- a/packetbeat/protos/dns/fields.go +++ b/packetbeat/protos/dns/fields.go @@ -20,7 +20,7 @@ package dns import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/dns/names_test.go b/packetbeat/protos/dns/names_test.go index 25c31881016a..9066082cab8a 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type dnsTestMsg struct { diff --git a/packetbeat/protos/http/config.go b/packetbeat/protos/http/config.go index 14b3f55e359e..86f59fb36b1f 100644 --- a/packetbeat/protos/http/config.go +++ b/packetbeat/protos/http/config.go @@ -18,9 +18,9 @@ package http import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) type httpConfig struct { diff --git a/packetbeat/protos/http/event.go b/packetbeat/protos/http/event.go index f02aae421623..691f8b1d1560 100644 --- a/packetbeat/protos/http/event.go +++ b/packetbeat/protos/http/event.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/protos/http/fields.go b/packetbeat/protos/http/fields.go index 1c4efb516d26..079579e89b01 100644 --- a/packetbeat/protos/http/fields.go +++ b/packetbeat/protos/http/fields.go @@ -20,7 +20,7 @@ package http import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/http/http.go b/packetbeat/protos/http/http.go index dbc76badfd8f..efa344ab163b 100644 --- a/packetbeat/protos/http/http.go +++ b/packetbeat/protos/http/http.go @@ -28,13 +28,13 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/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/ecs/code/go/ecs" ) diff --git a/packetbeat/protos/http/http_parser.go b/packetbeat/protos/http/http_parser.go index 8548d0ecf7c7..748ea9dc712b 100644 --- a/packetbeat/protos/http/http_parser.go +++ b/packetbeat/protos/http/http_parser.go @@ -25,10 +25,10 @@ import ( "time" "unicode" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) // Http Message diff --git a/packetbeat/protos/http/http_test.go b/packetbeat/protos/http/http_test.go index f07af54008d7..69c8cd792ed7 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/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type testParser struct { diff --git a/packetbeat/protos/icmp/config.go b/packetbeat/protos/icmp/config.go index 6e4113cd52ea..cb3ee28d7f92 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/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos" ) type icmpConfig struct { diff --git a/packetbeat/protos/icmp/fields.go b/packetbeat/protos/icmp/fields.go index 7d01789a7be2..a2feb6509e2a 100644 --- a/packetbeat/protos/icmp/fields.go +++ b/packetbeat/protos/icmp/fields.go @@ -20,7 +20,7 @@ package icmp import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/icmp/icmp.go b/packetbeat/protos/icmp/icmp.go index 82b8481df923..3c4b692ca828 100644 --- a/packetbeat/protos/icmp/icmp.go +++ b/packetbeat/protos/icmp/icmp.go @@ -21,14 +21,14 @@ import ( "net" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" "github.com/elastic/ecs/code/go/ecs" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/tsg/gopacket/layers" ) diff --git a/packetbeat/protos/icmp/icmp_test.go b/packetbeat/protos/icmp/icmp_test.go index 0a8e7750b353..3ad537fa7d4a 100644 --- a/packetbeat/protos/icmp/icmp_test.go +++ b/packetbeat/protos/icmp/icmp_test.go @@ -24,11 +24,11 @@ import ( "net" "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/tsg/gopacket" "github.com/tsg/gopacket/layers" diff --git a/packetbeat/protos/icmp/message.go b/packetbeat/protos/icmp/message.go index 0a8b857c2df8..873809a212a9 100644 --- a/packetbeat/protos/icmp/message.go +++ b/packetbeat/protos/icmp/message.go @@ -23,7 +23,7 @@ import ( "github.com/tsg/gopacket/layers" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // TODO: more types (that are not provided as constants in gopacket) diff --git a/packetbeat/protos/memcache/binary.go b/packetbeat/protos/memcache/binary.go index 0ec929995e36..f9db915ce8a9 100644 --- a/packetbeat/protos/memcache/binary.go +++ b/packetbeat/protos/memcache/binary.go @@ -24,8 +24,8 @@ package memcache // init function. import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type memcacheMagic uint8 diff --git a/packetbeat/protos/memcache/commands.go b/packetbeat/protos/memcache/commands.go index 8afe3ca1795f..399647bac5a9 100644 --- a/packetbeat/protos/memcache/commands.go +++ b/packetbeat/protos/memcache/commands.go @@ -21,8 +21,8 @@ package memcache // binary/text protocol based commands with setters and serializers. import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type commandType struct { diff --git a/packetbeat/protos/memcache/config.go b/packetbeat/protos/memcache/config.go index cc0863fbe690..e558c84153dd 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/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type memcacheConfig struct { diff --git a/packetbeat/protos/memcache/fields.go b/packetbeat/protos/memcache/fields.go index 8e886384959a..a346cddbd4f8 100644 --- a/packetbeat/protos/memcache/fields.go +++ b/packetbeat/protos/memcache/fields.go @@ -20,7 +20,7 @@ package memcache import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/memcache/memcache.go b/packetbeat/protos/memcache/memcache.go index 96676a4a7f18..74bbd0f3f89c 100644 --- a/packetbeat/protos/memcache/memcache.go +++ b/packetbeat/protos/memcache/memcache.go @@ -24,13 +24,13 @@ import ( "math" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) // memcache types diff --git a/packetbeat/protos/memcache/memcache_test.go b/packetbeat/protos/memcache/memcache_test.go index 63cfadc463e3..7e6f61cd67e0 100644 --- a/packetbeat/protos/memcache/memcache_test.go +++ b/packetbeat/protos/memcache/memcache_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type memcacheTest struct { diff --git a/packetbeat/protos/memcache/parse.go b/packetbeat/protos/memcache/parse.go index 64e1486a70df..2fe774c19e5c 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/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) const ( diff --git a/packetbeat/protos/memcache/parse_test.go b/packetbeat/protos/memcache/parse_test.go index c61e7875cffd..f50b156a789c 100644 --- a/packetbeat/protos/memcache/parse_test.go +++ b/packetbeat/protos/memcache/parse_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type testParser struct { diff --git a/packetbeat/protos/memcache/plugin_tcp.go b/packetbeat/protos/memcache/plugin_tcp.go index ff9f15f266b7..e9dded17dd65 100644 --- a/packetbeat/protos/memcache/plugin_tcp.go +++ b/packetbeat/protos/memcache/plugin_tcp.go @@ -22,13 +22,13 @@ package memcache import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" - "github.com/elastic/beats/packetbeat/protos/tcp" + "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" ) type tcpMemcache struct { diff --git a/packetbeat/protos/memcache/plugin_udp.go b/packetbeat/protos/memcache/plugin_udp.go index e0041ccf83f1..850c6e421fb2 100644 --- a/packetbeat/protos/memcache/plugin_udp.go +++ b/packetbeat/protos/memcache/plugin_udp.go @@ -23,13 +23,13 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/applayer" ) type udpMemcache struct { diff --git a/packetbeat/protos/memcache/text.go b/packetbeat/protos/memcache/text.go index 769ccbf08e98..72b36442c9a5 100644 --- a/packetbeat/protos/memcache/text.go +++ b/packetbeat/protos/memcache/text.go @@ -29,8 +29,8 @@ import ( "bytes" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type textCommandType struct { diff --git a/packetbeat/protos/mongodb/config.go b/packetbeat/protos/mongodb/config.go index 76e1fc998c18..e7e2143b6474 100644 --- a/packetbeat/protos/mongodb/config.go +++ b/packetbeat/protos/mongodb/config.go @@ -18,8 +18,8 @@ package mongodb import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type mongodbConfig struct { diff --git a/packetbeat/protos/mongodb/fields.go b/packetbeat/protos/mongodb/fields.go index 4a84b24f29fb..5293efdece9a 100644 --- a/packetbeat/protos/mongodb/fields.go +++ b/packetbeat/protos/mongodb/fields.go @@ -20,7 +20,7 @@ package mongodb import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/mongodb/mongodb.go b/packetbeat/protos/mongodb/mongodb.go index c3690944325f..ac3e66dca5ee 100644 --- a/packetbeat/protos/mongodb/mongodb.go +++ b/packetbeat/protos/mongodb/mongodb.go @@ -22,14 +22,14 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/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" ) var debugf = logp.MakeDebug("mongodb") diff --git a/packetbeat/protos/mongodb/mongodb_parser.go b/packetbeat/protos/mongodb/mongodb_parser.go index cbbeca800ebb..a5ff5fa06253 100644 --- a/packetbeat/protos/mongodb/mongodb_parser.go +++ b/packetbeat/protos/mongodb/mongodb_parser.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" "gopkg.in/mgo.v2/bson" ) diff --git a/packetbeat/protos/mongodb/mongodb_structs.go b/packetbeat/protos/mongodb/mongodb_structs.go index b3366f0b97bb..6bd66b4570f8 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/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type mongodbMessage struct { diff --git a/packetbeat/protos/mongodb/mongodb_test.go b/packetbeat/protos/mongodb/mongodb_test.go index 09cc2a1ef4f9..4bd16ec121d0 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/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" ) type eventStore struct { diff --git a/packetbeat/protos/mysql/config.go b/packetbeat/protos/mysql/config.go index 4429946f7f34..d53429c3a2cd 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/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type mysqlConfig struct { diff --git a/packetbeat/protos/mysql/fields.go b/packetbeat/protos/mysql/fields.go index 609b5d029623..05c415aebd8a 100644 --- a/packetbeat/protos/mysql/fields.go +++ b/packetbeat/protos/mysql/fields.go @@ -20,7 +20,7 @@ package mysql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/mysql/mysql.go b/packetbeat/protos/mysql/mysql.go index 1e6fc5179def..4d08debf9767 100644 --- a/packetbeat/protos/mysql/mysql.go +++ b/packetbeat/protos/mysql/mysql.go @@ -25,14 +25,14 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/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" ) // Packet types diff --git a/packetbeat/protos/mysql/mysql_test.go b/packetbeat/protos/mysql/mysql_test.go index 20332a08cc1a..9bdfdb2cf072 100644 --- a/packetbeat/protos/mysql/mysql_test.go +++ b/packetbeat/protos/mysql/mysql_test.go @@ -27,13 +27,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/publish" ) const serverPort = 3306 diff --git a/packetbeat/protos/nfs/config.go b/packetbeat/protos/nfs/config.go index 70f9cef0a0e6..639bdad525d6 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/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/config" ) type rpcConfig struct { diff --git a/packetbeat/protos/nfs/fields.go b/packetbeat/protos/nfs/fields.go index d195b065d791..7ebf9023bbc8 100644 --- a/packetbeat/protos/nfs/fields.go +++ b/packetbeat/protos/nfs/fields.go @@ -20,7 +20,7 @@ package nfs import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/nfs/nfs.go b/packetbeat/protos/nfs/nfs.go index cb207cf8f9d3..9537f9924ec3 100644 --- a/packetbeat/protos/nfs/nfs.go +++ b/packetbeat/protos/nfs/nfs.go @@ -18,9 +18,9 @@ package nfs import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/pb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/pb" ) type nfs struct { diff --git a/packetbeat/protos/nfs/request_handler.go b/packetbeat/protos/nfs/request_handler.go index bd56466197d1..241e0dca482c 100644 --- a/packetbeat/protos/nfs/request_handler.go +++ b/packetbeat/protos/nfs/request_handler.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/pb" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) const nfsProgramNumber = 100003 diff --git a/packetbeat/protos/nfs/rpc.go b/packetbeat/protos/nfs/rpc.go index 7607bb507b85..f115cf19fba0 100644 --- a/packetbeat/protos/nfs/rpc.go +++ b/packetbeat/protos/nfs/rpc.go @@ -26,11 +26,11 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos/tcp" ) var debugf = logp.MakeDebug("rpc") diff --git a/packetbeat/protos/pgsql/config.go b/packetbeat/protos/pgsql/config.go index 4a647483f4fa..54a9a1b9e2eb 100644 --- a/packetbeat/protos/pgsql/config.go +++ b/packetbeat/protos/pgsql/config.go @@ -18,8 +18,8 @@ package pgsql import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type pgsqlConfig struct { diff --git a/packetbeat/protos/pgsql/fields.go b/packetbeat/protos/pgsql/fields.go index f01c41c8bd51..9e6dd8c6a8ad 100644 --- a/packetbeat/protos/pgsql/fields.go +++ b/packetbeat/protos/pgsql/fields.go @@ -20,7 +20,7 @@ package pgsql import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/pgsql/parse.go b/packetbeat/protos/pgsql/parse.go index cf7d9f72d97e..a7bcdb44770a 100644 --- a/packetbeat/protos/pgsql/parse.go +++ b/packetbeat/protos/pgsql/parse.go @@ -21,7 +21,7 @@ import ( "errors" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/packetbeat/protos/pgsql/pgsql.go b/packetbeat/protos/pgsql/pgsql.go index a16c07d64b9a..69bfb4688879 100644 --- a/packetbeat/protos/pgsql/pgsql.go +++ b/packetbeat/protos/pgsql/pgsql.go @@ -22,14 +22,14 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/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" "go.uber.org/zap" ) diff --git a/packetbeat/protos/pgsql/pgsql_test.go b/packetbeat/protos/pgsql/pgsql_test.go index 259f727adc43..356d367c3911 100644 --- a/packetbeat/protos/pgsql/pgsql_test.go +++ b/packetbeat/protos/pgsql/pgsql_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/protos.go b/packetbeat/protos/protos.go index fe801f96c616..9991458eb2b8 100644 --- a/packetbeat/protos/protos.go +++ b/packetbeat/protos/protos.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" + "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/libbeat/logp" ) const ( diff --git a/packetbeat/protos/protos_test.go b/packetbeat/protos/protos_test.go index 2d482d7179b0..4d61d20038e0 100644 --- a/packetbeat/protos/protos_test.go +++ b/packetbeat/protos/protos_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/protos/redis/config.go b/packetbeat/protos/redis/config.go index 0450923ca898..beb1caed2e2f 100644 --- a/packetbeat/protos/redis/config.go +++ b/packetbeat/protos/redis/config.go @@ -18,8 +18,8 @@ package redis import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type redisConfig struct { diff --git a/packetbeat/protos/redis/fields.go b/packetbeat/protos/redis/fields.go index 7e816a6ac811..6c6bb66c0e3e 100644 --- a/packetbeat/protos/redis/fields.go +++ b/packetbeat/protos/redis/fields.go @@ -20,7 +20,7 @@ package redis import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/redis/redis.go b/packetbeat/protos/redis/redis.go index 3962c199a8e8..e7feac645c53 100644 --- a/packetbeat/protos/redis/redis.go +++ b/packetbeat/protos/redis/redis.go @@ -21,16 +21,16 @@ import ( "bytes" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/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" ) type stream struct { diff --git a/packetbeat/protos/redis/redis_parse.go b/packetbeat/protos/redis/redis_parse.go index 5ec9c3a7c286..c99679a1ba6f 100644 --- a/packetbeat/protos/redis/redis_parse.go +++ b/packetbeat/protos/redis/redis_parse.go @@ -20,9 +20,9 @@ package redis import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) type parser struct { diff --git a/packetbeat/protos/registry.go b/packetbeat/protos/registry.go index c8b5ad56517a..f1fc17b70740 100644 --- a/packetbeat/protos/registry.go +++ b/packetbeat/protos/registry.go @@ -20,8 +20,8 @@ package protos import ( "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) type ProtocolPlugin func( diff --git a/packetbeat/protos/tcp/tcp.go b/packetbeat/protos/tcp/tcp.go index 215b0cd0d80b..e9db7b948972 100644 --- a/packetbeat/protos/tcp/tcp.go +++ b/packetbeat/protos/tcp/tcp.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/tsg/gopacket/layers" ) diff --git a/packetbeat/protos/tcp/tcp_test.go b/packetbeat/protos/tcp/tcp_test.go index 879921022300..c34611729376 100644 --- a/packetbeat/protos/tcp/tcp_test.go +++ b/packetbeat/protos/tcp/tcp_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/stretchr/testify/assert" "github.com/tsg/gopacket/layers" diff --git a/packetbeat/protos/thrift/config.go b/packetbeat/protos/thrift/config.go index 4f770fa79ee0..f687da9ac0c1 100644 --- a/packetbeat/protos/thrift/config.go +++ b/packetbeat/protos/thrift/config.go @@ -18,8 +18,8 @@ package thrift import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type thriftConfig struct { diff --git a/packetbeat/protos/thrift/fields.go b/packetbeat/protos/thrift/fields.go index 3fdd330f1887..29347f3b1f31 100644 --- a/packetbeat/protos/thrift/fields.go +++ b/packetbeat/protos/thrift/fields.go @@ -20,7 +20,7 @@ package thrift import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/thrift/thrift.go b/packetbeat/protos/thrift/thrift.go index 8241f4001084..8c15b9bdf9c6 100644 --- a/packetbeat/protos/thrift/thrift.go +++ b/packetbeat/protos/thrift/thrift.go @@ -27,14 +27,14 @@ import ( "time" "unicode/utf8" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/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" ) type thriftPlugin struct { diff --git a/packetbeat/protos/thrift/thrift_idl.go b/packetbeat/protos/thrift/thrift_idl.go index 8d4d891bc86e..82d8dedbe939 100644 --- a/packetbeat/protos/thrift/thrift_idl.go +++ b/packetbeat/protos/thrift/thrift_idl.go @@ -20,7 +20,7 @@ package thrift import ( "fmt" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/samuel/go-thrift/parser" ) diff --git a/packetbeat/protos/thrift/thrift_idl_test.go b/packetbeat/protos/thrift/thrift_idl_test.go index 3120abe9ef0c..e1d5a334b87a 100644 --- a/packetbeat/protos/thrift/thrift_idl_test.go +++ b/packetbeat/protos/thrift/thrift_idl_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func thriftIdlForTesting(t *testing.T, content string) *thriftIdl { diff --git a/packetbeat/protos/thrift/thrift_test.go b/packetbeat/protos/thrift/thrift_test.go index 58cf9a26f24f..2c6618bab770 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/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" ) func thriftForTests() *thriftPlugin { diff --git a/packetbeat/protos/tls/alerts.go b/packetbeat/protos/tls/alerts.go index 1ff6cbb8cc05..4713e7e81f60 100644 --- a/packetbeat/protos/tls/alerts.go +++ b/packetbeat/protos/tls/alerts.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) type alertSeverity uint8 diff --git a/packetbeat/protos/tls/alerts_test.go b/packetbeat/protos/tls/alerts_test.go index 5a33704eb66d..5c35d3bbf28d 100644 --- a/packetbeat/protos/tls/alerts_test.go +++ b/packetbeat/protos/tls/alerts_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) func getParser() *parser { diff --git a/packetbeat/protos/tls/buffer.go b/packetbeat/protos/tls/buffer.go index 30864f803123..55205fd6fd41 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/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/common/streambuf" ) type bufferView struct { diff --git a/packetbeat/protos/tls/config.go b/packetbeat/protos/tls/config.go index 5f35d4e54362..775a8f69cc10 100644 --- a/packetbeat/protos/tls/config.go +++ b/packetbeat/protos/tls/config.go @@ -18,8 +18,8 @@ package tls import ( - "github.com/elastic/beats/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/protos" ) type tlsConfig struct { diff --git a/packetbeat/protos/tls/extensions.go b/packetbeat/protos/tls/extensions.go index 50a5ddf23b2b..0021705c7f7f 100644 --- a/packetbeat/protos/tls/extensions.go +++ b/packetbeat/protos/tls/extensions.go @@ -21,8 +21,8 @@ import ( "fmt" "strconv" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // ExtensionID is the 16-bit identifier for an extension diff --git a/packetbeat/protos/tls/fields.go b/packetbeat/protos/tls/fields.go index f25aabd7bf5e..f56f6af273aa 100644 --- a/packetbeat/protos/tls/fields.go +++ b/packetbeat/protos/tls/fields.go @@ -20,7 +20,7 @@ package tls import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/packetbeat/protos/tls/ja3_test.go b/packetbeat/protos/tls/ja3_test.go index c8f58333063d..b71ef35f4654 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/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/protos" "github.com/stretchr/testify/assert" ) diff --git a/packetbeat/protos/tls/parse.go b/packetbeat/protos/tls/parse.go index 2191a7a8afde..d6714a76784a 100644 --- a/packetbeat/protos/tls/parse.go +++ b/packetbeat/protos/tls/parse.go @@ -27,9 +27,9 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) type direction uint8 diff --git a/packetbeat/protos/tls/parse_test.go b/packetbeat/protos/tls/parse_test.go index aaad54f30bf0..f8635371494d 100644 --- a/packetbeat/protos/tls/parse_test.go +++ b/packetbeat/protos/tls/parse_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/streambuf" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/packetbeat/protos/tls/tls.go b/packetbeat/protos/tls/tls.go index b8b5431f1ee8..ab068884b615 100644 --- a/packetbeat/protos/tls/tls.go +++ b/packetbeat/protos/tls/tls.go @@ -24,15 +24,15 @@ import ( "github.com/elastic/ecs/code/go/ecs" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/x509util" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/pb" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/applayer" - "github.com/elastic/beats/packetbeat/protos/tcp" + "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/logp" + "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" ) type stream struct { diff --git a/packetbeat/protos/tls/tls_test.go b/packetbeat/protos/tls/tls_test.go index 0fc9cc501e4a..608e87738837 100644 --- a/packetbeat/protos/tls/tls_test.go +++ b/packetbeat/protos/tls/tls_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/publish" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/publish" ) type eventStore struct { diff --git a/packetbeat/protos/udp/udp.go b/packetbeat/protos/udp/udp.go index 8e05691d95c3..1d26fbf0c877 100644 --- a/packetbeat/protos/udp/udp.go +++ b/packetbeat/protos/udp/udp.go @@ -20,11 +20,11 @@ package udp import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/flows" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/flows" + "github.com/elastic/beats/v7/packetbeat/protos" ) type UDP struct { diff --git a/packetbeat/protos/udp/udp_test.go b/packetbeat/protos/udp/udp_test.go index 32b4503945a4..32eae60308ac 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/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/protos" // import plugins for testing - _ "github.com/elastic/beats/packetbeat/protos/http" - _ "github.com/elastic/beats/packetbeat/protos/mysql" - _ "github.com/elastic/beats/packetbeat/protos/redis" + _ "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/stretchr/testify/assert" ) diff --git a/packetbeat/publish/publish.go b/packetbeat/publish/publish.go index 844f6d4e9b07..7890a1c173d9 100644 --- a/packetbeat/publish/publish.go +++ b/packetbeat/publish/publish.go @@ -22,11 +22,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/packetbeat/pb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/packetbeat/pb" ) type TransactionPublisher struct { diff --git a/packetbeat/publish/publish_test.go b/packetbeat/publish/publish_test.go index 895d8247bdab..711758187b0c 100644 --- a/packetbeat/publish/publish_test.go +++ b/packetbeat/publish/publish_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/packetbeat/pb" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/packetbeat/pb" "github.com/elastic/ecs/code/go/ecs" ) diff --git a/packetbeat/scripts/mage/config.go b/packetbeat/scripts/mage/config.go index d1b695e97b33..fac457cd7efd 100644 --- a/packetbeat/scripts/mage/config.go +++ b/packetbeat/scripts/mage/config.go @@ -18,7 +18,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) const ( diff --git a/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl b/packetbeat/scripts/tcp-protocol/{protocol}/config.go.tmpl index 4e8ff9702841..66ca38c28360 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/packetbeat/config" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/packetbeat/config" + "github.com/elastic/beats/v7/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 dc114289482a..00c64cf15dc3 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/libbeat/common/streambuf" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common/streambuf" + "github.com/elastic/beats/v7/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 a6cdb7ff73e9..cf69faac9c90 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/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/packetbeat/protos" + "github.com/elastic/beats/v7/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 e234d01ceb66..4f7ad362bfed 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/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/packetbeat/procs" - "github.com/elastic/beats/packetbeat/protos/applayer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/packetbeat/procs" + "github.com/elastic/beats/v7/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 98f5758283d9..f783e8403018 100644 --- a/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl +++ b/packetbeat/scripts/tcp-protocol/{protocol}/{protocol}.go.tmpl @@ -3,11 +3,11 @@ package {protocol} import ( "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/protos" - "github.com/elastic/beats/packetbeat/protos/tcp" + "github.com/elastic/beats/v7/packetbeat/protos" + "github.com/elastic/beats/v7/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 005254a4ff4c..c95e7a377975 100644 --- a/packetbeat/sniffer/afpacket_linux.go +++ b/packetbeat/sniffer/afpacket_linux.go @@ -25,7 +25,7 @@ import ( "time" "unsafe" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/tsg/gopacket" "github.com/tsg/gopacket/afpacket" diff --git a/packetbeat/sniffer/device.go b/packetbeat/sniffer/device.go index 29fc4cbe69cb..52ff220309dc 100644 --- a/packetbeat/sniffer/device.go +++ b/packetbeat/sniffer/device.go @@ -24,7 +24,7 @@ import ( "github.com/tsg/gopacket/pcap" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var deviceAnySupported = runtime.GOOS == "linux" diff --git a/packetbeat/sniffer/file.go b/packetbeat/sniffer/file.go index 1d6913b92b13..b112e4c90edb 100644 --- a/packetbeat/sniffer/file.go +++ b/packetbeat/sniffer/file.go @@ -26,7 +26,7 @@ import ( "github.com/tsg/gopacket/layers" "github.com/tsg/gopacket/pcap" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type fileHandler struct { diff --git a/packetbeat/sniffer/sniffer.go b/packetbeat/sniffer/sniffer.go index d38101c4b20a..bfe720c7b985 100644 --- a/packetbeat/sniffer/sniffer.go +++ b/packetbeat/sniffer/sniffer.go @@ -29,10 +29,10 @@ import ( "github.com/tsg/gopacket/layers" "github.com/tsg/gopacket/pcap" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/packetbeat/config" + "github.com/elastic/beats/v7/packetbeat/config" ) // Sniffer provides packet sniffing capabilities, forwarding packets read diff --git a/winlogbeat/beater/acker.go b/winlogbeat/beater/acker.go index bcff2e2fb8a7..e9cc2e77c33c 100644 --- a/winlogbeat/beater/acker.go +++ b/winlogbeat/beater/acker.go @@ -21,8 +21,8 @@ import ( "context" "sync" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/winlogbeat/checkpoint" ) type eventACKer struct { diff --git a/winlogbeat/beater/eventlogger.go b/winlogbeat/beater/eventlogger.go index 29606c4eba82..6dc85d1e1407 100644 --- a/winlogbeat/beater/eventlogger.go +++ b/winlogbeat/beater/eventlogger.go @@ -21,15 +21,15 @@ import ( "io" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" - - "github.com/elastic/beats/winlogbeat/checkpoint" - "github.com/elastic/beats/winlogbeat/eventlog" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/add_formatted_index" + + "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/winlogbeat/eventlog" ) type eventLogger struct { diff --git a/winlogbeat/beater/eventlogger_test.go b/winlogbeat/beater/eventlogger_test.go index 7e55db8aeb0f..b59eb58e6c5d 100644 --- a/winlogbeat/beater/eventlogger_test.go +++ b/winlogbeat/beater/eventlogger_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestProcessorsForConfig(t *testing.T) { diff --git a/winlogbeat/beater/winlogbeat.go b/winlogbeat/beater/winlogbeat.go index bfda8ec567f0..f057830592c4 100644 --- a/winlogbeat/beater/winlogbeat.go +++ b/winlogbeat/beater/winlogbeat.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/paths" - - "github.com/elastic/beats/winlogbeat/checkpoint" - "github.com/elastic/beats/winlogbeat/config" - "github.com/elastic/beats/winlogbeat/eventlog" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/paths" + + "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/winlogbeat/config" + "github.com/elastic/beats/v7/winlogbeat/eventlog" ) // Debug logging functions for this package. diff --git a/winlogbeat/checkpoint/checkpoint.go b/winlogbeat/checkpoint/checkpoint.go index 6c7567ee8017..2ce455c97e30 100644 --- a/winlogbeat/checkpoint/checkpoint.go +++ b/winlogbeat/checkpoint/checkpoint.go @@ -31,7 +31,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Checkpoint persists event log state information to disk. diff --git a/winlogbeat/cmd/root.go b/winlogbeat/cmd/root.go index 2b230790915a..7075a51aeb00 100644 --- a/winlogbeat/cmd/root.go +++ b/winlogbeat/cmd/root.go @@ -18,17 +18,17 @@ package cmd import ( - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/winlogbeat/beater" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/winlogbeat/beater" // Register fields. - _ "github.com/elastic/beats/winlogbeat/include" + _ "github.com/elastic/beats/v7/winlogbeat/include" // Import processors and supporting modules. - _ "github.com/elastic/beats/libbeat/processors/script" - _ "github.com/elastic/beats/libbeat/processors/timestamp" - _ "github.com/elastic/beats/winlogbeat/processors/script/javascript/module/winlogbeat" + _ "github.com/elastic/beats/v7/libbeat/processors/script" + _ "github.com/elastic/beats/v7/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/winlogbeat/processors/script/javascript/module/winlogbeat" ) // Name of this beat diff --git a/winlogbeat/config/config.go b/winlogbeat/config/config.go index 362ad1a613db..9700554eacf6 100644 --- a/winlogbeat/config/config.go +++ b/winlogbeat/config/config.go @@ -24,7 +24,7 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) const ( diff --git a/winlogbeat/config/config_test.go b/winlogbeat/config/config_test.go index 03ef2b0cb701..aa468b44ed44 100644 --- a/winlogbeat/config/config_test.go +++ b/winlogbeat/config/config_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type validationTestCase struct { diff --git a/winlogbeat/eventlog/cache.go b/winlogbeat/eventlog/cache.go index 58d9e1bb1261..04c11a6c6213 100644 --- a/winlogbeat/eventlog/cache.go +++ b/winlogbeat/eventlog/cache.go @@ -24,9 +24,9 @@ import ( "expvar" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/winlogbeat/sys" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/winlogbeat/sys" ) // Stats for the message file caches. diff --git a/winlogbeat/eventlog/common_test.go b/winlogbeat/eventlog/common_test.go index 4dce42fd527c..a7f3f8b2cf12 100644 --- a/winlogbeat/eventlog/common_test.go +++ b/winlogbeat/eventlog/common_test.go @@ -20,8 +20,8 @@ package eventlog import ( "testing" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/winlogbeat/checkpoint" ) type factory func(*common.Config) (EventLog, error) diff --git a/winlogbeat/eventlog/eventlog.go b/winlogbeat/eventlog/eventlog.go index 3e02085bc3e1..468483a71d76 100644 --- a/winlogbeat/eventlog/eventlog.go +++ b/winlogbeat/eventlog/eventlog.go @@ -26,12 +26,12 @@ import ( "syscall" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/winlogbeat/checkpoint" - "github.com/elastic/beats/winlogbeat/sys" + "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/winlogbeat/sys" ) // Debug selectors used in this package. diff --git a/winlogbeat/eventlog/eventlogging.go b/winlogbeat/eventlog/eventlogging.go index d3f46cbfca9f..3e9494c91b60 100644 --- a/winlogbeat/eventlog/eventlogging.go +++ b/winlogbeat/eventlog/eventlogging.go @@ -26,11 +26,11 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/winlogbeat/checkpoint" - "github.com/elastic/beats/winlogbeat/sys" - win "github.com/elastic/beats/winlogbeat/sys/eventlogging" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/winlogbeat/sys" + win "github.com/elastic/beats/v7/winlogbeat/sys/eventlogging" ) const ( diff --git a/winlogbeat/eventlog/eventlogging_test.go b/winlogbeat/eventlog/eventlogging_test.go index 3f5acd679552..7ed4ea78772f 100644 --- a/winlogbeat/eventlog/eventlogging_test.go +++ b/winlogbeat/eventlog/eventlogging_test.go @@ -31,9 +31,9 @@ import ( "github.com/joeshaw/multierror" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/winlogbeat/checkpoint" - "github.com/elastic/beats/winlogbeat/sys/eventlogging" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/winlogbeat/sys/eventlogging" ) // Names that are registered by the test for logging events. diff --git a/winlogbeat/eventlog/factory.go b/winlogbeat/eventlog/factory.go index 5e22e3c550f1..dcb117d7df0e 100644 --- a/winlogbeat/eventlog/factory.go +++ b/winlogbeat/eventlog/factory.go @@ -24,7 +24,7 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var commonConfigKeys = []string{"api", "name", "fields", "fields_under_root", diff --git a/winlogbeat/eventlog/wineventlog.go b/winlogbeat/eventlog/wineventlog.go index 1da89f4028ae..db00f239974a 100644 --- a/winlogbeat/eventlog/wineventlog.go +++ b/winlogbeat/eventlog/wineventlog.go @@ -31,11 +31,11 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/windows" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/winlogbeat/checkpoint" - "github.com/elastic/beats/winlogbeat/sys" - win "github.com/elastic/beats/winlogbeat/sys/wineventlog" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/winlogbeat/sys" + win "github.com/elastic/beats/v7/winlogbeat/sys/wineventlog" ) const ( diff --git a/winlogbeat/include/fields.go b/winlogbeat/include/fields.go index 05c9ea35a258..a348b1bd436f 100644 --- a/winlogbeat/include/fields.go +++ b/winlogbeat/include/fields.go @@ -20,7 +20,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/winlogbeat/magefile.go b/winlogbeat/magefile.go index e358a4f6ad06..e0b50a21ad51 100644 --- a/winlogbeat/magefile.go +++ b/winlogbeat/magefile.go @@ -22,24 +22,24 @@ package main import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/build" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/build" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/dashboards" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/docs" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/docs" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" // mage:import - winlogbeat "github.com/elastic/beats/winlogbeat/scripts/mage" + winlogbeat "github.com/elastic/beats/v7/winlogbeat/scripts/mage" ) func init() { diff --git a/winlogbeat/main.go b/winlogbeat/main.go index c561fdb98096..600debc0a552 100644 --- a/winlogbeat/main.go +++ b/winlogbeat/main.go @@ -27,7 +27,7 @@ package main import ( "os" - "github.com/elastic/beats/winlogbeat/cmd" + "github.com/elastic/beats/v7/winlogbeat/cmd" ) func main() { diff --git a/winlogbeat/main_test.go b/winlogbeat/main_test.go index d92d7a8dfd2a..106da2a768c6 100644 --- a/winlogbeat/main_test.go +++ b/winlogbeat/main_test.go @@ -22,8 +22,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" - "github.com/elastic/beats/winlogbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/winlogbeat/cmd" ) var systemTest *bool diff --git a/winlogbeat/scripts/mage/config.go b/winlogbeat/scripts/mage/config.go index 5ef710dd07cc..1dae96510dda 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // config generates short/reference configs. diff --git a/winlogbeat/scripts/mage/docs.go b/winlogbeat/scripts/mage/docs.go index b8cd2a5c24b6..14980b63d732 100644 --- a/winlogbeat/scripts/mage/docs.go +++ b/winlogbeat/scripts/mage/docs.go @@ -27,7 +27,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage" ) const moduleDocsGlob = "module/*/_meta/docs.asciidoc" diff --git a/winlogbeat/scripts/mage/fields.go b/winlogbeat/scripts/mage/fields.go index 887dfdd9f1e9..0535419d70ee 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/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) var fb fieldsBuilder diff --git a/winlogbeat/scripts/mage/package.go b/winlogbeat/scripts/mage/package.go index bc30a185a475..89fb12c5173f 100644 --- a/winlogbeat/scripts/mage/package.go +++ b/winlogbeat/scripts/mage/package.go @@ -25,9 +25,9 @@ import ( "github.com/magefile/mage/mg" "github.com/pkg/errors" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/build" - "github.com/elastic/beats/dev-tools/mage/target/pkg" + 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" ) const ( diff --git a/winlogbeat/scripts/mage/update.go b/winlogbeat/scripts/mage/update.go index ddc3fee13b73..2c7d4dd840c9 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/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/target/build" - "github.com/elastic/beats/dev-tools/mage/target/common" - "github.com/elastic/beats/dev-tools/mage/target/dashboards" - "github.com/elastic/beats/dev-tools/mage/target/docs" + 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" ) func init() { diff --git a/winlogbeat/sys/eventlogging/eventlogging_windows.go b/winlogbeat/sys/eventlogging/eventlogging_windows.go index 29d2c47fdefd..f0984ced2096 100644 --- a/winlogbeat/sys/eventlogging/eventlogging_windows.go +++ b/winlogbeat/sys/eventlogging/eventlogging_windows.go @@ -29,8 +29,8 @@ import ( "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/winlogbeat/sys" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/winlogbeat/sys" ) // The value of EventID element contains the low-order 16 bits of the event diff --git a/winlogbeat/sys/eventlogging/stringinserts_windows.go b/winlogbeat/sys/eventlogging/stringinserts_windows.go index 3b9c9138a751..ad759104b5ba 100644 --- a/winlogbeat/sys/eventlogging/stringinserts_windows.go +++ b/winlogbeat/sys/eventlogging/stringinserts_windows.go @@ -22,7 +22,7 @@ import ( "reflect" "unsafe" - "github.com/elastic/beats/winlogbeat/sys" + "github.com/elastic/beats/v7/winlogbeat/sys" ) const ( diff --git a/winlogbeat/sys/wineventlog/wineventlog_windows.go b/winlogbeat/sys/wineventlog/wineventlog_windows.go index 9753f2a12599..57aaf4569472 100644 --- a/winlogbeat/sys/wineventlog/wineventlog_windows.go +++ b/winlogbeat/sys/wineventlog/wineventlog_windows.go @@ -29,7 +29,7 @@ import ( "golang.org/x/sys/windows" - "github.com/elastic/beats/winlogbeat/sys" + "github.com/elastic/beats/v7/winlogbeat/sys" ) // Errors diff --git a/x-pack/auditbeat/cmd/root.go b/x-pack/auditbeat/cmd/root.go index fbb38140e3f6..f1e3a2593d62 100644 --- a/x-pack/auditbeat/cmd/root.go +++ b/x-pack/auditbeat/cmd/root.go @@ -5,11 +5,11 @@ package cmd import ( - "github.com/elastic/beats/auditbeat/cmd" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/auditbeat/cmd" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" // Register Auditbeat x-pack modules. - _ "github.com/elastic/beats/x-pack/auditbeat/include" + _ "github.com/elastic/beats/v7/x-pack/auditbeat/include" ) // RootCmd to handle beats CLI. diff --git a/x-pack/auditbeat/include/list.go b/x-pack/auditbeat/include/list.go index b9cebbd33307..ef7001452925 100644 --- a/x-pack/auditbeat/include/list.go +++ b/x-pack/auditbeat/include/list.go @@ -8,11 +8,11 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/x-pack/auditbeat/module/system" - _ "github.com/elastic/beats/x-pack/auditbeat/module/system/host" - _ "github.com/elastic/beats/x-pack/auditbeat/module/system/login" - _ "github.com/elastic/beats/x-pack/auditbeat/module/system/package" - _ "github.com/elastic/beats/x-pack/auditbeat/module/system/process" - _ "github.com/elastic/beats/x-pack/auditbeat/module/system/socket" - _ "github.com/elastic/beats/x-pack/auditbeat/module/system/user" + _ "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" ) diff --git a/x-pack/auditbeat/magefile.go b/x-pack/auditbeat/magefile.go index a042d897a15b..39b1316ffd34 100644 --- a/x-pack/auditbeat/magefile.go +++ b/x-pack/auditbeat/magefile.go @@ -15,13 +15,13 @@ import ( "github.com/magefile/mage/sh" "github.com/pkg/errors" - auditbeat "github.com/elastic/beats/auditbeat/scripts/mage" - devtools "github.com/elastic/beats/dev-tools/mage" + auditbeat "github.com/elastic/beats/v7/auditbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest" ) func init() { @@ -221,7 +221,7 @@ func installDependencies(pkg, arch string) error { // TODO: This is only for debian 7 and should be removed when move to a newer OS. This flag is // going to be used unnecessary when building using non-debian7 images // (like when making the linux/arm binaries) and we should remove it soonish. - // See https://github.com/elastic/beats/issues/11750 for more details. + // See https://github.com/elastic/beats/v7/issues/11750 for more details. if err := sh.Run("apt-get", "update", "-o", "Acquire::Check-Valid-Until=false"); err != nil { return err } diff --git a/x-pack/auditbeat/main.go b/x-pack/auditbeat/main.go index c731b367cc3b..1c735eb34f1b 100644 --- a/x-pack/auditbeat/main.go +++ b/x-pack/auditbeat/main.go @@ -7,14 +7,14 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/auditbeat/cmd" + "github.com/elastic/beats/v7/x-pack/auditbeat/cmd" // Register modules. - _ "github.com/elastic/beats/auditbeat/module/auditd" - _ "github.com/elastic/beats/auditbeat/module/file_integrity" + _ "github.com/elastic/beats/v7/auditbeat/module/auditd" + _ "github.com/elastic/beats/v7/auditbeat/module/file_integrity" // Register includes. - _ "github.com/elastic/beats/auditbeat/include" + _ "github.com/elastic/beats/v7/auditbeat/include" ) func main() { diff --git a/x-pack/auditbeat/main_test.go b/x-pack/auditbeat/main_test.go index 5cae282115e9..7dd24b327fdc 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/auditbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/auditbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/x-pack/auditbeat/module/system/fields.go b/x-pack/auditbeat/module/system/fields.go index 77670acd9956..80e839562ad8 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/libbeat/asset" + "github.com/elastic/beats/v7/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 5b56c30ed8e9..540848f8a024 100644 --- a/x-pack/auditbeat/module/system/host/host.go +++ b/x-pack/auditbeat/module/system/host/host.go @@ -19,11 +19,11 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/types" ) diff --git a/x-pack/auditbeat/module/system/host/host_test.go b/x-pack/auditbeat/module/system/host/host_test.go index 1595fdaf73f4..813be7798a87 100644 --- a/x-pack/auditbeat/module/system/host/host_test.go +++ b/x-pack/auditbeat/module/system/host/host_test.go @@ -7,9 +7,9 @@ package host import ( "testing" - "github.com/elastic/beats/auditbeat/core" - abtest "github.com/elastic/beats/auditbeat/testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + abtest "github.com/elastic/beats/v7/auditbeat/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) 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 698911822101..8dc01b95e687 100644 --- a/x-pack/auditbeat/module/system/login/login.go +++ b/x-pack/auditbeat/module/system/login/login.go @@ -13,11 +13,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/x-pack/auditbeat/module/system/login/login_other.go b/x-pack/auditbeat/module/system/login/login_other.go index 73462e1c2f12..a0d4124bb411 100644 --- a/x-pack/auditbeat/module/system/login/login_other.go +++ b/x-pack/auditbeat/module/system/login/login_other.go @@ -9,7 +9,7 @@ package login import ( "fmt" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/x-pack/auditbeat/module/system/login/login_test.go b/x-pack/auditbeat/module/system/login/login_test.go index 9bd977ac0e46..8c1bccc7753b 100644 --- a/x-pack/auditbeat/module/system/login/login_test.go +++ b/x-pack/auditbeat/module/system/login/login_test.go @@ -18,10 +18,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/auditbeat/core" - abtest "github.com/elastic/beats/auditbeat/testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + abtest "github.com/elastic/beats/v7/auditbeat/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/auditbeat/module/system/login/utmp.go b/x-pack/auditbeat/module/system/login/utmp.go index 2b8d1f53303e..d01ba528a944 100644 --- a/x-pack/auditbeat/module/system/login/utmp.go +++ b/x-pack/auditbeat/module/system/login/utmp.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/x-pack/auditbeat/module/system/package/package.go b/x-pack/auditbeat/module/system/package/package.go index 4df25b313189..2c016a70fe36 100644 --- a/x-pack/auditbeat/module/system/package/package.go +++ b/x-pack/auditbeat/module/system/package/package.go @@ -24,13 +24,13 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/auditbeat/cache" - "github.com/elastic/beats/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) const ( 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 45eb73018659..4dae9a223700 100644 --- a/x-pack/auditbeat/module/system/package/package_homebrew_test.go +++ b/x-pack/auditbeat/module/system/package/package_homebrew_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/auditbeat/core" - abtest "github.com/elastic/beats/auditbeat/testing" - "github.com/elastic/beats/libbeat/beat" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "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" ) func TestHomebrew(t *testing.T) { diff --git a/x-pack/auditbeat/module/system/package/package_test.go b/x-pack/auditbeat/module/system/package/package_test.go index d82f5f3e1c01..8cadd2115603 100644 --- a/x-pack/auditbeat/module/system/package/package_test.go +++ b/x-pack/auditbeat/module/system/package/package_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/auditbeat/core" - abtest "github.com/elastic/beats/auditbeat/testing" - "github.com/elastic/beats/libbeat/logp" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + abtest "github.com/elastic/beats/v7/auditbeat/testing" + "github.com/elastic/beats/v7/libbeat/logp" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestData(t *testing.T) { diff --git a/x-pack/auditbeat/module/system/package/package_windows.go b/x-pack/auditbeat/module/system/package/package_windows.go index 498eea611111..9b39395436a1 100644 --- a/x-pack/auditbeat/module/system/package/package_windows.go +++ b/x-pack/auditbeat/module/system/package/package_windows.go @@ -9,7 +9,7 @@ package pkg import ( "fmt" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/x-pack/auditbeat/module/system/process/config.go b/x-pack/auditbeat/module/system/process/config.go index 49def8412a5a..52cb6dd98933 100644 --- a/x-pack/auditbeat/module/system/process/config.go +++ b/x-pack/auditbeat/module/system/process/config.go @@ -7,7 +7,7 @@ package process import ( "time" - "github.com/elastic/beats/auditbeat/helper/hasher" + "github.com/elastic/beats/v7/auditbeat/helper/hasher" ) // Config defines the host metricset's configuration options. diff --git a/x-pack/auditbeat/module/system/process/process.go b/x-pack/auditbeat/module/system/process/process.go index de807ac99f6d..48c6914142ff 100644 --- a/x-pack/auditbeat/module/system/process/process.go +++ b/x-pack/auditbeat/module/system/process/process.go @@ -17,14 +17,14 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/auditbeat/helper/hasher" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/auditbeat/cache" - "github.com/elastic/beats/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/auditbeat/helper/hasher" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "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/go-sysinfo" "github.com/elastic/go-sysinfo/types" ) diff --git a/x-pack/auditbeat/module/system/process/process_test.go b/x-pack/auditbeat/module/system/process/process_test.go index 5fa6e16a7223..18e649986188 100644 --- a/x-pack/auditbeat/module/system/process/process_test.go +++ b/x-pack/auditbeat/module/system/process/process_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/auditbeat/core" - "github.com/elastic/beats/auditbeat/helper/hasher" - abtest "github.com/elastic/beats/auditbeat/testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + "github.com/elastic/beats/v7/auditbeat/helper/hasher" + abtest "github.com/elastic/beats/v7/auditbeat/testing" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/go-sysinfo/types" ) diff --git a/x-pack/auditbeat/module/system/socket/arch_386.go b/x-pack/auditbeat/module/system/socket/arch_386.go index 69acbe49b3c7..43ce2c702f62 100644 --- a/x-pack/auditbeat/module/system/socket/arch_386.go +++ b/x-pack/auditbeat/module/system/socket/arch_386.go @@ -6,7 +6,7 @@ package socket -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" var archVariables = common.MapStr{ // Regular function call parameters 1 to 6 diff --git a/x-pack/auditbeat/module/system/socket/arch_amd64.go b/x-pack/auditbeat/module/system/socket/arch_amd64.go index 756fe3d053c8..4f7c578f8ee5 100644 --- a/x-pack/auditbeat/module/system/socket/arch_amd64.go +++ b/x-pack/auditbeat/module/system/socket/arch_amd64.go @@ -6,7 +6,7 @@ package socket -import "github.com/elastic/beats/libbeat/common" +import "github.com/elastic/beats/v7/libbeat/common" var archVariables = common.MapStr{ // Regular function call parameters 1 to 6 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 0ea36c8e6e04..98cce6fbdf09 100644 --- a/x-pack/auditbeat/module/system/socket/dns/afpacket/afpacket.go +++ b/x-pack/auditbeat/module/system/socket/dns/afpacket/afpacket.go @@ -17,14 +17,14 @@ import ( "github.com/pkg/errors" "golang.org/x/net/bpf" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" "github.com/google/gopacket" "github.com/google/gopacket/afpacket" "github.com/google/gopacket/layers" - "github.com/elastic/beats/libbeat/logp" - parent "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/dns" + "github.com/elastic/beats/v7/libbeat/logp" + parent "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns" ) var udpSrcPort53Filter = []bpf.RawInstruction{ diff --git a/x-pack/auditbeat/module/system/socket/dns/dns.go b/x-pack/auditbeat/module/system/socket/dns/dns.go index 310c6707b832..87c7a01d4490 100644 --- a/x-pack/auditbeat/module/system/socket/dns/dns.go +++ b/x-pack/auditbeat/module/system/socket/dns/dns.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Transaction represents a DNS transaction of A or AAAA type. diff --git a/x-pack/auditbeat/module/system/socket/dns/registry.go b/x-pack/auditbeat/module/system/socket/dns/registry.go index 07f2e48bd6c3..9579533df366 100644 --- a/x-pack/auditbeat/module/system/socket/dns/registry.go +++ b/x-pack/auditbeat/module/system/socket/dns/registry.go @@ -7,8 +7,8 @@ package dns import ( "fmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // ImplFactory is a factory method for DNS monitoring implementations. diff --git a/x-pack/auditbeat/module/system/socket/events.go b/x-pack/auditbeat/module/system/socket/events.go index a5cb5c0ebeef..76d91a8db243 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/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/x-pack/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 ce62103374f3..ad35ed06e935 100644 --- a/x-pack/auditbeat/module/system/socket/guess/creds.go +++ b/x-pack/auditbeat/module/system/socket/guess/creds.go @@ -13,9 +13,9 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go b/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go index f09552a7bc0c..b17efafabaab 100644 --- a/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go +++ b/x-pack/auditbeat/module/system/socket/guess/cskxmit6.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/deref.go b/x-pack/auditbeat/module/system/socket/guess/deref.go index abcfb81b6e53..a019b7cf7b9f 100644 --- a/x-pack/auditbeat/module/system/socket/guess/deref.go +++ b/x-pack/auditbeat/module/system/socket/guess/deref.go @@ -12,9 +12,9 @@ import ( "strconv" "syscall" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/guess.go b/x-pack/auditbeat/module/system/socket/guess/guess.go index 421580bf1175..21fe3e380092 100644 --- a/x-pack/auditbeat/module/system/socket/guess/guess.go +++ b/x-pack/auditbeat/module/system/socket/guess/guess.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // Context shared with guesses. diff --git a/x-pack/auditbeat/module/system/socket/guess/helpers.go b/x-pack/auditbeat/module/system/socket/guess/helpers.go index a17d4715e5c6..5aa8ac37db1a 100644 --- a/x-pack/auditbeat/module/system/socket/guess/helpers.go +++ b/x-pack/auditbeat/module/system/socket/guess/helpers.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func createSocket(bindAddr unix.SockaddrInet4) (fd int, addr unix.SockaddrInet4, err error) { diff --git a/x-pack/auditbeat/module/system/socket/guess/inetsock.go b/x-pack/auditbeat/module/system/socket/guess/inetsock.go index f183387e40cd..cc08fa79bf41 100644 --- a/x-pack/auditbeat/module/system/socket/guess/inetsock.go +++ b/x-pack/auditbeat/module/system/socket/guess/inetsock.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // Guess the offsets within a struct inet_sock where the local and remote diff --git a/x-pack/auditbeat/module/system/socket/guess/inetsock6.go b/x-pack/auditbeat/module/system/socket/guess/inetsock6.go index 013a10c8faa9..c76b47e3d19c 100644 --- a/x-pack/auditbeat/module/system/socket/guess/inetsock6.go +++ b/x-pack/auditbeat/module/system/socket/guess/inetsock6.go @@ -14,9 +14,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go b/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go index 236807d0f1b3..ec8075060d42 100644 --- a/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go +++ b/x-pack/auditbeat/module/system/socket/guess/inetsockaf.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/iplocalout.go b/x-pack/auditbeat/module/system/socket/guess/iplocalout.go index bc09cad156e2..170d2bf6885d 100644 --- a/x-pack/auditbeat/module/system/socket/guess/iplocalout.go +++ b/x-pack/auditbeat/module/system/socket/guess/iplocalout.go @@ -12,9 +12,9 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // Guess how to get a struct sock* from an ip_local_out() call. diff --git a/x-pack/auditbeat/module/system/socket/guess/skbuff.go b/x-pack/auditbeat/module/system/socket/guess/skbuff.go index d4e8acdbb4e0..78a73de1187f 100644 --- a/x-pack/auditbeat/module/system/socket/guess/skbuff.go +++ b/x-pack/auditbeat/module/system/socket/guess/skbuff.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go b/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go index e75f16575501..c9df83564723 100644 --- a/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go +++ b/x-pack/auditbeat/module/system/socket/guess/sockaddrin.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go b/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go index 98d57a46950d..ffed4c577e32 100644 --- a/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go +++ b/x-pack/auditbeat/module/system/socket/guess/sockaddrin6.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/socketsk.go b/x-pack/auditbeat/module/system/socket/guess/socketsk.go index 4b75707738b2..e084c82f1a44 100644 --- a/x-pack/auditbeat/module/system/socket/guess/socketsk.go +++ b/x-pack/auditbeat/module/system/socket/guess/socketsk.go @@ -11,9 +11,9 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // Guess the offset of (struct socket*)->sk (type struct sock*) diff --git a/x-pack/auditbeat/module/system/socket/guess/syscallargs.go b/x-pack/auditbeat/module/system/socket/guess/syscallargs.go index 70e1e437e237..563ec9e1355c 100644 --- a/x-pack/auditbeat/module/system/socket/guess/syscallargs.go +++ b/x-pack/auditbeat/module/system/socket/guess/syscallargs.go @@ -11,9 +11,9 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) /* diff --git a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go index 519117620ea1..f0382ad3ed24 100644 --- a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go +++ b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgargs.go @@ -9,9 +9,9 @@ package guess import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // Guess the position of size parameter in tcp_sendmsg. diff --git a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go index 42347b69ab64..0e3ede37b543 100644 --- a/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go +++ b/x-pack/auditbeat/module/system/socket/guess/tcpsendmsgsk.go @@ -11,9 +11,9 @@ import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // Guess how to get a struct sock* from tcp_sendmsg parameters. It can be: diff --git a/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go b/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go index 3d12ea47e07d..f381b5ba95e7 100644 --- a/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go +++ b/x-pack/auditbeat/module/system/socket/guess/udpsendmsg.go @@ -9,9 +9,9 @@ package guess import ( "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // guess udp_sendmsg arguments: diff --git a/x-pack/auditbeat/module/system/socket/helper/probes.go b/x-pack/auditbeat/module/system/socket/helper/probes.go index cb4d03ee9629..f04aa568c4ff 100644 --- a/x-pack/auditbeat/module/system/socket/helper/probes.go +++ b/x-pack/auditbeat/module/system/socket/helper/probes.go @@ -12,8 +12,8 @@ import ( "strings" "text/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // ProbeDef couples a probe with a decoder factory. diff --git a/x-pack/auditbeat/module/system/socket/helper/types.go b/x-pack/auditbeat/module/system/socket/helper/types.go index 1375315a6965..711bf2f933f8 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/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/x-pack/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 340e2e520cbb..c2d3fa937786 100644 --- a/x-pack/auditbeat/module/system/socket/kprobes.go +++ b/x-pack/auditbeat/module/system/socket/kprobes.go @@ -14,9 +14,9 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/helper" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // This is how many data we dump from sk_buff->data to read full packet headers diff --git a/x-pack/auditbeat/module/system/socket/kprobes_test.go b/x-pack/auditbeat/module/system/socket/kprobes_test.go index a186be20da7b..8e6b84abaa44 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/x-pack/auditbeat/module/system/socket/guess" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/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/v7/x-pack/auditbeat/tracing" ) 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 8d8427e48d10..d92f2e7ba19f 100644 --- a/x-pack/auditbeat/module/system/socket/socket_linux.go +++ b/x-pack/auditbeat/module/system/socket/socket_linux.go @@ -18,21 +18,21 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/auditbeat/module/system" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/guess" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "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/v7/x-pack/auditbeat/tracing" "github.com/elastic/go-perf" "github.com/elastic/go-sysinfo" "github.com/elastic/go-sysinfo/providers/linux" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/dns" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns" // Register dns capture implementations - _ "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/dns/afpacket" + _ "github.com/elastic/beats/v7/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 2c8c92882e39..f9ef3d5a11b4 100644 --- a/x-pack/auditbeat/module/system/socket/socket_other.go +++ b/x-pack/auditbeat/module/system/socket/socket_other.go @@ -9,7 +9,7 @@ package socket import ( "fmt" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/x-pack/auditbeat/module/system/socket/state.go b/x-pack/auditbeat/module/system/socket/state.go index 757677970c61..9f1bd8964f71 100644 --- a/x-pack/auditbeat/module/system/socket/state.go +++ b/x-pack/auditbeat/module/system/socket/state.go @@ -19,12 +19,12 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/dns" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/helper" - "github.com/elastic/beats/x-pack/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/v7/x-pack/auditbeat/tracing" "github.com/elastic/go-libaudit/aucoalesce" ) diff --git a/x-pack/auditbeat/module/system/socket/state_test.go b/x-pack/auditbeat/module/system/socket/state_test.go index efff2613a1c0..1a76c26e228a 100644 --- a/x-pack/auditbeat/module/system/socket/state_test.go +++ b/x-pack/auditbeat/module/system/socket/state_test.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/sys/unix" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/x-pack/auditbeat/module/system/socket/dns" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/x-pack/auditbeat/module/system/socket/dns" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) type logWrapper testing.T diff --git a/x-pack/auditbeat/module/system/socket/template.go b/x-pack/auditbeat/module/system/socket/template.go index a51ff5eb33e8..2066d60cdcf7 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/libbeat/common" - "github.com/elastic/beats/x-pack/auditbeat/tracing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/auditbeat/tracing" ) // baseTemplateVars contains the substitution variables useful to write KProbes diff --git a/x-pack/auditbeat/module/system/system.go b/x-pack/auditbeat/module/system/system.go index a4c01f912fd8..72a1abca2215 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/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/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 c0f9a94f3081..ffa4e272b838 100644 --- a/x-pack/auditbeat/module/system/user/user.go +++ b/x-pack/auditbeat/module/system/user/user.go @@ -23,13 +23,13 @@ import ( "github.com/joeshaw/multierror" "github.com/pkg/errors" - "github.com/elastic/beats/auditbeat/datastore" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/auditbeat/cache" - "github.com/elastic/beats/x-pack/auditbeat/module/system" + "github.com/elastic/beats/v7/auditbeat/datastore" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) const ( diff --git a/x-pack/auditbeat/module/system/user/user_test.go b/x-pack/auditbeat/module/system/user/user_test.go index 4ad880159491..14708232d296 100644 --- a/x-pack/auditbeat/module/system/user/user_test.go +++ b/x-pack/auditbeat/module/system/user/user_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/elastic/beats/auditbeat/core" - abtest "github.com/elastic/beats/auditbeat/testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/auditbeat/core" + abtest "github.com/elastic/beats/v7/auditbeat/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) 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 da9351dc9712..ed640f024fa1 100644 --- a/x-pack/auditbeat/module/system/user/users_other.go +++ b/x-pack/auditbeat/module/system/user/users_other.go @@ -9,7 +9,7 @@ package user import ( "fmt" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/x-pack/auditbeat/seccomp_linux.go b/x-pack/auditbeat/seccomp_linux.go index 70e32c2723a7..c5c3469525ea 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/libbeat/common/seccomp" + "github.com/elastic/beats/v7/libbeat/common/seccomp" ) func init() { diff --git a/x-pack/dockerlogbeat/handlers.go b/x-pack/dockerlogbeat/handlers.go index 12320cee232d..3791aacfc3ac 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/x-pack/dockerlogbeat/pipelinemanager" + "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemanager" "github.com/pkg/errors" ) diff --git a/x-pack/dockerlogbeat/magefile.go b/x-pack/dockerlogbeat/magefile.go index e6921509600c..77863c1c4c66 100644 --- a/x-pack/dockerlogbeat/magefile.go +++ b/x-pack/dockerlogbeat/magefile.go @@ -18,17 +18,17 @@ import ( "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - "github.com/elastic/beats/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" "github.com/pkg/errors" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" diff --git a/x-pack/dockerlogbeat/main.go b/x-pack/dockerlogbeat/main.go index 60dcf70537f0..360fd265caab 100644 --- a/x-pack/dockerlogbeat/main.go +++ b/x-pack/dockerlogbeat/main.go @@ -10,18 +10,18 @@ import ( "github.com/docker/go-plugins-helpers/sdk" - "github.com/elastic/beats/libbeat/common" - logpcfg "github.com/elastic/beats/libbeat/logp/configure" - _ "github.com/elastic/beats/libbeat/outputs/console" - _ "github.com/elastic/beats/libbeat/outputs/elasticsearch" - _ "github.com/elastic/beats/libbeat/outputs/fileout" - _ "github.com/elastic/beats/libbeat/outputs/kafka" - _ "github.com/elastic/beats/libbeat/outputs/logstash" - _ "github.com/elastic/beats/libbeat/outputs/redis" - _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" - _ "github.com/elastic/beats/libbeat/publisher/queue/spool" - "github.com/elastic/beats/libbeat/service" - "github.com/elastic/beats/x-pack/dockerlogbeat/pipelinemanager" + "github.com/elastic/beats/v7/libbeat/common" + logpcfg "github.com/elastic/beats/v7/libbeat/logp/configure" + _ "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/libbeat/publisher/queue/spool" + "github.com/elastic/beats/v7/libbeat/service" + "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemanager" ) // genNewMonitoringConfig is a hacked-in function to enable a debug stderr logger diff --git a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go index c94317d92fc8..eef787cb0f52 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go +++ b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader.go @@ -12,11 +12,11 @@ import ( "github.com/docker/docker/api/types/plugins/logdriver" "github.com/docker/docker/daemon/logger" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - helper "github.com/elastic/beats/libbeat/common/docker" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/dockerlogbeat/pipereader" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + helper "github.com/elastic/beats/v7/libbeat/common/docker" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipereader" ) // ClientLogger is an instance of a pipeline logger client meant for reading from a single log stream diff --git a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go index e6068c9560df..5ee9b69c8095 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go +++ b/x-pack/dockerlogbeat/pipelinemanager/clientLogReader_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/dockerlogbeat/pipelinemock" - "github.com/elastic/beats/x-pack/dockerlogbeat/pipereader" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemock" + "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipereader" ) func TestNewClient(t *testing.T) { diff --git a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go index 8f1e55f342e5..d3cf6840aeb5 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go +++ b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go @@ -17,16 +17,16 @@ import ( "github.com/pkg/errors" yaml "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cloudid" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/idxmgmt" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs" - "github.com/elastic/beats/libbeat/publisher/pipeline" - "github.com/elastic/beats/libbeat/publisher/processing" - "github.com/elastic/beats/libbeat/version" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/cloudid" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/idxmgmt" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) // makeConfigHash is the helper function that turns a user config into a hash diff --git a/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go b/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go index 37696101e7c9..e3c282c4de9d 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go +++ b/x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go @@ -8,14 +8,14 @@ import ( "fmt" "sync" - "github.com/elastic/beats/x-pack/dockerlogbeat/pipereader" + "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipereader" "github.com/docker/docker/daemon/logger" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/publisher/pipeline" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/publisher/pipeline" ) // containerConfig is the common.Config unpacking type diff --git a/x-pack/dockerlogbeat/pipelinemock/pipelines.go b/x-pack/dockerlogbeat/pipelinemock/pipelines.go index ea7f273be5b1..d9054cf6eb4a 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/libbeat/beat" + "github.com/elastic/beats/v7/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 51e6398e9401..8875d43d6870 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/x-pack/dockerlogbeat/pipelinemock" + "github.com/elastic/beats/v7/x-pack/dockerlogbeat/pipelinemock" ) func TestPipeReader(t *testing.T) { diff --git a/x-pack/filebeat/cmd/root.go b/x-pack/filebeat/cmd/root.go index 3ba22d205a55..db3b5884be4e 100644 --- a/x-pack/filebeat/cmd/root.go +++ b/x-pack/filebeat/cmd/root.go @@ -5,11 +5,11 @@ package cmd import ( - "github.com/elastic/beats/filebeat/cmd" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/filebeat/cmd" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" // Register the includes. - _ "github.com/elastic/beats/x-pack/filebeat/include" + _ "github.com/elastic/beats/v7/x-pack/filebeat/include" ) // RootCmd to handle beats CLI. diff --git a/x-pack/filebeat/include/list.go b/x-pack/filebeat/include/list.go index e92b3ceb7d54..83c66f0925f0 100644 --- a/x-pack/filebeat/include/list.go +++ b/x-pack/filebeat/include/list.go @@ -8,27 +8,27 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/x-pack/filebeat/input/azureeventhub" - _ "github.com/elastic/beats/x-pack/filebeat/input/googlepubsub" - _ "github.com/elastic/beats/x-pack/filebeat/input/httpjson" - _ "github.com/elastic/beats/x-pack/filebeat/input/netflow" - _ "github.com/elastic/beats/x-pack/filebeat/input/s3" - _ "github.com/elastic/beats/x-pack/filebeat/module/activemq" - _ "github.com/elastic/beats/x-pack/filebeat/module/aws" - _ "github.com/elastic/beats/x-pack/filebeat/module/azure" - _ "github.com/elastic/beats/x-pack/filebeat/module/cef" - _ "github.com/elastic/beats/x-pack/filebeat/module/cisco" - _ "github.com/elastic/beats/x-pack/filebeat/module/coredns" - _ "github.com/elastic/beats/x-pack/filebeat/module/envoyproxy" - _ "github.com/elastic/beats/x-pack/filebeat/module/googlecloud" - _ "github.com/elastic/beats/x-pack/filebeat/module/ibmmq" - _ "github.com/elastic/beats/x-pack/filebeat/module/iptables" - _ "github.com/elastic/beats/x-pack/filebeat/module/misp" - _ "github.com/elastic/beats/x-pack/filebeat/module/mssql" - _ "github.com/elastic/beats/x-pack/filebeat/module/netflow" - _ "github.com/elastic/beats/x-pack/filebeat/module/panw" - _ "github.com/elastic/beats/x-pack/filebeat/module/rabbitmq" - _ "github.com/elastic/beats/x-pack/filebeat/module/suricata" - _ "github.com/elastic/beats/x-pack/filebeat/module/zeek" - _ "github.com/elastic/beats/x-pack/filebeat/processors/decode_cef" + _ "github.com/elastic/beats/v7/x-pack/filebeat/input/azureeventhub" + _ "github.com/elastic/beats/v7/x-pack/filebeat/input/googlepubsub" + _ "github.com/elastic/beats/v7/x-pack/filebeat/input/httpjson" + _ "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow" + _ "github.com/elastic/beats/v7/x-pack/filebeat/input/s3" + _ "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/azure" + _ "github.com/elastic/beats/v7/x-pack/filebeat/module/cef" + _ "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/envoyproxy" + _ "github.com/elastic/beats/v7/x-pack/filebeat/module/googlecloud" + _ "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/misp" + _ "github.com/elastic/beats/v7/x-pack/filebeat/module/mssql" + _ "github.com/elastic/beats/v7/x-pack/filebeat/module/netflow" + _ "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/suricata" + _ "github.com/elastic/beats/v7/x-pack/filebeat/module/zeek" + _ "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef" ) diff --git a/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go b/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go index f53da1971d81..9d65ff801049 100644 --- a/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go +++ b/x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go @@ -16,10 +16,10 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "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" ) var ( diff --git a/x-pack/filebeat/input/azureeventhub/input.go b/x-pack/filebeat/input/azureeventhub/input.go index 68eff0547d62..8f5068e8c96e 100644 --- a/x-pack/filebeat/input/azureeventhub/input.go +++ b/x-pack/filebeat/input/azureeventhub/input.go @@ -11,15 +11,15 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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" + "github.com/elastic/beats/v7/libbeat/logp" eventhub "github.com/Azure/azure-event-hubs-go/v3" "github.com/Azure/azure-event-hubs-go/v3/eph" diff --git a/x-pack/filebeat/input/azureeventhub/input_test.go b/x-pack/filebeat/input/azureeventhub/input_test.go index 35e0683133a9..367d5cae1e25 100644 --- a/x-pack/filebeat/input/azureeventhub/input_test.go +++ b/x-pack/filebeat/input/azureeventhub/input_test.go @@ -13,9 +13,9 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/filebeat/channel" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/x-pack/filebeat/input/googlepubsub/input.go b/x-pack/filebeat/input/googlepubsub/input.go index 6a061d2a4e1e..f2b5811e1949 100644 --- a/x-pack/filebeat/input/googlepubsub/input.go +++ b/x-pack/filebeat/input/googlepubsub/input.go @@ -15,13 +15,13 @@ import ( "github.com/pkg/errors" "google.golang.org/api/option" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/common/useragent" - "github.com/elastic/beats/libbeat/logp" + "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" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/common/useragent" + "github.com/elastic/beats/v7/libbeat/logp" ) const ( diff --git a/x-pack/filebeat/input/googlepubsub/pubsub_test.go b/x-pack/filebeat/input/googlepubsub/pubsub_test.go index 8efc0034a76f..17005ac57f3c 100644 --- a/x-pack/filebeat/input/googlepubsub/pubsub_test.go +++ b/x-pack/filebeat/input/googlepubsub/pubsub_test.go @@ -19,14 +19,14 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/api/iterator" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/libbeat/tests/resources" + "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" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/libbeat/tests/resources" ) const ( diff --git a/x-pack/filebeat/input/httpjson/config.go b/x-pack/filebeat/input/httpjson/config.go index a1baece249f5..6839f6f3b2f2 100644 --- a/x-pack/filebeat/input/httpjson/config.go +++ b/x-pack/filebeat/input/httpjson/config.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" ) // Config contains information about httpjson configuration diff --git a/x-pack/filebeat/input/httpjson/httpjson_test.go b/x-pack/filebeat/input/httpjson/httpjson_test.go index 6c8ad1a98b67..9ede985581ec 100644 --- a/x-pack/filebeat/input/httpjson/httpjson_test.go +++ b/x-pack/filebeat/input/httpjson/httpjson_test.go @@ -16,11 +16,11 @@ import ( "golang.org/x/sync/errgroup" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "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" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/x-pack/filebeat/input/httpjson/input.go b/x-pack/filebeat/input/httpjson/input.go index e733648b32db..75661b23bfc5 100644 --- a/x-pack/filebeat/input/httpjson/input.go +++ b/x-pack/filebeat/input/httpjson/input.go @@ -15,14 +15,14 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/transport/tlscommon" - "github.com/elastic/beats/libbeat/common/useragent" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/transport" + "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" + "github.com/elastic/beats/v7/libbeat/common/transport/tlscommon" + "github.com/elastic/beats/v7/libbeat/common/useragent" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/transport" ) const ( diff --git a/x-pack/filebeat/input/netflow/case.go b/x-pack/filebeat/input/netflow/case.go index 9a6e5f659549..cfe5e8fbfa14 100644 --- a/x-pack/filebeat/input/netflow/case.go +++ b/x-pack/filebeat/input/netflow/case.go @@ -9,8 +9,8 @@ import ( "sync" "unicode" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" ) var fieldNameConverter = caseConverter{ diff --git a/x-pack/filebeat/input/netflow/config.go b/x-pack/filebeat/input/netflow/config.go index a73897653445..cc0094f4ed84 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/filebeat/harvester" - "github.com/elastic/beats/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/filebeat/harvester" + "github.com/elastic/beats/v7/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 abf7457e2b8f..cfc3fd1736a5 100644 --- a/x-pack/filebeat/input/netflow/convert.go +++ b/x-pack/filebeat/input/netflow/convert.go @@ -14,10 +14,10 @@ import ( "github.com/cespare/xxhash/v2" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/flowhash" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" + "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/x-pack/filebeat/input/netflow/decoder/record" ) var ( diff --git a/x-pack/filebeat/input/netflow/decoder/config/config.go b/x-pack/filebeat/input/netflow/decoder/config/config.go index fd124767184f..3613f93f369f 100644 --- a/x-pack/filebeat/input/netflow/decoder/config/config.go +++ b/x-pack/filebeat/input/netflow/decoder/config/config.go @@ -9,7 +9,7 @@ import ( "io/ioutil" "time" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" ) // Config stores the configuration used by the NetFlow Collector. diff --git a/x-pack/filebeat/input/netflow/decoder/decoder.go b/x-pack/filebeat/input/netflow/decoder/decoder.go index fa70848247df..4f8d178df5c5 100644 --- a/x-pack/filebeat/input/netflow/decoder/decoder.go +++ b/x-pack/filebeat/input/netflow/decoder/decoder.go @@ -15,9 +15,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" + "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" ) // 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 c66fbafdaf20..c86e97e5d460 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 ( "net" "os" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder" + "github.com/elastic/beats/v7/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 89cd81b977c0..cb90760c5f36 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/x-pack/filebeat/input/netflow/decoder/ipfix" - _ "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v1" - _ "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v5" - _ "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v6" - _ "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v7" - _ "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v8" - _ "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v9" + _ "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" ) diff --git a/x-pack/filebeat/input/netflow/decoder/ipfix/decoder.go b/x-pack/filebeat/input/netflow/decoder/ipfix/decoder.go index 9c0252cb9c4e..d236d5f23c71 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/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - v9 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v9" + "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" ) 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 ea9b15054f7a..7617ef9f89be 100644 --- a/x-pack/filebeat/input/netflow/decoder/ipfix/decoder_test.go +++ b/x-pack/filebeat/input/netflow/decoder/ipfix/decoder_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" - v9 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v9" + "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/test" + v9 "github.com/elastic/beats/v7/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 5d57d057721c..b8799c2d3919 100644 --- a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix.go +++ b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix.go @@ -7,9 +7,9 @@ package ipfix import ( "log" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - v9 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v9" + "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" ) 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 dd366619dbf4..7453b1316089 100644 --- a/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go +++ b/x-pack/filebeat/input/netflow/decoder/ipfix/ipfix_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" - v9 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v9" + "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" ) func TestMessageWithOptions(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/protocol/protocol.go b/x-pack/filebeat/input/netflow/decoder/protocol/protocol.go index 3c32a050e164..3ae756eb140e 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/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v7/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 778609b62013..56d40f6dac70 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/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v7/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 6070e9fc2036..b78fe875486f 100644 --- a/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go +++ b/x-pack/filebeat/input/netflow/decoder/protocol/registry_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" ) type testProto int diff --git a/x-pack/filebeat/input/netflow/decoder/template/template.go b/x-pack/filebeat/input/netflow/decoder/template/template.go index e04dc93cfe36..8709ca8766e1 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/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v7/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 882756dc9a2a..8dc1c69f60d0 100644 --- a/x-pack/filebeat/input/netflow/decoder/template/template_test.go +++ b/x-pack/filebeat/input/netflow/decoder/template/template_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "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" ) func TestTemplate_Apply(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/template/test_helpers.go b/x-pack/filebeat/input/netflow/decoder/template/test_helpers.go index 48f41c9be761..9045108c4490 100644 --- a/x-pack/filebeat/input/netflow/decoder/template/test_helpers.go +++ b/x-pack/filebeat/input/netflow/decoder/template/test_helpers.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" ) var ( diff --git a/x-pack/filebeat/input/netflow/decoder/test/helper.go b/x-pack/filebeat/input/netflow/decoder/test/helper.go index ef904e2af5aa..f62d03fa87ad 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/x-pack/filebeat/input/netflow/decoder/record" + "github.com/elastic/beats/v7/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 4302c56c4bf9..8d9008c93932 100644 --- a/x-pack/filebeat/input/netflow/decoder/v1/v1.go +++ b/x-pack/filebeat/input/netflow/decoder/v1/v1.go @@ -14,11 +14,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" + "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" ) const ( 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 7852a5614881..8887298c06d0 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/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - template2 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + template2 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" ) func TestNetflowProtocol_New(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/v5/v5.go b/x-pack/filebeat/input/netflow/decoder/v5/v5.go index 26779a74f00e..74d4adbb70e0 100644 --- a/x-pack/filebeat/input/netflow/decoder/v5/v5.go +++ b/x-pack/filebeat/input/netflow/decoder/v5/v5.go @@ -12,12 +12,12 @@ import ( "net" "time" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - v1 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v1" + "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" ) 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 e9d8fe974bef..9494d482f6d3 100644 --- a/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v5/v5_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "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" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" ) func TestNetflowProtocol_New(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/v6/v6.go b/x-pack/filebeat/input/netflow/decoder/v6/v6.go index 44c119a32977..a5d1bc339e97 100644 --- a/x-pack/filebeat/input/netflow/decoder/v6/v6.go +++ b/x-pack/filebeat/input/netflow/decoder/v6/v6.go @@ -7,12 +7,12 @@ package v6 import ( "log" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - v1 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v1" - v5 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v5" + "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" ) 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 199a76fe27dc..af46896289e2 100644 --- a/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v6/v6_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "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" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" ) func TestNetflowProtocol_New(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/v7/v7.go b/x-pack/filebeat/input/netflow/decoder/v7/v7.go index 89cae051e330..62cbdc56a065 100644 --- a/x-pack/filebeat/input/netflow/decoder/v7/v7.go +++ b/x-pack/filebeat/input/netflow/decoder/v7/v7.go @@ -12,12 +12,12 @@ import ( "net" "time" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - v1 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/v1" + "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" ) 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 08f4d0b510f3..cafdbc36b563 100644 --- a/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v7/v7_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "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" + "github.com/elastic/beats/v7/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 2e1edbd40e1c..855b8d3c9147 100644 --- a/x-pack/filebeat/input/netflow/decoder/v8/v8.go +++ b/x-pack/filebeat/input/netflow/decoder/v8/v8.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" + "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" ) const ( 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 9f69cc615b00..81ad2437cae9 100644 --- a/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v8/v8_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - template2 "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/config" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/record" + template2 "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" ) func TestTemplates(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/decoder/v9/decoder.go b/x-pack/filebeat/input/netflow/decoder/v9/decoder.go index 6b4fc9be8be7..4901ba7d6a84 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/decoder.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/decoder.go @@ -14,9 +14,9 @@ import ( "net" "time" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" + "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" ) 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 e0e66dcf63fd..46f8e15ff4af 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/decoder_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/decoder_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "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/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 734524cc2442..4813bd0cc190 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/session.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/session.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/atomic" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/atomic" + "github.com/elastic/beats/v7/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 6a7a999087c4..63bbf3314aa8 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/session_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/session_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/template" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/template" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/test" ) var logger = log.New(ioutil.Discard, "", 0) diff --git a/x-pack/filebeat/input/netflow/decoder/v9/v9.go b/x-pack/filebeat/input/netflow/decoder/v9/v9.go index edfe65db21d8..30cb1405f39c 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/v9.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/v9.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" + "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" ) 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 53024c8f3143..007f006ac13f 100644 --- a/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go +++ b/x-pack/filebeat/input/netflow/decoder/v9/v9_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/config" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "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" ) func TestNetflowV9Protocol_ID(t *testing.T) { diff --git a/x-pack/filebeat/input/netflow/definitions.go b/x-pack/filebeat/input/netflow/definitions.go index 4227334d96a8..267abef5a927 100644 --- a/x-pack/filebeat/input/netflow/definitions.go +++ b/x-pack/filebeat/input/netflow/definitions.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "gopkg.in/yaml.v2" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v7/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 e1f219b05666..8fdcbcac785c 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/x-pack/filebeat/input/netflow/decoder/fields" + "github.com/elastic/beats/v7/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 92226a14406d..c1b9fcf244e3 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/libbeat/asset" + "github.com/elastic/beats/v7/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 4928d8517930..5e41a3087660 100644 --- a/x-pack/filebeat/input/netflow/fields_gen.go +++ b/x-pack/filebeat/input/netflow/fields_gen.go @@ -17,7 +17,7 @@ import ( "os" "strings" - "github.com/elastic/beats/x-pack/filebeat/input/netflow" + "github.com/elastic/beats/v7/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 77e1ac8fb071..cc8d30815b02 100644 --- a/x-pack/filebeat/input/netflow/input.go +++ b/x-pack/filebeat/input/netflow/input.go @@ -12,18 +12,18 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/harvester" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/filebeat/inputsource" - "github.com/elastic/beats/filebeat/inputsource/udp" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/atomic" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/fields" + "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/filebeat/inputsource/udp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/atomic" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder" + "github.com/elastic/beats/v7/x-pack/filebeat/input/netflow/decoder/fields" ) const ( diff --git a/x-pack/filebeat/input/netflow/netflow_test.go b/x-pack/filebeat/input/netflow/netflow_test.go index ce68e34ba525..7ffa78c77492 100644 --- a/x-pack/filebeat/input/netflow/netflow_test.go +++ b/x-pack/filebeat/input/netflow/netflow_test.go @@ -21,11 +21,11 @@ import ( "github.com/tsg/gopacket/pcap" "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/protocol" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/record" - "github.com/elastic/beats/x-pack/filebeat/input/netflow/decoder/test" + "github.com/elastic/beats/v7/libbeat/beat" + "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" ) var ( diff --git a/x-pack/filebeat/input/s3/config.go b/x-pack/filebeat/input/s3/config.go index 7fa455713e96..72960ad9ade2 100644 --- a/x-pack/filebeat/input/s3/config.go +++ b/x-pack/filebeat/input/s3/config.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "github.com/elastic/beats/filebeat/harvester" - awscommon "github.com/elastic/beats/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v7/filebeat/harvester" + awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" ) type config struct { diff --git a/x-pack/filebeat/input/s3/fields.go b/x-pack/filebeat/input/s3/fields.go index db9fe874c195..3c373aeaa118 100644 --- a/x-pack/filebeat/input/s3/fields.go +++ b/x-pack/filebeat/input/s3/fields.go @@ -7,7 +7,7 @@ package s3 import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/input/s3/input.go b/x-pack/filebeat/input/s3/input.go index dd254cffebf2..2bfdeeba3318 100644 --- a/x-pack/filebeat/input/s3/input.go +++ b/x-pack/filebeat/input/s3/input.go @@ -25,13 +25,13 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs/sqsiface" "github.com/pkg/errors" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - awscommon "github.com/elastic/beats/x-pack/libbeat/common/aws" + "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" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" ) const inputName = "s3" diff --git a/x-pack/filebeat/input/s3/input_test.go b/x-pack/filebeat/input/s3/input_test.go index 62d93a66e5fe..b4ad597c1464 100644 --- a/x-pack/filebeat/input/s3/input_test.go +++ b/x-pack/filebeat/input/s3/input_test.go @@ -20,7 +20,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) // MockS3Client struct is used for unit tests. diff --git a/x-pack/filebeat/input/s3/s3_integration_test.go b/x-pack/filebeat/input/s3/s3_integration_test.go index 6431317aa4fc..7dcd3c241fd4 100644 --- a/x-pack/filebeat/input/s3/s3_integration_test.go +++ b/x-pack/filebeat/input/s3/s3_integration_test.go @@ -22,12 +22,12 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/filebeat/channel" - "github.com/elastic/beats/filebeat/input" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/tests/resources" - awscommon "github.com/elastic/beats/x-pack/libbeat/common/aws" + "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" + "github.com/elastic/beats/v7/libbeat/tests/resources" + awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" ) const ( diff --git a/x-pack/filebeat/magefile.go b/x-pack/filebeat/magefile.go index a8ffd9d68759..ccdb4de5c6c6 100644 --- a/x-pack/filebeat/magefile.go +++ b/x-pack/filebeat/magefile.go @@ -13,13 +13,13 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - filebeat "github.com/elastic/beats/filebeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + filebeat "github.com/elastic/beats/v7/filebeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import generate - _ "github.com/elastic/beats/filebeat/scripts/mage/generate" + _ "github.com/elastic/beats/v7/filebeat/scripts/mage/generate" ) func init() { diff --git a/x-pack/filebeat/main.go b/x-pack/filebeat/main.go index e0c4b4ac26e6..3c5849a2e4c6 100644 --- a/x-pack/filebeat/main.go +++ b/x-pack/filebeat/main.go @@ -7,7 +7,7 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/filebeat/cmd" + "github.com/elastic/beats/v7/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 e32c676e2164..33c32879fb9d 100644 --- a/x-pack/filebeat/main_test.go +++ b/x-pack/filebeat/main_test.go @@ -8,8 +8,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/filebeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/filebeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/x-pack/filebeat/module/activemq/fields.go b/x-pack/filebeat/module/activemq/fields.go index 7ee85d80cbf9..6c81d244204f 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/aws/fields.go b/x-pack/filebeat/module/aws/fields.go index e976c49dffa6..76b42b6232b0 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/azure/fields.go b/x-pack/filebeat/module/azure/fields.go index a47837d80d4f..846cbb25232a 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/cef/fields.go b/x-pack/filebeat/module/cef/fields.go index 19312fd7acaf..ce9bfda5de2f 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/cisco/fields.go b/x-pack/filebeat/module/cisco/fields.go index 1b9d5d6f5e56..568f33c53bba 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/libbeat/asset" + "github.com/elastic/beats/v7/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 147cc72bc484..53496b6a6402 100644 --- a/x-pack/filebeat/module/cisco/ios/pipeline_test.go +++ b/x-pack/filebeat/module/cisco/ios/pipeline_test.go @@ -9,20 +9,20 @@ import ( "fmt" "testing" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" "github.com/elastic/go-lookslike" "github.com/elastic/go-lookslike/isdef" "github.com/elastic/go-lookslike/validator" // Register JS "require" modules. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module" // Register required processors. - _ "github.com/elastic/beats/libbeat/cmd/instance" - _ "github.com/elastic/beats/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/libbeat/cmd/instance" + _ "github.com/elastic/beats/v7/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 2275e8e05c2e..23400dd7e524 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/envoyproxy/fields.go b/x-pack/filebeat/module/envoyproxy/fields.go index 1b4aa69c83c3..7c2ebe2f5846 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/googlecloud/fields.go b/x-pack/filebeat/module/googlecloud/fields.go index 2b4b6537850c..74ecc3a94875 100644 --- a/x-pack/filebeat/module/googlecloud/fields.go +++ b/x-pack/filebeat/module/googlecloud/fields.go @@ -7,7 +7,7 @@ package googlecloud import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/ibmmq/fields.go b/x-pack/filebeat/module/ibmmq/fields.go index 441a975dda15..6c7a46adfd96 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/iptables/fields.go b/x-pack/filebeat/module/iptables/fields.go index 3fe34ea12685..cb00df67de53 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/misp/fields.go b/x-pack/filebeat/module/misp/fields.go index 17dca85aadf6..3029168faa3c 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/mssql/fields.go b/x-pack/filebeat/module/mssql/fields.go index e50a5eaa6799..882b11047740 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/netflow/fields.go b/x-pack/filebeat/module/netflow/fields.go index d71d8ceb53f9..6d6ea26f0afd 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/panw/fields.go b/x-pack/filebeat/module/panw/fields.go index 0748e2a73741..8d877ad9d7e8 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/rabbitmq/fields.go b/x-pack/filebeat/module/rabbitmq/fields.go index d1f37b31ba77..3dbd9fc31718 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/suricata/fields.go b/x-pack/filebeat/module/suricata/fields.go index 4d1c0de9a8c4..578c30c9d6bf 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/filebeat/module/zeek/fields.go b/x-pack/filebeat/module/zeek/fields.go index d12bd9ba9d29..2af5c1fecc51 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { 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 e11b9309eb2b..32a692d77c99 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 @@ -13,7 +13,7 @@ import ( "log" "os" - "github.com/elastic/beats/x-pack/filebeat/processors/decode_cef/cef" + "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef/cef" ) var ( diff --git a/x-pack/filebeat/processors/decode_cef/cef/fuzz/fuzz.go b/x-pack/filebeat/processors/decode_cef/cef/fuzz/fuzz.go index 427daae679d8..e397cced9888 100644 --- a/x-pack/filebeat/processors/decode_cef/cef/fuzz/fuzz.go +++ b/x-pack/filebeat/processors/decode_cef/cef/fuzz/fuzz.go @@ -5,7 +5,7 @@ package fuzz import ( - cef2 "github.com/elastic/beats/x-pack/filebeat/processors/decode_cef/cef" + cef2 "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef/cef" ) // Fuzz is the entry point that go-fuzz uses to fuzz the parser. diff --git a/x-pack/filebeat/processors/decode_cef/cef/types.go b/x-pack/filebeat/processors/decode_cef/cef/types.go index c8e7e43916d3..6ef0b830622e 100644 --- a/x-pack/filebeat/processors/decode_cef/cef/types.go +++ b/x-pack/filebeat/processors/decode_cef/cef/types.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // DataType specifies one of CEF data types. diff --git a/x-pack/filebeat/processors/decode_cef/decode_cef.go b/x-pack/filebeat/processors/decode_cef/decode_cef.go index 45853f5378a6..d3ca96f7c1ca 100644 --- a/x-pack/filebeat/processors/decode_cef/decode_cef.go +++ b/x-pack/filebeat/processors/decode_cef/decode_cef.go @@ -12,12 +12,12 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/x-pack/filebeat/processors/decode_cef/cef" + "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/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef/cef" ) const ( 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 a23663861bb3..bdc3266fb6d8 100644 --- a/x-pack/filebeat/processors/decode_cef/decode_cef_test.go +++ b/x-pack/filebeat/processors/decode_cef/decode_cef_test.go @@ -15,8 +15,8 @@ import ( "github.com/pmezard/go-difflib/difflib" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) var updateGolden = flag.Bool("update", false, "update golden test files") diff --git a/x-pack/filebeat/processors/decode_cef/fields.go b/x-pack/filebeat/processors/decode_cef/fields.go index 7eb1872509a7..30d9e1abba15 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/libbeat/asset" + "github.com/elastic/beats/v7/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 efb320caab40..e6eb0c18e6ed 100644 --- a/x-pack/filebeat/processors/decode_cef/keys.ecs.go +++ b/x-pack/filebeat/processors/decode_cef/keys.ecs.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/filebeat/processors/decode_cef/cef" + "github.com/elastic/beats/v7/x-pack/filebeat/processors/decode_cef/cef" ) type mappedField struct { diff --git a/x-pack/functionbeat/config/config.go b/x-pack/functionbeat/config/config.go index 46e4eece0e5b..a95346c59c14 100644 --- a/x-pack/functionbeat/config/config.go +++ b/x-pack/functionbeat/config/config.go @@ -11,8 +11,8 @@ import ( "fmt" "regexp" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/common" ) var ( diff --git a/x-pack/functionbeat/config/config_test.go b/x-pack/functionbeat/config/config_test.go index 472e2aecf7ea..af62d8ca7e47 100644 --- a/x-pack/functionbeat/config/config_test.go +++ b/x-pack/functionbeat/config/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestNameMustBeUnique(t *testing.T) { diff --git a/x-pack/functionbeat/function/beater/functionbeat.go b/x-pack/functionbeat/function/beater/functionbeat.go index 44659bb1a06d..f2cc52abea1b 100644 --- a/x-pack/functionbeat/function/beater/functionbeat.go +++ b/x-pack/functionbeat/function/beater/functionbeat.go @@ -11,18 +11,18 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common/fmtstr" - - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/monitoring" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" - "github.com/elastic/beats/x-pack/libbeat/licenser" + "github.com/elastic/beats/v7/libbeat/common/fmtstr" + + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/processors" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/x-pack/libbeat/licenser" ) var ( diff --git a/x-pack/functionbeat/function/beater/proccessors_test.go b/x-pack/functionbeat/function/beater/proccessors_test.go index 7d366aa14af2..3a18aa82b02a 100644 --- a/x-pack/functionbeat/function/beater/proccessors_test.go +++ b/x-pack/functionbeat/function/beater/proccessors_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/processors" - _ "github.com/elastic/beats/libbeat/processors/actions" + "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" ) func TestProcessorsForFunction(t *testing.T) { diff --git a/x-pack/functionbeat/function/beater/processors.go b/x-pack/functionbeat/function/beater/processors.go index 26149a4cd683..23c5da9ca232 100644 --- a/x-pack/functionbeat/function/beater/processors.go +++ b/x-pack/functionbeat/function/beater/processors.go @@ -5,10 +5,10 @@ package beater import ( - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common/fmtstr" - "github.com/elastic/beats/libbeat/processors" - "github.com/elastic/beats/libbeat/processors/add_formatted_index" + "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" ) func processorsForFunction(beatInfo beat.Info, config fnExtraConfig) (*processors.Processors, error) { diff --git a/x-pack/functionbeat/function/cmd/root.go b/x-pack/functionbeat/function/cmd/root.go index ac8917237de6..75206efbb2c2 100644 --- a/x-pack/functionbeat/function/cmd/root.go +++ b/x-pack/functionbeat/function/cmd/root.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/x-pack/functionbeat/config" + "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/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" ) // FunctionCmd is the command of the function. diff --git a/x-pack/functionbeat/function/core/coordinator.go b/x-pack/functionbeat/function/core/coordinator.go index 114c97812d7e..99e011c39d87 100644 --- a/x-pack/functionbeat/function/core/coordinator.go +++ b/x-pack/functionbeat/function/core/coordinator.go @@ -10,8 +10,8 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) // Runner is the interface that the coordinator will follow to manage a function goroutine. diff --git a/x-pack/functionbeat/function/core/coordinator_test.go b/x-pack/functionbeat/function/core/coordinator_test.go index f64b60aa4f85..71f3356941d7 100644 --- a/x-pack/functionbeat/function/core/coordinator_test.go +++ b/x-pack/functionbeat/function/core/coordinator_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) var errUnhappy = errors.New("unhappy :(") diff --git a/x-pack/functionbeat/function/core/sync_client.go b/x-pack/functionbeat/function/core/sync_client.go index 1bdc8840efed..f599567f7105 100644 --- a/x-pack/functionbeat/function/core/sync_client.go +++ b/x-pack/functionbeat/function/core/sync_client.go @@ -7,8 +7,8 @@ package core import ( "sync" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/logp" ) // Client implements the interface used by all the functionbeat function, we only implement a synchronous diff --git a/x-pack/functionbeat/function/core/sync_client_test.go b/x-pack/functionbeat/function/core/sync_client_test.go index 953c9b7e3127..623729525d06 100644 --- a/x-pack/functionbeat/function/core/sync_client_test.go +++ b/x-pack/functionbeat/function/core/sync_client_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/beat" ) type dummyClient struct { diff --git a/x-pack/functionbeat/function/provider/cli.go b/x-pack/functionbeat/function/provider/cli.go index d07258e80fb3..9e2c9f1c42c2 100644 --- a/x-pack/functionbeat/function/provider/cli.go +++ b/x-pack/functionbeat/function/provider/cli.go @@ -5,8 +5,8 @@ package provider import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // CLIManager is the interface implemented by each provider to expose a command CLI interface diff --git a/x-pack/functionbeat/function/provider/default_provider.go b/x-pack/functionbeat/function/provider/default_provider.go index bd4b8a84d0d8..a73a5a54db94 100644 --- a/x-pack/functionbeat/function/provider/default_provider.go +++ b/x-pack/functionbeat/function/provider/default_provider.go @@ -7,10 +7,10 @@ package provider import ( "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" ) // DefaultProvider implements the minimal required to retrieve and start functions. diff --git a/x-pack/functionbeat/function/provider/feature.go b/x-pack/functionbeat/function/provider/feature.go index b5e56389fd2d..1cb8c3fc9504 100644 --- a/x-pack/functionbeat/function/provider/feature.go +++ b/x-pack/functionbeat/function/provider/feature.go @@ -5,7 +5,7 @@ package provider import ( - "github.com/elastic/beats/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/feature" ) // getNamespace return the namespace for functions of a specific provider. The registry have a flat view diff --git a/x-pack/functionbeat/function/provider/feature_test.go b/x-pack/functionbeat/function/provider/feature_test.go index 7873604c2edc..01843e4cf293 100644 --- a/x-pack/functionbeat/function/provider/feature_test.go +++ b/x-pack/functionbeat/function/provider/feature_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestBuilder(t *testing.T) { diff --git a/x-pack/functionbeat/function/provider/provider.go b/x-pack/functionbeat/function/provider/provider.go index 2827b3031575..a2198251a07a 100644 --- a/x-pack/functionbeat/function/provider/provider.go +++ b/x-pack/functionbeat/function/provider/provider.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) // Create a new pipeline client based on the function configuration. diff --git a/x-pack/functionbeat/function/provider/provider_test.go b/x-pack/functionbeat/function/provider/provider_test.go index cab3f5946ec4..e93d8bd55463 100644 --- a/x-pack/functionbeat/function/provider/provider_test.go +++ b/x-pack/functionbeat/function/provider/provider_test.go @@ -12,10 +12,10 @@ import ( e "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) type simpleFunction struct { diff --git a/x-pack/functionbeat/function/provider/registry.go b/x-pack/functionbeat/function/provider/registry.go index 403cbea893e7..9b88930e4cad 100644 --- a/x-pack/functionbeat/function/provider/registry.go +++ b/x-pack/functionbeat/function/provider/registry.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" ) // Errors generated by the registry when we are retrieving providers or functions from the main registry. diff --git a/x-pack/functionbeat/function/provider/registry_test.go b/x-pack/functionbeat/function/provider/registry_test.go index 84ac481a88bd..d18be7365310 100644 --- a/x-pack/functionbeat/function/provider/registry_test.go +++ b/x-pack/functionbeat/function/provider/registry_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) type mockProvider struct { diff --git a/x-pack/functionbeat/function/provider/template.go b/x-pack/functionbeat/function/provider/template.go index dfa0651ed3fa..843a1bd2c26a 100644 --- a/x-pack/functionbeat/function/provider/template.go +++ b/x-pack/functionbeat/function/provider/template.go @@ -5,8 +5,8 @@ package provider import ( - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // TemplateBuilderFactory factory method to call to create a new template builder. diff --git a/x-pack/functionbeat/function/telemetry/telemetry.go b/x-pack/functionbeat/function/telemetry/telemetry.go index 531e94c582f8..cd476d50e750 100644 --- a/x-pack/functionbeat/function/telemetry/telemetry.go +++ b/x-pack/functionbeat/function/telemetry/telemetry.go @@ -5,7 +5,7 @@ package telemetry import ( - "github.com/elastic/beats/libbeat/monitoring" + "github.com/elastic/beats/v7/libbeat/monitoring" ) // T is a telemetry instance diff --git a/x-pack/functionbeat/include/feature.go b/x-pack/functionbeat/include/feature.go index 211efd3e6a21..f66f8532f748 100644 --- a/x-pack/functionbeat/include/feature.go +++ b/x-pack/functionbeat/include/feature.go @@ -5,10 +5,10 @@ package include import ( - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/x-pack/functionbeat/manager/aws" - "github.com/elastic/beats/x-pack/functionbeat/manager/gcp" - "github.com/elastic/beats/x-pack/functionbeat/provider/local/local" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/aws" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/gcp" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/local/local" ) // Bundle feature enabled. diff --git a/x-pack/functionbeat/include/fields.go b/x-pack/functionbeat/include/fields.go index ce881d240172..c827391cbb53 100644 --- a/x-pack/functionbeat/include/fields.go +++ b/x-pack/functionbeat/include/fields.go @@ -7,7 +7,7 @@ package include import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/functionbeat/magefile.go b/x-pack/functionbeat/magefile.go index 44e9765e397d..44e31b531203 100644 --- a/x-pack/functionbeat/magefile.go +++ b/x-pack/functionbeat/magefile.go @@ -15,18 +15,18 @@ import ( "github.com/magefile/mage/mg" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" - "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/unittest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest/notests" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest/notests" - devtools "github.com/elastic/beats/dev-tools/mage" - functionbeat "github.com/elastic/beats/x-pack/functionbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + functionbeat "github.com/elastic/beats/v7/x-pack/functionbeat/scripts/mage" ) func init() { diff --git a/x-pack/functionbeat/main.go b/x-pack/functionbeat/main.go index 1a1f8eecd67d..d6c63e4f7097 100644 --- a/x-pack/functionbeat/main.go +++ b/x-pack/functionbeat/main.go @@ -7,8 +7,8 @@ package main import ( "os" - _ "github.com/elastic/beats/x-pack/functionbeat/include" // imports features - "github.com/elastic/beats/x-pack/functionbeat/manager/cmd" + _ "github.com/elastic/beats/v7/x-pack/functionbeat/include" // imports features + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/cmd" ) func main() { diff --git a/x-pack/functionbeat/main_test.go b/x-pack/functionbeat/main_test.go index 05615f97e751..bd62f055ba56 100644 --- a/x-pack/functionbeat/main_test.go +++ b/x-pack/functionbeat/main_test.go @@ -10,8 +10,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" - "github.com/elastic/beats/x-pack/functionbeat/manager/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/cmd" ) var systemTest *bool diff --git a/x-pack/functionbeat/manager/aws/aws.go b/x-pack/functionbeat/manager/aws/aws.go index 4d8f34c726b5..f9585c706aec 100644 --- a/x-pack/functionbeat/manager/aws/aws.go +++ b/x-pack/functionbeat/manager/aws/aws.go @@ -5,9 +5,9 @@ package aws import ( - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws" ) // Bundle exposes the trigger supported by the AWS provider. diff --git a/x-pack/functionbeat/manager/aws/cli_manager.go b/x-pack/functionbeat/manager/aws/cli_manager.go index 5d93423dbaab..07479fc18c59 100644 --- a/x-pack/functionbeat/manager/aws/cli_manager.go +++ b/x-pack/functionbeat/manager/aws/cli_manager.go @@ -18,12 +18,12 @@ import ( "github.com/awslabs/goformation/v4/cloudformation/lambda" merrors "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/manager/core" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" - fnaws "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" + fnaws "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws" ) const ( diff --git a/x-pack/functionbeat/manager/aws/cli_manager_test.go b/x-pack/functionbeat/manager/aws/cli_manager_test.go index 534971c4358b..336f979587f8 100644 --- a/x-pack/functionbeat/manager/aws/cli_manager_test.go +++ b/x-pack/functionbeat/manager/aws/cli_manager_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestChecksum(t *testing.T) { diff --git a/x-pack/functionbeat/manager/aws/event_stack_poller.go b/x-pack/functionbeat/manager/aws/event_stack_poller.go index 5813bc3a1241..4d9703d2c66a 100644 --- a/x-pack/functionbeat/manager/aws/event_stack_poller.go +++ b/x-pack/functionbeat/manager/aws/event_stack_poller.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudformation" "github.com/aws/aws-sdk-go-v2/service/cloudformation/cloudformationiface" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // Resource type to look for. diff --git a/x-pack/functionbeat/manager/aws/event_stack_poller_test.go b/x-pack/functionbeat/manager/aws/event_stack_poller_test.go index ab1ee3725e11..a81ef707aba9 100644 --- a/x-pack/functionbeat/manager/aws/event_stack_poller_test.go +++ b/x-pack/functionbeat/manager/aws/event_stack_poller_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/atomic" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type mockEventHandler struct { diff --git a/x-pack/functionbeat/manager/aws/op_cloudformation.go b/x-pack/functionbeat/manager/aws/op_cloudformation.go index 7103834ab9f8..c7a977b6b186 100644 --- a/x-pack/functionbeat/manager/aws/op_cloudformation.go +++ b/x-pack/functionbeat/manager/aws/op_cloudformation.go @@ -15,8 +15,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudformation/cloudformationiface" "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opCreateCloudFormation struct { diff --git a/x-pack/functionbeat/manager/aws/op_cloudformation_test.go b/x-pack/functionbeat/manager/aws/op_cloudformation_test.go index 04c57df68510..5fd56bd217d9 100644 --- a/x-pack/functionbeat/manager/aws/op_cloudformation_test.go +++ b/x-pack/functionbeat/manager/aws/op_cloudformation_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudformation/cloudformationiface" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type mockCloudformationStack struct { diff --git a/x-pack/functionbeat/manager/aws/op_delete_cloudformation.go b/x-pack/functionbeat/manager/aws/op_delete_cloudformation.go index 3ee7c7c86828..90c81341aaea 100644 --- a/x-pack/functionbeat/manager/aws/op_delete_cloudformation.go +++ b/x-pack/functionbeat/manager/aws/op_delete_cloudformation.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudformation/cloudformationiface" "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opDeleteCloudFormation struct { diff --git a/x-pack/functionbeat/manager/aws/op_delete_file_bucket.go b/x-pack/functionbeat/manager/aws/op_delete_file_bucket.go index 38b00a93fb28..cfd04491b8ef 100644 --- a/x-pack/functionbeat/manager/aws/op_delete_file_bucket.go +++ b/x-pack/functionbeat/manager/aws/op_delete_file_bucket.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opDeleteFileBucket struct { diff --git a/x-pack/functionbeat/manager/aws/op_ensure_bucket.go b/x-pack/functionbeat/manager/aws/op_ensure_bucket.go index 304127ac1512..fdf5aefd8430 100644 --- a/x-pack/functionbeat/manager/aws/op_ensure_bucket.go +++ b/x-pack/functionbeat/manager/aws/op_ensure_bucket.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/awserr" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) // This error is not provided by the S3 error package. diff --git a/x-pack/functionbeat/manager/aws/op_update_cloudformation.go b/x-pack/functionbeat/manager/aws/op_update_cloudformation.go index 315ed6d89007..9760b631fae2 100644 --- a/x-pack/functionbeat/manager/aws/op_update_cloudformation.go +++ b/x-pack/functionbeat/manager/aws/op_update_cloudformation.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudformation/cloudformationiface" "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opUpdateCloudFormation struct { diff --git a/x-pack/functionbeat/manager/aws/op_upload_to_bucket.go b/x-pack/functionbeat/manager/aws/op_upload_to_bucket.go index 0064d53d5591..20b390fe06c9 100644 --- a/x-pack/functionbeat/manager/aws/op_upload_to_bucket.go +++ b/x-pack/functionbeat/manager/aws/op_upload_to_bucket.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opUploadToBucket struct { diff --git a/x-pack/functionbeat/manager/aws/op_wait_cloud_formation.go b/x-pack/functionbeat/manager/aws/op_wait_cloud_formation.go index 281784796948..c639cb37c4b3 100644 --- a/x-pack/functionbeat/manager/aws/op_wait_cloud_formation.go +++ b/x-pack/functionbeat/manager/aws/op_wait_cloud_formation.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudformation" "github.com/aws/aws-sdk-go-v2/service/cloudformation/cloudformationiface" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) var periodicCheck = 2 * time.Second diff --git a/x-pack/functionbeat/manager/aws/policies_test.go b/x-pack/functionbeat/manager/aws/policies_test.go index 277c7268d59a..55ef20efc3f0 100644 --- a/x-pack/functionbeat/manager/aws/policies_test.go +++ b/x-pack/functionbeat/manager/aws/policies_test.go @@ -11,9 +11,9 @@ import ( "github.com/awslabs/goformation/v4/cloudformation/iam" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - fnaws "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + fnaws "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws" ) func TestConfig(t *testing.T) { diff --git a/x-pack/functionbeat/manager/aws/template_builder.go b/x-pack/functionbeat/manager/aws/template_builder.go index ef8f718b67ef..d28a75b37948 100644 --- a/x-pack/functionbeat/manager/aws/template_builder.go +++ b/x-pack/functionbeat/manager/aws/template_builder.go @@ -16,12 +16,12 @@ import ( "github.com/awslabs/goformation/v4/cloudformation/logs" "github.com/awslabs/goformation/v4/cloudformation/tags" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/manager/core" - "github.com/elastic/beats/x-pack/functionbeat/manager/core/bundle" - fnaws "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/core/bundle" + fnaws "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws" ) // zipData stores the data on the zip to be deployed diff --git a/x-pack/functionbeat/manager/beater/functionbeat.go b/x-pack/functionbeat/manager/beater/functionbeat.go index 9c1c1cd6de7f..855cf16c02a9 100644 --- a/x-pack/functionbeat/manager/beater/functionbeat.go +++ b/x-pack/functionbeat/manager/beater/functionbeat.go @@ -8,10 +8,10 @@ import ( "fmt" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" ) var ( diff --git a/x-pack/functionbeat/manager/cmd/cli_handler.go b/x-pack/functionbeat/manager/cmd/cli_handler.go index 70a0b5596dca..d1d9d9ca5c50 100644 --- a/x-pack/functionbeat/manager/cmd/cli_handler.go +++ b/x-pack/functionbeat/manager/cmd/cli_handler.go @@ -10,8 +10,8 @@ import ( "io" "strings" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" ) // Errors generated by the cliHandler. diff --git a/x-pack/functionbeat/manager/cmd/cli_handler_test.go b/x-pack/functionbeat/manager/cmd/cli_handler_test.go index c4b332d413bf..726ee93e9a1c 100644 --- a/x-pack/functionbeat/manager/cmd/cli_handler_test.go +++ b/x-pack/functionbeat/manager/cmd/cli_handler_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" ) type mockCLIManager struct { diff --git a/x-pack/functionbeat/manager/cmd/provider_cmd.go b/x-pack/functionbeat/manager/cmd/provider_cmd.go index 4482edf9f6cf..70c0637f108c 100644 --- a/x-pack/functionbeat/manager/cmd/provider_cmd.go +++ b/x-pack/functionbeat/manager/cmd/provider_cmd.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" ) func initProviders() ([]provider.Provider, error) { diff --git a/x-pack/functionbeat/manager/cmd/root.go b/x-pack/functionbeat/manager/cmd/root.go index 1c4bafc66567..98358b40453a 100644 --- a/x-pack/functionbeat/manager/cmd/root.go +++ b/x-pack/functionbeat/manager/cmd/root.go @@ -9,10 +9,10 @@ import ( "github.com/spf13/cobra" - cmd "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/manager/beater" + cmd "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/beater" ) // Name of this beat diff --git a/x-pack/functionbeat/manager/core/bundle/bundle_test.go b/x-pack/functionbeat/manager/core/bundle/bundle_test.go index 0aae4e7f8e6f..89d010522b77 100644 --- a/x-pack/functionbeat/manager/core/bundle/bundle_test.go +++ b/x-pack/functionbeat/manager/core/bundle/bundle_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func newFixedResource(name string, length int64) *MemoryFile { diff --git a/x-pack/functionbeat/manager/core/makezip.go b/x-pack/functionbeat/manager/core/makezip.go index bcb6261b3920..26bd9bc99650 100644 --- a/x-pack/functionbeat/manager/core/makezip.go +++ b/x-pack/functionbeat/manager/core/makezip.go @@ -11,11 +11,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/keystore" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/manager/core/bundle" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/keystore" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/core/bundle" ) func rawYaml() ([]byte, error) { diff --git a/x-pack/functionbeat/manager/executor/executor.go b/x-pack/functionbeat/manager/executor/executor.go index 8cbc0344b227..516b03801a17 100644 --- a/x-pack/functionbeat/manager/executor/executor.go +++ b/x-pack/functionbeat/manager/executor/executor.go @@ -7,7 +7,7 @@ package executor import ( "errors" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) var ( diff --git a/x-pack/functionbeat/manager/gcp/cli_manager.go b/x-pack/functionbeat/manager/gcp/cli_manager.go index 102b523a3d68..f0cf31cc3017 100644 --- a/x-pack/functionbeat/manager/gcp/cli_manager.go +++ b/x-pack/functionbeat/manager/gcp/cli_manager.go @@ -15,12 +15,12 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/google" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/manager/core" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" - fngcp "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/gcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" + fngcp "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/gcp" ) type installer interface { diff --git a/x-pack/functionbeat/manager/gcp/gcp.go b/x-pack/functionbeat/manager/gcp/gcp.go index f9ced9ef5d38..733fba03d978 100644 --- a/x-pack/functionbeat/manager/gcp/gcp.go +++ b/x-pack/functionbeat/manager/gcp/gcp.go @@ -5,9 +5,9 @@ package gcp import ( - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/gcp" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/gcp" ) // Bundle exposes the trigger supported by the gcp provider. diff --git a/x-pack/functionbeat/manager/gcp/op_create_function.go b/x-pack/functionbeat/manager/gcp/op_create_function.go index 9e39218e2cfe..cf970a770914 100644 --- a/x-pack/functionbeat/manager/gcp/op_create_function.go +++ b/x-pack/functionbeat/manager/gcp/op_create_function.go @@ -11,8 +11,8 @@ import ( "golang.org/x/oauth2" cloudfunctions "google.golang.org/api/cloudfunctions/v1" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opCreateFunction struct { diff --git a/x-pack/functionbeat/manager/gcp/op_delete_file_bucket.go b/x-pack/functionbeat/manager/gcp/op_delete_file_bucket.go index 43159fa4d8f5..50841bd7f63c 100644 --- a/x-pack/functionbeat/manager/gcp/op_delete_file_bucket.go +++ b/x-pack/functionbeat/manager/gcp/op_delete_file_bucket.go @@ -10,8 +10,8 @@ import ( "cloud.google.com/go/storage" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opDeleteFromBucket struct { diff --git a/x-pack/functionbeat/manager/gcp/op_delete_function.go b/x-pack/functionbeat/manager/gcp/op_delete_function.go index 8f4743895456..97b8b25cf113 100644 --- a/x-pack/functionbeat/manager/gcp/op_delete_function.go +++ b/x-pack/functionbeat/manager/gcp/op_delete_function.go @@ -11,8 +11,8 @@ import ( "golang.org/x/oauth2" cloudfunctions "google.golang.org/api/cloudfunctions/v1" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opDeleteFunction struct { diff --git a/x-pack/functionbeat/manager/gcp/op_ensure_bucket.go b/x-pack/functionbeat/manager/gcp/op_ensure_bucket.go index c04051bcbffa..06da4fb446f2 100644 --- a/x-pack/functionbeat/manager/gcp/op_ensure_bucket.go +++ b/x-pack/functionbeat/manager/gcp/op_ensure_bucket.go @@ -10,8 +10,8 @@ import ( "cloud.google.com/go/storage" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opEnsureBucket struct { diff --git a/x-pack/functionbeat/manager/gcp/op_update_function.go b/x-pack/functionbeat/manager/gcp/op_update_function.go index c89569641409..ca70af1aad8a 100644 --- a/x-pack/functionbeat/manager/gcp/op_update_function.go +++ b/x-pack/functionbeat/manager/gcp/op_update_function.go @@ -11,8 +11,8 @@ import ( "golang.org/x/oauth2" cloudfunctions "google.golang.org/api/cloudfunctions/v1" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opUpdateFunction struct { diff --git a/x-pack/functionbeat/manager/gcp/op_upload_to_bucket.go b/x-pack/functionbeat/manager/gcp/op_upload_to_bucket.go index 228da618d6af..a05a16c7b717 100644 --- a/x-pack/functionbeat/manager/gcp/op_upload_to_bucket.go +++ b/x-pack/functionbeat/manager/gcp/op_upload_to_bucket.go @@ -10,8 +10,8 @@ import ( "cloud.google.com/go/storage" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) type opUploadToBucket struct { diff --git a/x-pack/functionbeat/manager/gcp/op_wait_for_function.go b/x-pack/functionbeat/manager/gcp/op_wait_for_function.go index a90508196015..94cf2dcbc0df 100644 --- a/x-pack/functionbeat/manager/gcp/op_wait_for_function.go +++ b/x-pack/functionbeat/manager/gcp/op_wait_for_function.go @@ -12,8 +12,8 @@ import ( "golang.org/x/oauth2" cloudfunctions "google.golang.org/api/cloudfunctions/v1" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/manager/executor" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/executor" ) var periodicCheck = 5 * time.Second diff --git a/x-pack/functionbeat/manager/gcp/template_builder.go b/x-pack/functionbeat/manager/gcp/template_builder.go index da13f8eb8d5d..57814cb34de3 100644 --- a/x-pack/functionbeat/manager/gcp/template_builder.go +++ b/x-pack/functionbeat/manager/gcp/template_builder.go @@ -13,12 +13,12 @@ import ( cloudfunctions "google.golang.org/api/cloudfunctions/v1" yaml "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/manager/core" - "github.com/elastic/beats/x-pack/functionbeat/manager/core/bundle" - fngcp "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/gcp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/core/bundle" + fngcp "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/gcp" ) const ( diff --git a/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy.go b/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy.go index 7f2aff3ee31d..e2bf6cb2dbf5 100644 --- a/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy.go +++ b/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy.go @@ -12,14 +12,14 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/aws/aws-lambda-go/lambda" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws/transformer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws/transformer" ) type message struct { diff --git a/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy_test.go b/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy_test.go index 74d527f65a32..227b4ad9af00 100644 --- a/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy_test.go +++ b/x-pack/functionbeat/provider/aws/aws/api_gateway_proxy_test.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" ) func TestAPIGatewayProxy(t *testing.T) { diff --git a/x-pack/functionbeat/provider/aws/aws/cloudwatch_kinesis.go b/x-pack/functionbeat/provider/aws/aws/cloudwatch_kinesis.go index 67f124e7dc70..32df79089c7c 100644 --- a/x-pack/functionbeat/provider/aws/aws/cloudwatch_kinesis.go +++ b/x-pack/functionbeat/provider/aws/aws/cloudwatch_kinesis.go @@ -12,13 +12,13 @@ import ( "github.com/awslabs/goformation/v4/cloudformation" "github.com/awslabs/goformation/v4/cloudformation/iam" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws/transformer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws/transformer" ) // CloudwatchKinesis receives events from a kinesis stream and forward them to elasticsearch. diff --git a/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs.go b/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs.go index 6dd48802a229..1d033397b581 100644 --- a/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs.go +++ b/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs.go @@ -19,13 +19,13 @@ import ( "github.com/awslabs/goformation/v4/cloudformation/lambda" "github.com/awslabs/goformation/v4/cloudformation/policies" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws/transformer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws/transformer" ) var ( diff --git a/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs_test.go b/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs_test.go index e746f18f58bd..463646eeb22f 100644 --- a/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs_test.go +++ b/x-pack/functionbeat/provider/aws/aws/cloudwatch_logs_test.go @@ -16,9 +16,9 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" ) type arrayBackedClient struct { diff --git a/x-pack/functionbeat/provider/aws/aws/config.go b/x-pack/functionbeat/provider/aws/aws/config.go index 7d0421071233..604035522b5d 100644 --- a/x-pack/functionbeat/provider/aws/aws/config.go +++ b/x-pack/functionbeat/provider/aws/aws/config.go @@ -14,7 +14,7 @@ import ( "github.com/dustin/go-humanize" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" ) // Config expose the configuration option the AWS provider. diff --git a/x-pack/functionbeat/provider/aws/aws/kinesis.go b/x-pack/functionbeat/provider/aws/aws/kinesis.go index f91cbe3a0c2e..9798dabbc1e7 100644 --- a/x-pack/functionbeat/provider/aws/aws/kinesis.go +++ b/x-pack/functionbeat/provider/aws/aws/kinesis.go @@ -17,13 +17,13 @@ import ( "github.com/awslabs/goformation/v4/cloudformation/iam" "github.com/awslabs/goformation/v4/cloudformation/lambda" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws/transformer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws/transformer" ) type startingPosition uint diff --git a/x-pack/functionbeat/provider/aws/aws/kinesis_test.go b/x-pack/functionbeat/provider/aws/aws/kinesis_test.go index 6178758fede0..6f54c1bf061f 100644 --- a/x-pack/functionbeat/provider/aws/aws/kinesis_test.go +++ b/x-pack/functionbeat/provider/aws/aws/kinesis_test.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" ) func TestKinesis(t *testing.T) { diff --git a/x-pack/functionbeat/provider/aws/aws/sqs.go b/x-pack/functionbeat/provider/aws/aws/sqs.go index da20e66b6443..670fe0cfe3f0 100644 --- a/x-pack/functionbeat/provider/aws/aws/sqs.go +++ b/x-pack/functionbeat/provider/aws/aws/sqs.go @@ -15,13 +15,13 @@ import ( "github.com/awslabs/goformation/v4/cloudformation/iam" "github.com/awslabs/goformation/v4/cloudformation/lambda" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws/transformer" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws/transformer" ) const batchSize = 10 diff --git a/x-pack/functionbeat/provider/aws/aws/sqs_test.go b/x-pack/functionbeat/provider/aws/aws/sqs_test.go index 2d5ec40b4c31..dd53d75a9f7c 100644 --- a/x-pack/functionbeat/provider/aws/aws/sqs_test.go +++ b/x-pack/functionbeat/provider/aws/aws/sqs_test.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" ) func TestSQS(t *testing.T) { diff --git a/x-pack/functionbeat/provider/aws/aws/transformer/transformer.go b/x-pack/functionbeat/provider/aws/aws/transformer/transformer.go index 87ffad9c054e..7a488446711b 100644 --- a/x-pack/functionbeat/provider/aws/aws/transformer/transformer.go +++ b/x-pack/functionbeat/provider/aws/aws/transformer/transformer.go @@ -14,8 +14,8 @@ import ( "github.com/aws/aws-lambda-go/events" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // Centralize anything related to ECS into a common file. diff --git a/x-pack/functionbeat/provider/aws/aws/transformer/transformer_test.go b/x-pack/functionbeat/provider/aws/aws/transformer/transformer_test.go index ab66687459f7..1fcdc1fc525c 100644 --- a/x-pack/functionbeat/provider/aws/aws/transformer/transformer_test.go +++ b/x-pack/functionbeat/provider/aws/aws/transformer/transformer_test.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-lambda-go/events" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) func TestCloudwatch(t *testing.T) { diff --git a/x-pack/functionbeat/provider/aws/cmd/root.go b/x-pack/functionbeat/provider/aws/cmd/root.go index 495ba81ffccd..fc7a7e0c2515 100644 --- a/x-pack/functionbeat/provider/aws/cmd/root.go +++ b/x-pack/functionbeat/provider/aws/cmd/root.go @@ -7,8 +7,8 @@ package cmd import ( "flag" - "github.com/elastic/beats/x-pack/functionbeat/function/beater" - funcmd "github.com/elastic/beats/x-pack/functionbeat/function/cmd" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/beater" + funcmd "github.com/elastic/beats/v7/x-pack/functionbeat/function/cmd" ) // Name of this beat diff --git a/x-pack/functionbeat/provider/aws/include/feature.go b/x-pack/functionbeat/provider/aws/include/feature.go index b1c797b1afe6..2a6c14ef05cc 100644 --- a/x-pack/functionbeat/provider/aws/include/feature.go +++ b/x-pack/functionbeat/provider/aws/include/feature.go @@ -5,9 +5,9 @@ package include import ( - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/aws" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/aws" ) // Bundle exposes the trigger supported by the AWS provider. diff --git a/x-pack/functionbeat/provider/aws/main.go b/x-pack/functionbeat/provider/aws/main.go index 2016f5ade04f..9ee80bb48942 100644 --- a/x-pack/functionbeat/provider/aws/main.go +++ b/x-pack/functionbeat/provider/aws/main.go @@ -7,8 +7,8 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/cmd" - _ "github.com/elastic/beats/x-pack/functionbeat/provider/aws/include" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/cmd" + _ "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/include" ) func main() { diff --git a/x-pack/functionbeat/provider/aws/main_test.go b/x-pack/functionbeat/provider/aws/main_test.go index b404f98206c3..dad745420cb7 100644 --- a/x-pack/functionbeat/provider/aws/main_test.go +++ b/x-pack/functionbeat/provider/aws/main_test.go @@ -10,7 +10,7 @@ import ( "flag" "testing" - "github.com/elastic/beats/x-pack/functionbeat/provider/aws/cmd" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/aws/cmd" ) var systemTest *bool diff --git a/x-pack/functionbeat/provider/gcp/gcp/pubsub.go b/x-pack/functionbeat/provider/gcp/gcp/pubsub.go index 42bcbe2a2fe9..6e090697bd10 100644 --- a/x-pack/functionbeat/provider/gcp/gcp/pubsub.go +++ b/x-pack/functionbeat/provider/gcp/gcp/pubsub.go @@ -11,12 +11,12 @@ import ( "cloud.google.com/go/functions/metadata" "cloud.google.com/go/pubsub" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) const ( diff --git a/x-pack/functionbeat/provider/gcp/gcp/storage.go b/x-pack/functionbeat/provider/gcp/gcp/storage.go index d58a45a9b4d1..868fd22448d4 100644 --- a/x-pack/functionbeat/provider/gcp/gcp/storage.go +++ b/x-pack/functionbeat/provider/gcp/gcp/storage.go @@ -10,12 +10,12 @@ import ( "cloud.google.com/go/functions/metadata" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) const ( diff --git a/x-pack/functionbeat/provider/gcp/gcp/transformer.go b/x-pack/functionbeat/provider/gcp/gcp/transformer.go index 9072597de514..a3e0a5235d7a 100644 --- a/x-pack/functionbeat/provider/gcp/gcp/transformer.go +++ b/x-pack/functionbeat/provider/gcp/gcp/transformer.go @@ -10,8 +10,8 @@ import ( "cloud.google.com/go/functions/metadata" "cloud.google.com/go/pubsub" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" ) // StorageEvent is the event from Google Cloud Storage diff --git a/x-pack/functionbeat/provider/gcp/include/feature.go b/x-pack/functionbeat/provider/gcp/include/feature.go index bb4e0b82ccba..371ed1d961d3 100644 --- a/x-pack/functionbeat/provider/gcp/include/feature.go +++ b/x-pack/functionbeat/provider/gcp/include/feature.go @@ -5,9 +5,9 @@ package include import ( - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/gcp" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/gcp" ) // Bundle exposes the trigger supported by the GCP provider. diff --git a/x-pack/functionbeat/provider/gcp/pubsub/pubsub.go b/x-pack/functionbeat/provider/gcp/pubsub/pubsub.go index c317a614b0da..44f77695e946 100644 --- a/x-pack/functionbeat/provider/gcp/pubsub/pubsub.go +++ b/x-pack/functionbeat/provider/gcp/pubsub/pubsub.go @@ -10,15 +10,15 @@ import ( gpubsub "cloud.google.com/go/pubsub" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/function/beater" - prov "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/gcp" - _ "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/include" + "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/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/beater" + prov "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/gcp" + _ "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/include" ) func RunPubSub(ctx context.Context, m gpubsub.Message) error { diff --git a/x-pack/functionbeat/provider/gcp/storage/storage.go b/x-pack/functionbeat/provider/gcp/storage/storage.go index be7cd0525185..c9d1660d67c1 100644 --- a/x-pack/functionbeat/provider/gcp/storage/storage.go +++ b/x-pack/functionbeat/provider/gcp/storage/storage.go @@ -8,15 +8,15 @@ import ( "context" "fmt" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/x-pack/functionbeat/config" - "github.com/elastic/beats/x-pack/functionbeat/function/beater" - "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/gcp" - _ "github.com/elastic/beats/x-pack/functionbeat/provider/gcp/include" + "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/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/x-pack/functionbeat/config" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/beater" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/gcp" + _ "github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/include" ) func RunCloudStorage(ctx context.Context, e gcp.StorageEvent) error { diff --git a/x-pack/functionbeat/provider/local/cmd/root.go b/x-pack/functionbeat/provider/local/cmd/root.go index 599eac100563..11307a141b19 100644 --- a/x-pack/functionbeat/provider/local/cmd/root.go +++ b/x-pack/functionbeat/provider/local/cmd/root.go @@ -5,8 +5,8 @@ package cmd import ( - funcmd "github.com/elastic/beats/x-pack/functionbeat/function/cmd" - "github.com/elastic/beats/x-pack/functionbeat/manager/beater" + funcmd "github.com/elastic/beats/v7/x-pack/functionbeat/function/cmd" + "github.com/elastic/beats/v7/x-pack/functionbeat/manager/beater" ) // Name of this beat diff --git a/x-pack/functionbeat/provider/local/include/feature.go b/x-pack/functionbeat/provider/local/include/feature.go index 5de6edd38743..203c70f43a4c 100644 --- a/x-pack/functionbeat/provider/local/include/feature.go +++ b/x-pack/functionbeat/provider/local/include/feature.go @@ -5,8 +5,8 @@ package include import ( - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/x-pack/functionbeat/provider/local/local" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/local/local" ) // Bundle feature enabled. diff --git a/x-pack/functionbeat/provider/local/local/local.go b/x-pack/functionbeat/provider/local/local/local.go index 0e456af87701..de4015e4108a 100644 --- a/x-pack/functionbeat/provider/local/local/local.go +++ b/x-pack/functionbeat/provider/local/local/local.go @@ -10,12 +10,12 @@ import ( "os" "time" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/feature" - "github.com/elastic/beats/x-pack/functionbeat/function/core" - "github.com/elastic/beats/x-pack/functionbeat/function/provider" - "github.com/elastic/beats/x-pack/functionbeat/function/telemetry" + "github.com/elastic/beats/v7/libbeat/beat" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/feature" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/core" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/provider" + "github.com/elastic/beats/v7/x-pack/functionbeat/function/telemetry" ) const stdinName = "stdin" diff --git a/x-pack/functionbeat/provider/local/main.go b/x-pack/functionbeat/provider/local/main.go index 4bb606b278d7..35284d4a716f 100644 --- a/x-pack/functionbeat/provider/local/main.go +++ b/x-pack/functionbeat/provider/local/main.go @@ -7,8 +7,8 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/functionbeat/provider/local/cmd" - _ "github.com/elastic/beats/x-pack/functionbeat/provider/local/include" // imports features + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/local/cmd" + _ "github.com/elastic/beats/v7/x-pack/functionbeat/provider/local/include" // imports features ) func main() { diff --git a/x-pack/functionbeat/provider/local/main_test.go b/x-pack/functionbeat/provider/local/main_test.go index e658308875b3..cc941b40c020 100644 --- a/x-pack/functionbeat/provider/local/main_test.go +++ b/x-pack/functionbeat/provider/local/main_test.go @@ -10,7 +10,7 @@ import ( "flag" "testing" - "github.com/elastic/beats/x-pack/functionbeat/provider/local/cmd" + "github.com/elastic/beats/v7/x-pack/functionbeat/provider/local/cmd" ) var systemTest *bool diff --git a/x-pack/functionbeat/scripts/mage/config.go b/x-pack/functionbeat/scripts/mage/config.go index dae9ba373b8a..576fc765b121 100644 --- a/x-pack/functionbeat/scripts/mage/config.go +++ b/x-pack/functionbeat/scripts/mage/config.go @@ -5,7 +5,7 @@ package mage import ( - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" ) // XPackConfigFileParams returns the configuration of sample and reference configuration data. diff --git a/x-pack/functionbeat/scripts/mage/update.go b/x-pack/functionbeat/scripts/mage/update.go index 57b8e7850ef9..becd7f12763a 100644 --- a/x-pack/functionbeat/scripts/mage/update.go +++ b/x-pack/functionbeat/scripts/mage/update.go @@ -11,8 +11,8 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - "github.com/elastic/beats/dev-tools/mage/gotool" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + "github.com/elastic/beats/v7/dev-tools/mage/gotool" ) // Update target namespace. @@ -61,21 +61,21 @@ func (Update) VendorBeats() error { return err } - deps, err := gotool.ListDeps("github.com/elastic/beats/x-pack/functionbeat/provider/gcp/" + f) + deps, err := gotool.ListDeps("github.com/elastic/beats/v7/x-pack/functionbeat/provider/gcp/" + f) if err != nil { return err } for _, d := range deps { var in string - if strings.HasPrefix(d, "github.com/elastic/beats") { - in = strings.ReplaceAll(d, "github.com/elastic/beats/", "") + if strings.HasPrefix(d, "github.com/elastic/beats/v7") { + in = strings.ReplaceAll(d, "github.com/elastic/beats/v7/", "") in = filepath.Join("..", "..", in) } else { in = filepath.Join("..", "..", "vendor", d) } - out := strings.ReplaceAll(d, "github.com/elastic/beats/vendor", "") + out := strings.ReplaceAll(d, "github.com/elastic/beats/v7/vendor", "") cp := &devtools.CopyTask{ Source: in, diff --git a/x-pack/heartbeat/cmd/root.go b/x-pack/heartbeat/cmd/root.go index 154d2cf7dcf3..8fa75613c0e5 100644 --- a/x-pack/heartbeat/cmd/root.go +++ b/x-pack/heartbeat/cmd/root.go @@ -5,8 +5,8 @@ package cmd import ( - "github.com/elastic/beats/heartbeat/cmd" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/heartbeat/cmd" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" ) // RootCmd to handle beats cli diff --git a/x-pack/heartbeat/main.go b/x-pack/heartbeat/main.go index a619fe9d3d82..05d40db6a33f 100644 --- a/x-pack/heartbeat/main.go +++ b/x-pack/heartbeat/main.go @@ -7,9 +7,9 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/heartbeat/cmd" + "github.com/elastic/beats/v7/x-pack/heartbeat/cmd" - _ "github.com/elastic/beats/heartbeat/include" + _ "github.com/elastic/beats/v7/heartbeat/include" ) func main() { diff --git a/x-pack/heartbeat/main_test.go b/x-pack/heartbeat/main_test.go index 7712e5787a45..ec6f7a06faaa 100644 --- a/x-pack/heartbeat/main_test.go +++ b/x-pack/heartbeat/main_test.go @@ -8,8 +8,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/heartbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/heartbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/x-pack/journalbeat/cmd/root.go b/x-pack/journalbeat/cmd/root.go index 507379970866..12fed916086b 100644 --- a/x-pack/journalbeat/cmd/root.go +++ b/x-pack/journalbeat/cmd/root.go @@ -5,8 +5,8 @@ package cmd import ( - "github.com/elastic/beats/journalbeat/cmd" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/journalbeat/cmd" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" ) // RootCmd to handle beats cli diff --git a/x-pack/journalbeat/main.go b/x-pack/journalbeat/main.go index f80646bfc49c..232a3e6fc498 100644 --- a/x-pack/journalbeat/main.go +++ b/x-pack/journalbeat/main.go @@ -7,9 +7,9 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/journalbeat/cmd" + "github.com/elastic/beats/v7/x-pack/journalbeat/cmd" - _ "github.com/elastic/beats/journalbeat/include" + _ "github.com/elastic/beats/v7/journalbeat/include" ) func main() { diff --git a/x-pack/journalbeat/main_test.go b/x-pack/journalbeat/main_test.go index 662ccf213ddc..786c7a575648 100644 --- a/x-pack/journalbeat/main_test.go +++ b/x-pack/journalbeat/main_test.go @@ -8,8 +8,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/journalbeat/cmd" - "github.com/elastic/beats/libbeat/tests/system/template" + "github.com/elastic/beats/v7/journalbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/x-pack/libbeat/autodiscover/providers/aws/config.go b/x-pack/libbeat/autodiscover/providers/aws/config.go index e3a0873734e7..ada3cfe8ff15 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/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" - "github.com/elastic/beats/libbeat/autodiscover/template" + "github.com/elastic/beats/v7/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 3a81acb4d5a5..fb5268547f3f 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/ec2.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" ) type ec2Instance struct { diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go index 6f1e6fd38fb7..d25b6105fd99 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/fetch.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2/ec2iface" "go.uber.org/multierr" - "github.com/elastic/beats/libbeat/logp" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" + "github.com/elastic/beats/v7/libbeat/logp" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" ) // fetcher is an interface that can fetch a list of ec2Instance objects without pagination being necessary. diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go index 4c9aa3e8b436..3af1a736778d 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go @@ -10,14 +10,14 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" - awscommon "github.com/elastic/beats/x-pack/libbeat/common/aws" + "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/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" ) func init() { 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 f8216294006c..3dd1152d40d8 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" - "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws/test" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/test" ) func Test_internalBuilder(t *testing.T) { diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go index 4ae56465d9c0..f3af85f5bc2f 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go +++ b/x-pack/libbeat/autodiscover/providers/aws/ec2/watch.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" + "github.com/elastic/beats/v7/libbeat/logp" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" ) type watcher struct { diff --git a/x-pack/libbeat/autodiscover/providers/aws/elb/fetch.go b/x-pack/libbeat/autodiscover/providers/aws/elb/fetch.go index 33a7e8bb56ac..246f401df3db 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/fetch.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/fetch.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/elasticloadbalancingv2iface" "go.uber.org/multierr" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // fetcher is an interface that can fetch a list of lbListener (load balancer + listener) objects without pagination being necessary. diff --git a/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go b/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go index b673113872de..b8cc2a9ab07f 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/lblistener.go @@ -7,8 +7,8 @@ package elb import ( "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" - "github.com/elastic/beats/libbeat/common" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" + "github.com/elastic/beats/v7/libbeat/common" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" ) // lbListener is a tuple type representing an elasticloadbalancingv2.Listener and its associated elasticloadbalancingv2.LoadBalancer. diff --git a/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go b/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go index b965f9ee1e2f..0801e157ef2c 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/provider.go @@ -10,14 +10,14 @@ import ( "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/elasticloadbalancingv2iface" "github.com/gofrs/uuid" - "github.com/elastic/beats/libbeat/autodiscover" - "github.com/elastic/beats/libbeat/autodiscover/template" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" - awscommon "github.com/elastic/beats/x-pack/libbeat/common/aws" + "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/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" + awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" ) func init() { 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 0f7bd0f66c60..9574e598b362 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/bus" - "github.com/elastic/beats/libbeat/logp" - awsauto "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/logp" + awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws" ) type testEventAccumulator struct { diff --git a/x-pack/libbeat/autodiscover/providers/aws/elb/watch.go b/x-pack/libbeat/autodiscover/providers/aws/elb/watch.go index cdc74ae455f2..f0fcfff16115 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/elb/watch.go +++ b/x-pack/libbeat/autodiscover/providers/aws/elb/watch.go @@ -8,7 +8,7 @@ import ( "context" "time" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type watcher struct { diff --git a/x-pack/libbeat/autodiscover/providers/aws/test/provider.go b/x-pack/libbeat/autodiscover/providers/aws/test/provider.go index 353b6d626317..d9eb4c45fbff 100644 --- a/x-pack/libbeat/autodiscover/providers/aws/test/provider.go +++ b/x-pack/libbeat/autodiscover/providers/aws/test/provider.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/elastic/beats/libbeat/common/bus" + "github.com/elastic/beats/v7/libbeat/common/bus" ) // TestEventAccumulator defined a list of events for testing diff --git a/x-pack/libbeat/cmd/enroll.go b/x-pack/libbeat/cmd/enroll.go index 68d5689fadf4..3f44647bd5bc 100644 --- a/x-pack/libbeat/cmd/enroll.go +++ b/x-pack/libbeat/cmd/enroll.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/x-pack/libbeat/management" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v7/x-pack/libbeat/management" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) func getBeat(name, version string) (*instance.Beat, error) { diff --git a/x-pack/libbeat/cmd/inject.go b/x-pack/libbeat/cmd/inject.go index 658209bb99b3..2c3ee7033b50 100644 --- a/x-pack/libbeat/cmd/inject.go +++ b/x-pack/libbeat/cmd/inject.go @@ -5,15 +5,15 @@ package cmd import ( - "github.com/elastic/beats/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd" // register central management - "github.com/elastic/beats/x-pack/libbeat/licenser" - _ "github.com/elastic/beats/x-pack/libbeat/management" + "github.com/elastic/beats/v7/x-pack/libbeat/licenser" + _ "github.com/elastic/beats/v7/x-pack/libbeat/management" // register autodiscover providers - _ "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws/ec2" - _ "github.com/elastic/beats/x-pack/libbeat/autodiscover/providers/aws/elb" + _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/ec2" + _ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/elb" ) // AddXPack extends the given root folder with XPack features diff --git a/x-pack/libbeat/libbeat.go b/x-pack/libbeat/libbeat.go index 8b789c199a8e..eeaf82cccbd4 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/libbeat/cmd" - "github.com/elastic/beats/libbeat/mock" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/mock" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" ) // RootCmd to test libbeat diff --git a/x-pack/libbeat/libbeat_test.go b/x-pack/libbeat/libbeat_test.go index 02d17e31492d..0e7b6854d14a 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/libbeat/tests/system/template" + "github.com/elastic/beats/v7/libbeat/tests/system/template" ) var systemTest *bool diff --git a/x-pack/libbeat/licenser/check.go b/x-pack/libbeat/licenser/check.go index b41383f27e1f..20c94d64df57 100644 --- a/x-pack/libbeat/licenser/check.go +++ b/x-pack/libbeat/licenser/check.go @@ -5,7 +5,7 @@ package licenser import ( - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) // CheckFunc signature to implement a function that validate a license. diff --git a/x-pack/libbeat/licenser/check_test.go b/x-pack/libbeat/licenser/check_test.go index d5ad6d6306e4..c96d7347842f 100644 --- a/x-pack/libbeat/licenser/check_test.go +++ b/x-pack/libbeat/licenser/check_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) func TestCheckLicense(t *testing.T) { diff --git a/x-pack/libbeat/licenser/elastic_fetcher.go b/x-pack/libbeat/licenser/elastic_fetcher.go index e22613546ae7..1edde4e79926 100644 --- a/x-pack/libbeat/licenser/elastic_fetcher.go +++ b/x-pack/libbeat/licenser/elastic_fetcher.go @@ -14,8 +14,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" ) const xPackURL = "/_license" diff --git a/x-pack/libbeat/licenser/elastic_fetcher_integration_test.go b/x-pack/libbeat/licenser/elastic_fetcher_integration_test.go index 99c722efc31b..63b38fdb9625 100644 --- a/x-pack/libbeat/licenser/elastic_fetcher_integration_test.go +++ b/x-pack/libbeat/licenser/elastic_fetcher_integration_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common/cli" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" - "github.com/elastic/beats/libbeat/outputs/outil" + "github.com/elastic/beats/v7/libbeat/common/cli" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/outil" ) const ( diff --git a/x-pack/libbeat/licenser/elastic_fetcher_test.go b/x-pack/libbeat/licenser/elastic_fetcher_test.go index 1d60cb107f4a..87b92d6bcca6 100644 --- a/x-pack/libbeat/licenser/elastic_fetcher_test.go +++ b/x-pack/libbeat/licenser/elastic_fetcher_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" ) func newServerClientPair(t *testing.T, handler http.HandlerFunc) (*httptest.Server, *elasticsearch.Client) { diff --git a/x-pack/libbeat/licenser/es_callback.go b/x-pack/libbeat/licenser/es_callback.go index 8195c33ddb9c..5c15c3eaab41 100644 --- a/x-pack/libbeat/licenser/es_callback.go +++ b/x-pack/libbeat/licenser/es_callback.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/outputs/elasticsearch" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/outputs/elasticsearch" ) const licenseDebugK = "license" diff --git a/x-pack/libbeat/magefile.go b/x-pack/libbeat/magefile.go index f859423a0841..433adf9cae1a 100644 --- a/x-pack/libbeat/magefile.go +++ b/x-pack/libbeat/magefile.go @@ -9,12 +9,12 @@ package main import ( "context" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/integtest" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/integtest" ) func init() { diff --git a/x-pack/libbeat/management/api/client.go b/x-pack/libbeat/management/api/client.go index 154244c96df4..6212a69379f5 100644 --- a/x-pack/libbeat/management/api/client.go +++ b/x-pack/libbeat/management/api/client.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/kibana" ) const defaultTimeout = 10 * time.Second diff --git a/x-pack/libbeat/management/api/client_test.go b/x-pack/libbeat/management/api/client_test.go index a0359a2598d6..0bdd8d2de59d 100644 --- a/x-pack/libbeat/management/api/client_test.go +++ b/x-pack/libbeat/management/api/client_test.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "testing" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func newServerClientPair(t *testing.T, handler http.HandlerFunc) (*httptest.Server, *Client) { diff --git a/x-pack/libbeat/management/api/configuration.go b/x-pack/libbeat/management/api/configuration.go index f29b1d041cc5..04bf525eab4f 100644 --- a/x-pack/libbeat/management/api/configuration.go +++ b/x-pack/libbeat/management/api/configuration.go @@ -13,9 +13,9 @@ import ( "github.com/mitchellh/hashstructure" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/common/reload" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) var errConfigurationNotFound = errors.New("no configuration found, you need to enroll your Beat") diff --git a/x-pack/libbeat/management/api/enroll.go b/x-pack/libbeat/management/api/enroll.go index a347737f9af2..354d263d0760 100644 --- a/x-pack/libbeat/management/api/enroll.go +++ b/x-pack/libbeat/management/api/enroll.go @@ -10,7 +10,7 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) type enrollResponse struct { diff --git a/x-pack/libbeat/management/api/event_reporter.go b/x-pack/libbeat/management/api/event_reporter.go index f349d9433ade..8ed492c7e6b0 100644 --- a/x-pack/libbeat/management/api/event_reporter.go +++ b/x-pack/libbeat/management/api/event_reporter.go @@ -10,7 +10,7 @@ import ( "github.com/joeshaw/multierror" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) const debugK = "event_reporter" diff --git a/x-pack/libbeat/management/api/event_reporter_test.go b/x-pack/libbeat/management/api/event_reporter_test.go index e69f0c9690f7..e1576bbd0934 100644 --- a/x-pack/libbeat/management/api/event_reporter_test.go +++ b/x-pack/libbeat/management/api/event_reporter_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" ) type memoryAuthClient struct { diff --git a/x-pack/libbeat/management/blacklist.go b/x-pack/libbeat/management/blacklist.go index aa79cbf81f1d..9e3326aa537f 100644 --- a/x-pack/libbeat/management/blacklist.go +++ b/x-pack/libbeat/management/blacklist.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/match" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/match" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) // ConfigBlacklist takes a ConfigBlocks object and filter it based on the given diff --git a/x-pack/libbeat/management/blacklist_test.go b/x-pack/libbeat/management/blacklist_test.go index 30b9c14b7f2e..4bd2e36352e8 100644 --- a/x-pack/libbeat/management/blacklist_test.go +++ b/x-pack/libbeat/management/blacklist_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) func TestConfigBlacklistSettingsUnpack(t *testing.T) { diff --git a/x-pack/libbeat/management/cache.go b/x-pack/libbeat/management/cache.go index e69ef171e395..58146a3cbe4e 100644 --- a/x-pack/libbeat/management/cache.go +++ b/x-pack/libbeat/management/cache.go @@ -8,10 +8,10 @@ import ( "io/ioutil" "os" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" "github.com/pkg/errors" "gopkg.in/yaml.v2" diff --git a/x-pack/libbeat/management/cache_test.go b/x-pack/libbeat/management/cache_test.go index 364618ad5a02..1acbe76d60d0 100644 --- a/x-pack/libbeat/management/cache_test.go +++ b/x-pack/libbeat/management/cache_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) func TestHasConfig(t *testing.T) { diff --git a/x-pack/libbeat/management/config.go b/x-pack/libbeat/management/config.go index 908f2bef1baa..7ff40a6a541f 100644 --- a/x-pack/libbeat/management/config.go +++ b/x-pack/libbeat/management/config.go @@ -11,7 +11,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/beats/libbeat/kibana" + "github.com/elastic/beats/v7/libbeat/kibana" ) // ManagedConfigTemplate is used to overwrite settings file during enrollment diff --git a/x-pack/libbeat/management/enroll.go b/x-pack/libbeat/management/enroll.go index 49db0d9e3426..108740a91e1c 100644 --- a/x-pack/libbeat/management/enroll.go +++ b/x-pack/libbeat/management/enroll.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/cfgfile" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/common/file" - "github.com/elastic/beats/libbeat/kibana" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/libbeat/cfgfile" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/file" + "github.com/elastic/beats/v7/libbeat/kibana" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) const accessTokenKey = "management.accesstoken" diff --git a/x-pack/libbeat/management/error.go b/x-pack/libbeat/management/error.go index b4d5b6eaf23b..ab320159396d 100644 --- a/x-pack/libbeat/management/error.go +++ b/x-pack/libbeat/management/error.go @@ -12,7 +12,7 @@ import ( "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) // ErrorType is type of error that the events endpoint understand. diff --git a/x-pack/libbeat/management/error_test.go b/x-pack/libbeat/management/error_test.go index 0e40632630af..1416199c019c 100644 --- a/x-pack/libbeat/management/error_test.go +++ b/x-pack/libbeat/management/error_test.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) func TestErrorSerialization(t *testing.T) { diff --git a/x-pack/libbeat/management/manager.go b/x-pack/libbeat/management/manager.go index 6697440bbceb..66fdabe9d99e 100644 --- a/x-pack/libbeat/management/manager.go +++ b/x-pack/libbeat/management/manager.go @@ -9,19 +9,19 @@ import ( "sync" "time" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/feature" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/feature" "github.com/gofrs/uuid" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/management" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/management" ) var errEmptyAccessToken = errors.New("access_token is empty, you must reenroll your Beat") diff --git a/x-pack/libbeat/management/manager_test.go b/x-pack/libbeat/management/manager_test.go index 1ada01bfdb36..90370286d143 100644 --- a/x-pack/libbeat/management/manager_test.go +++ b/x-pack/libbeat/management/manager_test.go @@ -18,10 +18,10 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/reload" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/reload" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) type reloadable struct { diff --git a/x-pack/libbeat/management/state.go b/x-pack/libbeat/management/state.go index f53ec0a32f70..00fdc7c169b1 100644 --- a/x-pack/libbeat/management/state.go +++ b/x-pack/libbeat/management/state.go @@ -8,7 +8,7 @@ import ( "encoding/json" "fmt" - "github.com/elastic/beats/x-pack/libbeat/management/api" + "github.com/elastic/beats/v7/x-pack/libbeat/management/api" ) // StateEvent is a state change notification. diff --git a/x-pack/metricbeat/cmd/root.go b/x-pack/metricbeat/cmd/root.go index 0a4584889c6a..7979188063dd 100644 --- a/x-pack/metricbeat/cmd/root.go +++ b/x-pack/metricbeat/cmd/root.go @@ -9,19 +9,19 @@ import ( "github.com/spf13/pflag" - "github.com/elastic/beats/libbeat/cmd" - "github.com/elastic/beats/libbeat/cmd/instance" - "github.com/elastic/beats/metricbeat/beater" - mbcmd "github.com/elastic/beats/metricbeat/cmd" - "github.com/elastic/beats/metricbeat/cmd/test" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd" + "github.com/elastic/beats/v7/libbeat/cmd/instance" + "github.com/elastic/beats/v7/metricbeat/beater" + mbcmd "github.com/elastic/beats/v7/metricbeat/cmd" + "github.com/elastic/beats/v7/metricbeat/cmd/test" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" // Register the includes. - _ "github.com/elastic/beats/x-pack/metricbeat/include" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/include" // Import OSS modules. - _ "github.com/elastic/beats/metricbeat/include" - _ "github.com/elastic/beats/metricbeat/include/fields" + _ "github.com/elastic/beats/v7/metricbeat/include" + _ "github.com/elastic/beats/v7/metricbeat/include/fields" ) // Name of this beat diff --git a/x-pack/metricbeat/include/list.go b/x-pack/metricbeat/include/list.go index 590accfd8627..b567b2380cc9 100644 --- a/x-pack/metricbeat/include/list.go +++ b/x-pack/metricbeat/include/list.go @@ -8,46 +8,46 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/x-pack/metricbeat/module/activemq" - _ "github.com/elastic/beats/x-pack/metricbeat/module/appsearch" - _ "github.com/elastic/beats/x-pack/metricbeat/module/appsearch/stats" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/ec2" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/rds" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/s3_daily_storage" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/s3_request" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/sqs" - _ "github.com/elastic/beats/x-pack/metricbeat/module/azure" - _ "github.com/elastic/beats/x-pack/metricbeat/module/azure/compute_vm" - _ "github.com/elastic/beats/x-pack/metricbeat/module/azure/compute_vm_scaleset" - _ "github.com/elastic/beats/x-pack/metricbeat/module/azure/monitor" - _ "github.com/elastic/beats/x-pack/metricbeat/module/azure/storage" - _ "github.com/elastic/beats/x-pack/metricbeat/module/cockroachdb" - _ "github.com/elastic/beats/x-pack/metricbeat/module/coredns" - _ "github.com/elastic/beats/x-pack/metricbeat/module/coredns/stats" - _ "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud" - _ "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud/stackdriver" - _ "github.com/elastic/beats/x-pack/metricbeat/module/ibmmq" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/citadel" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/galley" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/mesh" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/mixer" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio/pilot" - _ "github.com/elastic/beats/x-pack/metricbeat/module/mssql" - _ "github.com/elastic/beats/x-pack/metricbeat/module/mssql/performance" - _ "github.com/elastic/beats/x-pack/metricbeat/module/mssql/transaction_log" - _ "github.com/elastic/beats/x-pack/metricbeat/module/oracle" - _ "github.com/elastic/beats/x-pack/metricbeat/module/oracle/performance" - _ "github.com/elastic/beats/x-pack/metricbeat/module/oracle/tablespace" - _ "github.com/elastic/beats/x-pack/metricbeat/module/sql" - _ "github.com/elastic/beats/x-pack/metricbeat/module/sql/query" - _ "github.com/elastic/beats/x-pack/metricbeat/module/stan" - _ "github.com/elastic/beats/x-pack/metricbeat/module/stan/channels" - _ "github.com/elastic/beats/x-pack/metricbeat/module/stan/stats" - _ "github.com/elastic/beats/x-pack/metricbeat/module/stan/subscriptions" - _ "github.com/elastic/beats/x-pack/metricbeat/module/statsd" - _ "github.com/elastic/beats/x-pack/metricbeat/module/statsd/server" - _ "github.com/elastic/beats/x-pack/metricbeat/module/tomcat" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/activemq" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/appsearch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/appsearch/stats" + _ "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/v7/x-pack/metricbeat/module/aws/ec2" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/rds" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/s3_daily_storage" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/s3_request" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/sqs" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/compute_vm" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure/compute_vm_scaleset" + _ "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/cockroachdb" + _ "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/googlecloud" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/stackdriver" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/ibmmq" + _ "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/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/oracle" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle/performance" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle/tablespace" + _ "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/tomcat" ) diff --git a/x-pack/metricbeat/magefile.go b/x-pack/metricbeat/magefile.go index 8b65953fc38b..5e30c711cc4c 100644 --- a/x-pack/metricbeat/magefile.go +++ b/x-pack/metricbeat/magefile.go @@ -13,13 +13,13 @@ import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" - metricbeat "github.com/elastic/beats/metricbeat/scripts/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" + metricbeat "github.com/elastic/beats/v7/metricbeat/scripts/mage" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/common" + "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/compose" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/compose" ) func init() { diff --git a/x-pack/metricbeat/main.go b/x-pack/metricbeat/main.go index 6deaf0fbeacc..333a0d30fa56 100644 --- a/x-pack/metricbeat/main.go +++ b/x-pack/metricbeat/main.go @@ -14,7 +14,7 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/metricbeat/cmd" + "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" ) func main() { diff --git a/x-pack/metricbeat/main_test.go b/x-pack/metricbeat/main_test.go index 584aeeb27726..ab3f317d4f57 100644 --- a/x-pack/metricbeat/main_test.go +++ b/x-pack/metricbeat/main_test.go @@ -8,8 +8,8 @@ import ( "flag" "testing" - "github.com/elastic/beats/libbeat/tests/system/template" - "github.com/elastic/beats/x-pack/metricbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/x-pack/metricbeat/cmd" ) var systemTest *bool diff --git a/x-pack/metricbeat/module/activemq/fields.go b/x-pack/metricbeat/module/activemq/fields.go index d798c885f91e..d2362e3ea29f 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/appsearch/fields.go b/x-pack/metricbeat/module/appsearch/fields.go index e54e5fb584ed..e09543811fe2 100644 --- a/x-pack/metricbeat/module/appsearch/fields.go +++ b/x-pack/metricbeat/module/appsearch/fields.go @@ -7,7 +7,7 @@ package appsearch import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/appsearch/stats/data.go b/x-pack/metricbeat/module/appsearch/stats/data.go index 34b1097e11ac..6017da9695d5 100644 --- a/x-pack/metricbeat/module/appsearch/stats/data.go +++ b/x-pack/metricbeat/module/appsearch/stats/data.go @@ -8,9 +8,9 @@ import ( "encoding/json" "errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" + "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" ) var ( diff --git a/x-pack/metricbeat/module/appsearch/stats/stats.go b/x-pack/metricbeat/module/appsearch/stats/stats.go index 8c4d74d1398e..be0742ee6f58 100644 --- a/x-pack/metricbeat/module/appsearch/stats/stats.go +++ b/x-pack/metricbeat/module/appsearch/stats/stats.go @@ -7,9 +7,9 @@ package stats import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( diff --git a/x-pack/metricbeat/module/appsearch/stats/stats_integration_test.go b/x-pack/metricbeat/module/appsearch/stats/stats_integration_test.go index ec9c07332687..1dd0c10d095f 100644 --- a/x-pack/metricbeat/module/appsearch/stats/stats_integration_test.go +++ b/x-pack/metricbeat/module/appsearch/stats/stats_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/aws.go b/x-pack/metricbeat/module/aws/aws.go index a4bba395bc58..9143911dcad0 100644 --- a/x-pack/metricbeat/module/aws/aws.go +++ b/x-pack/metricbeat/module/aws/aws.go @@ -16,9 +16,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sts" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - awscommon "github.com/elastic/beats/x-pack/libbeat/common/aws" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + awscommon "github.com/elastic/beats/v7/x-pack/libbeat/common/aws" ) // Config defines all required and optional parameters for aws metricsets 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 f479f57c22a3..fe8fa31fd878 100644 --- a/x-pack/metricbeat/module/aws/billing/billing_integration_test.go +++ b/x-pack/metricbeat/module/aws/billing/billing_integration_test.go @@ -9,8 +9,8 @@ package billing import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/billing/billing_test.go b/x-pack/metricbeat/module/aws/billing/billing_test.go index dac7a5e51b05..664eeea51030 100644 --- a/x-pack/metricbeat/module/aws/billing/billing_test.go +++ b/x-pack/metricbeat/module/aws/billing/billing_test.go @@ -7,11 +7,11 @@ package billing import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go index 40be8a846cdd..6541503f13e3 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go @@ -17,9 +17,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" ) var ( 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 d23e90016da7..09cdde83a4f4 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/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 9ce957adc7b1..513165104b80 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_test.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" ) var ( 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 d6c06a864cc5..48e7f501e0f9 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/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 38b953cb4859..f2046b0a8614 100644 --- a/x-pack/metricbeat/module/aws/dynamodb/dynamodb_test.go +++ b/x-pack/metricbeat/module/aws/dynamodb/dynamodb_test.go @@ -7,11 +7,11 @@ package dynamodb import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v7/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 0a7abff49aab..d2cec8d0ab9b 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/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 6709a935d1d9..8989f808a230 100644 --- a/x-pack/metricbeat/module/aws/ebs/ebs_test.go +++ b/x-pack/metricbeat/module/aws/ebs/ebs_test.go @@ -7,11 +7,11 @@ package ebs import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/ec2/data.go b/x-pack/metricbeat/module/aws/ec2/data.go index 12599b32d87f..0e496c4edb1e 100644 --- a/x-pack/metricbeat/module/aws/ec2/data.go +++ b/x-pack/metricbeat/module/aws/ec2/data.go @@ -5,8 +5,8 @@ package ec2 import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/x-pack/metricbeat/module/aws/ec2/ec2.go b/x-pack/metricbeat/module/aws/ec2/ec2.go index 41770c495ab1..397e093f87c6 100644 --- a/x-pack/metricbeat/module/aws/ec2/ec2.go +++ b/x-pack/metricbeat/module/aws/ec2/ec2.go @@ -11,15 +11,15 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/aws/aws-sdk-go-v2/service/ec2/ec2iface" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" ) var ( 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 acdf5a901f38..1e745b52107d 100644 --- a/x-pack/metricbeat/module/aws/ec2/ec2_integration_test.go +++ b/x-pack/metricbeat/module/aws/ec2/ec2_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 6e06acd77361..2b0def9fd989 100644 --- a/x-pack/metricbeat/module/aws/ec2/ec2_test.go +++ b/x-pack/metricbeat/module/aws/ec2/ec2_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cloudwatch" @@ -19,8 +19,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2/ec2iface" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) // MockEC2Client struct is used for unit tests. 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 38ea98d1cb22..254dc822ee02 100644 --- a/x-pack/metricbeat/module/aws/elb/elb_integration_test.go +++ b/x-pack/metricbeat/module/aws/elb/elb_integration_test.go @@ -10,9 +10,9 @@ import ( "fmt" "testing" - "github.com/elastic/beats/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/elb/elb_test.go b/x-pack/metricbeat/module/aws/elb/elb_test.go index ed2632028acc..49bf2b275b4a 100644 --- a/x-pack/metricbeat/module/aws/elb/elb_test.go +++ b/x-pack/metricbeat/module/aws/elb/elb_test.go @@ -7,11 +7,11 @@ package elb import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v7/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 6b6e11857664..47ec8e50d16f 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) 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 247228254b68..4382ef36e0ef 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/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 6b0c7baf2a94..a1eb98fee36a 100644 --- a/x-pack/metricbeat/module/aws/lambda/lambda_test.go +++ b/x-pack/metricbeat/module/aws/lambda/lambda_test.go @@ -7,11 +7,11 @@ package lambda import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/mtest/integration.go b/x-pack/metricbeat/module/aws/mtest/integration.go index 7399d6ed3131..417f3b600967 100644 --- a/x-pack/metricbeat/module/aws/mtest/integration.go +++ b/x-pack/metricbeat/module/aws/mtest/integration.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // GetConfigForTest function gets aws credentials for integration tests. diff --git a/x-pack/metricbeat/module/aws/rds/data.go b/x-pack/metricbeat/module/aws/rds/data.go index fcebee061d04..273626d3b1b4 100644 --- a/x-pack/metricbeat/module/aws/rds/data.go +++ b/x-pack/metricbeat/module/aws/rds/data.go @@ -5,8 +5,8 @@ package rds import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/x-pack/metricbeat/module/aws/rds/rds.go b/x-pack/metricbeat/module/aws/rds/rds.go index e2f2d1eb7f53..414f5349a9be 100644 --- a/x-pack/metricbeat/module/aws/rds/rds.go +++ b/x-pack/metricbeat/module/aws/rds/rds.go @@ -17,8 +17,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/rds" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" ) var ( 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 ff905a2de6f6..4d8a45812e32 100644 --- a/x-pack/metricbeat/module/aws/rds/rds_integration_test.go +++ b/x-pack/metricbeat/module/aws/rds/rds_integration_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/s3_daily_storage/data.go b/x-pack/metricbeat/module/aws/s3_daily_storage/data.go index 79257cd74496..95b5b3cf53dd 100644 --- a/x-pack/metricbeat/module/aws/s3_daily_storage/data.go +++ b/x-pack/metricbeat/module/aws/s3_daily_storage/data.go @@ -5,8 +5,8 @@ package s3_daily_storage import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go index de9d2574380e..68d17b8e9b70 100644 --- a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go +++ b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" ) var metricsetName = "s3_daily_storage" 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 468880ee8a60..2c27f317cd8e 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 @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/aws/s3_request/data.go b/x-pack/metricbeat/module/aws/s3_request/data.go index 0751ef522f1a..5c4c2bfa1a42 100644 --- a/x-pack/metricbeat/module/aws/s3_request/data.go +++ b/x-pack/metricbeat/module/aws/s3_request/data.go @@ -5,8 +5,8 @@ package s3_request import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/x-pack/metricbeat/module/aws/s3_request/s3_request.go b/x-pack/metricbeat/module/aws/s3_request/s3_request.go index 5474cbc0117b..562adab6f945 100644 --- a/x-pack/metricbeat/module/aws/s3_request/s3_request.go +++ b/x-pack/metricbeat/module/aws/s3_request/s3_request.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" ) var metricsetName = "s3_request" 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 644bf2e4f1f9..0892e6a7f713 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 @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" ) func TestFetch(t *testing.T) { 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 bd1a6fbe3041..82438ae8040e 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/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 85d31c97934e..ea04cd8eff3e 100644 --- a/x-pack/metricbeat/module/aws/sns/sns_test.go +++ b/x-pack/metricbeat/module/aws/sns/sns_test.go @@ -7,11 +7,11 @@ package sns import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/sqs/data.go b/x-pack/metricbeat/module/aws/sqs/data.go index f76810cf9256..58efdc1307cd 100644 --- a/x-pack/metricbeat/module/aws/sqs/data.go +++ b/x-pack/metricbeat/module/aws/sqs/data.go @@ -5,8 +5,8 @@ package sqs import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/libbeat/common/schema/mapstrstr" ) var ( diff --git a/x-pack/metricbeat/module/aws/sqs/sqs.go b/x-pack/metricbeat/module/aws/sqs/sqs.go index 5e70cdb0b1b1..31cf776da710 100644 --- a/x-pack/metricbeat/module/aws/sqs/sqs.go +++ b/x-pack/metricbeat/module/aws/sqs/sqs.go @@ -16,9 +16,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs/sqsiface" "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/aws" + s "github.com/elastic/beats/v7/libbeat/common/schema" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" ) var metricsetName = "sqs" 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 87ec988d1893..eeeb9d979fa7 100644 --- a/x-pack/metricbeat/module/aws/sqs/sqs_integration_test.go +++ b/x-pack/metricbeat/module/aws/sqs/sqs_integration_test.go @@ -9,11 +9,11 @@ package sqs import ( "testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestFetch(t *testing.T) { 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 fb33c9ecb935..60d2437743fe 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/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/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 43eb3d49b974..67c9c07fd8a2 100644 --- a/x-pack/metricbeat/module/aws/usage/usage_test.go +++ b/x-pack/metricbeat/module/aws/usage/usage_test.go @@ -7,11 +7,11 @@ package usage import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" - _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch" ) func init() { diff --git a/x-pack/metricbeat/module/aws/utils.go b/x-pack/metricbeat/module/aws/utils.go index 91dc7124050b..f9e0f58b16c8 100644 --- a/x-pack/metricbeat/module/aws/utils.go +++ b/x-pack/metricbeat/module/aws/utils.go @@ -17,8 +17,8 @@ import ( "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - s "github.com/elastic/beats/libbeat/common/schema" + "github.com/elastic/beats/v7/libbeat/common" + s "github.com/elastic/beats/v7/libbeat/common/schema" ) // GetStartTimeEndTime function uses durationString to create startTime and endTime for queries. diff --git a/x-pack/metricbeat/module/azure/azure.go b/x-pack/metricbeat/module/azure/azure.go index 2da534d7372d..1cd648407409 100644 --- a/x-pack/metricbeat/module/azure/azure.go +++ b/x-pack/metricbeat/module/azure/azure.go @@ -7,11 +7,11 @@ package azure import ( "time" - "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Config options diff --git a/x-pack/metricbeat/module/azure/client.go b/x-pack/metricbeat/module/azure/client.go index b200daa3c772..a32614a6120a 100644 --- a/x-pack/metricbeat/module/azure/client.go +++ b/x-pack/metricbeat/module/azure/client.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" ) // Client represents the azure client which will make use of the azure sdk go metrics related clients diff --git a/x-pack/metricbeat/module/azure/compute_vm/client_helper.go b/x-pack/metricbeat/module/azure/compute_vm/client_helper.go index d4b4e241af45..87690ef0bd5d 100644 --- a/x-pack/metricbeat/module/azure/compute_vm/client_helper.go +++ b/x-pack/metricbeat/module/azure/compute_vm/client_helper.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources" "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) // mapMetrics should validate and map the metric related configuration to relevant azure monitor api parameters diff --git a/x-pack/metricbeat/module/azure/compute_vm/client_helper_test.go b/x-pack/metricbeat/module/azure/compute_vm/client_helper_test.go index 1d24f6b65aaf..e5c82279498f 100644 --- a/x-pack/metricbeat/module/azure/compute_vm/client_helper_test.go +++ b/x-pack/metricbeat/module/azure/compute_vm/client_helper_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) func MockResource() resources.GenericResource { diff --git a/x-pack/metricbeat/module/azure/compute_vm/compute_vm.go b/x-pack/metricbeat/module/azure/compute_vm/compute_vm.go index 2b9774c2a29e..a432ed610e76 100644 --- a/x-pack/metricbeat/module/azure/compute_vm/compute_vm.go +++ b/x-pack/metricbeat/module/azure/compute_vm/compute_vm.go @@ -7,8 +7,8 @@ package compute_vm import ( "fmt" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) const defaultVMNamespace = "Microsoft.Compute/virtualMachines" 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 cdc12b8ee354..76bd8f005cf3 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 @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper.go b/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper.go index aa5e699109f9..526ed99ea68b 100644 --- a/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper.go +++ b/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources" "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) const ( diff --git a/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper_test.go b/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper_test.go index 889c029a0e9d..f3ac49198bba 100644 --- a/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper_test.go +++ b/x-pack/metricbeat/module/azure/compute_vm_scaleset/client_helper_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) func MockResource() resources.GenericResource { diff --git a/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset.go b/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset.go index 7b321e3c0797..b2755eeabf00 100644 --- a/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset.go +++ b/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset.go @@ -7,8 +7,8 @@ package compute_vm_scaleset import ( "fmt" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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/compute_vm_scaleset/compute_vm_scaleset_test.go b/x-pack/metricbeat/module/azure/compute_vm_scaleset/compute_vm_scaleset_test.go index bcec1879b74e..d7c4101ed230 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 @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/azure/data.go b/x-pack/metricbeat/module/azure/data.go index 5b5ebc04eed9..ad8f81b2cbb9 100644 --- a/x-pack/metricbeat/module/azure/data.go +++ b/x-pack/metricbeat/module/azure/data.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) const ( diff --git a/x-pack/metricbeat/module/azure/fields.go b/x-pack/metricbeat/module/azure/fields.go index 8c678616d180..32d9a94dc721 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/libbeat/asset" + "github.com/elastic/beats/v7/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 0078273097c9..42da360c99af 100644 --- a/x-pack/metricbeat/module/azure/mock_service.go +++ b/x-pack/metricbeat/module/azure/mock_service.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/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 2a6ab1495e30..55a805f76e62 100644 --- a/x-pack/metricbeat/module/azure/monitor/client_helper.go +++ b/x-pack/metricbeat/module/azure/monitor/client_helper.go @@ -13,7 +13,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) // mapMetrics should validate and map the metric related configuration to relevant azure monitor api parameters 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 06499e0be5a4..03cc0a07eb80 100644 --- a/x-pack/metricbeat/module/azure/monitor/client_helper_test.go +++ b/x-pack/metricbeat/module/azure/monitor/client_helper_test.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) func MockResource() resources.GenericResource { diff --git a/x-pack/metricbeat/module/azure/monitor/monitor.go b/x-pack/metricbeat/module/azure/monitor/monitor.go index 6efea011fa4a..ff1aaf2256e5 100644 --- a/x-pack/metricbeat/module/azure/monitor/monitor.go +++ b/x-pack/metricbeat/module/azure/monitor/monitor.go @@ -5,8 +5,8 @@ package monitor import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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_test.go b/x-pack/metricbeat/module/azure/monitor/monitor_test.go index 60bc38ba3086..bddc34190b28 100644 --- a/x-pack/metricbeat/module/azure/monitor/monitor_test.go +++ b/x-pack/metricbeat/module/azure/monitor/monitor_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/azure/monitor_service.go b/x-pack/metricbeat/module/azure/monitor_service.go index 4800a9c9de54..3057174235ce 100644 --- a/x-pack/metricbeat/module/azure/monitor_service.go +++ b/x-pack/metricbeat/module/azure/monitor_service.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2019-06-01/insights" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources" diff --git a/x-pack/metricbeat/module/azure/storage/client_helper.go b/x-pack/metricbeat/module/azure/storage/client_helper.go index 488f90d21ebd..4103649c2c91 100644 --- a/x-pack/metricbeat/module/azure/storage/client_helper.go +++ b/x-pack/metricbeat/module/azure/storage/client_helper.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-03-01/resources" "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) const resourceIDExtension = "/default" 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 f9dd066df33e..6221c97a2fb5 100644 --- a/x-pack/metricbeat/module/azure/storage/client_helper_test.go +++ b/x-pack/metricbeat/module/azure/storage/client_helper_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) var ( diff --git a/x-pack/metricbeat/module/azure/storage/storage.go b/x-pack/metricbeat/module/azure/storage/storage.go index 9a386b82519b..9f54871b3194 100644 --- a/x-pack/metricbeat/module/azure/storage/storage.go +++ b/x-pack/metricbeat/module/azure/storage/storage.go @@ -7,8 +7,8 @@ package storage import ( "fmt" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/azure" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/azure" ) const defaultStorageAccountNamespace = "Microsoft.Storage/storageAccounts" diff --git a/x-pack/metricbeat/module/azure/storage/storage_test.go b/x-pack/metricbeat/module/azure/storage/storage_test.go index 6add3aae4584..b491b53d99f7 100644 --- a/x-pack/metricbeat/module/azure/storage/storage_test.go +++ b/x-pack/metricbeat/module/azure/storage/storage_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/mb" ) var ( diff --git a/x-pack/metricbeat/module/cockroachdb/fields.go b/x-pack/metricbeat/module/cockroachdb/fields.go index 1bf66b84593f..2ff86a4ea8f6 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/libbeat/asset" + "github.com/elastic/beats/v7/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 0f375643ca2e..797b69820731 100644 --- a/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go +++ b/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/prometheus" - _ "github.com/elastic/beats/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v7/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 7002202b6087..fdfb099f4e5c 100644 --- a/x-pack/metricbeat/module/cockroachdb/status/status_test.go +++ b/x-pack/metricbeat/module/cockroachdb/status/status_test.go @@ -10,13 +10,13 @@ import ( "os" "testing" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/prometheus" - _ "github.com/elastic/beats/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/coredns/fields.go b/x-pack/metricbeat/module/coredns/fields.go index 2ab5f4e6468c..0de4a6ffade8 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/libbeat/asset" + "github.com/elastic/beats/v7/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 6f9cc5b1321d..623af6883e09 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/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 3e113ff3528f..54c970325b35 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 31c7384de4d6..6daaeb4881a4 100644 --- a/x-pack/metricbeat/module/coredns/stats/stats_test.go +++ b/x-pack/metricbeat/module/coredns/stats/stats_test.go @@ -9,9 +9,9 @@ package stats import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/x-pack/metricbeat/module/coredns" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/coredns" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/googlecloud/fields.go b/x-pack/metricbeat/module/googlecloud/fields.go index 8d22aa845580..e3c6f689ddaa 100644 --- a/x-pack/metricbeat/module/googlecloud/fields.go +++ b/x-pack/metricbeat/module/googlecloud/fields.go @@ -7,7 +7,7 @@ package googlecloud import ( - "github.com/elastic/beats/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/googlecloud/metadata.go b/x-pack/metricbeat/module/googlecloud/metadata.go index f4e5f9088673..e98f05752c9f 100644 --- a/x-pack/metricbeat/module/googlecloud/metadata.go +++ b/x-pack/metricbeat/module/googlecloud/metadata.go @@ -10,7 +10,7 @@ import ( monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // MetadataService must be implemented by GCP services that requires non out-of-the box code that is not fulfil by the Stackdriver diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/compute/identity.go b/x-pack/metricbeat/module/googlecloud/stackdriver/compute/identity.go index db14b3f22cfb..9367862e6c7a 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/compute/identity.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/compute/identity.go @@ -8,7 +8,7 @@ import ( "context" "errors" - "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" ) // ID returns a generated ID for a Compute resource based on its labels, projectID, zone, timestamp and instance ID diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/compute/metadata.go b/x-pack/metricbeat/module/googlecloud/stackdriver/compute/metadata.go index 63cdfcbe82b1..5ed502d8b691 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/compute/metadata.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/compute/metadata.go @@ -14,9 +14,9 @@ import ( "google.golang.org/api/option" monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" - "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" ) // NewMetadataService returns the specific Metadata service for a GCP Compute resource diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/metadata_services.go b/x-pack/metricbeat/module/googlecloud/stackdriver/metadata_services.go index d5956bb565ca..6b7f4024f154 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/metadata_services.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/metadata_services.go @@ -7,8 +7,8 @@ package stackdriver import ( "github.com/pkg/errors" - "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud" - "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud/stackdriver/compute" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/stackdriver/compute" ) // NewMetadataServiceForConfig returns a service to fetch metadata from a config struct. It must return the Compute diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/metrics_requester.go b/x-pack/metricbeat/module/googlecloud/stackdriver/metrics_requester.go index bb59d6fffc32..1cabc32a9712 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/metrics_requester.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/metrics_requester.go @@ -16,8 +16,8 @@ import ( "google.golang.org/api/iterator" monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" ) func newStackdriverMetricsRequester(ctx context.Context, c config, window time.Duration, logger *logp.Logger) (*stackdriverMetricsRequester, error) { diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go b/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go index 48dc48664fd0..33d934ce4595 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go @@ -13,10 +13,10 @@ import ( "google.golang.org/api/option" monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud" + "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/metricbeat/module/googlecloud" ) const ( diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/response_parser.go b/x-pack/metricbeat/module/googlecloud/stackdriver/response_parser.go index b50d23490e85..474f04a244b3 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/response_parser.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/response_parser.go @@ -14,8 +14,8 @@ import ( "github.com/golang/protobuf/ptypes" "google.golang.org/genproto/googleapis/monitoring/v3" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) func newIncomingFieldExtractor(l *logp.Logger) *incomingFieldExtractor { diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/timeseries.go b/x-pack/metricbeat/module/googlecloud/stackdriver/timeseries.go index aa5d21399154..40ad0d4e79c1 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/timeseries.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/timeseries.go @@ -9,7 +9,7 @@ import ( monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - "github.com/elastic/beats/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" ) //timeSeriesGrouped groups TimeSeries responses into common Elasticsearch friendly events. This is to avoid sending diff --git a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go b/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go index bc1d39fba2ae..5e6922ef47d7 100644 --- a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go +++ b/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) // NewStackdriverCollectorInputData returns a ready to use MetadataCollectorInputData to be sent to Metadata collectors diff --git a/x-pack/metricbeat/module/ibmmq/fields.go b/x-pack/metricbeat/module/ibmmq/fields.go index 734332594b92..356251d17169 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/libbeat/asset" + "github.com/elastic/beats/v7/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 4261a9fbf89f..1f6cf78a1da6 100644 --- a/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_integration_test.go +++ b/x-pack/metricbeat/module/ibmmq/qmgr/qmgr_integration_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/prometheus" - _ "github.com/elastic/beats/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v7/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 458bd7e5dc0a..4adad858ec89 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/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" // Register input module and metricset - _ "github.com/elastic/beats/metricbeat/module/prometheus" - _ "github.com/elastic/beats/metricbeat/module/prometheus/collector" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus" + _ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector" ) func init() { diff --git a/x-pack/metricbeat/module/istio/citadel/citadel.go b/x-pack/metricbeat/module/istio/citadel/citadel.go index 9d433bd64e79..163a4a0909e1 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 096723047111..41bced9954bd 100644 --- a/x-pack/metricbeat/module/istio/citadel/citadel_test.go +++ b/x-pack/metricbeat/module/istio/citadel/citadel_test.go @@ -9,9 +9,9 @@ package citadel import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v7/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 730d787d9912..51c2f60e66f4 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/libbeat/asset" + "github.com/elastic/beats/v7/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 72976943ee6a..e7f09a9fc641 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 87d3537fdf22..debd92bac63c 100644 --- a/x-pack/metricbeat/module/istio/galley/galley_test.go +++ b/x-pack/metricbeat/module/istio/galley/galley_test.go @@ -9,9 +9,9 @@ package galley import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/istio/mesh/mesh.go b/x-pack/metricbeat/module/istio/mesh/mesh.go index e375d5ce7282..3c8a36b2b9b5 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 801a2330992a..f27689ff60f9 100644 --- a/x-pack/metricbeat/module/istio/mesh/mesh_test.go +++ b/x-pack/metricbeat/module/istio/mesh/mesh_test.go @@ -9,9 +9,9 @@ package mesh import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v7/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 bbf150eeb328..cf324ef2da52 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 a50267040a0e..6f9b624f70e6 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v7/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 ddde1d7c94d6..7307373c2fb5 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/metricbeat/helper/prometheus" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/helper/prometheus" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 748360fdac31..0cd6113fe3f9 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - _ "github.com/elastic/beats/x-pack/metricbeat/module/istio" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/istio" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/mssql/fields.go b/x-pack/metricbeat/module/mssql/fields.go index 6507a3b5991f..f3d9bcc13e25 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/module/mssql/mssql.go b/x-pack/metricbeat/module/mssql/mssql.go index 04f26b91436f..773aab03cbea 100644 --- a/x-pack/metricbeat/module/mssql/mssql.go +++ b/x-pack/metricbeat/module/mssql/mssql.go @@ -5,8 +5,8 @@ package mssql import ( - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 2456154cdfb4..4f01d17d1577 100644 --- a/x-pack/metricbeat/module/mssql/performance/data.go +++ b/x-pack/metricbeat/module/mssql/performance/data.go @@ -5,8 +5,8 @@ package performance import ( - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstrstr" + s "github.com/elastic/beats/v7/libbeat/common/schema" + c "github.com/elastic/beats/v7/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 116a72698251..f7753b983649 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/pkg/errors" "github.com/stretchr/testify/assert" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - mtest "github.com/elastic/beats/x-pack/metricbeat/module/mssql/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mtest "github.com/elastic/beats/v7/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 0399e2dc4e8c..faea7f09c2b8 100644 --- a/x-pack/metricbeat/module/mssql/performance/performance.go +++ b/x-pack/metricbeat/module/mssql/performance/performance.go @@ -9,14 +9,14 @@ import ( "fmt" "strings" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/mssql" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql" ) type performanceCounter struct { 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 86b55333764a..884bfe727633 100644 --- a/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go +++ b/x-pack/metricbeat/module/mssql/performance/performance_integration_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - mtest "github.com/elastic/beats/x-pack/metricbeat/module/mssql/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) type keyAssertion struct { 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 8616e427c0bf..fcdad6ccb442 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 @@ -7,8 +7,8 @@ package transaction_log import ( "testing" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - mtest "github.com/elastic/beats/x-pack/metricbeat/module/mssql/testing" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + mtest "github.com/elastic/beats/v7/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 e2e56fa8ec12..6047d0161b4c 100644 --- a/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go +++ b/x-pack/metricbeat/module/mssql/transaction_log/transaction_log.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/mssql" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/mssql" ) type dbInfo struct { 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 baecb3ff6785..07465b525b53 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,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - mtest "github.com/elastic/beats/x-pack/metricbeat/module/mssql/testing" + "github.com/elastic/beats/v7/libbeat/logp" + "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" ) func TestFetch(t *testing.T) { diff --git a/x-pack/metricbeat/module/oracle/connection.go b/x-pack/metricbeat/module/oracle/connection.go index 96add9ced083..f2fc870fb8d3 100644 --- a/x-pack/metricbeat/module/oracle/connection.go +++ b/x-pack/metricbeat/module/oracle/connection.go @@ -9,8 +9,8 @@ import ( "github.com/godror/godror" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" "github.com/pkg/errors" ) diff --git a/x-pack/metricbeat/module/oracle/fields.go b/x-pack/metricbeat/module/oracle/fields.go index 22209e95f7ce..b5908686ae96 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/libbeat/asset" + "github.com/elastic/beats/v7/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 3edd9e796833..a480d818e9a6 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 @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" ) type bufferCacheHitRatio struct { diff --git a/x-pack/metricbeat/module/oracle/performance/cursors.go b/x-pack/metricbeat/module/oracle/performance/cursors.go index d0d60fdbd78c..e9da4ef0007a 100644 --- a/x-pack/metricbeat/module/oracle/performance/cursors.go +++ b/x-pack/metricbeat/module/oracle/performance/cursors.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" ) type cursorsByUsernameAndMachine struct { diff --git a/x-pack/metricbeat/module/oracle/performance/data.go b/x-pack/metricbeat/module/oracle/performance/data.go index 0671b4c17acc..f24bfd869691 100644 --- a/x-pack/metricbeat/module/oracle/performance/data.go +++ b/x-pack/metricbeat/module/oracle/performance/data.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/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 5767a00e36ed..076874f3b1b9 100644 --- a/x-pack/metricbeat/module/oracle/performance/library_cache.go +++ b/x-pack/metricbeat/module/oracle/performance/library_cache.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" ) type libraryCache struct { diff --git a/x-pack/metricbeat/module/oracle/performance/metricset.go b/x-pack/metricbeat/module/oracle/performance/metricset.go index 70a4462eef24..c408a150afcc 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 80d16a4e495e..097107baf3be 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/libbeat/common" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/oracle/sql.go b/x-pack/metricbeat/module/oracle/sql.go index 39c382dadb78..fb0e7551f418 100644 --- a/x-pack/metricbeat/module/oracle/sql.go +++ b/x-pack/metricbeat/module/oracle/sql.go @@ -8,8 +8,8 @@ import ( "database/sql" "errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) // SetSqlValueWithParentKey avoid setting an invalid empty value value on Metricbeat event diff --git a/x-pack/metricbeat/module/oracle/tablespace/data.go b/x-pack/metricbeat/module/oracle/tablespace/data.go index 1406b349083d..ef51fe823a70 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/data.go +++ b/x-pack/metricbeat/module/oracle/tablespace/data.go @@ -7,12 +7,12 @@ package tablespace import ( "context" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/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 2d06127d2190..8fe0d504ced2 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/metricset.go +++ b/x-pack/metricbeat/module/oracle/tablespace/metricset.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/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 f0bb4b672d8a..a7367f208066 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/x-pack/metricbeat/module/oracle" + "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" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/sql/fields.go b/x-pack/metricbeat/module/sql/fields.go index cefc5b3c29bf..b11ad11e21c7 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/libbeat/asset" + "github.com/elastic/beats/v7/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 2a472c3fbe5b..0ff3796da1c1 100644 --- a/x-pack/metricbeat/module/sql/query/dsn.go +++ b/x-pack/metricbeat/module/sql/query/dsn.go @@ -9,7 +9,7 @@ import ( "github.com/go-sql-driver/mysql" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) // ParseDSN tries to parse the host diff --git a/x-pack/metricbeat/module/sql/query/query.go b/x-pack/metricbeat/module/sql/query/query.go index 5ff543aa681d..1b58a7433835 100644 --- a/x-pack/metricbeat/module/sql/query/query.go +++ b/x-pack/metricbeat/module/sql/query/query.go @@ -14,9 +14,9 @@ import ( "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/metricbeat/mb" ) // represents the response format of the query 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 9d75c59943c0..b6c68bd43064 100644 --- a/x-pack/metricbeat/module/sql/query/query_integration_test.go +++ b/x-pack/metricbeat/module/sql/query/query_integration_test.go @@ -18,12 +18,12 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" - "github.com/elastic/beats/libbeat/beat" - "github.com/elastic/beats/libbeat/tests/compose" - "github.com/elastic/beats/metricbeat/mb" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" - "github.com/elastic/beats/metricbeat/module/mysql" - "github.com/elastic/beats/metricbeat/module/postgresql" + "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" ) type testFetchConfig struct { diff --git a/x-pack/metricbeat/module/stan/channels/channels.go b/x-pack/metricbeat/module/stan/channels/channels.go index f7c5b9aef6fd..478fc3773b63 100644 --- a/x-pack/metricbeat/module/stan/channels/channels.go +++ b/x-pack/metricbeat/module/stan/channels/channels.go @@ -7,10 +7,10 @@ package channels import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( 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 bd83bbdea471..ec34211aaa5b 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 287b6f64f708..e78c39074553 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 1be2b651eb5c..9ac80ce63d4c 100644 --- a/x-pack/metricbeat/module/stan/channels/data.go +++ b/x-pack/metricbeat/module/stan/channels/data.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + 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" ) var ( diff --git a/x-pack/metricbeat/module/stan/fields.go b/x-pack/metricbeat/module/stan/fields.go index 84c15e23e8af..7fa6e2dc38d8 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/libbeat/asset" + "github.com/elastic/beats/v7/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 a28412f78d0f..569a201f53d4 100644 --- a/x-pack/metricbeat/module/stan/stats/data.go +++ b/x-pack/metricbeat/module/stan/stats/data.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + 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" ) var ( diff --git a/x-pack/metricbeat/module/stan/stats/stats.go b/x-pack/metricbeat/module/stan/stats/stats.go index 65b7fb9ec3e6..e87944562677 100644 --- a/x-pack/metricbeat/module/stan/stats/stats.go +++ b/x-pack/metricbeat/module/stan/stats/stats.go @@ -7,10 +7,10 @@ package stats import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( 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 9a5a6cdc3792..a3a9de329642 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 b3a46e0c2c6e..2e1b19419b9d 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 cec4a71474c3..2135c68fca03 100644 --- a/x-pack/metricbeat/module/stan/subscriptions/data.go +++ b/x-pack/metricbeat/module/stan/subscriptions/data.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - s "github.com/elastic/beats/libbeat/common/schema" - c "github.com/elastic/beats/libbeat/common/schema/mapstriface" - "github.com/elastic/beats/metricbeat/mb" + 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" ) var ( diff --git a/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go b/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go index 5449add589ec..af028586d563 100644 --- a/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go +++ b/x-pack/metricbeat/module/stan/subscriptions/subscriptions.go @@ -7,10 +7,10 @@ package subscriptions import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper" - "github.com/elastic/beats/metricbeat/mb" - "github.com/elastic/beats/metricbeat/mb/parse" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper" + "github.com/elastic/beats/v7/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb/parse" ) const ( 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 058fd2ada863..3fcb9bf22b6c 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/libbeat/tests/compose" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/tests/compose" + mbtest "github.com/elastic/beats/v7/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 cd49b3a1c894..c97343ab05a0 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/metricbeat/mb/testing" + mbtest "github.com/elastic/beats/v7/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 4cc1e0c02a8e..4db2edca2388 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/libbeat/asset" + "github.com/elastic/beats/v7/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 53fb6c51953c..9c8613e0c17b 100644 --- a/x-pack/metricbeat/module/statsd/server/data.go +++ b/x-pack/metricbeat/module/statsd/server/data.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/logp" - "github.com/elastic/beats/metricbeat/helper/server" + "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/metricbeat/helper/server" ) var errInvalidPacket = errors.New("invalid statsd packet") diff --git a/x-pack/metricbeat/module/statsd/server/data_test.go b/x-pack/metricbeat/module/statsd/server/data_test.go index 96f822aa9efb..7830a007a449 100644 --- a/x-pack/metricbeat/module/statsd/server/data_test.go +++ b/x-pack/metricbeat/module/statsd/server/data_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/metricbeat/helper/server" - mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/metricbeat/helper/server" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" ) func TestParseMetrics(t *testing.T) { diff --git a/x-pack/metricbeat/module/statsd/server/registry.go b/x-pack/metricbeat/module/statsd/server/registry.go index 9dba2f968c80..46be209094ae 100644 --- a/x-pack/metricbeat/module/statsd/server/registry.go +++ b/x-pack/metricbeat/module/statsd/server/registry.go @@ -10,8 +10,8 @@ import ( "github.com/rcrowley/go-metrics" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/logp" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/logp" ) var logger = logp.NewLogger("statd") diff --git a/x-pack/metricbeat/module/statsd/server/server.go b/x-pack/metricbeat/module/statsd/server/server.go index 2a8cb72ee64f..25f8fd5a78f1 100644 --- a/x-pack/metricbeat/module/statsd/server/server.go +++ b/x-pack/metricbeat/module/statsd/server/server.go @@ -7,10 +7,10 @@ package server import ( "time" - "github.com/elastic/beats/libbeat/common" - serverhelper "github.com/elastic/beats/metricbeat/helper/server" - "github.com/elastic/beats/metricbeat/helper/server/udp" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/libbeat/common" + 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" ) // init registers the MetricSet with the central registry. diff --git a/x-pack/metricbeat/module/tomcat/fields.go b/x-pack/metricbeat/module/tomcat/fields.go index d7b10c550378..46b1f1ab5f3a 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { diff --git a/x-pack/metricbeat/scripts/msetlists/main.go b/x-pack/metricbeat/scripts/msetlists/main.go index c1cb9ef1cc87..2af47083c52e 100644 --- a/x-pack/metricbeat/scripts/msetlists/main.go +++ b/x-pack/metricbeat/scripts/msetlists/main.go @@ -9,11 +9,11 @@ import ( "fmt" "os" - "github.com/elastic/beats/metricbeat/scripts/msetlists" + "github.com/elastic/beats/v7/metricbeat/scripts/msetlists" - "github.com/elastic/beats/libbeat/paths" - "github.com/elastic/beats/metricbeat/mb" - _ "github.com/elastic/beats/x-pack/metricbeat/include" + "github.com/elastic/beats/v7/libbeat/paths" + "github.com/elastic/beats/v7/metricbeat/mb" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/include" ) func main() { diff --git a/x-pack/packetbeat/cmd/root.go b/x-pack/packetbeat/cmd/root.go index 3e399023a228..1cd9d4a7aa37 100644 --- a/x-pack/packetbeat/cmd/root.go +++ b/x-pack/packetbeat/cmd/root.go @@ -5,8 +5,8 @@ package cmd import ( - "github.com/elastic/beats/packetbeat/cmd" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/packetbeat/cmd" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" ) // Name of this beat. diff --git a/x-pack/packetbeat/main.go b/x-pack/packetbeat/main.go index 3d7f9946044b..6ae71ec15c20 100644 --- a/x-pack/packetbeat/main.go +++ b/x-pack/packetbeat/main.go @@ -7,7 +7,7 @@ package main import ( "os" - "github.com/elastic/beats/x-pack/packetbeat/cmd" + "github.com/elastic/beats/v7/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 e75a13088531..5ec2da2d72f9 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/libbeat/tests/system/template" - "github.com/elastic/beats/x-pack/packetbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/x-pack/packetbeat/cmd" ) var systemTest *bool diff --git a/x-pack/winlogbeat/cmd/root.go b/x-pack/winlogbeat/cmd/root.go index faafbac4fb33..94fd93d5b6f1 100644 --- a/x-pack/winlogbeat/cmd/root.go +++ b/x-pack/winlogbeat/cmd/root.go @@ -5,8 +5,8 @@ package cmd import ( - "github.com/elastic/beats/winlogbeat/cmd" - xpackcmd "github.com/elastic/beats/x-pack/libbeat/cmd" + "github.com/elastic/beats/v7/winlogbeat/cmd" + xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd" ) // Name of this beat. diff --git a/x-pack/winlogbeat/include/list.go b/x-pack/winlogbeat/include/list.go index a571fc840ee5..ae74b2a2dfd2 100644 --- a/x-pack/winlogbeat/include/list.go +++ b/x-pack/winlogbeat/include/list.go @@ -8,6 +8,6 @@ package include import ( // Import packages that need to register themselves. - _ "github.com/elastic/beats/x-pack/winlogbeat/module/security" - _ "github.com/elastic/beats/x-pack/winlogbeat/module/sysmon" + _ "github.com/elastic/beats/v7/x-pack/winlogbeat/module/security" + _ "github.com/elastic/beats/v7/x-pack/winlogbeat/module/sysmon" ) diff --git a/x-pack/winlogbeat/magefile.go b/x-pack/winlogbeat/magefile.go index 85019ffde0a1..b2e5a69c9afc 100644 --- a/x-pack/winlogbeat/magefile.go +++ b/x-pack/winlogbeat/magefile.go @@ -9,22 +9,22 @@ package main import ( "github.com/magefile/mage/mg" - devtools "github.com/elastic/beats/dev-tools/mage" + devtools "github.com/elastic/beats/v7/dev-tools/mage" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/common" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/common" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/build" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/build" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/pkg" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/pkg" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/dashboards" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/dashboards" // mage:import - _ "github.com/elastic/beats/dev-tools/mage/target/test" + _ "github.com/elastic/beats/v7/dev-tools/mage/target/test" // mage:import - "github.com/elastic/beats/dev-tools/mage/target/unittest" + "github.com/elastic/beats/v7/dev-tools/mage/target/unittest" // mage:import - winlogbeat "github.com/elastic/beats/winlogbeat/scripts/mage" + winlogbeat "github.com/elastic/beats/v7/winlogbeat/scripts/mage" ) func init() { diff --git a/x-pack/winlogbeat/main.go b/x-pack/winlogbeat/main.go index 56e4e0aab224..2f5400d02ea3 100644 --- a/x-pack/winlogbeat/main.go +++ b/x-pack/winlogbeat/main.go @@ -7,9 +7,9 @@ package main import ( "os" - _ "github.com/elastic/beats/winlogbeat/include" + _ "github.com/elastic/beats/v7/winlogbeat/include" - "github.com/elastic/beats/x-pack/winlogbeat/cmd" + "github.com/elastic/beats/v7/x-pack/winlogbeat/cmd" ) func main() { diff --git a/x-pack/winlogbeat/main_test.go b/x-pack/winlogbeat/main_test.go index c96f4ed03b7b..c8c4e35dd347 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/libbeat/tests/system/template" - "github.com/elastic/beats/x-pack/winlogbeat/cmd" + "github.com/elastic/beats/v7/libbeat/tests/system/template" + "github.com/elastic/beats/v7/x-pack/winlogbeat/cmd" ) var systemTest *bool diff --git a/x-pack/winlogbeat/module/security/fields.go b/x-pack/winlogbeat/module/security/fields.go index 571a72da514d..3d8d8e16146e 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { 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 5c61594df881..79c8d36cc59c 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/x-pack/winlogbeat/module" + "github.com/elastic/beats/v7/x-pack/winlogbeat/module" // Register required processors. - _ "github.com/elastic/beats/libbeat/cmd/instance" - _ "github.com/elastic/beats/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/libbeat/cmd/instance" + _ "github.com/elastic/beats/v7/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 09307cfb926f..eeb184deb3b1 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/libbeat/asset" + "github.com/elastic/beats/v7/libbeat/asset" ) func init() { 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 a82f5ba2e4c4..b59df3f22d7b 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/x-pack/winlogbeat/module" + "github.com/elastic/beats/v7/x-pack/winlogbeat/module" // Register required processors. - _ "github.com/elastic/beats/libbeat/cmd/instance" - _ "github.com/elastic/beats/libbeat/processors/timestamp" + _ "github.com/elastic/beats/v7/libbeat/cmd/instance" + _ "github.com/elastic/beats/v7/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_windows.go b/x-pack/winlogbeat/module/testing_windows.go index 675c01f02140..12b2102070f1 100644 --- a/x-pack/winlogbeat/module/testing_windows.go +++ b/x-pack/winlogbeat/module/testing_windows.go @@ -20,15 +20,15 @@ import ( "github.com/pmezard/go-difflib/difflib" "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/mapping" - "github.com/elastic/beats/libbeat/processors/script/javascript" - "github.com/elastic/beats/winlogbeat/checkpoint" - "github.com/elastic/beats/winlogbeat/eventlog" + "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/mapping" + "github.com/elastic/beats/v7/libbeat/processors/script/javascript" + "github.com/elastic/beats/v7/winlogbeat/checkpoint" + "github.com/elastic/beats/v7/winlogbeat/eventlog" // Register javascript modules. - _ "github.com/elastic/beats/libbeat/processors/script/javascript/module" - _ "github.com/elastic/beats/winlogbeat/processors/script/javascript/module/winlogbeat" + _ "github.com/elastic/beats/v7/libbeat/processors/script/javascript/module" + _ "github.com/elastic/beats/v7/winlogbeat/processors/script/javascript/module/winlogbeat" ) var update = flag.Bool("update", false, "update golden files")