small j for float 3

deployment/deploy-yml.tmpl

@@ -17,7 +17,7 @@ metadata:
   labels:
     app: udi
   annotations:
-    secret.reloader.stakater.com/reload: "%PRE%-udi-conf,%PRE%-udi-db-cred,%PRE%-mqtt-password"
+    secret.reloader.stakater.com/reload: "%PRE%-udi-conf,%PRE%-udi-db-cred,%PRE%-mqtt-password,%PRE%-udi-influxdb-cred"
 spec:
   replicas: 1
   selector:
@@ -36,6 +36,8 @@ spec:
                 name: %PRE%-udi-db-cred
             - secretRef:
                 name: %PRE%-mqtt-password
+            - secretRef:
+                name: %PRE%-udi-influxdb-cred
             - configMapRef:
                 name: %PRE%-udi-conf
           volumeMounts:

deployment/deploy.sh

@@ -67,6 +67,7 @@ for NAMESPACE_DIR in `find $INSTANCES_DIR -type d -mindepth 1 -maxdepth 1`; do
     DATABASE_VARIABLE=$VARIABLE_PREFIX"_PGDATABASE"
     NEW_UDI_DB_DATABASE="${!DATABASE_VARIABLE}"
     NEW_UDI_DB_HOST=database.database1.svc.cluster.local
+    INFLUXDB_URL=$VARIABLE_PREFIX"_INFLUXDB_URL"
 
     kubectl create secret generic $INSTANCE-udi-db-cred \
       --dry-run=client \
@@ -79,6 +80,13 @@ for NAMESPACE_DIR in `find $INSTANCES_DIR -type d -mindepth 1 -maxdepth 1`; do
       --from-literal=PGSSLMODE="require" | \
       kubectl apply -f - -n $NAMESPACE
 
+    kubectl create secret generic $INSTANCE-udi-influxdb-cred \
+      --dry-run=client \
+      -o yaml \
+      --save-config \
+      --from-literal=INFLUXDB_URL="${!INFLUXDB_URL}" | \
+      kubectl apply -f - -n $NAMESPACE
+
     # set configuration as configMap
     kubectl create configmap $INSTANCE-udi-conf \
       --from-literal=UDI_CONF="`cat $CONFIG_FILE`" \

deployment/instances/udi-influx/default/config.json

@@ -165,7 +165,7 @@
     {
       "topics": [ "shellyplusht/+/status/humidity:0" ],
       "handler": "SVEJ",
-      "id": "SVE4",
+      "id": "SVEJ3",
       "config": {
         "databaseConnStr": "",
         "attributes": {
@@ -175,6 +175,48 @@
           "unitSelector": "C:%"
         }
       }
+    },
+    {
+      "topics": [ "shellies/sensor/+/status/temperature:0" ],
+      "handler": "SVEJ",
+      "id": "SVEJ4",
+      "config": {
+        "databaseConnStr": "",
+        "attributes": {
+          "application": "Shellies Sensor Temperature",
+          "deviceSelector": "T:2",
+          "valueSelector": "J:$.tC",
+          "unitSelector": "C:°C"
+        }
+      }
+    },
+    {
+      "topics": [ "shellies/sensor/+/status/humidity:0" ],
+      "handler": "SVEJ",
+      "id": "SVEJ5",
+      "config": {
+        "databaseConnStr": "",
+        "attributes": {
+          "application": "Shellies Sensor Humidity",
+          "deviceSelector": "T:2",
+          "valueSelector": "J:$.rh",
+          "unitSelector": "C:%"
+        }
+      }
+    },
+    {
+      "topics": [ "shellies/sensor/+/status/devicepower:0" ],
+      "handler": "SVEJ",
+      "id": "SVEJ6",
+      "config": {
+        "databaseConnStr": "",
+        "attributes": {
+          "application": "Shellies Sensor Power",
+          "deviceSelector": "T:2",
+          "valueSelector": "J:$.battery.percent",
+          "unitSelector": "C:%"
+        }
+      }
     }
   ],
   "archiver": {

deployment/secrets.asc

@@ -1,7 +1,8 @@
 -----BEGIN PGP MESSAGE-----
 
-jA0ECQMIOpibMyX5/pH90mMBMdpIUJC/lR3BeUddyWJjwixQcePZIAQ/QEV6VO71
-2cleQWnw8Ll5/bKtDv94UMLDZy86YdcNyeUXDP5cYPrGAFqWLaBmkLbpAJf7LRtb
-nckgwR1+++GPvn5vNYcqGt92pB0=
-=xy3G
+jA0ECQMIYUoTHR96Qfb90psBoxuk38UXPXTWPCmdW690bi2+w34S4NLHZvHfe3Ra
+nck319+PXvr0agfHGZ733hhTQv4sa8I2o6ICrgFqtKGfHmgnqL5kYNP9+NuV/IsF
+x3dxwjEejsZ5GYn/zk+CQceItQ8nyyJc2ms1KwTu2r4hMzuHmnVtvKxNCzPrw2N5
+SJIRhh41eequFkzELQqqXXu10raBFsttOemVhA==
+=TySu
 -----END PGP MESSAGE-----

src/udi/database/database.go

@@ -40,7 +40,7 @@ func NewDatabaseHandle() *DatabaseHandle {
 	})
 
 	if err != nil {
-		log.Printf("Unable to create InfluxDB client: %s", err)
+		log.Printf("Unable to create InfluxDB client (config: URL: %s, Username: %s, Password: %s): %s", influxDB, username, password, err)
 		db.initialized = false
 		return &db
 	}

src/udi/handlers/svej/svej.go

@@ -1,16 +1,17 @@
 package svej
 
 import (
+	"encoding/json"
+	"fmt"
 	"log"
-  "time"
 	"strconv"
 	"strings"
-  "fmt"
-  "github.com/oliveagle/jsonpath"
-  "encoding/json"
+	"time"
 	"udi/config"
-  "udi/handlers/handler"
 	"udi/database"
+	"udi/handlers/handler"
+
+	"github.com/oliveagle/jsonpath"
 )
 
 type SingleValueExtractorJsonpathHandler struct {
@@ -33,9 +34,8 @@ T:TopicPartIndex
 C:ConstantValue
 */
 
-
 func New(id string, config config.HandlerConfigT) handler.Handler {
-  t := &SingleValueExtractorJsonpathHandler {
+	t := &SingleValueExtractorJsonpathHandler{
 		ready: false,
 	}
 
@@ -76,12 +76,12 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
 	t.Id = id
 	t.ready = true
 	t.dbh = database.NewDatabaseHandle()
-  log.Printf("Handler SVEJ %d initialized", id)
+	log.Printf("Handler SVEJ %s initialized", id)
 	return t
 }
 
-func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (string, error) {
-  var res string
+func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (interface{}, error) {
+	var res interface{}
 	switch selector[:2] {
 	case "J:":
 		// extract using jsonpath from payload
@@ -89,7 +89,7 @@ func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []st
 		if e != nil {
 			return "", fmt.Errorf("jp.Lookup failed with %s", e)
 		}
-    res = fmt.Sprint(r)
+		res = r
 	case "T:":
 		// T: extract from topic
 		i, e := strconv.Atoi(selector[2:])
@@ -109,9 +109,8 @@ func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []st
 	return res, nil
 }
 
-
 func (self *SingleValueExtractorJsonpathHandler) Handle(message handler.MessageT) {
-  if ! self.ready {
+	if !self.ready {
 		self.Lost("Handler is not marked as ready", nil, message)
 		return
 	}
@@ -149,12 +148,12 @@ func (self *SingleValueExtractorJsonpathHandler) Handle(message handler.MessageT
 		return
 	}
 
-  measurement.Device = device
+	measurement.Device = device.(string)
 
 	var variable database.VariableType
 	variable.Label = ""
 	variable.Variable = ""
-  variable.Unit = unit
+	variable.Unit = unit.(string)
 	variable.Value = value
 	measurement.Values = make(map[string]database.VariableType)
 	measurement.Values["Value"] = variable
@@ -163,4 +162,3 @@ func (self *SingleValueExtractorJsonpathHandler) Handle(message handler.MessageT
 	self.dbh.StoreMeasurement(&measurement)
 	self.S()
 }
-