diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index 02725e353..ba267dca1 100644 --- a/cmd/prometheus/main.go +++ b/cmd/prometheus/main.go @@ -37,7 +37,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/grafana/regexp" - conntrack "github.com/mwitkow/go-conntrack" + "github.com/mwitkow/go-conntrack" "github.com/oklog/run" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" @@ -48,8 +48,8 @@ import ( toolkit_webflag "github.com/prometheus/exporter-toolkit/web/kingpinflag" "go.uber.org/atomic" "go.uber.org/automaxprocs/maxprocs" - kingpin "gopkg.in/alecthomas/kingpin.v2" - klog "k8s.io/klog" + "gopkg.in/alecthomas/kingpin.v2" + "k8s.io/klog" klogv2 "k8s.io/klog/v2" "github.com/prometheus/prometheus/config" diff --git a/cmd/promtool/main.go b/cmd/promtool/main.go index fdb05a190..a2f710d14 100644 --- a/cmd/promtool/main.go +++ b/cmd/promtool/main.go @@ -42,7 +42,7 @@ import ( "github.com/prometheus/common/version" "github.com/prometheus/exporter-toolkit/web" "gopkg.in/alecthomas/kingpin.v2" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" dto "github.com/prometheus/client_model/go" "github.com/prometheus/common/expfmt" diff --git a/cmd/promtool/unittest.go b/cmd/promtool/unittest.go index f03906089..744235dda 100644 --- a/cmd/promtool/unittest.go +++ b/cmd/promtool/unittest.go @@ -27,7 +27,7 @@ import ( "github.com/go-kit/log" "github.com/prometheus/common/model" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/promql" diff --git a/config/config.go b/config/config.go index ce17803f9..036faaeef 100644 --- a/config/config.go +++ b/config/config.go @@ -29,7 +29,7 @@ import ( "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/common/sigv4" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/model/labels" diff --git a/discovery/file/file.go b/discovery/file/file.go index 8fa1d9743..5aa7f2e5f 100644 --- a/discovery/file/file.go +++ b/discovery/file/file.go @@ -32,7 +32,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/config" "github.com/prometheus/common/model" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/discovery/gce/gce.go b/discovery/gce/gce.go index 887188e2d..fa05fbbf3 100644 --- a/discovery/gce/gce.go +++ b/discovery/gce/gce.go @@ -25,7 +25,7 @@ import ( "github.com/go-kit/log" "github.com/prometheus/common/model" "golang.org/x/oauth2/google" - compute "google.golang.org/api/compute/v1" + "google.golang.org/api/compute/v1" "google.golang.org/api/option" "github.com/prometheus/prometheus/discovery" diff --git a/discovery/openstack/openstack.go b/discovery/openstack/openstack.go index 2505542ab..92c83a4cf 100644 --- a/discovery/openstack/openstack.go +++ b/discovery/openstack/openstack.go @@ -23,7 +23,7 @@ import ( "github.com/go-kit/log" "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack" - conntrack "github.com/mwitkow/go-conntrack" + "github.com/mwitkow/go-conntrack" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/discovery/triton/triton.go b/discovery/triton/triton.go index 54c67b121..c83f3b34a 100644 --- a/discovery/triton/triton.go +++ b/discovery/triton/triton.go @@ -25,7 +25,7 @@ import ( "time" "github.com/go-kit/log" - conntrack "github.com/mwitkow/go-conntrack" + "github.com/mwitkow/go-conntrack" "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/model/labels/labels_test.go b/model/labels/labels_test.go index 8e32e8ed0..8a852bdef 100644 --- a/model/labels/labels_test.go +++ b/model/labels/labels_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/require" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" ) func TestLabels_String(t *testing.T) { diff --git a/model/rulefmt/rulefmt.go b/model/rulefmt/rulefmt.go index 6af79f6ac..f1d5f3925 100644 --- a/model/rulefmt/rulefmt.go +++ b/model/rulefmt/rulefmt.go @@ -24,7 +24,7 @@ import ( "time" "github.com/prometheus/common/model" - yaml "gopkg.in/yaml.v3" + "gopkg.in/yaml.v3" "github.com/prometheus/prometheus/model/timestamp" "github.com/prometheus/prometheus/promql/parser" diff --git a/notifier/notifier_test.go b/notifier/notifier_test.go index 163e55354..cb44cdda5 100644 --- a/notifier/notifier_test.go +++ b/notifier/notifier_test.go @@ -31,7 +31,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "go.uber.org/atomic" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/rules/alerting.go b/rules/alerting.go index bffd3e230..ccbb1b592 100644 --- a/rules/alerting.go +++ b/rules/alerting.go @@ -25,7 +25,7 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/common/model" "go.uber.org/atomic" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/rulefmt" diff --git a/rules/manager_test.go b/rules/manager_test.go index 2af757ff2..3389ec741 100644 --- a/rules/manager_test.go +++ b/rules/manager_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" "go.uber.org/goleak" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/rulefmt" diff --git a/rules/recording.go b/rules/recording.go index f9d732e7c..35d496032 100644 --- a/rules/recording.go +++ b/rules/recording.go @@ -20,7 +20,7 @@ import ( "time" "go.uber.org/atomic" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/rulefmt" diff --git a/scrape/manager_test.go b/scrape/manager_test.go index 2994e9f97..90aa1db28 100644 --- a/scrape/manager_test.go +++ b/scrape/manager_test.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/web/web.go b/web/web.go index 27d7c9635..2a913a60d 100644 --- a/web/web.go +++ b/web/web.go @@ -38,7 +38,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/grafana/regexp" - conntrack "github.com/mwitkow/go-conntrack" + "github.com/mwitkow/go-conntrack" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp"