Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e28042f3be
|
|||
|
e1ad76f703
|
|||
|
6dac149a48
|
@@ -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:
|
||||
|
||||
@@ -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`" \
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
{
|
||||
"topics": [ "shellyplusht/+/status/humidity:0" ],
|
||||
"handler": "SVEJ",
|
||||
"id": "SVE4",
|
||||
"id": "SVEJ3",
|
||||
"config": {
|
||||
"databaseConnStr": "",
|
||||
"attributes": {
|
||||
@@ -175,6 +175,34 @@
|
||||
"unitSelector": "C:%"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"topics": [ "shellies/sensor/+/status/temperature:0" ],
|
||||
"handler": "SVEJ",
|
||||
"id": "SVEJ4",
|
||||
"config": {
|
||||
"databaseConnStr": "",
|
||||
"attributes": {
|
||||
"application": "Temperature Shellies",
|
||||
"deviceSelector": "T:1",
|
||||
"valueSelector": "J:$.tC",
|
||||
"unitSelector": "C:°C"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"topics": [ "shellies/sensor+/status/humidity:0" ],
|
||||
"handler": "SVEJ",
|
||||
"id": "SVEJ5",
|
||||
"config": {
|
||||
"databaseConnStr": "",
|
||||
"attributes": {
|
||||
"application": "Humidity Shellies",
|
||||
"deviceSelector": "T:1",
|
||||
"valueSelector": "J:$.rh",
|
||||
"unitSelector": "C:%"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"archiver": {
|
||||
|
||||
@@ -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-----
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user