anomaliesCollector: Add wanguard_anomaly_latest_value metric

Author: NerijusRazvodovskis

Makefile

@@ -1,4 +1,4 @@
-EXPORTER_VERSION=1.7
+EXPORTER_VERSION=1.8
 PACKAGES_DIR=compiled_packages
 
 all: test build clean

README.md

@@ -76,11 +76,13 @@ wanguard_announcements_finished 1
 Metric | Type | Description | Labels
 -------|------|-------------|-------
 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_anomaly_latest_value | gauge | Latest measurement value for active anomaly | anomaly, anomaly_id, 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",latest_value="17500",packets="320020500",pkts_s="17500",prefix="10.10.10.10/32",sensor_interface_name="Interface 1"} 1
+wanguard_anomaly_latest_value{anomaly="ICMP pkts/s > 1",anomaly_id="1",prefix="10.10.10.10/32",sensor_interface_name="Interface 1"} 17500
 wanguard_anomalies_finished 1
 ```
 

collectors/anomalies_collector.go

@@ -9,9 +9,10 @@ import (
 )
 
 type AnomaliesCollector struct {
-	wgClient          *wgc.Client
-	AnomalyActive     *prometheus.Desc
-	AnomaliesFinished *prometheus.Desc
+	wgClient           *wgc.Client
+	AnomalyActive      *prometheus.Desc
+	AnomalyLatestValue *prometheus.Desc
+	AnomaliesFinished  *prometheus.Desc
 }
 
 type AnomaliesCount struct {
@@ -36,23 +37,25 @@ type Anomaly struct {
 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", "latest_value", "sensor_interface_name"}, nil),
-		AnomaliesFinished: prometheus.NewDesc(prefix+"finished", "Number of finished anomalies", nil, nil),
+		wgClient:           wgclient,
+		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),
+		AnomalyLatestValue: prometheus.NewDesc("wanguard_anomaly_latest_value", "Latest measurement value for active anomaly", []string{"prefix", "anomaly", "anomaly_id", "sensor_interface_name"}, nil),
+		AnomaliesFinished:  prometheus.NewDesc(prefix+"finished", "Number of finished anomalies", nil, nil),
 	}
 }
 
 func (c *AnomaliesCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- c.AnomalyActive
+	ch <- c.AnomalyLatestValue
 	ch <- c.AnomaliesFinished
 }
 
 func (c *AnomaliesCollector) Collect(ch chan<- prometheus.Metric) {
-	collectActiveAnomalies(c.AnomalyActive, c.wgClient, ch)
+	collectActiveAnomalies(c.AnomalyActive, c.AnomalyLatestValue, c.wgClient, ch)
 	collectFinishedAnomaliesTotal(c.AnomaliesFinished, c.wgClient, ch)
 }
 
-func collectActiveAnomalies(desc *prometheus.Desc, wgclient *wgc.Client, ch chan<- prometheus.Metric) {
+func collectActiveAnomalies(desc *prometheus.Desc, latestValueDesc *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,latest_value,sensor", &anomalies)
@@ -72,6 +75,14 @@ func collectActiveAnomalies(desc *prometheus.Desc, wgclient *wgc.Client, ch chan
 			anomaly.Bits,
 			anomaly.LatestValue,
 			anomaly.Sensor.SensorInterfaceName)
+
+		if v, err := strconv.ParseFloat(anomaly.LatestValue, 64); err == nil {
+			ch <- prometheus.MustNewConstMetric(latestValueDesc, prometheus.GaugeValue, v,
+				anomaly.Prefix,
+				anomaly.Anomaly,
+				anomaly.AnomalyId,
+				anomaly.Sensor.SensorInterfaceName)
+		}
 	}
 }
 

collectors/anomalies_collector_test.go

@@ -14,8 +14,8 @@ func TestAnomaliesCollector(t *testing.T) {
 	AnomaliesCollector := NewAnomaliesCollector(wgcClient)
 
 	metricsCount := testutil.CollectAndCount(AnomaliesCollector)
-	if metricsCount != 2 {
-		t.Errorf("Expected 2 metrics, got %d", metricsCount)
+	if metricsCount != 3 {
+		t.Errorf("Expected 3 metrics, got %d", metricsCount)
 	}
 
 	lintErrors, err := testutil.CollectAndLint(AnomaliesCollector)
@@ -30,6 +30,7 @@ func TestAnomaliesCollector(t *testing.T) {
 	expectedMetrics := anomaliesExpectedMetrics()
 	err = testutil.CollectAndCompare(AnomaliesCollector, strings.NewReader(expectedMetrics),
 		"wanguard_anomalies_active",
+		"wanguard_anomaly_latest_value",
 		"wanguard_anomalies_finished")
 	if err != nil {
 		t.Errorf("Expected no error, got %s", err)
@@ -41,7 +42,11 @@ func anomaliesExpectedMetrics() string {
 	# 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",latest_value="130961807",packets="320020500",pkts_s="17500",prefix="10.10.10.10/32",sensor_interface_name="sFlows Filter Cluster"} 1
-	
+
+	# HELP wanguard_anomaly_latest_value Latest measurement value for active anomaly
+	# TYPE wanguard_anomaly_latest_value gauge
+	wanguard_anomaly_latest_value{anomaly="ICMP pkts/s > 1",anomaly_id="1",prefix="10.10.10.10/32",sensor_interface_name="sFlows Filter Cluster"} 1.30961807e+08
+
 	# HELP wanguard_anomalies_finished Number of finished anomalies
 	# TYPE wanguard_anomalies_finished gauge
 	wanguard_anomalies_finished 1

wanguard_exporter.go

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