_REPORT_ON` settings) and `events` (dependent on the on-device **Alert Events** setting) might be too noisy for most setups. More info in the [NTFPRCS plugin](https://github.com/netalertx/NetAlertX/blob/main/front/plugins/notification_processing/README.md) on what events these selections include.
2. Alert down after (`NTFPRCS_alert_down_time`) is useful if you want to wait for some time before the system sends out a down notification for a device. This is related to the on-device **Alert down** setting and only devices with this checked will trigger a down notification.
+3. Alert down after (sleep) (`NTFPRCS_sleep_time`) sets the **sleep window** in minutes. If a device has **Can Sleep** enabled and goes offline, it is shown as **Sleeping** (aqua 🌙 badge) for this many minutes before down-alert logic kicks in. Default is `30` minutes. Changing this setting takes effect after saving — no restart required.
You can filter out unwanted notifications globally. This could be because of a misbehaving device (GoogleNest/GoogleHub (See also [ARPSAN docs and the `--exclude-broadcast` flag](https://github.com/netalertx/NetAlertX/tree/main/front/plugins/arp_scan#ip-flipping-on-google-nest-devices))) which flips between IP addresses, or because you want to ignore new device notifications of a certain pattern.
diff --git a/front/deviceDetailsEdit.php b/front/deviceDetailsEdit.php
index 2ff37396..542f2a59 100755
--- a/front/deviceDetailsEdit.php
+++ b/front/deviceDetailsEdit.php
@@ -138,7 +138,7 @@ function getDeviceData() {
},
// Group for event and alert settings
DevDetail_EveandAl_Title: {
- data: ["devAlertEvents", "devAlertDown", "devSkipRepeated", "devReqNicsOnline", "devChildrenNicsDynamic", "devForceStatus"],
+ data: ["devAlertEvents", "devAlertDown", "devCanSleep", "devSkipRepeated", "devReqNicsOnline", "devChildrenNicsDynamic", "devForceStatus"],
docs: "https://docs.netalertx.com/NOTIFICATIONS",
iconClass: "fa fa-bell",
inputGroupClasses: "field-group alert-group col-lg-4 col-sm-6 col-xs-12",
@@ -447,6 +447,7 @@ function setDeviceData(direction = '', refreshCallback = '') {
devAlertEvents: ($('#NEWDEV_devAlertEvents')[0].checked * 1),
devAlertDown: ($('#NEWDEV_devAlertDown')[0].checked * 1),
+ devCanSleep: ($('#NEWDEV_devCanSleep')[0].checked * 1),
devSkipRepeated: $('#NEWDEV_devSkipRepeated').val().split(' ')[0],
devForceStatus: $('#NEWDEV_devForceStatus').val().replace(/'/g, ""),
diff --git a/front/js/network-api.js b/front/js/network-api.js
index 4ed82e55..01addaef 100644
--- a/front/js/network-api.js
+++ b/front/js/network-api.js
@@ -24,6 +24,7 @@ function loadNetworkNodes() {
parent.devIcon AS node_icon,
parent.devAlertDown AS node_alert,
parent.devFlapping AS node_flapping,
+ parent.devIsSleeping AS node_sleeping,
COUNT(child.devMac) AS node_ports_count
FROM DevicesView AS parent
LEFT JOIN DevicesView AS child
@@ -34,7 +35,7 @@ function loadNetworkNodes() {
WHERE parent.devType IN (${networkDeviceTypes})
AND parent.devIsArchived = 0
GROUP BY parent.devMac, parent.devName, parent.devPresentLastScan,
- parent.devType, parent.devParentMAC, parent.devIcon, parent.devAlertDown, parent.devFlapping
+ parent.devType, parent.devParentMAC, parent.devIcon, parent.devAlertDown, parent.devFlapping, parent.devIsSleeping
ORDER BY parent.devName;
`;
@@ -146,7 +147,8 @@ function loadDeviceTable({ sql, containerSelector, tableId, wrapperHtml = null,
device.devAlertDown,
device.devFlapping,
device.devMac,
- device.devStatus
+ device.devStatus,
+ device.devIsSleeping || 0
);
return `${badge.iconHtml} ${badge.text}`;
}
@@ -204,7 +206,7 @@ function loadDeviceTable({ sql, containerSelector, tableId, wrapperHtml = null,
*/
function loadUnassignedDevices() {
const sql = `
- SELECT devMac, devPresentLastScan, devName, devLastIP, devVendor, devAlertDown, devParentPort, devFlapping, devStatus
+ SELECT devMac, devPresentLastScan, devName, devLastIP, devVendor, devAlertDown, devParentPort, devFlapping, devIsSleeping, devStatus
FROM DevicesView
WHERE (devParentMAC IS NULL OR devParentMAC IN ("", " ", "undefined", "null"))
AND LOWER(devMac) NOT LIKE "%internet%"
@@ -239,10 +241,11 @@ function loadConnectedDevices(node_mac) {
const normalized_mac = node_mac.toLowerCase();
const sql = `
- SELECT devName, devMac, devLastIP, devVendor, devPresentLastScan, devAlertDown, devParentPort, devVlan, devFlapping,
+ SELECT devName, devMac, devLastIP, devVendor, devPresentLastScan, devAlertDown, devParentPort, devVlan, devFlapping, devIsSleeping,
CASE
WHEN devIsNew = 1 THEN 'New'
WHEN devPresentLastScan = 1 THEN 'On-line'
+ WHEN devIsSleeping = 1 THEN 'Sleeping'
WHEN devPresentLastScan = 0 AND devAlertDown != 0 THEN 'Down'
WHEN devIsArchived = 1 THEN 'Archived'
WHEN devPresentLastScan = 0 THEN 'Off-line'
diff --git a/front/js/network-init.js b/front/js/network-init.js
index b61ec9fe..173b0a89 100644
--- a/front/js/network-init.js
+++ b/front/js/network-init.js
@@ -24,8 +24,9 @@ function initNetworkTopology() {
LOWER(devMac) AS devMac,
LOWER(devParentMAC) AS devParentMAC,
CASE
- WHEN devAlertDown != 0 AND devPresentLastScan = 0 THEN 'Down'
WHEN devPresentLastScan = 1 THEN 'On-line'
+ WHEN devIsSleeping = 1 THEN 'Sleeping'
+ WHEN devAlertDown != 0 AND devPresentLastScan = 0 THEN 'Down'
ELSE 'Off-line'
END AS devStatus,
CASE
diff --git a/front/js/network-tabs.js b/front/js/network-tabs.js
index f358a1ce..d995da31 100644
--- a/front/js/network-tabs.js
+++ b/front/js/network-tabs.js
@@ -9,7 +9,8 @@ function renderNetworkTabs(nodes) {
let html = '';
nodes.forEach((node, i) => {
const iconClass = node.online == 1 ? "text-green" :
- (node.node_alert == 1 ? "text-red" : "text-gray50");
+ (node.node_sleeping == 1 ? "text-aqua" :
+ (node.node_alert == 1 ? "text-red" : "text-gray50"));
const portLabel = node.node_ports_count ? ` (${node.node_ports_count})` : '';
const icon = atob(node.node_icon);
@@ -55,7 +56,9 @@ function renderNetworkTabContent(nodes) {
node.online,
node.node_alert,
node.node_flapping,
- node.node_mac
+ node.node_mac,
+ '',
+ node.node_sleeping || 0
);
const badgeHtml = `${badge.iconHtml} ${badge.status}`;
diff --git a/front/js/network-tree.js b/front/js/network-tree.js
index a20c3a24..9e67cbce 100644
--- a/front/js/network-tree.js
+++ b/front/js/network-tree.js
@@ -74,6 +74,7 @@ function getChildren(node, list, path, visited = [])
presentLastScan: node.devPresentLastScan,
flapping: node.devFlapping,
alertDown: node.devAlertDown,
+ sleeping: node.devIsSleeping || 0,
hasChildren: children.length > 0 || hiddenMacs.includes(node.devMac),
relType: node.devParentRelType,
devVlan: node.devVlan,
@@ -272,7 +273,8 @@ function initTree(myHierarchy)
nodeData.data.alertDown,
nodeData.data.flapping,
nodeData.data.mac,
- statusText = ''
+ '',
+ nodeData.data.sleeping || 0
);
return result = `${badge.iconHtml} ${badge.status}`
const html = `
diff --git a/front/plugins/newdev_template/config.json b/front/plugins/newdev_template/config.json
index 1bddbd1a..1a90589d 100755
--- a/front/plugins/newdev_template/config.json
+++ b/front/plugins/newdev_template/config.json
@@ -1191,6 +1191,41 @@
}
]
},
+ {
+ "function": "devCanSleep",
+ "type": {
+ "dataType": "integer",
+ "elements": [
+ {
+ "elementType": "input",
+ "elementOptions": [
+ {
+ "type": "checkbox"
+ }
+ ],
+ "transformers": []
+ }
+ ]
+ },
+ "default_value": 0,
+ "options": [],
+ "localized": [
+ "name",
+ "description"
+ ],
+ "name": [
+ {
+ "language_code": "en_us",
+ "string": "Can Sleep"
+ }
+ ],
+ "description": [
+ {
+ "language_code": "en_us",
+ "string": "When enabled, the device will appear as Sleeping instead of Down or Off-line while it has been absent for less than the Sleep Window (NTFPRCS_sleep_time). Once the sleep window expires the device becomes subject to the normal Alert Down condition. Database column name: devCanSleep."
+ }
+ ]
+ },
{
"function": "devSkipRepeated",
"type": {
diff --git a/front/plugins/notification_processing/config.json b/front/plugins/notification_processing/config.json
index acb4fbbf..87c52093 100755
--- a/front/plugins/notification_processing/config.json
+++ b/front/plugins/notification_processing/config.json
@@ -105,6 +105,34 @@
}
]
},
+ {
+ "function": "sleep_time",
+ "type": {
+ "dataType": "integer",
+ "elements": [
+ {
+ "elementType": "input",
+ "elementOptions": [{ "type": "number" }],
+ "transformers": []
+ }
+ ]
+ },
+ "default_value": 30,
+ "options": [],
+ "localized": ["name", "description"],
+ "name": [
+ {
+ "language_code": "en_us",
+ "string": "Sleep Window"
+ }
+ ],
+ "description": [
+ {
+ "language_code": "en_us",
+ "string": "How many minutes a device with Can Sleep enabled is shown as Sleeping before it becomes subject to the Alert Down condition. Changes take effect after saving settings."
+ }
+ ]
+ },
{
"function": "new_dev_condition",
"type": {
diff --git a/front/workflowsCore.php b/front/workflowsCore.php
index b2942e6e..09da6af0 100755
--- a/front/workflowsCore.php
+++ b/front/workflowsCore.php
@@ -46,7 +46,7 @@ let fieldOptions = [
"devName", "devMac", "devOwner", "devType", "devVendor", "devVlan", "devFavorite",
"devGroup", "devComments", "devFirstConnection", "devLastConnection",
"devLastIP", "devStaticIP", "devScan", "devLogEvents", "devAlertEvents",
- "devAlertDown", "devSkipRepeated", "devLastNotification", "devPresentLastScan",
+ "devAlertDown", "devCanSleep", "devSkipRepeated", "devLastNotification", "devPresentLastScan",
"devIsNew", "devLocation", "devIsArchived", "devParentMAC", "devParentPort",
"devIcon", "devSite", "devSSID", "devSyncHubNode", "devSourcePlugin", "devFQDN",
"devParentRelType", "devReqNicsOnline", "devNameSource", "devVendorSource" ,
diff --git a/scripts/generate-device-inventory.py b/scripts/generate-device-inventory.py
index 1ad959f3..ee6989e4 100644
--- a/scripts/generate-device-inventory.py
+++ b/scripts/generate-device-inventory.py
@@ -33,6 +33,7 @@ DEFAULT_HEADER = [
"devLogEvents",
"devAlertEvents",
"devAlertDown",
+ "devCanSleep",
"devSkipRepeated",
"devLastNotification",
"devPresentLastScan",
@@ -185,6 +186,7 @@ def build_row(
"devLogEvents": "1",
"devAlertEvents": "1",
"devAlertDown": "0",
+ "devCanSleep": "0",
"devSkipRepeated": "0",
"devLastNotification": "",
"devPresentLastScan": "0",
diff --git a/server/api_server/graphql_endpoint.py b/server/api_server/graphql_endpoint.py
index 000f43a9..1e0da83d 100755
--- a/server/api_server/graphql_endpoint.py
+++ b/server/api_server/graphql_endpoint.py
@@ -101,6 +101,8 @@ class Device(ObjectType):
devParentRelTypeSource = String(description="Source tracking for devParentRelType (USER, LOCKED, NEWDEV, or plugin prefix)")
devVlanSource = String(description="Source tracking for devVlan")
devFlapping = Int(description="Indicates flapping device (device changing between online/offline states frequently)")
+ devCanSleep = Int(description="Can this device sleep? (0 or 1). When enabled, offline periods within NTFPRCS_sleep_time are reported as Sleeping instead of Down.")
+ devIsSleeping = Int(description="Computed: Is device currently in a sleep window? (0 or 1)")
class DeviceResult(ObjectType):
@@ -247,7 +249,7 @@ class Query(ObjectType):
)
is_down = (
- device["devPresentLastScan"] == 0 and device["devAlertDown"] and "down" in allowed_statuses
+ device["devPresentLastScan"] == 0 and device["devAlertDown"] and device.get("devIsSleeping", 0) == 0 and "down" in allowed_statuses
)
is_offline = (
@@ -282,11 +284,17 @@ class Query(ObjectType):
devices_data = [
device for device in devices_data if device["devIsNew"] == 1 and device["devIsArchived"] == 0
]
+ elif status == "sleeping":
+ devices_data = [
+ device
+ for device in devices_data
+ if device.get("devIsSleeping", 0) == 1 and device["devIsArchived"] == 0
+ ]
elif status == "down":
devices_data = [
device
for device in devices_data
- if device["devPresentLastScan"] == 0 and device["devAlertDown"] and device["devIsArchived"] == 0
+ if device["devPresentLastScan"] == 0 and device["devAlertDown"] and device.get("devIsSleeping", 0) == 0 and device["devIsArchived"] == 0
]
elif status == "archived":
devices_data = [
diff --git a/server/api_server/openapi/schemas.py b/server/api_server/openapi/schemas.py
index 0c3b08ea..4d7d3127 100644
--- a/server/api_server/openapi/schemas.py
+++ b/server/api_server/openapi/schemas.py
@@ -35,7 +35,7 @@ COLUMN_NAME_PATTERN = re.compile(r"^[a-zA-Z0-9_]+$")
ALLOWED_DEVICE_COLUMNS = Literal[
"devName", "devOwner", "devType", "devVendor",
"devGroup", "devLocation", "devComments", "devFavorite",
- "devParentMAC"
+ "devParentMAC", "devCanSleep"
]
ALLOWED_NMAP_MODES = Literal[
@@ -204,9 +204,19 @@ class DeviceInfo(BaseModel):
description="Present in last scan (0 or 1)",
json_schema_extra={"enum": [0, 1]}
)
- devStatus: Optional[Literal["online", "offline"]] = Field(
+ devStatus: Optional[Literal["online", "offline", "sleeping"]] = Field(
None,
- description="Online/Offline status"
+ description="Online/Offline/Sleeping status"
+ )
+ devCanSleep: Optional[int] = Field(
+ 0,
+ description="Can device sleep? (0=No, 1=Yes). When enabled, offline periods within NTFPRCS_sleep_time window are shown as Sleeping.",
+ json_schema_extra={"enum": [0, 1]}
+ )
+ devIsSleeping: Optional[int] = Field(
+ 0,
+ description="Computed: Is device currently in a sleep window? (0=No, 1=Yes)",
+ json_schema_extra={"enum": [0, 1]}
)
devMacSource: Optional[str] = Field(None, description="Source of devMac (USER, LOCKED, or plugin prefix)")
devNameSource: Optional[str] = Field(None, description="Source of devName")
@@ -228,14 +238,15 @@ class DeviceSearchResponse(BaseResponse):
class DeviceListRequest(BaseModel):
"""Request for listing devices by status."""
status: Optional[Literal[
- "connected", "down", "favorites", "new", "archived", "all", "my",
+ "connected", "down", "sleeping", "favorites", "new", "archived", "all", "my",
"offline"
]] = Field(
None,
description=(
"Filter devices by status:\n"
"- connected: Active devices present in the last scan\n"
- "- down: Devices with active 'Device Down' alert\n"
+ "- down: Devices with active 'Device Down' alert (excludes sleeping)\n"
+ "- sleeping: Devices in a sleep window (devCanSleep=1, offline within NTFPRCS_sleep_time)\n"
"- favorites: Devices marked as favorite\n"
"- new: Devices flagged as new\n"
"- archived: Devices moved to archive\n"
diff --git a/server/database.py b/server/database.py
index 405c47a8..521e865b 100755
--- a/server/database.py
+++ b/server/database.py
@@ -10,7 +10,6 @@ from db.db_helper import get_table_json, json_obj
from workflows.app_events import AppEvent_obj
from db.db_upgrade import (
ensure_column,
- ensure_views,
ensure_CurrentScan,
ensure_plugins_tables,
ensure_Parameters,
@@ -192,6 +191,8 @@ class DB:
raise RuntimeError("ensure_column(devParentRelTypeSource) failed")
if not ensure_column(self.sql, "Devices", "devVlanSource", "TEXT"):
raise RuntimeError("ensure_column(devVlanSource) failed")
+ if not ensure_column(self.sql, "Devices", "devCanSleep", "INTEGER"):
+ raise RuntimeError("ensure_column(devCanSleep) failed")
# Settings table setup
ensure_Settings(self.sql)
@@ -208,8 +209,9 @@ class DB:
# CurrentScan table setup
ensure_CurrentScan(self.sql)
- # Views
- ensure_views(self.sql)
+ # Views are created in importConfigs() after settings are committed,
+ # so NTFPRCS_sleep_time is available when the view is built.
+ # ensure_views is NOT called here.
# Indexes
ensure_Indexes(self.sql)
diff --git a/server/db/db_helper.py b/server/db/db_helper.py
index 54ae5a59..25ded026 100755
--- a/server/db/db_helper.py
+++ b/server/db/db_helper.py
@@ -24,7 +24,8 @@ def get_device_conditions():
"connected": "WHERE devPresentLastScan=1",
"favorites": f"WHERE {base_active} AND devFavorite=1",
"new": f"WHERE {base_active} AND devIsNew=1",
- "down": f"WHERE {base_active} AND devAlertDown != 0 AND devPresentLastScan=0",
+ "sleeping": f"WHERE {base_active} AND devIsSleeping=1",
+ "down": f"WHERE {base_active} AND devAlertDown != 0 AND devPresentLastScan=0 AND devIsSleeping=0",
"offline": f"WHERE {base_active} AND devPresentLastScan=0",
"archived": "WHERE devIsArchived=1",
"network_devices": f"WHERE {base_active} AND devType IN ({network_dev_types})",
diff --git a/server/db/db_upgrade.py b/server/db/db_upgrade.py
index 8886b959..c07a2063 100755
--- a/server/db/db_upgrade.py
+++ b/server/db/db_upgrade.py
@@ -28,6 +28,7 @@ EXPECTED_DEVICES_COLUMNS = [
"devLogEvents",
"devAlertEvents",
"devAlertDown",
+ "devCanSleep",
"devSkipRepeated",
"devLastNotification",
"devPresentLastScan",
@@ -235,8 +236,22 @@ def ensure_views(sql) -> bool:
FLAP_THRESHOLD = 3
FLAP_WINDOW_HOURS = 1
+ # Read sleep window from settings; fall back to 30 min if not yet configured.
+ # Uses the same sql cursor (no separate connection) to avoid lock contention.
+ # Note: changing NTFPRCS_sleep_time requires a restart to take effect,
+ # same behaviour as FLAP_THRESHOLD / FLAP_WINDOW_HOURS.
+ try:
+ sql.execute("SELECT setValue FROM Settings WHERE setKey = 'NTFPRCS_sleep_time'")
+ _sleep_row = sql.fetchone()
+ SLEEP_MINUTES = int(_sleep_row[0]) if _sleep_row and _sleep_row[0] else 30
+ except Exception:
+ SLEEP_MINUTES = 30
+
sql.execute(""" DROP VIEW IF EXISTS DevicesView;""")
sql.execute(f""" CREATE VIEW DevicesView AS
+ -- CTE computes devIsSleeping and devFlapping so devStatus can
+ -- reference them without duplicating the sub-expressions.
+ WITH base AS (
SELECT
rowid,
IFNULL(devMac, '') AS devMac,
@@ -259,6 +274,7 @@ def ensure_views(sql) -> bool:
IFNULL(devLogEvents, '') AS devLogEvents,
IFNULL(devAlertEvents, '') AS devAlertEvents,
IFNULL(devAlertDown, '') AS devAlertDown,
+ IFNULL(devCanSleep, 0) AS devCanSleep,
IFNULL(devSkipRepeated, '') AS devSkipRepeated,
IFNULL(devLastNotification, '') AS devLastNotification,
IFNULL(devPresentLastScan, 0) AS devPresentLastScan,
@@ -287,14 +303,15 @@ def ensure_views(sql) -> bool:
IFNULL(devParentPortSource, '') AS devParentPortSource,
IFNULL(devParentRelTypeSource, '') AS devParentRelTypeSource,
IFNULL(devVlanSource, '') AS devVlanSource,
+ -- devIsSleeping: opted-in, absent, and still within the sleep window
CASE
- WHEN devIsNew = 1 THEN 'New'
- WHEN devPresentLastScan = 1 THEN 'On-line'
- WHEN devPresentLastScan = 0 AND devAlertDown != 0 THEN 'Down'
- WHEN devIsArchived = 1 THEN 'Archived'
- WHEN devPresentLastScan = 0 THEN 'Off-line'
- ELSE 'Unknown status'
- END AS devStatus,
+ WHEN devCanSleep = 1
+ AND devPresentLastScan = 0
+ AND devLastConnection >= datetime('now', '-{SLEEP_MINUTES} minutes')
+ THEN 1
+ ELSE 0
+ END AS devIsSleeping,
+ -- devFlapping: toggling online/offline frequently within the flap window
CASE
WHEN EXISTS (
SELECT 1
@@ -308,8 +325,20 @@ def ensure_views(sql) -> bool:
THEN 1
ELSE 0
END AS devFlapping
-
- FROM Devices
+ FROM Devices
+ )
+ SELECT *,
+ -- devStatus references devIsSleeping from the CTE (no duplication)
+ CASE
+ WHEN devIsNew = 1 THEN 'New'
+ WHEN devPresentLastScan = 1 THEN 'On-line'
+ WHEN devIsSleeping = 1 THEN 'Sleeping'
+ WHEN devAlertDown != 0 THEN 'Down'
+ WHEN devIsArchived = 1 THEN 'Archived'
+ WHEN devPresentLastScan = 0 THEN 'Off-line'
+ ELSE 'Unknown status'
+ END AS devStatus
+ FROM base
""")
@@ -381,6 +410,10 @@ def ensure_Indexes(sql) -> bool:
"idx_dev_alertdown",
"CREATE INDEX idx_dev_alertdown ON Devices(devAlertDown)",
),
+ (
+ "idx_dev_cansleep",
+ "CREATE INDEX idx_dev_cansleep ON Devices(devCanSleep)",
+ ),
("idx_dev_isnew", "CREATE INDEX idx_dev_isnew ON Devices(devIsNew)"),
(
"idx_dev_isarchived",
diff --git a/server/initialise.py b/server/initialise.py
index afed6dd8..850490c0 100755
--- a/server/initialise.py
+++ b/server/initialise.py
@@ -11,6 +11,7 @@ import uuid
# Register NetAlertX libraries
import conf
from const import fullConfPath, fullConfFolder, default_tz, applicationPath
+from db.db_upgrade import ensure_views
from helper import getBuildTimeStampAndVersion, collect_lang_strings, updateSubnets, generate_random_string
from utils.datetime_utils import timeNowUTC
from app_state import updateState
@@ -733,6 +734,12 @@ def importConfigs(pm, db, all_plugins):
db.commitDB()
+ # Rebuild DevicesView now that settings (including NTFPRCS_sleep_time) are committed.
+ # This is the single call site — initDB() deliberately skips it so the view
+ # always gets the real user value, not an empty-Settings fallback.
+ ensure_views(sql)
+ db.commitDB()
+
# update only the settings datasource
update_api(db, all_plugins, True, ["settings"])
diff --git a/server/models/device_instance.py b/server/models/device_instance.py
index 94726753..266ec55a 100755
--- a/server/models/device_instance.py
+++ b/server/models/device_instance.py
@@ -61,8 +61,8 @@ class DeviceInstance:
def getDown(self):
return self._fetchall("""
- SELECT * FROM Devices
- WHERE devAlertDown = 1 AND devPresentLastScan = 0
+ SELECT * FROM DevicesView
+ WHERE devAlertDown = 1 AND devPresentLastScan = 0 AND devIsSleeping = 0
""")
def getOffline(self):
@@ -454,7 +454,9 @@ class DeviceInstance:
"devPresenceHours": 0,
"devFQDN": "",
"devForceStatus" : "dont_force",
- "devVlan": ""
+ "devVlan": "",
+ "devCanSleep": 0,
+ "devIsSleeping": 0
}
return device_data
@@ -467,11 +469,6 @@ class DeviceInstance:
d.*,
LOWER(d.devMac) AS devMac,
LOWER(d.devParentMAC) AS devParentMAC,
- CASE
- WHEN d.devAlertDown != 0 AND d.devPresentLastScan = 0 THEN 'Down'
- WHEN d.devPresentLastScan = 1 THEN 'On-line'
- ELSE 'Off-line'
- END AS devStatus,
(SELECT COUNT(*) FROM Sessions
WHERE LOWER(ses_MAC) = LOWER(d.devMac) AND (
@@ -501,11 +498,10 @@ class DeviceInstance:
OR ses_DateTimeDisconnection >= {period_date_sql} OR ses_StillConnected = 1)
) AS devPresenceHours
- FROM Devices d
+ FROM DevicesView d
WHERE LOWER(d.devMac) = LOWER(?) OR CAST(d.rowid AS TEXT) = ?
"""
-
conn = get_temp_db_connection()
cur = conn.cursor()
cur.execute(sql, (mac, mac))
@@ -571,7 +567,8 @@ class DeviceInstance:
"devIsArchived",
"devCustomProps",
"devForceStatus",
- "devVlan"
+ "devVlan",
+ "devCanSleep"
}
# Only mark USER for tracked fields that this method actually updates.
@@ -617,12 +614,12 @@ class DeviceInstance:
devMac, devName, devOwner, devType, devVendor, devIcon,
devFavorite, devGroup, devLocation, devComments,
devParentMAC, devParentPort, devSSID, devSite,
- devStaticIP, devScan, devAlertEvents, devAlertDown,
+ devStaticIP, devScan, devAlertEvents, devAlertDown, devCanSleep,
devParentRelType, devReqNicsOnline, devSkipRepeated,
devIsNew, devIsArchived, devLastConnection,
devFirstConnection, devLastIP, devGUID, devCustomProps,
devSourcePlugin, devForceStatus, devVlan
- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
"""
values = (
@@ -644,6 +641,7 @@ class DeviceInstance:
data.get("devScan") or 0,
data.get("devAlertEvents") or 0,
data.get("devAlertDown") or 0,
+ data.get("devCanSleep") or 0,
data.get("devParentRelType") or "default",
data.get("devReqNicsOnline") or 0,
data.get("devSkipRepeated") or 0,
@@ -665,7 +663,7 @@ class DeviceInstance:
devName=?, devOwner=?, devType=?, devVendor=?, devIcon=?,
devFavorite=?, devGroup=?, devLocation=?, devComments=?,
devParentMAC=?, devParentPort=?, devSSID=?, devSite=?,
- devStaticIP=?, devScan=?, devAlertEvents=?, devAlertDown=?,
+ devStaticIP=?, devScan=?, devAlertEvents=?, devAlertDown=?, devCanSleep=?,
devParentRelType=?, devReqNicsOnline=?, devSkipRepeated=?,
devIsNew=?, devIsArchived=?, devCustomProps=?, devForceStatus=?, devVlan=?
WHERE devMac=?
@@ -688,6 +686,7 @@ class DeviceInstance:
data.get("devScan") or 0,
data.get("devAlertEvents") or 0,
data.get("devAlertDown") or 0,
+ data.get("devCanSleep") or 0,
data.get("devParentRelType") or "default",
data.get("devReqNicsOnline") or 0,
data.get("devSkipRepeated") or 0,
@@ -834,7 +833,6 @@ class DeviceInstance:
conn.close()
return result
-
def lockDeviceField(self, mac, field_name):
"""Lock a device field so it won't be overwritten by plugins."""
if field_name not in FIELD_SOURCE_MAP:
diff --git a/server/scan/device_handling.py b/server/scan/device_handling.py
index a80a717d..88090460 100755
--- a/server/scan/device_handling.py
+++ b/server/scan/device_handling.py
@@ -533,8 +533,8 @@ def print_scan_stats(db):
SELECT
(SELECT COUNT(*) FROM CurrentScan) AS devices_detected,
(SELECT COUNT(*) FROM CurrentScan WHERE NOT EXISTS (SELECT 1 FROM Devices WHERE devMac = scanMac)) AS new_devices,
- (SELECT COUNT(*) FROM Devices WHERE devAlertDown != 0 AND NOT EXISTS (SELECT 1 FROM CurrentScan WHERE devMac = scanMac)) AS down_alerts,
- (SELECT COUNT(*) FROM Devices WHERE devAlertDown != 0 AND devPresentLastScan = 1 AND NOT EXISTS (SELECT 1 FROM CurrentScan WHERE devMac = scanMac)) AS new_down_alerts,
+ (SELECT COUNT(*) FROM DevicesView WHERE devAlertDown != 0 AND devIsSleeping = 0 AND NOT EXISTS (SELECT 1 FROM CurrentScan WHERE devMac = scanMac)) AS down_alerts,
+ (SELECT COUNT(*) FROM DevicesView WHERE devAlertDown != 0 AND devIsSleeping = 0 AND devPresentLastScan = 1 AND NOT EXISTS (SELECT 1 FROM CurrentScan WHERE devMac = scanMac)) AS new_down_alerts,
(SELECT COUNT(*) FROM Devices WHERE devPresentLastScan = 0) AS new_connections,
(SELECT COUNT(*) FROM Devices WHERE devPresentLastScan = 1 AND NOT EXISTS (SELECT 1 FROM CurrentScan WHERE devMac = scanMac)) AS disconnections,
(SELECT COUNT(*) FROM Devices, CurrentScan
diff --git a/server/scan/session_events.py b/server/scan/session_events.py
index 049f2190..bae9f053 100755
--- a/server/scan/session_events.py
+++ b/server/scan/session_events.py
@@ -175,8 +175,9 @@ def insert_events(db):
eve_EventType, eve_AdditionalInfo,
eve_PendingAlertEmail)
SELECT devMac, devLastIP, '{startTime}', 'Device Down', '', 1
- FROM Devices
+ FROM DevicesView
WHERE devAlertDown != 0
+ AND devIsSleeping = 0
AND devPresentLastScan = 1
AND NOT EXISTS (SELECT 1 FROM CurrentScan
WHERE devMac = scanMac
@@ -242,8 +243,8 @@ def insertOnlineHistory(db):
COUNT(*) AS allDevices,
COALESCE(SUM(CASE WHEN devIsArchived = 1 THEN 1 ELSE 0 END), 0) AS archivedDevices,
COALESCE(SUM(CASE WHEN devPresentLastScan = 1 THEN 1 ELSE 0 END), 0) AS onlineDevices,
- COALESCE(SUM(CASE WHEN devPresentLastScan = 0 AND devAlertDown = 1 THEN 1 ELSE 0 END), 0) AS downDevices
- FROM Devices
+ COALESCE(SUM(CASE WHEN devPresentLastScan = 0 AND devAlertDown = 1 AND devIsSleeping = 0 THEN 1 ELSE 0 END), 0) AS downDevices
+ FROM DevicesView
"""
deviceCounts = db.read(query)[