vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-04 01:01:35 -07:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Normalize MAC addresses in SQL queries and add devCanSleep column to device schema

Browse Source
This commit is contained in:
Jokob @NetAlertX
2026-03-02 06:03:18 +00:00
parent 15807b7ab9
commit 3e237bb452
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/db/db_upgrade.py
View File

@@ -254,7 +254,7 @@ def ensure_views(sql) -> bool:
WITH base AS ( WITH base AS (
SELECT SELECT
rowid, rowid,
IFNULL(devMac, '') AS devMac, LOWER(IFNULL(devMac, '')) AS devMac,
IFNULL(devName, '') AS devName, IFNULL(devName, '') AS devName,
IFNULL(devOwner, '') AS devOwner, IFNULL(devOwner, '') AS devOwner,
IFNULL(devType, '') AS devType, IFNULL(devType, '') AS devType,
@@ -281,7 +281,7 @@ def ensure_views(sql) -> bool:
IFNULL(devIsNew, '') AS devIsNew, IFNULL(devIsNew, '') AS devIsNew,
IFNULL(devLocation, '') AS devLocation, IFNULL(devLocation, '') AS devLocation,
IFNULL(devIsArchived, '') AS devIsArchived, IFNULL(devIsArchived, '') AS devIsArchived,
IFNULL(devParentMAC, '') AS devParentMAC, LOWER(IFNULL(devParentMAC, '')) AS devParentMAC,
IFNULL(devParentPort, '') AS devParentPort, IFNULL(devParentPort, '') AS devParentPort,
IFNULL(devIcon, '') AS devIcon, IFNULL(devIcon, '') AS devIcon,
IFNULL(devGUID, '') AS devGUID, IFNULL(devGUID, '') AS devGUID,
@@ -316,7 +316,7 @@ def ensure_views(sql) -> bool:
WHEN EXISTS ( WHEN EXISTS (
SELECT 1 SELECT 1
FROM Events e FROM Events e
WHERE e.eve_MAC = Devices.devMac WHERE LOWER(e.eve_MAC) = LOWER(Devices.devMac)
AND e.eve_EventType IN ('Connected','Disconnected','Device Down','Down Reconnected') AND e.eve_EventType IN ('Connected','Disconnected','Device Down','Down Reconnected')
AND e.eve_DateTime >= datetime('now', '-{FLAP_WINDOW_HOURS} hours') AND e.eve_DateTime >= datetime('now', '-{FLAP_WINDOW_HOURS} hours')
GROUP BY e.eve_MAC GROUP BY e.eve_MAC

1
test/test_device_atomicity.py
View File

@@ -58,6 +58,7 @@ class TestDeviceAtomicity(unittest.TestCase):
devScan INTEGER DEFAULT 0, devScan INTEGER DEFAULT 0,
devAlertEvents INTEGER DEFAULT 0, devAlertEvents INTEGER DEFAULT 0,
devAlertDown INTEGER DEFAULT 0, devAlertDown INTEGER DEFAULT 0,
devCanSleep INTEGER DEFAULT 0,
devParentRelType TEXT DEFAULT 'default', devParentRelType TEXT DEFAULT 'default',
devReqNicsOnline INTEGER DEFAULT 0, devReqNicsOnline INTEGER DEFAULT 0,
devSkipRepeated INTEGER DEFAULT 0, devSkipRepeated INTEGER DEFAULT 0,