Adds ifAlias label to all exported metrics. (#16)

* Adds ifAlias label to all exported metrics.
m-lab · Sep 21, 2020 · f538650 · f538650
1 parent 3286a68
commit f538650
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -41,6 +41,7 @@ type oid struct {
 	name          string
 	previousValue uint64
 	scope         string
+	ifAlias       string
 	ifDescr       string
 	interval      archive.Model
 }
@@ -54,10 +55,12 @@ func mustGetIfaces(client snmp.Client, machine string) map[string]map[string]str
 	ifaces := map[string]map[string]string{
 		"machine": map[string]string{
 			"iface":   "",
+			"ifAlias": "",
 			"ifDescr": "",
 		},
 		"uplink": map[string]string{
 			"iface":   "",
+			"ifAlias": "",
 			"ifDescr": "",
 		},
 	}
@@ -71,13 +74,15 @@ func mustGetIfaces(client snmp.Client, machine string) map[string]map[string]str
 			ifDescrOid := createOID(ifDescrOidStub, iface)
 			oidMap, err := getOidsString(client, []string{ifDescrOid})
 			rtx.Must(err, "Failed to determine the machine interface ifDescr")
+			ifaces["machine"]["ifAlias"] = machine
 			ifaces["machine"]["ifDescr"] = oidMap[ifDescrOid]
 			ifaces["machine"]["iface"] = iface
 		}
 		if strings.HasPrefix(val, "uplink") {
 			ifDescrOid := createOID(ifDescrOidStub, iface)
 			oidMap, err := getOidsString(client, []string{ifDescrOid})
 			rtx.Must(err, "Failed to determine the uplink interface ifDescr")
+			ifaces["uplink"]["ifAlias"] = "uplink"
 			ifaces["uplink"]["ifDescr"] = oidMap[ifDescrOid]
 			ifaces["uplink"]["iface"] = iface
 		}
@@ -181,9 +186,10 @@ func (metrics *Metrics) Collect(client snmp.Client, config config.Config) error
 		}
 
 		increase := value - metrics.oids[oid].previousValue
+		ifAlias := metrics.oids[oid].ifAlias
 		ifDescr := metrics.oids[oid].ifDescr
 		metricName := metrics.oids[oid].name
-		metrics.prom[metricName].WithLabelValues(ifDescr).Add(float64(increase))
+		metrics.prom[metricName].WithLabelValues(ifAlias, ifDescr).Add(float64(increase))
 
 		metrics.oids[oid].interval.Samples = append(
 			metrics.oids[oid].interval.Samples,
@@ -294,6 +300,7 @@ func New(client snmp.Client, config config.Config, target string, hostname strin
 			o := &oid{
 				name:    metric.Name,
 				scope:   scope,
+				ifAlias: values["ifAlias"],
 				ifDescr: values["ifDescr"],
 				interval: archive.Model{
 					Experiment: target,
@@ -310,6 +317,7 @@ func New(client snmp.Client, config config.Config, target string, hostname strin
 				Help: metric.Description,
 			},
 			[]string{
+				"ifAlias",
 				"interface",
 			},
 		)

diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go
@@ -200,6 +200,7 @@ func Test_New(t *testing.T) {
 			name:          "ifOutDiscards",
 			previousValue: 0,
 			scope:         "machine",
+			ifAlias:       "mlab2",
 			ifDescr:       "xe-0/0/12",
 			interval: archive.Model{
 				Experiment: "s1-abc0t.measurement-lab.org",
@@ -212,6 +213,7 @@ func Test_New(t *testing.T) {
 			name:          "ifOutDiscards",
 			previousValue: 0,
 			scope:         "uplink",
+			ifAlias:       "uplink",
 			ifDescr:       "xe-0/0/45",
 			interval: archive.Model{
 				Experiment: "s1-abc0t.measurement-lab.org",
@@ -224,6 +226,7 @@ func Test_New(t *testing.T) {
 			name:          "ifHCInOctets",
 			previousValue: 0,
 			scope:         "machine",
+			ifAlias:       "mlab2",
 			ifDescr:       "xe-0/0/12",
 			interval: archive.Model{
 				Experiment: "s1-abc0t.measurement-lab.org",
@@ -236,6 +239,7 @@ func Test_New(t *testing.T) {
 			name:          "ifHCInOctets",
 			previousValue: 0,
 			scope:         "uplink",
+			ifAlias:       "uplink",
 			ifDescr:       "xe-0/0/45",
 			interval: archive.Model{
 				Experiment: "s1-abc0t.measurement-lab.org",