From 52a3f5d4045d32d9b2b0ea72f6037d0c38e77df5 Mon Sep 17 00:00:00 2001
From: Pierrick Brossin <dynek@users.noreply.github.com>
Date: Mon, 20 Apr 2020 16:58:50 +0200
Subject: [PATCH] Fibaro input: for battery operated devices, add battery level
 scraping (#7319)

---
 plugins/inputs/fibaro/README.md      |  2 ++
 plugins/inputs/fibaro/fibaro.go      | 17 ++++++++++++-----
 plugins/inputs/fibaro/fibaro_test.go |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/fibaro/README.md b/plugins/inputs/fibaro/README.md
index 68fda0586..54c203102 100644
--- a/plugins/inputs/fibaro/README.md
+++ b/plugins/inputs/fibaro/README.md
@@ -30,6 +30,7 @@ Those values could be true (1) or false (0) for switches, percentage for dimmers
     - name (device name)
     - type (device type)
   - fields:
+    - batteryLevel (float, when available from device)
     - energy (float, when available from device)
     - power (float, when available from device)
     - value (float)
@@ -52,4 +53,5 @@ fibaro,deviceId=220,host=vm1,name=CO2\ (ppm),room=Salon,section=Pièces\ commune
 fibaro,deviceId=221,host=vm1,name=Humidité\ (%),room=Salon,section=Pièces\ communes,type=com.fibaro.humiditySensor value=61 1529996807000000000
 fibaro,deviceId=222,host=vm1,name=Pression\ (mb),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=1013.7 1529996807000000000
 fibaro,deviceId=223,host=vm1,name=Bruit\ (db),room=Salon,section=Pièces\ communes,type=com.fibaro.multilevelSensor value=44 1529996807000000000
+fibaro,deviceId=248,host=vm1,name=Température,room=Garage,section=Extérieur,type=com.fibaro.temperatureSensor batteryLevel=85,value=10.8 1529996807000000000
 ```
diff --git a/plugins/inputs/fibaro/fibaro.go b/plugins/inputs/fibaro/fibaro.go
index 492feaf03..7def0ab09 100644
--- a/plugins/inputs/fibaro/fibaro.go
+++ b/plugins/inputs/fibaro/fibaro.go
@@ -69,11 +69,12 @@ type Devices struct {
 	Type       string `json:"type"`
 	Enabled    bool   `json:"enabled"`
 	Properties struct {
-		Dead   interface{} `json:"dead"`
-		Energy interface{} `json:"energy"`
-		Power  interface{} `json:"power"`
-		Value  interface{} `json:"value"`
-		Value2 interface{} `json:"value2"`
+		BatteryLevel interface{} `json:"batteryLevel"`
+		Dead         interface{} `json:"dead"`
+		Energy       interface{} `json:"energy"`
+		Power        interface{} `json:"power"`
+		Value        interface{} `json:"value"`
+		Value2       interface{} `json:"value2"`
 	} `json:"properties"`
 }
 
@@ -174,6 +175,12 @@ func (f *Fibaro) Gather(acc telegraf.Accumulator) error {
 		}
 		fields := make(map[string]interface{})
 
+		if device.Properties.BatteryLevel != nil {
+			if fValue, err := strconv.ParseFloat(device.Properties.BatteryLevel.(string), 64); err == nil {
+				fields["batteryLevel"] = fValue
+			}
+		}
+
 		if device.Properties.Energy != nil {
 			if fValue, err := strconv.ParseFloat(device.Properties.Energy.(string), 64); err == nil {
 				fields["energy"] = fValue
diff --git a/plugins/inputs/fibaro/fibaro_test.go b/plugins/inputs/fibaro/fibaro_test.go
index a58ad7c31..32a1447e3 100644
--- a/plugins/inputs/fibaro/fibaro_test.go
+++ b/plugins/inputs/fibaro/fibaro_test.go
@@ -107,6 +107,7 @@ const devicesJSON = `
             "type": "com.fibaro.temperatureSensor",
             "enabled": true,
             "properties": {
+                "batteryLevel": "100",
                 "dead": "false",
                 "value": "22.80"
             },
@@ -196,7 +197,7 @@ func TestJSONSuccess(t *testing.T) {
 
 	// Ensure fields / values are correct - Device 4
 	tags = map[string]string{"deviceId": "4", "section": "Section 3", "room": "Room 4", "name": "Device 4", "type": "com.fibaro.temperatureSensor"}
-	fields = map[string]interface{}{"value": float64(22.8)}
+	fields = map[string]interface{}{"batteryLevel": float64(100), "value": float64(22.8)}
 	acc.AssertContainsTaggedFields(t, "fibaro", fields, tags)
 
 	// Ensure fields / values are correct - Device 5