update logging (#5)

* removed Zap logging and switched to logrus
* "deprecating" the prometheus.go file and fixed up logging stuff on a couple more files.
* removed uber zap from glide
* well that sure messed things up

collector/collector.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 )
 
 const namespace = "mikrotik"
@@ -32,9 +32,9 @@ type deviceCollector struct {
 func NewDeviceCollector(cfg Config) (*deviceCollector, error) {
 	devices := make([]Device, len(cfg.Devices))
 
-	cfg.Logger.Info("setting up collector for devices",
-		"numDevices", len(cfg.Devices),
-	)
+	log.WithFields(log.Fields{
+		"numDevices": len(cfg.Devices),
+	}).Info("setting up collector for devices")
 
 	copy(devices, cfg.Devices)
 

collector/config.go

@@ -4,13 +4,10 @@ import (
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"go.uber.org/zap"
 )
 
 type Config struct {
 	Devices []Device
-	Logger  *zap.SugaredLogger
-	Metrics PromMetrics
 }
 
 func (c *Config) FromFlags(device, address, user, password *string) error {

collector/device.go

@@ -8,6 +8,7 @@ import (
 	"strconv"
 
 	"github.com/prometheus/client_golang/prometheus"
+	log "github.com/sirupsen/logrus"
 	"gopkg.in/routeros.v2"
 	"gopkg.in/routeros.v2/proto"
 )
@@ -37,19 +38,18 @@ func metricStringCleanup(in string) string {
 }
 
 func (d *Device) fetchInterfaceMetrics() ([]*proto.Sentence, error) {
-	// clean up logging later TODO(smb)
-	//l.Debugw("fetching interface metrics",
-	//	"device", d.name,
-	//)
+
+	log.WithFields(log.Fields{
+		"device": d.name,
+	}).Debug("fetching interface metrics")
 
 	// grab a connection to the device
 	c, err := routeros.Dial(d.address+apiPort, d.user, d.password)
 	if err != nil {
-		// clean up logging later TODO(smb)
-		//l.Errorw("error dialing device",
-		//	"device", d.name,
-		//	"error", err,
-		//)
+		log.WithFields(log.Fields{
+			"device": d.name,
+			"error":  err,
+		}).Error("error dialing device")
 		return nil, err
 	}
 	defer c.Close()
@@ -57,32 +57,14 @@ func (d *Device) fetchInterfaceMetrics() ([]*proto.Sentence, error) {
 	reply, err := c.Run("/interface/print", "?disabled=false",
 		"?running=true", "=.proplist="+strings.Join(InterfaceProps, ","))
 	if err != nil {
-		// do some logging here about an error when we redo all the logging TODO(smb)
+		log.WithFields(log.Fields{
+			"device": d.name,
+			"error":  err,
+		}).Error("error fetching interface metrics")
 		return nil, err
 	}
 
 	return reply.Re, nil
-
-	//for _, re := range reply.Re {
-	//	var name string
-	//	// name should always be first element on the array
-	//	for _, p := range InterfaceProps {
-	//		if p == "name" {
-	//			name = re.Map[p]
-	//		} else {
-	//			v, err := strconv.ParseFloat(re.Map[p], 64)
-	//			if err != nil {
-	//				l.Errorw("error parsing value to float",
-	//					"device", d.name,
-	//					"property", p,
-	//					"value", re.Map[p],
-	//					"error", err,
-	//				)
-	//			}
-	//			m.IncrementInterface(p, d.name, d.address, name, v)
-	//		}
-	//	}
-	//}
 }
 
 func (d *Device) Update(ch chan<- prometheus.Metric) error {
@@ -109,7 +91,15 @@ func (d *Device) Update(ch chan<- prometheus.Metric) error {
 					v, err := strconv.ParseFloat(re.Map[p], 64)
 					if err == nil {
 						ch <- prometheus.MustNewConstMetric(desc, prometheus.CounterValue, v, d.name, d.address, intf)
-					} // add an else with logging here when logging is re done TODO(smb)
+					} else {
+						log.WithFields(log.Fields{
+							"device":    d.name,
+							"interface": intf,
+							"property":  p,
+							"value":     re.Map[p],
+							"error":     err,
+						}).Error("error parsing interface metric value")
+					}
 				}
 			}
 		}

collector/prometheus.bak

@@ -6,7 +6,6 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"go.uber.org/zap"
 )
 
 type PromMetrics struct {
@@ -27,7 +26,7 @@ func (p *PromMetrics) makeInterfaceLabels(name, address, intf string) prometheus
 	return l
 }
 
-func (p *PromMetrics) SetupPrometheus(l zap.SugaredLogger) (http.Handler, error) {
+func (p *PromMetrics) SetupPrometheus() (http.Handler, error) {
 
 	p.InterfaceMetrics = make(map[string]*prometheus.CounterVec)
 	p.ResourceMetrics = make(map[string]*prometheus.GaugeVec)
@@ -42,10 +41,10 @@ func (p *PromMetrics) SetupPrometheus(l zap.SugaredLogger) (http.Handler, error)
 		}, interfaceLabelNames)
 
 		if err := prometheus.Register(c); err != nil {
-			l.Errorw("error creating interface counter vector",
-				"property", v,
-				"error", err,
-			)
+			//l.Errorw("error creating interface counter vector",
+			//	"property", v,
+			//	"error", err,
+			//)
 			return nil, err
 		}
 
@@ -63,10 +62,10 @@ func (p *PromMetrics) SetupPrometheus(l zap.SugaredLogger) (http.Handler, error)
 		}, resourceLabelNames)
 
 		if err := prometheus.Register(c); err != nil {
-			l.Errorw("error creating resource counter vec",
-				"property", v,
-				"error", err,
-			)
+			//l.Errorw("error creating resource counter vec",
+			//	"property", v,
+			//	"error", err,
+			//)
 			return nil, err
 		}
 		p.ResourceMetrics[v] = c