Skip to content

Commit

Permalink
Fix grouping of import blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabxc
fabxc committed Aug 22, 2015
1 parent 6d0f58d commit 438e232
Show file tree
Hide file tree
Showing 25 changed files with 25 additions and 46 deletions.
3 changes: 1 addition & 2 deletions config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ import (
"testing"
"time"

"gopkg.in/yaml.v2"

"github.com/prometheus/common/model"
"gopkg.in/yaml.v2"
)

var expectedConf = &Config{
Expand Down
3 changes: 1 addition & 2 deletions notification/notification.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions promql/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions promql/engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions promql/parse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions promql/parse_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"time"

"github.com/prometheus/common/model"

"github.com/prometheus/prometheus/storage/metric"
)

Expand Down
3 changes: 1 addition & 2 deletions retrieval/discovery/consul.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions retrieval/discovery/dns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions retrieval/discovery/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
1 change: 1 addition & 0 deletions retrieval/discovery/kubernetes/discovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions retrieval/discovery/serverset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions retrieval/targetmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions rules/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions storage/local/crashrecovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion storage/local/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"time"

"github.com/prometheus/client_golang/prometheus"

"github.com/prometheus/common/model"

"github.com/prometheus/prometheus/storage/metric"
Expand Down
3 changes: 1 addition & 2 deletions storage/local/persistence.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions storage/local/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions storage/local/storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions storage/remote/queue_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
7 changes: 3 additions & 4 deletions storage/remote/remote.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion web/api/legacy/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"net/http"

"github.com/prometheus/client_golang/prometheus"

"github.com/prometheus/common/model"

"github.com/prometheus/prometheus/promql"
Expand Down
3 changes: 1 addition & 2 deletions web/api/legacy/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions web/api/v1/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions web/api/v1/api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 438e232

Please sign in to comment.