Export latest_value and sensor_interface_name for active anomalies

README.md

@@ -75,12 +75,12 @@ wanguard_announcements_finished 1
 ### Anomalies Collector
 Metric | Type | Description | Labels
 -------|------|-------------|-------
-wanguard_anomalies_active | gauge | Active anomalies at the moment | anomaly, anomaly_id, bits, bits_s, duration, packets, pkts_s, prefix
+wanguard_anomalies_active | gauge | Active anomalies at the moment | anomaly, anomaly_id, bits, bits_s, duration, latest_value, packets, pkts_s, prefix, sensor_interface_name
 wanguard_anomalies_finished | gauge | Number of finished anomalies |
 
 Example:
 ```
-wanguard_anomalies_active{anomaly="ICMP pkts/s > 1",anomaly_id="1",bits="169576384000",bits_s="9014400",duration="60",packets="320020500",pkts_s="17500",prefix="10.10.10.10/32"} 1
+wanguard_anomalies_active{anomaly="ICMP pkts/s > 1",anomaly_id="1",bits="169576384000",bits_s="9014400",duration="60",latest_value="17500",packets="320020500",pkts_s="17500",prefix="10.10.10.10/32",sensor_interface_name="Interface 1"} 1
 wanguard_anomalies_finished 1
 ```
 

collectors/anomalies_collector.go

@@ -19,21 +19,25 @@ type AnomaliesCount struct {
 }
 
 type Anomaly struct {
-	AnomalyId string `json:"anomaly_id"`
-	Prefix    string
-	Anomaly   string
-	Duration  string
-	Pkts_s    string `json:"pkts/s"`
-	Bits_s    string `json:"bits/s"`
-	Packets   string
-	Bits      string
+	AnomalyId   string `json:"anomaly_id"`
+	Prefix      string
+	Anomaly     string
+	Duration    string
+	Pkts_s      string `json:"pkts/s"`
+	Bits_s      string `json:"bits/s"`
+	Packets     string
+	Bits        string
+	LatestValue string `json:"latest_value"`
+	Sensor      struct {
+		SensorInterfaceName string `json:"sensor_interface_name"`
+	} `json:"sensor"`
 }
 
 func NewAnomaliesCollector(wgclient *wgc.Client) *AnomaliesCollector {
 	prefix := "wanguard_anomalies_"
 	return &AnomaliesCollector{
 		wgClient:          wgclient,
-		AnomalyActive:     prometheus.NewDesc(prefix+"active", "Active anomalies at the moment", []string{"prefix", "anomaly", "anomaly_id", "duration", "pkts_s", "packets", "bits_s", "bits"}, nil),
+		AnomalyActive:     prometheus.NewDesc(prefix+"active", "Active anomalies at the moment", []string{"prefix", "anomaly", "anomaly_id", "duration", "pkts_s", "packets", "bits_s", "bits", "latest_value", "sensor_interface_name"}, nil),
 		AnomaliesFinished: prometheus.NewDesc(prefix+"finished", "Number of finished anomalies", nil, nil),
 	}
 }
@@ -51,7 +55,7 @@ func (c *AnomaliesCollector) Collect(ch chan<- prometheus.Metric) {
 func collectActiveAnomalies(desc *prometheus.Desc, wgclient *wgc.Client, ch chan<- prometheus.Metric) {
 	var anomalies []Anomaly
 
-	err := wgclient.GetParsed("anomalies?status=Active&fields=anomaly_id,anomaly,prefix,duration,pkts/s,packets,bits/s,bits", &anomalies)
+	err := wgclient.GetParsed("anomalies?status=Active&fields=anomaly_id,anomaly,prefix,duration,pkts/s,packets,bits/s,bits,latest_value,sensor", &anomalies)
 	if err != nil {
 		return
 	}
@@ -65,7 +69,9 @@ func collectActiveAnomalies(desc *prometheus.Desc, wgclient *wgc.Client, ch chan
 			anomaly.Pkts_s,
 			anomaly.Packets,
 			anomaly.Bits_s,
-			anomaly.Bits)
+			anomaly.Bits,
+			anomaly.LatestValue,
+			anomaly.Sensor.SensorInterfaceName)
 	}
 }
 

collectors/anomalies_collector_test.go

@@ -40,7 +40,7 @@ func anomaliesExpectedMetrics() string {
 	return `
 	# HELP wanguard_anomalies_active Active anomalies at the moment
 	# TYPE wanguard_anomalies_active gauge
-	wanguard_anomalies_active{anomaly="ICMP pkts/s > 1",anomaly_id="1",bits="169576384000",bits_s="9014400",duration="60",packets="320020500",pkts_s="17500",prefix="10.10.10.10/32"} 1
+	wanguard_anomalies_active{anomaly="ICMP pkts/s > 1",anomaly_id="1",bits="169576384000",bits_s="9014400",duration="60",latest_value="130961807",packets="320020500",pkts_s="17500",prefix="10.10.10.10/32",sensor_interface_name="sFlows Filter Cluster"} 1
 
 	# HELP wanguard_anomalies_finished Number of finished anomalies
 	# TYPE wanguard_anomalies_finished gauge

collectors/collector_test.go

@@ -270,6 +270,12 @@ func anomaliesPayload() string {
     "bits/s": "9014400",
     "packets": "320020500",
     "bits": "169576384000",
+    "latest_value": "130961807",
+    "sensor": {
+      "sensor_interface_name": "sFlows Filter Cluster",
+      "sensor_interface_id": "4-1-0",
+      "href": "/wanguard-api/v1/sensor_clusters/1"
+    },
     "href": "/wanguard-api/v1/anomalies/1"
   }
 ]`

wanguard_exporter.go

@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	version string = "1.6"
+	version string = "1.7"
 )
 
 type collectorsList struct {