diff --git a/modules/config.py b/modules/config.py index b1afcfb..3d69d6c 100644 --- a/modules/config.py +++ b/modules/config.py @@ -1,6 +1,7 @@ """ Module for parsing configuration from the top level config.py file """ + from pathlib import Path from importlib import util from os import environ, path @@ -17,7 +18,7 @@ DEFAULT_CONFIG = { "template_cf": "zabbix_template", "device_cf": "zabbix_hostid", "proxy_cf": False, - "proxy_group_cf" : False, + "proxy_group_cf": False, "clustering": False, "create_hostgroups": True, "create_journal": False, @@ -47,40 +48,40 @@ DEFAULT_CONFIG = { "serial": "serialno_a", "device_type/model": "type", "device_type/manufacturer/name": "vendor", - "oob_ip/address": "oob_ip" + "oob_ip/address": "oob_ip", }, "vm_inventory_map": { "status/label": "deployment_status", "comments": "notes", - "name": "name" + "name": "name", }, "usermacro_sync": False, "device_usermacro_map": { "serial": "{$HW_SERIAL}", "role/name": "{$DEV_ROLE}", "url": "{$NB_URL}", - "id": "{$NB_ID}" + "id": "{$NB_ID}", }, "vm_usermacro_map": { "memory": "{$TOTAL_MEMORY}", "role/name": "{$DEV_ROLE}", "url": "{$NB_URL}", - "id": "{$NB_ID}" + "id": "{$NB_ID}", }, "tag_sync": False, "tag_lower": True, - "tag_name": 'NetBox', + "tag_name": "NetBox", "tag_value": "name", "device_tag_map": { "site/name": "site", "rack/name": "rack", - "platform/name": "target" + "platform/name": "target", }, "vm_tag_map": { "site/name": "site", "cluster/name": "cluster", - "platform/name": "target" - } + "platform/name": "target", + }, } diff --git a/modules/hostgroups.py b/modules/hostgroups.py index 785e172..49890e6 100644 --- a/modules/hostgroups.py +++ b/modules/hostgroups.py @@ -118,8 +118,8 @@ class Hostgroup: # Check if requested data is available as option for this host 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_item = hg_item.strip("'") + hg_item = hg_item.strip('"') hg_output.append(hg_item) else: # Check if a custom field exists with this name