Merge pull request #152 from mischief/common-log

switch to github.com/prometheus/common/log for logging

collector/diskstats_linux.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 const (

collector/filesystem_freebsd.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 	"unsafe"
 
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 /*

collector/filesystem_linux.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 const (

collector/gmond.go

@@ -25,8 +25,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
-
 	"github.com/prometheus/node_exporter/collector/ganglia"
 )
 

collector/lastlogin_linux.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 const lastLoginSubsystem = "last_login"

collector/loadavg.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 // #include <stdlib.h>

collector/loadavg_linux.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 type loadavgCollector struct {

collector/mdadm.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 var (

collector/meminfo_freebsd.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 /*

collector/meminfo_linux.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 const (

collector/netdev_linux.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 var (

collector/ntp.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/beevik/ntp"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 var (

collector/runit.go

@@ -17,7 +17,7 @@ package collector
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 	"github.com/soundcloud/go-runit/runit"
 )
 

collector/supervisord.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/kolo/xmlrpc"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 var (

collector/textfile.go

@@ -27,10 +27,9 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/expfmt"
-	"github.com/prometheus/log"
-
 	dto "github.com/prometheus/client_model/go"
+	"github.com/prometheus/common/expfmt"
+	"github.com/prometheus/common/log"
 )
 
 var (

collector/time.go

@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 )
 
 type timeCollector struct {

node_exporter.go

@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/log"
+	"github.com/prometheus/common/log"
 
 	"github.com/prometheus/node_exporter/collector"
 )