Fix grouping of import blocks

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"
 )

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{

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"
 )

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"
 )

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"

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"

promql/parse_test.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/prometheus/common/model"
+
 	"github.com/prometheus/prometheus/storage/metric"
 )
 

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"
 )

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"
 )

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"
 )
 

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"

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"
 )

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"

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"

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"

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"

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"

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"
 )

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"

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 (

storage/remote/remote.go

@@ -16,12 +16,11 @@ package remote
 import (
 	"time"
 
-	"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"
+
+	"github.com/prometheus/prometheus/storage/remote/influxdb"
+	"github.com/prometheus/prometheus/storage/remote/opentsdb"
 )
 
 // Storage collects multiple remote storage queues.

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"

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"
 )

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"

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"