From eb7993734096af2966f7c486efbac709cac232b8 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Fri, 30 Oct 2015 13:20:06 -0700 Subject: [PATCH] switch to github.com/prometheus/common/log for logging --- collector/diskstats_linux.go | 2 +- collector/filesystem_freebsd.go | 2 +- collector/filesystem_linux.go | 2 +- collector/gmond.go | 3 +-- collector/lastlogin_linux.go | 2 +- collector/loadavg.go | 2 +- collector/loadavg_linux.go | 2 +- collector/mdadm.go | 2 +- collector/meminfo_freebsd.go | 2 +- collector/meminfo_linux.go | 2 +- collector/netdev_linux.go | 2 +- collector/ntp.go | 2 +- collector/runit.go | 2 +- collector/supervisord.go | 2 +- collector/textfile.go | 5 ++--- collector/time.go | 2 +- node_exporter.go | 2 +- 17 files changed, 18 insertions(+), 20 deletions(-) diff --git a/collector/diskstats_linux.go b/collector/diskstats_linux.go index 3af2cb71..822c7b0f 100644 --- a/collector/diskstats_linux.go +++ b/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 ( diff --git a/collector/filesystem_freebsd.go b/collector/filesystem_freebsd.go index f0a9ef14..688a4dc6 100644 --- a/collector/filesystem_freebsd.go +++ b/collector/filesystem_freebsd.go @@ -19,7 +19,7 @@ import ( "errors" "unsafe" - "github.com/prometheus/log" + "github.com/prometheus/common/log" ) /* diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.go index 2ba9faf5..3610668f 100644 --- a/collector/filesystem_linux.go +++ b/collector/filesystem_linux.go @@ -21,7 +21,7 @@ import ( "strings" "syscall" - "github.com/prometheus/log" + "github.com/prometheus/common/log" ) const ( diff --git a/collector/gmond.go b/collector/gmond.go index 8279c343..573785d3 100644 --- a/collector/gmond.go +++ b/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" ) diff --git a/collector/lastlogin_linux.go b/collector/lastlogin_linux.go index 76ac9955..61ae5e93 100644 --- a/collector/lastlogin_linux.go +++ b/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" diff --git a/collector/loadavg.go b/collector/loadavg.go index 93d5d1c9..1b27a68e 100644 --- a/collector/loadavg.go +++ b/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 diff --git a/collector/loadavg_linux.go b/collector/loadavg_linux.go index ccd2e372..b03cf02f 100644 --- a/collector/loadavg_linux.go +++ b/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 { diff --git a/collector/mdadm.go b/collector/mdadm.go index dae204d9..aa6a739d 100644 --- a/collector/mdadm.go +++ b/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 ( diff --git a/collector/meminfo_freebsd.go b/collector/meminfo_freebsd.go index f6ea53d0..74f59a84 100644 --- a/collector/meminfo_freebsd.go +++ b/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" ) /* diff --git a/collector/meminfo_linux.go b/collector/meminfo_linux.go index 17eca941..910b1dd3 100644 --- a/collector/meminfo_linux.go +++ b/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 ( diff --git a/collector/netdev_linux.go b/collector/netdev_linux.go index a68a0194..80a8e7f3 100644 --- a/collector/netdev_linux.go +++ b/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 ( diff --git a/collector/ntp.go b/collector/ntp.go index 14029fd4..fb2031f3 100644 --- a/collector/ntp.go +++ b/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 ( diff --git a/collector/runit.go b/collector/runit.go index b23bc4a6..02d10abb 100644 --- a/collector/runit.go +++ b/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" ) diff --git a/collector/supervisord.go b/collector/supervisord.go index 55b5154e..a8ee5bf1 100644 --- a/collector/supervisord.go +++ b/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 ( diff --git a/collector/textfile.go b/collector/textfile.go index a77ad1e9..6942732d 100644 --- a/collector/textfile.go +++ b/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 ( diff --git a/collector/time.go b/collector/time.go index b5090589..627f4679 100644 --- a/collector/time.go +++ b/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 { diff --git a/node_exporter.go b/node_exporter.go index 4704f94e..ef500f7a 100644 --- a/node_exporter.go +++ b/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" )