From 1e63677ce43ae853eb4f981be0b28b83169b9df0 Mon Sep 17 00:00:00 2001
From: dwillcocks <dwillcocks@users.noreply.github.com>
Date: Mon, 26 Jul 2021 16:57:27 +0100
Subject: [PATCH] Collect ProlongedObstructionDurationSeconds and
 ProlongedObstructionIntervalSeconds

---
 internal/exporter/exporter.go | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/internal/exporter/exporter.go b/internal/exporter/exporter.go
index ccdfc7d..be7e0a0 100644
--- a/internal/exporter/exporter.go
+++ b/internal/exporter/exporter.go
@@ -132,6 +132,16 @@ var (
 		"Unknown",
 		nil, nil,
 	)
+	dishProlongedObstructionDurationSeconds = prometheus.NewDesc(
+		prometheus.BuildFQName(namespace, "dish", "prolonged_obstruction_duration_seconds"),
+		"Average in seconds of prolonged obstructions",
+		nil, nil,
+	)
+	dishProlongedObstructionIntervalSeconds = prometheus.NewDesc(
+		prometheus.BuildFQName(namespace, "dish", "prolonged_obstruction_interval_seconds"),
+		"Average prolonged obstruction interval in seconds",
+		nil, nil,
+	)
 	dishWedgeFractionObstructionRatio = prometheus.NewDesc(
 		prometheus.BuildFQName(namespace, "dish", "wedge_fraction_obstruction_ratio"),
 		"Percentage of obstruction per wedge section",
@@ -241,6 +251,8 @@ func (e *Exporter) Describe(ch chan<- *prometheus.Desc) {
 	ch <- dishFractionObstructionRatio
 	ch <- dishLast24hObstructedSeconds
 	ch <- dishValidSeconds
+	ch <- dishProlongedObstructionDurationSeconds
+	ch <- dishProlongedObstructionIntervalSeconds
 	ch <- dishWedgeFractionObstructionRatio
 	ch <- dishWedgeAbsFractionObstructionRatio
 
@@ -263,14 +275,12 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
 	ok = ok && e.collectDishObstructions(ch)
 	ok = ok && e.collectDishAlerts(ch)
 
-	dishDuration := time.Since(start).Seconds()
-
 	if ok {
 		ch <- prometheus.MustNewConstMetric(
 			dishUp, prometheus.GaugeValue, 1.0,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			dishScrapeDurationSeconds, prometheus.GaugeValue, dishDuration,
+			dishScrapeDurationSeconds, prometheus.GaugeValue, time.Since(start).Seconds(),
 		)
 	} else {
 		ch <- prometheus.MustNewConstMetric(
@@ -290,7 +300,7 @@ func (e *Exporter) collectDishContext(ch chan<- prometheus.Metric) bool {
 	if err != nil {
 		st, ok := status.FromError(err)
 		if ok && st.Code() != 7 {
-			log.Errorf("failed to collect context from dish: %s", err.Error())
+			log.Errorf("failed to collect dish context: %s", err.Error())
 			return false
 		}
 	}
@@ -416,6 +426,14 @@ func (e *Exporter) collectDishObstructions(ch chan<- prometheus.Metric) bool {
 		dishValidSeconds, prometheus.GaugeValue, float64(obstructions.GetValidS()),
 	)
 
+	ch <- prometheus.MustNewConstMetric(
+		dishProlongedObstructionDurationSeconds, prometheus.GaugeValue, float64(obstructions.GetAvgProlongedObstructionDurationS()),
+	)
+
+	ch <- prometheus.MustNewConstMetric(
+		dishProlongedObstructionIntervalSeconds, prometheus.GaugeValue, float64(obstructions.GetAvgProlongedObstructionIntervalS()),
+	)
+
 	for i, v := range obstructions.GetWedgeFractionObstructed() {
 		ch <- prometheus.MustNewConstMetric(
 			dishWedgeFractionObstructionRatio, prometheus.GaugeValue, float64(v),