Multitenancy support (#17)

add multitenancy (multiple agent instances with different cloud servers) support

debian/changelog

@@ -1,3 +1,9 @@
+wb-cloud-agent (1.4.0) stable; urgency=medium
+
+  * Add multi-provider support
+
+ -- Aleksandr Kazadaev <[email protected]>  Tue, 2 Apr 2024 15:49:17 +0500
+
 wb-cloud-agent (1.3.3) stable; urgency=medium
 
   * Confirm unknown events without handling

debian/control

@@ -15,7 +15,7 @@ Depends: ${misc:Depends},
          telegraf-wb-cloud-agent | telegraf,
          frpc,
          curl,
-         python3-wb-common (>= 2.1.1)
-Recommends: wb-mqtt-homeui (>= 2.77.0~~)
+         python3-wb-common (>= 2.1.3)
+Recommends: wb-mqtt-homeui (>= 2.82.5~~)
 Description: Wiren Board Cloud agent
  This package provides Wiren Board Cloud agent service.

debian/rules

@@ -5,5 +5,8 @@
 
 override_dh_installsystemd:
 	dh_installsystemd --name=wb-cloud-agent
+	dh_installsystemd --name=wb-cloud-agent@ --no-start --no-enable
 	dh_installsystemd --name=wb-cloud-agent-telegraf --no-start --no-enable
+	dh_installsystemd --name=wb-cloud-agent-telegraf@ --no-start --no-enable
 	dh_installsystemd --name=wb-cloud-agent-frpc --no-start --no-enable
+	dh_installsystemd --name=wb-cloud-agent-frpc@ --no-start --no-enable

debian/wb-cloud-agent.postinst

@@ -12,13 +12,15 @@ cert_is_valid() {
 
 ORIGINAL_CERT=/etc/ssl/certs/device_bundle.crt.pem
 TARGET_CERT=/var/lib/wb-cloud-agent/device_bundle.crt.pem
+AGENT_CONFIG="/mnt/data/etc/wb-cloud-agent.conf"
 
 if [ ! -f "$ORIGINAL_CERT" ]; then
     echo "Can't find device certificate!"
     exit 1
 fi
 
-mkdir -p /var/lib/wb-cloud-agent
+mkdir -p /var/lib/wb-cloud-agent/providers
+mkdir -p /mnt/data/etc/wb-cloud-agent/providers
 
 # create correct certificate for agent to use
 if [ ! -f "$TARGET_CERT" ] || ! cert_is_valid "$TARGET_CERT"; then
@@ -46,9 +48,9 @@ fi
 wb_source of
 
 if of_machine_match "wirenboard,wirenboard-720"; then
-    sed -i 's/ATECCx08:00:../ATECCx08:00:02/g' /mnt/data/etc/wb-cloud-agent.conf
+    sed -i 's/ATECCx08:00:../ATECCx08:00:02/g' "$AGENT_CONFIG"
 elif of_machine_match "contactless,imx6ul-wirenboard60"; then
-    sed -i 's/ATECCx08:00:../ATECCx08:00:04/g' /mnt/data/etc/wb-cloud-agent.conf
+    sed -i 's/ATECCx08:00:../ATECCx08:00:04/g' "$AGENT_CONFIG"
 fi
 
 #DEBHELPER#

debian/wb-cloud-agent.wb-cloud-agent-frpc.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=telegraf metric sender for Wiren Board Cloud
+Description=telegraf metric sender for Wiren Board Cloud (default)
 After=wb-cloud-agent.service
 StartLimitIntervalSec=3600
 StartLimitBurst=100

debian/wb-cloud-agent.wb-cloud-agent-frpc@.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=telegraf metric sender for Wiren Board Cloud (%i)
+After=wb-cloud-agent.service
+StartLimitIntervalSec=3600
+StartLimitBurst=100
+
+[Service]
+ExecCondition=/usr/bin/test -f /var/lib/wb-cloud-agent/providers/%i/frpc.conf
+ExecStart=/usr/bin/frpc --config /var/lib/wb-cloud-agent/providers/%i/frpc.conf
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target

debian/wb-cloud-agent.wb-cloud-agent-telegraf.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=telegraf metric sender for Wiren Board Cloud
+Description=telegraf metric sender for Wiren Board Cloud (default)
 After=wb-cloud-agent.service
 StartLimitIntervalSec=3600
 StartLimitBurst=100

debian/wb-cloud-agent.wb-cloud-agent-telegraf@.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=telegraf metric sender for Wiren Board Cloud (%i)
+After=wb-cloud-agent.service
+StartLimitIntervalSec=3600
+StartLimitBurst=100
+
+[Service]
+ExecCondition=/usr/bin/test -f /var/lib/wb-cloud-agent/providers/%i/telegraf.conf
+ExecStart=/usr/bin/telegraf --config /var/lib/wb-cloud-agent/providers/%i/telegraf.conf
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target

debian/wb-cloud-agent.wb-cloud-agent.service

@@ -1,10 +1,10 @@
 [Unit]
-Description=Wiren Board Cloud Agent
+Description=Wiren Board Cloud Agent (default)
 StartLimitIntervalSec=3600
 StartLimitBurst=100
 
 [Service]
-ExecStart=/usr/bin/wb-cloud-agent --daemon
+ExecStart=/usr/bin/wb-cloud-agent --daemon --provider default
 Restart=always
 RestartSec=10
 

debian/wb-cloud-agent.wb-cloud-agent@.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Wiren Board Cloud Agent (%i)
+StartLimitIntervalSec=3600
+StartLimitBurst=100
+
+[Service]
+ExecStart=/usr/bin/wb-cloud-agent --daemon --provider %i
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target