From 525b8fc5f4d7fcc5b2be5c55de4eaf4b5f89d87e Mon Sep 17 00:00:00 2001
From: oGi4i <das.ogi4i@gmail.com>
Date: Sat, 12 Dec 2020 21:27:43 +0300
Subject: [PATCH] added more interface labels

---
 collector/interface_collector.go | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/collector/interface_collector.go b/collector/interface_collector.go
index b1bc4ff..228a325 100644
--- a/collector/interface_collector.go
+++ b/collector/interface_collector.go
@@ -21,11 +21,11 @@ func newInterfaceCollector() routerOSCollector {
 }
 
 func (c *interfaceCollector) init() {
-	c.props = []string{"name", "comment", "rx-byte", "tx-byte", "rx-packet", "tx-packet", "rx-error", "tx-error", "rx-drop", "tx-drop"}
+	c.props = []string{"name", "type", "disabled", "running", "comment", "rx-byte", "tx-byte", "rx-packet", "tx-packet", "rx-error", "tx-error", "rx-drop", "tx-drop"}
 
-	labelNames := []string{"name", "address", "interface", "comment"}
+	labelNames := []string{"name", "address", "interface", "type", "disabled", "running", "comment"}
 	c.descriptions = make(map[string]*prometheus.Desc)
-	for _, p := range c.props[1:] {
+	for _, p := range c.props[5:] {
 		c.descriptions[p] = descriptionForPropertyName("interface", p, labelNames)
 	}
 }
@@ -50,7 +50,7 @@ func (c *interfaceCollector) collect(ctx *collectorContext) error {
 }
 
 func (c *interfaceCollector) fetch(ctx *collectorContext) ([]*proto.Sentence, error) {
-	reply, err := ctx.client.Run("/interface/print", "?disabled=false", "?running=true", "=.proplist="+strings.Join(c.props, ","))
+	reply, err := ctx.client.Run("/interface/print", "=.proplist="+strings.Join(c.props, ","))
 	if err != nil {
 		log.WithFields(log.Fields{
 			"device": ctx.device.Name,
@@ -63,28 +63,25 @@ func (c *interfaceCollector) fetch(ctx *collectorContext) ([]*proto.Sentence, er
 }
 
 func (c *interfaceCollector) collectForStat(re *proto.Sentence, ctx *collectorContext) {
-	name := re.Map["name"]
-	comment := re.Map["comment"]
-
-	for _, p := range c.props[2:] {
-		c.collectMetricForProperty(p, name, comment, re, ctx)
+	for _, p := range c.props[5:] {
+		c.collectMetricForProperty(p, re, ctx)
 	}
 }
 
-func (c *interfaceCollector) collectMetricForProperty(property, iface, comment string, re *proto.Sentence, ctx *collectorContext) {
+func (c *interfaceCollector) collectMetricForProperty(property string, re *proto.Sentence, ctx *collectorContext) {
 	desc := c.descriptions[property]
 	if value := re.Map[property]; value != "" {
 		v, err := strconv.ParseFloat(value, 64)
 		if err != nil {
 			log.WithFields(log.Fields{
 				"device":    ctx.device.Name,
-				"interface": iface,
+				"interface": re.Map["name"],
 				"property":  property,
 				"value":     value,
 				"error":     err,
 			}).Error("error parsing interface metric value")
 			return
 		}
-		ctx.ch <- prometheus.MustNewConstMetric(desc, prometheus.CounterValue, v, ctx.device.Name, ctx.device.Address, iface, comment)
+		ctx.ch <- prometheus.MustNewConstMetric(desc, prometheus.CounterValue, v, ctx.device.Name, ctx.device.Address, re.Map["name"], re.Map["type"], re.Map["disabled"], re.Map["running"], re.Map["comment"])
 	}
 }