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

💄 Codebase formatting

Browse Source
This commit is contained in:
Wouter de Bruijn 2025-09-12 16:45:03 +02:00
parent 337184159b
commit bf512ada0b
No known key found for this signature in database
GPG Key ID: D848643EF8892815
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/tools.py
View File

@ -57,7 +57,9 @@ def cf_to_string(cf, key="name", logger=None):
if isinstance(cf, dict): if isinstance(cf, dict):
if key in cf: if key in cf:
return cf[key] return cf[key]
logger.error("Conversion of custom field failed, '%s' not found in cf dict.", key) logger.error(
"Conversion of custom field failed, '%s' not found in cf dict.", key
)
return None return None
return cf return cf
@ -172,7 +174,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(('"',"'")) 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"

16
netbox_zabbix_sync.py
View File

@ -12,6 +12,7 @@ from pynetbox import api
from pynetbox.core.query import RequestError as NBRequestError from pynetbox.core.query import RequestError as NBRequestError
from requests.exceptions import ConnectionError as RequestsConnectionError from requests.exceptions import ConnectionError as RequestsConnectionError
from zabbix_utils import APIRequestError, ProcessingError, ZabbixAPI from zabbix_utils import APIRequestError, ProcessingError, ZabbixAPI
from modules.config import load_config from modules.config import load_config
from modules.device import PhysicalDevice from modules.device import PhysicalDevice
from modules.exceptions import EnvironmentVarError, SyncError from modules.exceptions import EnvironmentVarError, SyncError
@ -82,8 +83,9 @@ def main(arguments):
device_cfs = [] device_cfs = []
vm_cfs = [] vm_cfs = []
device_cfs = list( device_cfs = list(
netbox.extras.custom_fields.filter(type=["text","object","select"], netbox.extras.custom_fields.filter(
content_types="dcim.device") type=["text", "object", "select"], content_types="dcim.device"
)
) )
verify_hg_format( verify_hg_format(
config["hostgroup_format"], device_cfs=device_cfs, hg_type="dev", logger=logger config["hostgroup_format"], device_cfs=device_cfs, hg_type="dev", logger=logger
@ -91,8 +93,8 @@ def main(arguments):
if config["sync_vms"]: if config["sync_vms"]:
vm_cfs = list( vm_cfs = list(
netbox.extras.custom_fields.filter( netbox.extras.custom_fields.filter(
type=["text","object","select"], type=["text", "object", "select"],
content_types="virtualization.virtualmachine" content_types="virtualization.virtualmachine",
) )
) )
verify_hg_format( verify_hg_format(
@ -170,7 +172,7 @@ def main(arguments):
continue continue
if config["extended_site_properties"] and nb_vm.site: if config["extended_site_properties"] and nb_vm.site:
logger.debug("VM %s: extending site information.", vm.name) logger.debug("VM %s: extending site information.", vm.name)
vm.site=(convert_recordset(netbox.dcim.sites.filter(id=nb_vm.site.id))) vm.site = convert_recordset(netbox.dcim.sites.filter(id=nb_vm.site.id))
vm.set_inventory(nb_vm) vm.set_inventory(nb_vm)
vm.set_usermacros() vm.set_usermacros()
vm.set_tags() vm.set_tags()
@ -245,7 +247,9 @@ def main(arguments):
continue continue
if config["extended_site_properties"] and nb_device.site: if config["extended_site_properties"] and nb_device.site:
logger.debug("Device %s: extending site information.", device.name) logger.debug("Device %s: extending site information.", device.name)
device.site=(convert_recordset(netbox.dcim.sites.filter(id=nb_device.site.id))) device.site = convert_recordset(
netbox.dcim.sites.filter(id=nb_device.site.id)
)
device.set_inventory(nb_device) device.set_inventory(nb_device)
device.set_usermacros() device.set_usermacros()
device.set_tags() device.set_tags()