ignore datapoints from offline devices

Signed-off-by: Markus Blaschke <[email protected]>

config/opts.go

@@ -21,6 +21,10 @@ type (
 				ClientID     string `long:"myuplink.auth.clientid"      env:"MYUPLINK_AUTH_CLIENTID"      description:"ClientID from myUplink" required:"yes"`
 				ClientSecret string `long:"myuplink.auth.clientsecret"  env:"MYUPLINK_AUTH_CLIENTSECRET"  description:"ClientSecret from myUplink" json:"-"  required:"yes"`
 			}
+
+			Device struct {
+				AllowedConnectionStates []string `long:"myuplink.device.allowed-connectionstates"  env:"MYUPLINK_DEVICE_ALLOWED_CONNECTIONSTATES"  env-delim:"," description:"Allowed device connection states" default:"Connected"`
+			}
 		}
 
 		// general options

myuplink/results.go

@@ -1,6 +1,7 @@
 package myuplink
 
 import (
+	"strings"
 	"time"
 )
 
@@ -10,23 +11,25 @@ type (
 		ItemsPerPage int `json:"itemsPerPage"`
 		NumItems     int `json:"numItems"`
 		Systems      []struct {
-			SystemID      string `json:"systemId"`
-			Name          string `json:"name"`
-			SecurityLevel string `json:"securityLevel"`
-			HasAlarm      bool   `json:"hasAlarm"`
-			Country       string `json:"country"`
-			Devices       []struct {
-				ID               string `json:"id"`
-				ConnectionState  string `json:"connectionState"`
-				CurrentFwVersion string `json:"currentFwVersion"`
-				Product          struct {
-					SerialNumber string `json:"serialNumber"`
-					Name         string `json:"name"`
-				} `json:"product"`
-			} `json:"devices"`
+			SystemID      string         `json:"systemId"`
+			Name          string         `json:"name"`
+			SecurityLevel string         `json:"securityLevel"`
+			HasAlarm      bool           `json:"hasAlarm"`
+			Country       string         `json:"country"`
+			Devices       []SystemDevice `json:"devices"`
 		} `json:"systems"`
 	}
 
+	SystemDevice struct {
+		ID               string `json:"id"`
+		ConnectionState  string `json:"connectionState"`
+		CurrentFwVersion string `json:"currentFwVersion"`
+		Product          struct {
+			SerialNumber string `json:"serialNumber"`
+			Name         string `json:"name"`
+		} `json:"product"`
+	}
+
 	SystemDeviceFirmwareInfo struct {
 		DeviceID         string `json:"deviceId"`
 		FirmwareID       string `json:"firmwareId"`
@@ -57,3 +60,13 @@ type (
 		ZoneID     string `json:"zoneId"`
 	}
 )
+
+func (d *SystemDevice) IsConnectionStateAllowed(allowedValues []string) bool {
+	for _, allowedVal := range allowedValues {
+		if strings.EqualFold(d.ConnectionState, allowedVal) {
+			return true
+		}
+	}
+
+	return false
+}

probe.go

@@ -73,6 +73,11 @@ func myuplinkProbe(w http.ResponseWriter, r *http.Request) {
 		}).Set(1)
 
 		for _, device := range system.Devices {
+			if !device.IsConnectionStateAllowed(opts.MyUplink.Device.AllowedConnectionStates) {
+				contextLogger.Warnf(`ignoring system "%s" device "%s", connection state is "%s"`, system.Name, device.ID, device.ConnectionState)
+				continue
+			}
+
 			metrics.systemDevice.With(prometheus.Labels{
 				"systemID":        system.SystemID,
 				"deviceID":        device.ID,