Remove the calculation of metrics from the exporter. Use clamp_min(idelta(netgear_traffic_todaydownload[5m]), 0) instead

Author: DRuggeri

collectors/traffic_collector.go

@@ -15,12 +15,6 @@ type TrafficCollector struct {
 	client    *netgear_client.NetgearClient
 	metrics   map[string]prometheus.Gauge
 
-	calculateDelta   bool
-	previousIn       float64
-	previousOut      float64
-	trafficInMetric  prometheus.Gauge
-	trafficOutMetric prometheus.Gauge
-
 	trafficScrapesTotalMetric              prometheus.Counter
 	trafficScrapeErrorsTotalMetric         prometheus.Counter
 	lastTrafficScrapeErrorMetric           prometheus.Gauge
@@ -52,7 +46,7 @@ var TrafficCollectorFields = [...]string{
 	"LastMonthUploadAverage",
 }
 
-func NewTrafficCollector(namespace string, client *netgear_client.NetgearClient, calculateDelta bool) *TrafficCollector {
+func NewTrafficCollector(namespace string, client *netgear_client.NetgearClient) *TrafficCollector {
 	metrics := make(map[string]prometheus.Gauge)
 	for _, name := range TrafficCollectorFields {
 		metrics[name] = prometheus.NewGauge(
@@ -65,23 +59,6 @@ func NewTrafficCollector(namespace string, client *netgear_client.NetgearClient,
 		)
 	}
 
-	trafficInMetric := prometheus.NewGauge(
-		prometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: "traffic",
-			Name:      "download",
-			Help:      "Value downloaded since previous check",
-		},
-	)
-	trafficOutMetric := prometheus.NewGauge(
-		prometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: "traffic",
-			Name:      "upload",
-			Help:      "Value uploaded since previous check",
-		},
-	)
-
 	trafficScrapesTotalMetric := prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: namespace,
@@ -132,12 +109,6 @@ func NewTrafficCollector(namespace string, client *netgear_client.NetgearClient,
 		client:    client,
 		metrics:   metrics,
 
-		calculateDelta:   calculateDelta,
-		trafficInMetric:  trafficInMetric,
-		previousIn:       float64(-1),
-		trafficOutMetric: trafficOutMetric,
-		previousOut:      float64(-1),
-
 		trafficScrapesTotalMetric:              trafficScrapesTotalMetric,
 		trafficScrapeErrorsTotalMetric:         trafficScrapeErrorsTotalMetric,
 		lastTrafficScrapeErrorMetric:           lastTrafficScrapeErrorMetric,
@@ -180,47 +151,6 @@ func (c *TrafficCollector) Collect(ch chan<- prometheus.Metric) {
 		}
 	}
 
-	if c.calculateDelta {
-		currentIn, _ := strconv.ParseFloat(stats["TodayDownload"], 64)
-		currentOut, _ := strconv.ParseFloat(stats["TodayUpload"], 64)
-
-		/* On the first scrape, the previous values are -1. Since we are calcluating
-		   a delta only, pretend this one was zero and update our previous value */
-		if c.previousIn < 0 {
-			c.previousIn = currentIn
-		}
-		if c.previousOut < 0 {
-			c.previousOut = currentOut
-		}
-
-		newIn := currentIn - c.previousIn
-		newOut := currentOut - c.previousOut
-
-		log.Infof("In - previous: %v, current: %v, new: %v", c.previousIn, currentIn, newIn)
-		log.Infof("Out - previous: %v, current: %v, new: %v", c.previousOut, currentOut, newOut)
-		log.Debugf("Raw stats returned:\n")
-		for k, v := range stats {
-			log.Debugf("  %v => %v", k, v)
-		}
-
-		c.previousIn = currentIn
-		c.previousOut = currentOut
-
-		/* Metric rolled to next day or this collector started. Assume 0 */
-		if newIn < 0 {
-			newIn = 0
-		}
-		if newOut < 0 {
-			newOut = 0
-		}
-
-		c.trafficInMetric.Set(newIn)
-		c.trafficInMetric.Collect(ch)
-
-		c.trafficOutMetric.Set(newOut)
-		c.trafficOutMetric.Collect(ch)
-	}
-
 	c.trafficScrapeErrorsTotalMetric.Collect(ch)
 
 	c.trafficScrapesTotalMetric.Inc()
@@ -241,11 +171,6 @@ func (c *TrafficCollector) Describe(ch chan<- *prometheus.Desc) {
 		c.metrics[name].Describe(ch)
 	}
 
-	if c.calculateDelta {
-		c.trafficInMetric.Describe(ch)
-		c.trafficOutMetric.Describe(ch)
-	}
-
 	c.trafficScrapesTotalMetric.Describe(ch)
 	c.trafficScrapeErrorsTotalMetric.Describe(ch)
 	c.lastTrafficScrapeErrorMetric.Describe(ch)

netgear_exporter.go

@@ -47,10 +47,6 @@ var (
 		"filter.collectors", "Comma separated collectors to filter (Traffic) ($NETGEAR_EXPORTER_FILTER_COLLECTORS)",
 	).Envar("NETGEAR_EXPORTER_FILTER_COLLECTORS").Default("").String()
 
-	netgearCalculateTrafficDelta = kingpin.Flag(
-		"traffic.calculatedelta", "When enabled, calculates a delta value for in/out bytes. See README.md for warning. ($NETGEAR_EXPORTER_CACLULATE_DELTA)",
-	).Envar("NETGEAR_EXPORTER_CALCULATE_DELTA").Default("false").Bool()
-
 	metricsNamespace = kingpin.Flag(
 		"metrics.namespace", "Metrics Namespace ($NETGEAR_EXPORTER_METRICS_NAMESPACE)",
 	).Envar("NETGEAR_EXPORTER_METRICS_NAMESPACE").Default("netgear").String()
@@ -146,7 +142,7 @@ func main() {
 		   - When the describe function exits after returning the last item, close the channel to end the background consume function
 		*/
 		fmt.Println("Traffic")
-		trafficCollector := collectors.NewTrafficCollector(*metricsNamespace, nil, true)
+		trafficCollector := collectors.NewTrafficCollector(*metricsNamespace, nil)
 		out = make(chan *prometheus.Desc)
 		go eatOutput(out)
 		trafficCollector.Describe(out)
@@ -181,7 +177,7 @@ func main() {
 	}
 
 	if collectorsFilter.Enabled(filters.TrafficCollector) {
-		trafficCollector := collectors.NewTrafficCollector(*metricsNamespace, netgearClient, *netgearCalculateTrafficDelta)
+		trafficCollector := collectors.NewTrafficCollector(*metricsNamespace, netgearClient)
 		prometheus.MustRegister(trafficCollector)
 	}