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

Added support for hardcoded strings in hostgroups

Browse Source
This commit is contained in:
Raymond Kuiper 2025-06-25 16:50:17 +02:00
parent 57c7f83e6a
commit 98c13919c5
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/hostgroups.py
View File

@ -117,6 +117,11 @@ class Hostgroup:
for hg_item in hg_items: for hg_item in hg_items:
# Check if requested data is available as option for this host # Check if requested data is available as option for this host
if hg_item not in self.format_options: if hg_item not in self.format_options:
if hg_item.startswith(("'", '"')) and hg_item.endswith(("'", '"')):
hg_item = hg_item.strip("\'")
hg_item = hg_item.strip('\"')
hg_output.append(hg_item)
else:
# Check if a custom field exists with this name # Check if a custom field exists with this name
cf_data = self.custom_field_lookup(hg_item) cf_data = self.custom_field_lookup(hg_item)
# CF does not exist # CF does not exist

1
modules/tools.py
View File

@ -160,6 +160,7 @@ def verify_hg_format(
if ( if (
hg_object not in allowed_objects[hg_type] hg_object not in allowed_objects[hg_type]
and hg_object not in allowed_objects["cfs"][hg_type] and hg_object not in allowed_objects["cfs"][hg_type]
and not hg_object.startswith(('"',"'"))
): ):
e = ( e = (
f"Hostgroup item {hg_object} is not valid. Make sure you" f"Hostgroup item {hg_object} is not valid. Make sure you"