NeoAnd/netbox-zabbix-sync
1
0
Fork 0
mirror of https://github.com/TheNetworkGuy/netbox-zabbix-sync.git synced 2026-03-21 20:18:38 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modified logging messages which contain device / VM and renamed this for consistent logging to "Host".

Browse Source 
Moved logging function from global to main() for CLI
This commit is contained in:
TheNetworkGuy
2026-02-23 13:46:53 +01:00
parent e3487378c1
commit dc0a1f9122
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox_zabbix_sync/modules/cli.py
+6 -4
View File
@@ -7,10 +7,6 @@ from netbox_zabbix_sync.modules.exceptions import EnvironmentVarError
from netbox_zabbix_sync.modules.logging import get_logger, set_log_levels, setup_logger
from netbox_zabbix_sync.modules.settings import load_config
# Set logging
setup_logger()
logger = get_logger()
# Boolean settings that can be toggled via --flag / --no-flag
_BOOL_ARGS = [
("clustering", "Enable clustering of devices with virtual chassis setup."),
@@ -84,6 +80,9 @@ def _apply_cli_overrides(config: dict, arguments: argparse.Namespace) -> dict:
def main(arguments):
"""Run the sync process."""
# Set logging
setup_logger()
logger = get_logger()
# Set log levels based on verbosity flags
if arguments.verbose:
set_log_levels(logging.WARNING, logging.INFO)
@@ -137,6 +136,9 @@ def main(arguments):
def parse_cli():
"""
Parse command-line arguments and run the main function.
"""
parser = argparse.ArgumentParser(
description="Synchronise NetBox device data to Zabbix."
)
netbox_zabbix_sync/modules/core.py
+9 -9
View File
@@ -277,7 +277,7 @@ class Sync:
if not vm.hostgroups:
continue
if self.config["extended_site_properties"] and nb_vm.site:
logger.debug("VM %s: extending site information.", vm.name)
logger.debug("Host %s: extending site information.", vm.name)
vm.site = convert_recordset(
self.netbox.dcim.sites.filter(id=nb_vm.site.id)
)
@@ -290,12 +290,12 @@ class Sync:
# Delete device from Zabbix
# and remove hostID from self.netbox.
vm.cleanup()
logger.info("VM %s: cleanup complete", vm.name)
logger.info("Host %s: cleanup complete", vm.name)
continue
# Device has been added to NetBox
# but is not in Activate state
logger.info(
"VM %s: Skipping since this VM is not in the active state.",
"Host %s: Skipping since this host is not in the active state.",
vm.name,
)
continue
@@ -351,12 +351,12 @@ class Sync:
# Check if a valid hostgroup has been found for this VM.
if not device.hostgroups:
logger.warning(
"Host %s: Host has no valid hostgroups, Skipping this host...",
"Host %s: has no valid hostgroups, Skipping this host...",
device.name,
)
continue
if self.config["extended_site_properties"] and nb_device.site:
logger.debug("Device %s: extending site information.", device.name)
logger.debug("Host %s: extending site information.", device.name)
device.site = convert_recordset(
self.netbox.dcim.sites.filter(id=nb_device.site.id)
)
@@ -369,13 +369,13 @@ class Sync:
# Check if device is primary or secondary
if device.promote_primary_device():
logger.info(
"Device %s: is part of cluster and primary.", device.name
"Host %s: is part of cluster and primary.", device.name
)
else:
# Device is secondary in cluster.
# Don't continue with this device.
logger.info(
"Device %s: Is part of cluster but not primary. Skipping this host...",
"Host %s: Is part of cluster but not primary. Skipping this host...",
device.name,
)
continue
@@ -385,12 +385,12 @@ class Sync:
# Delete device from Zabbix
# and remove hostID from NetBox.
device.cleanup()
logger.info("Device %s: cleanup complete", device.name)
logger.info("Host %s: cleanup complete", device.name)
continue
# Device has been added to NetBox
# but is not in Activate state
logger.info(
"Device %s: Skipping since this device is not in the active state.",
"Host %s: Skipping since this host is not in the active state.",
device.name,
)
continue