feat(probe): Add vlanid label to interface metrics

Signed-off-by: Jad Seifeddine <jad.seifeddine@icloud.com>

Author: Jad Seifeddine

pkg/probe/system_interface.go

@@ -1,53 +1,54 @@
 package probe
 
 import (
-	"log"
-
-	"github.com/bluecmd/fortigate_exporter/pkg/http"
-	"github.com/prometheus/client_golang/prometheus"
+    "log"
+    "strconv"
+    "github.com/bluecmd/fortigate_exporter/pkg/http"
+    "github.com/prometheus/client_golang/prometheus"
+    "github.com/prometheus-community/fortigate_exporter/pkg/fortigatehttpclient"
 )
 
 func probeSystemInterface(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	var (
 		mLink = prometheus.NewDesc(
 			"fortigate_interface_link_up",
 			"Whether the link is up or not (not taking into account admin status)",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 		mSpeed = prometheus.NewDesc(
 			"fortigate_interface_speed_bps",
 			"Speed negotiated on the port in bits/s",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 		mTxPkts = prometheus.NewDesc(
 			"fortigate_interface_transmit_packets_total",
 			"Number of packets transmitted on the interface",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 		mRxPkts = prometheus.NewDesc(
 			"fortigate_interface_receive_packets_total",
 			"Number of packets received on the interface",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 		mTxB = prometheus.NewDesc(
 			"fortigate_interface_transmit_bytes_total",
 			"Number of bytes transmitted on the interface",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 		mRxB = prometheus.NewDesc(
 			"fortigate_interface_receive_bytes_total",
 			"Number of bytes received on the interface",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 		mTxErr = prometheus.NewDesc(
 			"fortigate_interface_transmit_errors_total",
 			"Number of transmission errors detected on the interface",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 		mRxErr = prometheus.NewDesc(
 			"fortigate_interface_receive_errors_total",
 			"Number of reception errors detected on the interface",
-			[]string{"vdom", "name", "alias", "parent"}, nil,
+			[]string{"vdom", "name", "vlanid", "alias", "parent"}, nil,
 		)
 	)
 
@@ -64,6 +65,7 @@ func probeSystemInterface(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.
 		RxBytes   float64 `json:"rx_bytes"`
 		TxErrors  float64 `json:"tx_errors"`
 		RxErrors  float64 `json:"rx_errors"`
+		VlanID  int `json:"vlanid"`
 		Interface string
 	}
 	type ifResponse struct {
@@ -83,14 +85,15 @@ func probeSystemInterface(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.
 			if ir.Link {
 				linkf = 1.0
 			}
-			m = append(m, prometheus.MustNewConstMetric(mLink, prometheus.GaugeValue, linkf, v.VDOM, ir.Name, ir.Alias, ir.Interface))
-			m = append(m, prometheus.MustNewConstMetric(mSpeed, prometheus.GaugeValue, ir.Speed*1000*1000, v.VDOM, ir.Name, ir.Alias, ir.Interface))
-			m = append(m, prometheus.MustNewConstMetric(mTxPkts, prometheus.CounterValue, ir.TxPackets, v.VDOM, ir.Name, ir.Alias, ir.Interface))
-			m = append(m, prometheus.MustNewConstMetric(mRxPkts, prometheus.CounterValue, ir.RxPackets, v.VDOM, ir.Name, ir.Alias, ir.Interface))
-			m = append(m, prometheus.MustNewConstMetric(mTxB, prometheus.CounterValue, ir.TxBytes, v.VDOM, ir.Name, ir.Alias, ir.Interface))
-			m = append(m, prometheus.MustNewConstMetric(mRxB, prometheus.CounterValue, ir.RxBytes, v.VDOM, ir.Name, ir.Alias, ir.Interface))
-			m = append(m, prometheus.MustNewConstMetric(mTxErr, prometheus.CounterValue, ir.TxErrors, v.VDOM, ir.Name, ir.Alias, ir.Interface))
-			m = append(m, prometheus.MustNewConstMetric(mRxErr, prometheus.CounterValue, ir.RxErrors, v.VDOM, ir.Name, ir.Alias, ir.Interface))
+			vlan_string := strconv.Itoa(ir.VlanID)
+			m = append(m, prometheus.MustNewConstMetric(mLink, prometheus.GaugeValue, linkf, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
+			m = append(m, prometheus.MustNewConstMetric(mSpeed, prometheus.GaugeValue, ir.Speed*1000*1000, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
+			m = append(m, prometheus.MustNewConstMetric(mTxPkts, prometheus.CounterValue, ir.TxPackets, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
+			m = append(m, prometheus.MustNewConstMetric(mRxPkts, prometheus.CounterValue, ir.RxPackets, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
+			m = append(m, prometheus.MustNewConstMetric(mTxB, prometheus.CounterValue, ir.TxBytes, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
+			m = append(m, prometheus.MustNewConstMetric(mRxB, prometheus.CounterValue, ir.RxBytes, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
+			m = append(m, prometheus.MustNewConstMetric(mTxErr, prometheus.CounterValue, ir.TxErrors, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
+			m = append(m, prometheus.MustNewConstMetric(mRxErr, prometheus.CounterValue, ir.RxErrors, v.VDOM, ir.Name, vlan_string, ir.Alias, ir.Interface))
 		}
 	}
 	return m, true