From 7d6095cf27dd8e827db174bcb93ccda722c9ea6e Mon Sep 17 00:00:00 2001 From: Michael Okoko Date: Thu, 10 Jun 2021 14:58:45 +0100 Subject: [PATCH] Group imports and satisfy go-lint Signed-off-by: Michael Okoko --- cmd/thanos/rule.go | 5 ++--- pkg/rules/remotewrite/wal_test.go | 2 +- test/e2e/e2ethanos/services.go | 3 +-- test/e2e/rule_test.go | 7 +++---- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cmd/thanos/rule.go b/cmd/thanos/rule.go index b67c9e081c0..38306313066 100644 --- a/cmd/thanos/rule.go +++ b/cmd/thanos/rule.go @@ -15,9 +15,6 @@ import ( "strings" "time" - "github.com/prometheus/prometheus/storage" - "github.com/thanos-io/thanos/pkg/rules/remotewrite" - "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" grpc_logging "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" @@ -33,6 +30,7 @@ import ( "github.com/prometheus/prometheus/pkg/relabel" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/rules" + "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/tsdb" "github.com/prometheus/prometheus/util/strutil" "github.com/thanos-io/thanos/pkg/errutil" @@ -53,6 +51,7 @@ import ( "github.com/thanos-io/thanos/pkg/promclient" "github.com/thanos-io/thanos/pkg/query" thanosrules "github.com/thanos-io/thanos/pkg/rules" + "github.com/thanos-io/thanos/pkg/rules/remotewrite" "github.com/thanos-io/thanos/pkg/runutil" grpcserver "github.com/thanos-io/thanos/pkg/server/grpc" httpserver "github.com/thanos-io/thanos/pkg/server/http" diff --git a/pkg/rules/remotewrite/wal_test.go b/pkg/rules/remotewrite/wal_test.go index d1f9eb684af..555b71bb28f 100644 --- a/pkg/rules/remotewrite/wal_test.go +++ b/pkg/rules/remotewrite/wal_test.go @@ -348,7 +348,7 @@ func (s seriesList) SeriesNames() []string { return names } -// ExpectedSamples returns the list of expected samples, sorted by ref ID and timestamp +// ExpectedSamples returns the list of expected samples, sorted by ref ID and timestamp. func (s seriesList) ExpectedSamples() []record.RefSample { expect := []record.RefSample{} for _, series := range s { diff --git a/test/e2e/e2ethanos/services.go b/test/e2e/e2ethanos/services.go index 4ba003cc516..a2fd58d75d7 100644 --- a/test/e2e/e2ethanos/services.go +++ b/test/e2e/e2ethanos/services.go @@ -13,8 +13,6 @@ import ( "strings" "time" - "github.com/thanos-io/thanos/pkg/rules/remotewrite" - "github.com/cortexproject/cortex/integration/e2e" "github.com/cortexproject/cortex/pkg/util" "github.com/pkg/errors" @@ -28,6 +26,7 @@ import ( "github.com/thanos-io/thanos/pkg/query" "github.com/thanos-io/thanos/pkg/queryfrontend" "github.com/thanos-io/thanos/pkg/receive" + "github.com/thanos-io/thanos/pkg/rules/remotewrite" ) const infoLogLevel = "info" diff --git a/test/e2e/rule_test.go b/test/e2e/rule_test.go index 45a1091d640..90dfc48c1ca 100644 --- a/test/e2e/rule_test.go +++ b/test/e2e/rule_test.go @@ -15,12 +15,10 @@ import ( "testing" "time" - common_cfg "github.com/prometheus/common/config" - "github.com/prometheus/prometheus/config" - "github.com/thanos-io/thanos/pkg/rules/remotewrite" - "github.com/cortexproject/cortex/integration/e2e" + common_cfg "github.com/prometheus/common/config" "github.com/prometheus/common/model" + "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery/targetgroup" "gopkg.in/yaml.v2" @@ -28,6 +26,7 @@ import ( http_util "github.com/thanos-io/thanos/pkg/http" "github.com/thanos-io/thanos/pkg/promclient" "github.com/thanos-io/thanos/pkg/query" + "github.com/thanos-io/thanos/pkg/rules/remotewrite" "github.com/thanos-io/thanos/pkg/rules/rulespb" "github.com/thanos-io/thanos/pkg/testutil" "github.com/thanos-io/thanos/test/e2e/e2ethanos"