diff --git a/pkg/controller/elasticsearch/stackmon/es_config.go b/pkg/controller/elasticsearch/stackmon/es_config.go index 6fbab27c30e..24aca0ffc28 100644 --- a/pkg/controller/elasticsearch/stackmon/es_config.go +++ b/pkg/controller/elasticsearch/stackmon/es_config.go @@ -5,11 +5,11 @@ package stackmon import ( - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" corev1 "k8s.io/api/core/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" ) // MonitoringConfig returns the Elasticsearch settings to enable the collection of monitoring data diff --git a/pkg/controller/elasticsearch/stackmon/sidecar.go b/pkg/controller/elasticsearch/stackmon/sidecar.go index 9187c6af3cc..16e295fc41c 100644 --- a/pkg/controller/elasticsearch/stackmon/sidecar.go +++ b/pkg/controller/elasticsearch/stackmon/sidecar.go @@ -8,13 +8,13 @@ import ( "crypto/sha256" "fmt" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" corev1 "k8s.io/api/core/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/network" esvolume "github.com/elastic/cloud-on-k8s/pkg/controller/elasticsearch/volume" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" diff --git a/pkg/controller/elasticsearch/stackmon/sidecar_test.go b/pkg/controller/elasticsearch/stackmon/sidecar_test.go index 796b7fdc627..99a76bdd90f 100644 --- a/pkg/controller/elasticsearch/stackmon/sidecar_test.go +++ b/pkg/controller/elasticsearch/stackmon/sidecar_test.go @@ -7,7 +7,6 @@ package stackmon import ( "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -15,6 +14,7 @@ import ( commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" esv1 "github.com/elastic/cloud-on-k8s/pkg/apis/elasticsearch/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" ) diff --git a/pkg/controller/kibana/stackmon/sidecar.go b/pkg/controller/kibana/stackmon/sidecar.go index e60c56b99a5..17d57cf4589 100644 --- a/pkg/controller/kibana/stackmon/sidecar.go +++ b/pkg/controller/kibana/stackmon/sidecar.go @@ -8,13 +8,13 @@ import ( "crypto/sha256" "fmt" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" corev1 "k8s.io/api/core/v1" commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/controller/common/volume" "github.com/elastic/cloud-on-k8s/pkg/controller/kibana/network" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" diff --git a/pkg/controller/kibana/stackmon/sidecar_test.go b/pkg/controller/kibana/stackmon/sidecar_test.go index 987771fba38..42b3eace82f 100644 --- a/pkg/controller/kibana/stackmon/sidecar_test.go +++ b/pkg/controller/kibana/stackmon/sidecar_test.go @@ -8,7 +8,6 @@ import ( "fmt" "testing" - "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -16,6 +15,7 @@ import ( commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1" kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1" "github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults" + "github.com/elastic/cloud-on-k8s/pkg/controller/common/stackmon/monitoring" "github.com/elastic/cloud-on-k8s/pkg/utils/k8s" )