Zabbix monitoring

packages/helpermodules/subdata.py

@@ -689,9 +689,15 @@ def process_optional_topic(self, var: optional.Optional, msg: mqtt.MQTTMessage):
                     # do not reconfigure monitoring if topic is received on startup
                     if self.event_subdata_initialized.is_set():
                         config = decode_payload(msg.payload)
-                        mod = importlib.import_module(f".monitoring.{config['type']}.api", "modules")
-                        config = dataclass_from_dict(mod.device_descriptor.configuration_factory, config)
-                        mod.create_config(config)
+                        if config["type"] is not None:
+                            mod = importlib.import_module(f".monitoring.{config['type']}.api", "modules")
+                            config = dataclass_from_dict(mod.device_descriptor.configuration_factory, config)
+                            mod.create_config(config)
+                            run_command(["sudo", "systemctl", "restart", "zabbix-agent2"], process_exception=True)
+                            run_command(["sudo", "systemctl", "enable", "zabbix-agent2"], process_exception=True)
+                        else:
+                            run_command(["sudo", "systemctl", "stop", "zabbix-agent2"], process_exception=True)
+                            run_command(["sudo", "systemctl", "disable", "zabbix-agent2"], process_exception=True)
                     else:
                         log.debug("skipping monitoring config on startup")
                 else:

packages/modules/monitoring/zabbix/api.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import os
-from helpermodules.utils.run_command import run_command
 from modules.common.abstract_device import DeviceDescriptor
 from modules.monitoring.zabbix.config import Zabbix
 
@@ -35,7 +34,6 @@ def create_config(config: Zabbix):
     set_value(CONFIG_PATH, "TLSAccept", "psk")
     set_value(CONFIG_PATH, "TLSPSKFile", KEY_PATH)
     set_value(CONFIG_PATH, "TLSPSKIdentity", config.configuration.psk_identifier)
-    run_command(["sudo", "systemctl", "restart", "zabbix-agent2"], process_exception=True)
 
 
 device_descriptor = DeviceDescriptor(configuration_factory=Zabbix)

runs/install_packages.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 echo "install required packages with 'apt-get'..."
-if [ ! -e zabbix-release_6.2-3+debian11_all.deb ]
-then
-	wget https://repo.zabbix.com/zabbix/6.2/raspbian/pool/main/z/zabbix-release/zabbix-release_6.2-3%2Bdebian11_all.deb
-	sudo dpkg -i zabbix-release_6.2-3+debian11_all.deb
-	echo "download"
-fi
  sudo apt-get -q update
  sudo apt-get -q -y install \
  	vim bc jq socat sshpass sudo ssl-cert mmc-utils \
@@ -16,5 +10,14 @@ fi
  	python3-pip \
  	xserver-xorg x11-xserver-utils openbox-lxde-session lightdm lightdm-autologin-greeter accountsservice \
 	chromium chromium-l10n
-sudo apt install zabbix-agent2 zabbix-agent2-plugin-*
+if [ -z "$(dpkg -l | grep zabbix-agent2)" ]
+then
+    echo "install zabbix"
+	wget -P /tmp/ https://repo.zabbix.com/zabbix/6.2/raspbian/pool/main/z/zabbix-release/zabbix-release_6.2-3%2Bdebian11_all.deb
+	sudo dpkg -i /tmp/zabbix-release_6.2-3+debian11_all.deb
+	echo "download"
+	sudo apt-get -q update
+	sudo apt install zabbix-agent2 zabbix-agent2-plugin-*
+	sudo rm /tmp/zabbix-release_6.2-3+debian11_all.deb
+fi
 echo "done"