NeoAnd/netbox-zabbix-sync
1
0
Fork 0
mirror of https://github.com/TheNetworkGuy/netbox-zabbix-sync.git synced 2025-07-14 01:41:25 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 added check for empty usermacro value.

Browse Source
This commit is contained in:
Raymond Kuiper 2025-04-09 15:49:38 +02:00
parent 7781bc6732
commit 4449e040ce
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/usermacros.py
View File

@ -57,7 +57,7 @@ class ZabbixUsermacros:
macro["macro"] = str(macro_name) macro["macro"] = str(macro_name)
if isinstance(macro_properties, dict): if isinstance(macro_properties, dict):
if not "value" in macro_properties: 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 return False
macro["value"] = macro_properties["value"] macro["value"] = macro_properties["value"]
@ -76,10 +76,14 @@ class ZabbixUsermacros:
else: else:
macro["description"] = "" macro["description"] = ""
elif isinstance(macro_properties, str): elif isinstance(macro_properties, str) and macro_properties:
macro["value"] = macro_properties macro["value"] = macro_properties
macro["type"] = str(0) macro["type"] = str(0)
macro["description"] = "" macro["description"] = ""
else:
self.logger.warning(f"Usermacro {macro_name} has no value, skipping.")
return False
else: else:
self.logger.error( self.logger.error(
f"Usermacro {macro_name} is not a valid usermacro name, skipping." f"Usermacro {macro_name} is not a valid usermacro name, skipping."