fix remaining references

Signed-off-by: chrismark <[email protected]>
elastic · Nov 11, 2019 · 90ab976 · 90ab976
1 parent 1410cf9
commit 90ab976
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/x-pack/metricbeat/module/aws/ebs/ebs_test.go b/x-pack/metricbeat/module/aws/ebs/ebs_test.go
@@ -8,7 +8,6 @@ import (
 	"os"
 
 	"github.com/elastic/beats/metricbeat/mb"
-	xpackmb "github.com/elastic/beats/x-pack/metricbeat/mb"
 
 	// Register input module and metricset
 	_ "github.com/elastic/beats/x-pack/metricbeat/module/aws"
@@ -18,5 +17,5 @@ import (
 func init() {
 	// To be moved to some kind of helper
 	os.Setenv("BEAT_STRICT_PERMS", "false")
-	mb.Registry.SetSecondarySource(xpackmb.NewLightModulesSource("../../../module"))
+	mb.Registry.SetSecondarySource(mb.NewLightModulesSource("../../../module"))
 }
diff --git a/x-pack/metricbeat/module/aws/elb/elb_test.go b/x-pack/metricbeat/module/aws/elb/elb_test.go
@@ -8,7 +8,6 @@ import (
 	"os"
 
 	"github.com/elastic/beats/metricbeat/mb"
-	xpackmb "github.com/elastic/beats/x-pack/metricbeat/mb"
 
 	// Register input module and metricset
 	_ "github.com/elastic/beats/x-pack/metricbeat/module/aws"
@@ -18,5 +17,5 @@ import (
 func init() {
 	// To be moved to some kind of helper
 	os.Setenv("BEAT_STRICT_PERMS", "false")
-	mb.Registry.SetSecondarySource(xpackmb.NewLightModulesSource("../../../module"))
+	mb.Registry.SetSecondarySource(mb.NewLightModulesSource("../../../module"))
 }
diff --git a/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go b/x-pack/metricbeat/module/cockroachdb/status/status_integration_test.go
@@ -15,8 +15,6 @@ import (
 	"github.com/elastic/beats/libbeat/tests/compose"
 	"github.com/elastic/beats/metricbeat/mb"
 	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
-	xpackmb "github.com/elastic/beats/x-pack/metricbeat/mb"
-
 	// Register input module and metricset
 	_ "github.com/elastic/beats/metricbeat/module/prometheus"
 	_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
@@ -25,7 +23,7 @@ import (
 func init() {
 	// To be moved to some kind of helper
 	os.Setenv("BEAT_STRICT_PERMS", "false")
-	mb.Registry.SetSecondarySource(xpackmb.NewLightModulesSource("../../../module"))
+	mb.Registry.SetSecondarySource(mb.NewLightModulesSource("../../../module"))
 }
 
 func TestFetch(t *testing.T) {

diff --git a/x-pack/metricbeat/module/cockroachdb/status/status_test.go b/x-pack/metricbeat/module/cockroachdb/status/status_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/mb"
 	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
-	xpackmb "github.com/elastic/beats/x-pack/metricbeat/mb"
 
 	// Register input module and metricset
 	_ "github.com/elastic/beats/metricbeat/module/prometheus"
@@ -23,7 +22,7 @@ import (
 func init() {
 	// To be moved to some kind of helper
 	os.Setenv("BEAT_STRICT_PERMS", "false")
-	mb.Registry.SetSecondarySource(xpackmb.NewLightModulesSource("../../../module"))
+	mb.Registry.SetSecondarySource(mb.NewLightModulesSource("../../../module"))
 }
 
 func TestEventMapping(t *testing.T) {