From cc3c5adeb8db09cb587ad19e45bfaba24f14137d Mon Sep 17 00:00:00 2001 From: Mariana Date: Tue, 3 Mar 2020 14:05:09 +0100 Subject: [PATCH 1/2] fix --- .../container_instance/container_instance_integration_test.go | 2 +- .../module/azure/container_instance/container_instance_test.go | 2 +- .../container_registry/container_registry_integration_test.go | 2 +- .../module/azure/container_registry/container_registry_test.go | 2 +- .../container_service/container_service_integration_test.go | 2 +- .../module/azure/container_service/container_service_test.go | 2 +- x-pack/metricbeat/module/azure/data_test.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go b/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go index 37b814b070f..9a7188f7067 100644 --- a/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go +++ b/x-pack/metricbeat/module/azure/container_instance/container_instance_integration_test.go @@ -9,7 +9,7 @@ import ( "os" "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/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go b/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go index a92237aea4b..3b91ef66166 100644 --- a/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go +++ b/x-pack/metricbeat/module/azure/container_instance/container_instance_test.go @@ -7,7 +7,7 @@ package container_instance import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go b/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go index 41414529997..ef4929fc1b1 100644 --- a/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go +++ b/x-pack/metricbeat/module/azure/container_registry/container_registry_integration_test.go @@ -9,7 +9,7 @@ import ( "os" "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/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go b/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go index 7b65c68056f..6c94aab4345 100644 --- a/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go +++ b/x-pack/metricbeat/module/azure/container_registry/container_registry_test.go @@ -7,7 +7,7 @@ package container_registry import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go b/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go index 01c9f5a053e..8423cb06668 100644 --- a/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go +++ b/x-pack/metricbeat/module/azure/container_service/container_service_integration_test.go @@ -9,7 +9,7 @@ import ( "os" "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/x-pack/metricbeat/module/azure/container_service/container_service_test.go b/x-pack/metricbeat/module/azure/container_service/container_service_test.go index 0fb0b53347e..33b9513348f 100644 --- a/x-pack/metricbeat/module/azure/container_service/container_service_test.go +++ b/x-pack/metricbeat/module/azure/container_service/container_service_test.go @@ -7,7 +7,7 @@ package container_service import ( "os" - "github.com/elastic/beats/metricbeat/mb" + "github.com/elastic/beats/v7/metricbeat/mb" ) func init() { diff --git a/x-pack/metricbeat/module/azure/data_test.go b/x-pack/metricbeat/module/azure/data_test.go index 2498d92a558..d26f9270f0f 100644 --- a/x-pack/metricbeat/module/azure/data_test.go +++ b/x-pack/metricbeat/module/azure/data_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/elastic/beats/libbeat/common" + "github.com/elastic/beats/v7/libbeat/common" ) func TestReturnAllDimensions(t *testing.T) { From 7c9cebee74ec38f6718539379ffe647866523f25 Mon Sep 17 00:00:00 2001 From: Mariana Date: Tue, 3 Mar 2020 14:08:00 +0100 Subject: [PATCH 2/2] changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 95ad20ea4d3..825cd5a3d34 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -103,6 +103,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Made `logstash-xpack` module once again have parity with internally-collected Logstash monitoring data. {pull}16198[16198] - Change sqs metricset to use average as statistic method. {pull}16438[16438] - Revert changes in `docker` module: add size flag to docker.container. {pull}16600[16600] +- Fix imports after PR was merged before rebase. {pull}16756[16756] *Packetbeat*