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

Removed default for hostgroups and fixed bug for hostgroup attributes which do not exist

Browse Source
This commit is contained in:
TheNetworkGuy 2025-06-24 20:44:59 +02:00
parent 1cf24fbcb5
commit 1de0b0781b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/device.py
View File

@ -564,6 +564,9 @@ class PhysicalDevice:
final_data = [] final_data = []
# Check if the hostgroup is in a nested format and check each parent # Check if the hostgroup is in a nested format and check each parent
for hostgroup in self.hostgroups: for hostgroup in self.hostgroups:
# Check if hostgroup is string. If Nonetype skip hostgroup
if not isinstance(hostgroup, str):
continue
for pos in range(len(hostgroup.split("/"))): for pos in range(len(hostgroup.split("/"))):
zabbix_hg = hostgroup.rsplit("/", pos)[0] zabbix_hg = hostgroup.rsplit("/", pos)[0]
if self.lookupZabbixHostgroup(hostgroups, zabbix_hg): if self.lookupZabbixHostgroup(hostgroups, zabbix_hg):

5
modules/hostgroups.py
View File

@ -108,11 +108,6 @@ class Hostgroup:
def generate(self, hg_format=None): def generate(self, hg_format=None):
"""Generate hostgroup based on a provided format""" """Generate hostgroup based on a provided format"""
# Set format to default in case its not specified
if not hg_format:
hg_format = (
"site/manufacturer/role" if self.type == "dev" else "cluster/role"
)
# Split all given names # Split all given names
hg_output = [] hg_output = []
hg_items = hg_format.split("/") hg_items = hg_format.split("/")