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

Fix Merge conflict

Browse Source
This commit is contained in:
Domisiding 2023-04-12 18:02:21 +02:00
parent 9b8bde9527
commit f120d33e00
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
netbox_zabbix_sync.py
View File

@ -220,22 +220,15 @@ class NetworkDevice():
# Gather device Zabbix templates
device_type_cf = self.nb.device_type.custom_fields
if(templates_config_context):
try:
self.zbx_templates = self.config_context["zabbix"]["templates"]
except KeyError:
e = "Config context for Zabbix template was not found for host {self.name}"
logger.error(e)
if(template_cf in device_type_cf):
self.template_name = device_type_cf[template_cf]
self.zbx_templates = [device_type_cf[template_cf]]
else:
if(template_cf in device_type_cf):
self.template_name = device_type_cf[template_cf]
self.zbx_templates = [device_type_cf[template_cf]]
else:
e = (f"Custom field {template_cf} not "
f"found for {self.nb.device_type.manufacturer.name}"
f" - {self.nb.device_type.display}.")
logger.warning(e)
raise SyncInventoryError(e)
e = (f"Custom field {template_cf} not "
f"found for {self.nb.device_type.manufacturer.name}"
f" - {self.nb.device_type.display}.")
logger.warning(e)
raise SyncInventoryError(e)
def set_hostgroup(self, format):
"""Set the hostgroup for this device"""