diff --git a/config/config.go b/config/config.go index 506087afc..c59f786e7 100644 --- a/config/config.go +++ b/config/config.go @@ -23,9 +23,8 @@ import ( "strings" "time" - "gopkg.in/yaml.v2" - "github.com/prometheus/common/model" + "gopkg.in/yaml.v2" "github.com/prometheus/prometheus/util/strutil" ) diff --git a/config/config_test.go b/config/config_test.go index 52d0b81a4..9f7546e02 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -22,9 +22,8 @@ import ( "testing" "time" - "gopkg.in/yaml.v2" - "github.com/prometheus/common/model" + "gopkg.in/yaml.v2" ) var expectedConf = &Config{ diff --git a/notification/notification.go b/notification/notification.go index 2bdbce80b..bea0ee570 100644 --- a/notification/notification.go +++ b/notification/notification.go @@ -23,9 +23,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/util/httputil" ) diff --git a/promql/analyzer.go b/promql/analyzer.go index 80b6e1af0..8a5a3ff6d 100644 --- a/promql/analyzer.go +++ b/promql/analyzer.go @@ -17,9 +17,8 @@ import ( "errors" "time" - "golang.org/x/net/context" - "github.com/prometheus/common/model" + "golang.org/x/net/context" "github.com/prometheus/prometheus/storage/local" ) diff --git a/promql/engine.go b/promql/engine.go index 7c1580ded..3ba650187 100644 --- a/promql/engine.go +++ b/promql/engine.go @@ -22,11 +22,10 @@ import ( "strconv" "time" + "github.com/prometheus/common/model" "github.com/prometheus/log" "golang.org/x/net/context" - "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/storage/local" "github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/util/stats" diff --git a/promql/parse.go b/promql/parse.go index 33c999f91..dd3f1a3f8 100644 --- a/promql/parse.go +++ b/promql/parse.go @@ -20,9 +20,8 @@ import ( "strings" "time" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/util/strutil" diff --git a/promql/parse_test.go b/promql/parse_test.go index caddb8f4b..746202781 100644 --- a/promql/parse_test.go +++ b/promql/parse_test.go @@ -22,6 +22,7 @@ import ( "time" "github.com/prometheus/common/model" + "github.com/prometheus/prometheus/storage/metric" ) diff --git a/retrieval/discovery/consul.go b/retrieval/discovery/consul.go index ba7c781ad..f7b0ef034 100644 --- a/retrieval/discovery/consul.go +++ b/retrieval/discovery/consul.go @@ -21,10 +21,9 @@ import ( "sync" "time" - "github.com/prometheus/log" - consul "github.com/hashicorp/consul/api" "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/config" ) diff --git a/retrieval/discovery/dns.go b/retrieval/discovery/dns.go index c28a5f13b..542a692f8 100644 --- a/retrieval/discovery/dns.go +++ b/retrieval/discovery/dns.go @@ -22,9 +22,8 @@ import ( "github.com/miekg/dns" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/config" ) diff --git a/retrieval/discovery/file.go b/retrieval/discovery/file.go index c003fb7c0..91fcceb92 100644 --- a/retrieval/discovery/file.go +++ b/retrieval/discovery/file.go @@ -21,12 +21,11 @@ import ( "strings" "time" + "github.com/prometheus/common/model" "github.com/prometheus/log" "gopkg.in/fsnotify.v1" "gopkg.in/yaml.v2" - "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/config" ) diff --git a/retrieval/discovery/kubernetes/discovery.go b/retrieval/discovery/kubernetes/discovery.go index c5d10afff..44591447e 100644 --- a/retrieval/discovery/kubernetes/discovery.go +++ b/retrieval/discovery/kubernetes/discovery.go @@ -27,6 +27,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/log" + "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/util/httputil" "github.com/prometheus/prometheus/util/strutil" diff --git a/retrieval/discovery/serverset.go b/retrieval/discovery/serverset.go index 7d8055e00..f3ef0a215 100644 --- a/retrieval/discovery/serverset.go +++ b/retrieval/discovery/serverset.go @@ -21,11 +21,10 @@ import ( "sync" "time" + "github.com/prometheus/common/model" "github.com/prometheus/log" "github.com/samuel/go-zookeeper/zk" - "github.com/prometheus/common/model" - "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/util/strutil" ) diff --git a/retrieval/targetmanager.go b/retrieval/targetmanager.go index 917aea53d..43763466a 100644 --- a/retrieval/targetmanager.go +++ b/retrieval/targetmanager.go @@ -18,9 +18,8 @@ import ( "strings" "sync" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/retrieval/discovery" diff --git a/rules/manager.go b/rules/manager.go index 2fd8718b4..586853f4c 100644 --- a/rules/manager.go +++ b/rules/manager.go @@ -24,9 +24,8 @@ import ( html_template "html/template" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/notification" diff --git a/storage/local/crashrecovery.go b/storage/local/crashrecovery.go index 3362bf1ee..69086ed1a 100644 --- a/storage/local/crashrecovery.go +++ b/storage/local/crashrecovery.go @@ -21,9 +21,8 @@ import ( "strings" "sync/atomic" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/storage/local/codable" "github.com/prometheus/prometheus/storage/local/index" diff --git a/storage/local/interface.go b/storage/local/interface.go index 6b2fb3d4d..601659056 100644 --- a/storage/local/interface.go +++ b/storage/local/interface.go @@ -17,7 +17,6 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/common/model" "github.com/prometheus/prometheus/storage/metric" diff --git a/storage/local/persistence.go b/storage/local/persistence.go index bb571e1eb..9e191c0d8 100644 --- a/storage/local/persistence.go +++ b/storage/local/persistence.go @@ -29,9 +29,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/storage/local/codable" "github.com/prometheus/prometheus/storage/local/index" diff --git a/storage/local/storage.go b/storage/local/storage.go index 13ee37884..014d5cee7 100644 --- a/storage/local/storage.go +++ b/storage/local/storage.go @@ -21,9 +21,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/storage/metric" ) diff --git a/storage/local/storage_test.go b/storage/local/storage_test.go index e094f6f0d..f4d4e0852 100644 --- a/storage/local/storage_test.go +++ b/storage/local/storage_test.go @@ -22,9 +22,8 @@ import ( "testing/quick" "time" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/storage/metric" "github.com/prometheus/prometheus/util/testutil" diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index 051628e2b..fa6b65b67 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -17,9 +17,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" ) const ( diff --git a/storage/remote/remote.go b/storage/remote/remote.go index d75f9a71e..3e8e25c56 100644 --- a/storage/remote/remote.go +++ b/storage/remote/remote.go @@ -16,12 +16,11 @@ package remote import ( "time" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/common/model" + "github.com/prometheus/prometheus/storage/remote/influxdb" "github.com/prometheus/prometheus/storage/remote/opentsdb" - - "github.com/prometheus/client_golang/prometheus" - - "github.com/prometheus/common/model" ) // Storage collects multiple remote storage queues. diff --git a/web/api/legacy/api.go b/web/api/legacy/api.go index ef6b24a26..e3e40ce69 100644 --- a/web/api/legacy/api.go +++ b/web/api/legacy/api.go @@ -17,7 +17,6 @@ import ( "net/http" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/common/model" "github.com/prometheus/prometheus/promql" diff --git a/web/api/legacy/query.go b/web/api/legacy/query.go index 675fc2ed7..9136ad767 100644 --- a/web/api/legacy/query.go +++ b/web/api/legacy/query.go @@ -24,9 +24,8 @@ import ( "strconv" "time" - "github.com/prometheus/log" - "github.com/prometheus/common/model" + "github.com/prometheus/log" "github.com/prometheus/prometheus/promql" ) diff --git a/web/api/v1/api.go b/web/api/v1/api.go index ab5f9c210..2d08e20be 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -10,9 +10,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "golang.org/x/net/context" - "github.com/prometheus/common/model" + "golang.org/x/net/context" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/storage/local" diff --git a/web/api/v1/api_test.go b/web/api/v1/api_test.go index 2bcf60a43..64fe3a81d 100644 --- a/web/api/v1/api_test.go +++ b/web/api/v1/api_test.go @@ -12,9 +12,8 @@ import ( "testing" "time" - "golang.org/x/net/context" - "github.com/prometheus/common/model" + "golang.org/x/net/context" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/storage/metric"