From 4449e040cebab080c29cea3193d18e104108176a Mon Sep 17 00:00:00 2001 From: Raymond Kuiper Date: Wed, 9 Apr 2025 15:49:38 +0200 Subject: [PATCH] :bug: added check for empty usermacro value. --- modules/usermacros.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/usermacros.py b/modules/usermacros.py index 29580d1..c1d783b 100644 --- a/modules/usermacros.py +++ b/modules/usermacros.py @@ -57,7 +57,7 @@ class ZabbixUsermacros: macro["macro"] = str(macro_name) if isinstance(macro_properties, dict): if not "value" in macro_properties: - self.logger.error(f"Usermacro {macro_name} has no value, skipping.") + self.logger.warning(f"Usermacro {macro_name} has no value, skipping.") return False macro["value"] = macro_properties["value"] @@ -76,10 +76,14 @@ class ZabbixUsermacros: else: macro["description"] = "" - elif isinstance(macro_properties, str): + elif isinstance(macro_properties, str) and macro_properties: macro["value"] = macro_properties macro["type"] = str(0) macro["description"] = "" + + else: + self.logger.warning(f"Usermacro {macro_name} has no value, skipping.") + return False else: self.logger.error( f"Usermacro {macro_name} is not a valid usermacro name, skipping."