Skip to content

Commit

Permalink
Switch to common/log
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabxc
fabxc committed Oct 3, 2015
1 parent 91436b2 commit e3b6ec9
Show file tree
Hide file tree
Showing 34 changed files with 438 additions and 633 deletions.
2 changes: 1 addition & 1 deletion cmd/prometheus/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"time"
"unicode"

"github.com/prometheus/log"
"github.com/prometheus/common/log"
"github.com/prometheus/prometheus/notification"
"github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/storage/local"
Expand Down
2 changes: 1 addition & 1 deletion cmd/prometheus/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"text/template"
"time"

"github.com/prometheus/log"
"github.com/prometheus/common/log"

"github.com/prometheus/client_golang/prometheus"

Expand Down
2 changes: 1 addition & 1 deletion notification/notification.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"time"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/util/httputil"
Expand Down
2 changes: 1 addition & 1 deletion promql/engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"sort"
"time"

"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"
"golang.org/x/net/context"

"github.com/prometheus/prometheus/storage/local"
Expand Down
2 changes: 1 addition & 1 deletion promql/parse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"strings"
"time"

"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/strutil"
Expand Down
2 changes: 1 addition & 1 deletion retrieval/discovery/consul.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

consul "github.com/hashicorp/consul/api"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/config"
)
Expand Down
2 changes: 1 addition & 1 deletion retrieval/discovery/dns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/miekg/dns"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/config"
)
Expand Down
2 changes: 1 addition & 1 deletion retrieval/discovery/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"time"

"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"
"gopkg.in/fsnotify.v1"
"gopkg.in/yaml.v2"

Expand Down
2 changes: 1 addition & 1 deletion retrieval/discovery/kubernetes/discovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"sync"
"time"

"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/util/httputil"
Expand Down
2 changes: 1 addition & 1 deletion retrieval/discovery/marathon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package discovery
import (
"time"

"github.com/prometheus/log"
"github.com/prometheus/common/log"
"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/retrieval/discovery/marathon"
)
Expand Down
2 changes: 1 addition & 1 deletion retrieval/discovery/serverset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"sync"
"time"

"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"
"github.com/samuel/go-zookeeper/zk"

"github.com/prometheus/prometheus/config"
Expand Down
2 changes: 1 addition & 1 deletion retrieval/target.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/expfmt"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/storage"
Expand Down
2 changes: 1 addition & 1 deletion retrieval/targetmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"strings"
"sync"

"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/retrieval/discovery"
Expand Down
2 changes: 1 addition & 1 deletion rules/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
html_template "html/template"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/notification"
Expand Down
2 changes: 1 addition & 1 deletion storage/local/crashrecovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"sync/atomic"

"github.com/prometheus/common/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
2 changes: 1 addition & 1 deletion storage/local/mapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync/atomic"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/log"
"github.com/prometheus/common/log"

"github.com/prometheus/common/model"
)
Expand Down
2 changes: 1 addition & 1 deletion storage/local/persistence.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"time"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/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
2 changes: 1 addition & 1 deletion storage/local/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"time"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/storage/metric"
)
Expand Down
2 changes: 1 addition & 1 deletion storage/local/storage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing/quick"
"time"

"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

"github.com/prometheus/prometheus/storage/metric"
"github.com/prometheus/prometheus/util/testutil"
Expand Down
2 changes: 1 addition & 1 deletion storage/remote/influxdb/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"math"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"

influx "github.com/influxdb/influxdb/client"
)
Expand Down
2 changes: 1 addition & 1 deletion storage/remote/opentsdb/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"regexp"
"time"

"github.com/prometheus/log"
"github.com/prometheus/common/log"

"github.com/prometheus/common/model"

Expand Down
2 changes: 1 addition & 1 deletion storage/remote/queue_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"time"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"github.com/prometheus/log"
)

const (
Expand Down
Loading

0 comments on commit e3b6ec9

Please sign in to comment.