vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-03-30 23:03:03 -07:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/netalertx/NetAlertX

Browse Source
This commit is contained in:
Jokob @NetAlertX
2026-02-27 10:08:56 +00:00
parent 4c0d5c7376 686a713aa8
commit d2ebe0d452
6 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/PLUGINS_DEV.md
View File

@@ -34,7 +34,7 @@ NetAlertX comes with a plugin system to feed events from third-party scripts int
### 🐛 Troubleshooting ### 🐛 Troubleshooting
- **[Debugging Plugins](DEBUG_PLUGINS.md)** - Troubleshoot plugin issues - **[Debugging Plugins](DEBUG_PLUGINS.md)** - Troubleshoot plugin issues
- **[Plugin Examples](../front/plugins)** - Study existing plugins as reference implementations - **[Plugin Examples](https://github.com/netalertx/NetAlertX/tree/main/front/plugins)** - Study existing plugins as reference implementations
### 🎥 Video Tutorial ### 🎥 Video Tutorial

7
front/js/network-api.js
View File

@@ -17,10 +17,10 @@ function loadNetworkNodes() {
const rawSql = ` const rawSql = `
SELECT SELECT
parent.devName AS node_name, parent.devName AS node_name,
parent.devMac AS node_mac, LOWER(parent.devMac) AS node_mac,
parent.devPresentLastScan AS online, parent.devPresentLastScan AS online,
parent.devType AS node_type, parent.devType AS node_type,
parent.devParentMAC AS parent_mac, LOWER(parent.devParentMAC) AS parent_mac,
parent.devIcon AS node_icon, parent.devIcon AS node_icon,
parent.devAlertDown AS node_alert, parent.devAlertDown AS node_alert,
COUNT(child.devMac) AS node_ports_count COUNT(child.devMac) AS node_ports_count
@@ -116,6 +116,7 @@ function loadDeviceTable({ sql, containerSelector, tableId, wrapperHtml = null,
orderable: false, orderable: false,
width: '5%', width: '5%',
render: function (mac) { render: function (mac) {
// mac = mac.toLowerCase()
const label = assignMode ? 'assign' : 'unassign'; const label = assignMode ? 'assign' : 'unassign';
const btnClass = assignMode ? 'btn-primary' : 'btn-primary bg-red'; const btnClass = assignMode ? 'btn-primary' : 'btn-primary bg-red';
const btnText = assignMode ? getString('Network_ManageAssign') : getString('Network_ManageUnassign'); const btnText = assignMode ? getString('Network_ManageAssign') : getString('Network_ManageUnassign');
@@ -204,7 +205,7 @@ function loadUnassignedDevices() {
SELECT devMac, devPresentLastScan, devName, devLastIP, devVendor, devAlertDown, devParentPort SELECT devMac, devPresentLastScan, devName, devLastIP, devVendor, devAlertDown, devParentPort
FROM Devices FROM Devices
WHERE (devParentMAC IS NULL OR devParentMAC IN ("", " ", "undefined", "null")) WHERE (devParentMAC IS NULL OR devParentMAC IN ("", " ", "undefined", "null"))
AND devMac NOT LIKE "%internet%" AND LOWER(devMac) NOT LIKE "%internet%"
AND devIsArchived = 0 AND devIsArchived = 0
ORDER BY devName ASC`; ORDER BY devName ASC`;

9
front/js/network-init.js
View File

@@ -21,10 +21,12 @@ function initNetworkTopology() {
// Always get all devices // Always get all devices
const rawSql = ` const rawSql = `
SELECT *, SELECT *,
LOWER(devMac) AS devMac,
LOWER(devParentMAC) AS devParentMAC,
CASE CASE
WHEN devAlertDown != 0 AND devPresentLastScan = 0 THEN "Down" WHEN devAlertDown != 0 AND devPresentLastScan = 0 THEN 'Down'
WHEN devPresentLastScan = 1 THEN "On-line" WHEN devPresentLastScan = 1 THEN 'On-line'
ELSE "Off-line" ELSE 'Off-line'
END AS devStatus, END AS devStatus,
CASE CASE
WHEN devType IN (${networkDeviceTypes}) THEN 1 WHEN devType IN (${networkDeviceTypes}) THEN 1
@@ -33,6 +35,7 @@ function initNetworkTopology() {
FROM Devices a FROM Devices a
`; `;
const { token: apiToken, apiBase, authHeader } = getAuthContext(); const { token: apiToken, apiBase, authHeader } = getAuthContext();
// Verify token is available before making API call // Verify token is available before making API call

2
front/js/network-tabs.js
View File

@@ -49,7 +49,7 @@ function renderNetworkTabContent(nodes) {
$('.tab-content').empty(); $('.tab-content').empty();
nodes.forEach((node, i) => { nodes.forEach((node, i) => {
const id = node.node_mac.replace(/:/g, '_'); const id = node.node_mac.replace(/:/g, '_').toLowerCase();
const badge = getStatusBadgeParts( const badge = getStatusBadgeParts(
node.online, node.online,

2
front/plugins/website_monitor/config.json
View File

@@ -9,7 +9,7 @@
"display_name": [ "display_name": [
{ {
"language_code": "en_us", "language_code": "en_us",
"string": "Website monitor" "string": "Services & Web monitor"
}, },
{ {
"language_code": "es_es", "language_code": "es_es",

76
server/models/device_instance.py
View File

@@ -463,46 +463,49 @@ class DeviceInstance:
# Fetch device info + computed fields # Fetch device info + computed fields
sql = f""" sql = f"""
SELECT SELECT
d.*, d.*,
CASE LOWER(d.devMac) AS devMac,
WHEN d.devAlertDown != 0 AND d.devPresentLastScan = 0 THEN 'Down' LOWER(d.devParentMAC) AS devParentMAC,
WHEN d.devPresentLastScan = 1 THEN 'On-line' CASE
ELSE 'Off-line' WHEN d.devAlertDown != 0 AND d.devPresentLastScan = 0 THEN 'Down'
END AS devStatus, WHEN d.devPresentLastScan = 1 THEN 'On-line'
ELSE 'Off-line'
END AS devStatus,
(SELECT COUNT(*) FROM Sessions (SELECT COUNT(*) FROM Sessions
WHERE ses_MAC = d.devMac AND ( WHERE LOWER(ses_MAC) = LOWER(d.devMac) AND (
ses_DateTimeConnection >= {period_date_sql} OR ses_DateTimeConnection >= {period_date_sql} OR
ses_DateTimeDisconnection >= {period_date_sql} OR ses_DateTimeDisconnection >= {period_date_sql} OR
ses_StillConnected = 1 ses_StillConnected = 1
)) AS devSessions, )) AS devSessions,
(SELECT COUNT(*) FROM Events (SELECT COUNT(*) FROM Events
WHERE eve_MAC = d.devMac AND eve_DateTime >= {period_date_sql} WHERE LOWER(eve_MAC) = LOWER(d.devMac) AND eve_DateTime >= {period_date_sql}
AND eve_EventType NOT IN ('Connected','Disconnected')) AS devEvents, AND eve_EventType NOT IN ('Connected','Disconnected')) AS devEvents,
(SELECT COUNT(*) FROM Events (SELECT COUNT(*) FROM Events
WHERE eve_MAC = d.devMac AND eve_DateTime >= {period_date_sql} WHERE LOWER(eve_MAC) = LOWER(d.devMac) AND eve_DateTime >= {period_date_sql}
AND eve_EventType = 'Device Down') AS devDownAlerts, AND eve_EventType = 'Device Down') AS devDownAlerts,
(SELECT CAST(MAX(0, SUM( (SELECT CAST(MAX(0, SUM(
julianday(IFNULL(ses_DateTimeDisconnection,'{now}')) - julianday(IFNULL(ses_DateTimeDisconnection,'{now}')) -
julianday(CASE WHEN ses_DateTimeConnection < {period_date_sql} julianday(CASE WHEN ses_DateTimeConnection < {period_date_sql}
THEN {period_date_sql} ELSE ses_DateTimeConnection END) THEN {period_date_sql} ELSE ses_DateTimeConnection END)
) * 24) AS INT) ) * 24) AS INT)
FROM Sessions FROM Sessions
WHERE ses_MAC = d.devMac WHERE LOWER(ses_MAC) = LOWER(d.devMac)
AND ses_DateTimeConnection IS NOT NULL AND ses_DateTimeConnection IS NOT NULL
AND (ses_DateTimeDisconnection IS NOT NULL OR ses_StillConnected = 1) AND (ses_DateTimeDisconnection IS NOT NULL OR ses_StillConnected = 1)
AND (ses_DateTimeConnection >= {period_date_sql} AND (ses_DateTimeConnection >= {period_date_sql}
OR ses_DateTimeDisconnection >= {period_date_sql} OR ses_StillConnected = 1) OR ses_DateTimeDisconnection >= {period_date_sql} OR ses_StillConnected = 1)
) AS devPresenceHours ) AS devPresenceHours
FROM Devices d FROM Devices d
WHERE d.devMac = ? OR CAST(d.rowid AS TEXT) = ? WHERE LOWER(d.devMac) = LOWER(?) OR CAST(d.rowid AS TEXT) = ?
""" """
conn = get_temp_db_connection() conn = get_temp_db_connection()
cur = conn.cursor() cur = conn.cursor()
cur.execute(sql, (mac, mac)) cur.execute(sql, (mac, mac))
@@ -818,9 +821,9 @@ class DeviceInstance:
conn = get_temp_db_connection() conn = get_temp_db_connection()
cur = conn.cursor() cur = conn.cursor()
# Build safe SQL with column name # Convert the MAC to lowercase for comparison
sql = f"UPDATE Devices SET {column_name}=? WHERE devMac=?" sql = f"UPDATE Devices SET {column_name}=? WHERE LOWER(devMac)=?"
cur.execute(sql, (column_value, mac)) cur.execute(sql, (column_value, mac.lower()))
conn.commit() conn.commit()
if cur.rowcount > 0: if cur.rowcount > 0:
@@ -831,6 +834,7 @@ class DeviceInstance:
conn.close() conn.close()
return result return result
def lockDeviceField(self, mac, field_name): def lockDeviceField(self, mac, field_name):
"""Lock a device field so it won't be overwritten by plugins.""" """Lock a device field so it won't be overwritten by plugins."""
if field_name not in FIELD_SOURCE_MAP: if field_name not in FIELD_SOURCE_MAP: