vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Normalizing device names #833

Browse Source
This commit is contained in:
jokob-sk
2024-10-11 20:14:13 +11:00
parent c4e0abf913
commit ca1d55b3c2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
front/plugins/unifi_import/script.py
View File

@@ -21,7 +21,7 @@ sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
from plugin_helper import Plugin_Object, Plugin_Objects, rmBadChars, is_typical_router_ip from plugin_helper import Plugin_Object, Plugin_Objects, rmBadChars, is_typical_router_ip
from logger import mylog from logger import mylog
from helper import timeNowTZ, get_setting_value from helper import timeNowTZ, get_setting_value, normalize_string
import conf import conf
from pytz import timezone from pytz import timezone
@@ -161,7 +161,7 @@ def collect_details(device_type, devices, online_macs, processed_macs, plugin_ob
for device in devices: for device in devices:
mylog('verbose', [f'{json.dumps(device)}']) mylog('verbose', [f'{json.dumps(device)}'])
# try extracting variables from teh json # try extracting variables from the json
name = get_name(get_unifi_val(device, 'name'), get_unifi_val(device, 'hostname')) name = get_name(get_unifi_val(device, 'name'), get_unifi_val(device, 'hostname'))
ipTmp = get_ip(get_unifi_val(device, 'lan_ip'), get_unifi_val(device, 'last_ip'), get_unifi_val(device, 'fixed_ip'), get_unifi_val(device, 'ip')) ipTmp = get_ip(get_unifi_val(device, 'lan_ip'), get_unifi_val(device, 'last_ip'), get_unifi_val(device, 'fixed_ip'), get_unifi_val(device, 'ip'))
macTmp = device['mac'] macTmp = device['mac']
@@ -178,7 +178,7 @@ def collect_details(device_type, devices, online_macs, processed_macs, plugin_ob
plugin_objects.add_object( plugin_objects.add_object(
primaryId=macTmp, primaryId=macTmp,
secondaryId=ipTmp, secondaryId=ipTmp,
watched1=name, watched1=normalize_string(name),
watched2=get_unifi_val(device, 'oui', device_vendor), watched2=get_unifi_val(device, 'oui', device_vendor),
watched3=deviceType, watched3=deviceType,
watched4=status, watched4=status,