📊 Presence over time updates #816

server/api.py

@@ -3,7 +3,7 @@ import json
 
 # Register NetAlertX modules 
 import conf  
-from const import (apiPath, sql_appevents, sql_devices_all, sql_events_pending_alert, sql_settings, sql_plugins_events, sql_plugins_history, sql_plugins_objects,sql_language_strings, sql_notifications_all)
+from const import (apiPath, sql_appevents, sql_devices_all, sql_events_pending_alert, sql_settings, sql_plugins_events, sql_plugins_history, sql_plugins_objects,sql_language_strings, sql_notifications_all, sql_online_history)
 from logger import mylog
 from helper import write_file
 
@@ -32,6 +32,7 @@ def update_api(db, all_plugins, isNotification = False, updateOnlyDataSources =
         ["plugins_objects", sql_plugins_objects],
         ["plugins_language_strings", sql_language_strings],
         ["notifications", sql_notifications_all],
+        ["online_history", sql_online_history],
         ["custom_endpoint", conf.API_CUSTOM_SQL],
     ]
 

server/const.py

@@ -38,6 +38,7 @@ sql_settings = "SELECT  * FROM Settings"
 sql_plugins_objects = "SELECT  * FROM Plugins_Objects"
 sql_language_strings = "SELECT  * FROM Plugins_Language_Strings"
 sql_notifications_all = "SELECT  * FROM Notifications"
+sql_online_history = "SELECT  * FROM Online_History"
 sql_plugins_events = "SELECT  * FROM Plugins_Events"
 sql_plugins_history = "SELECT  * FROM Plugins_History ORDER BY DateTimeChanged DESC"
 sql_new_devices = """SELECT * FROM ( 

server/database.py

@@ -101,7 +101,7 @@ class DB():
           mylog('none','[upgradeDB] Table is incompatible, Dropping the Online_History table')
           self.sql.execute("DROP TABLE Online_History;")
           onlineHistoryAvailable = False
-
+          
         if onlineHistoryAvailable == False :
           self.sql.execute("""
           CREATE TABLE "Online_History" (
@@ -115,6 +115,18 @@ class DB():
           );
           """)
 
+        # Offline_Devices column
+        Offline_Devices_missing = self.sql.execute ("""
+            SELECT COUNT(*) AS CNTREC FROM pragma_table_info('Online_History') WHERE name='Offline_Devices'
+          """).fetchone()[0] == 0
+
+        if Offline_Devices_missing :
+          mylog('verbose', ["[upgradeDB] Adding Offline_Devices to the Online_History table"])
+          self.sql.execute("""
+            ALTER TABLE "Online_History" ADD "Offline_Devices" INTEGER
+          """)
+
+
         # -------------------------------------------------------------------------
         # Alter Devices table       
         # -------------------------------------------------------------------------
@@ -278,8 +290,8 @@ class DB():
                                     Plugin,
                                     Object_PrimaryID,
                                     Object_SecondaryID,
-  									DateTimeCreated,
-									DateTimeChanged,
+                                    DateTimeCreated,
+                                    DateTimeChanged,
                                     Watched_Value1,
                                     Watched_Value2,
                                     Watched_Value3,
@@ -293,8 +305,8 @@ class DB():
                                     'NMAP' AS Plugin,
                                     MAC AS Object_PrimaryID,
                                     Port AS Object_SecondaryID,
-									Time AS DateTimeCreated,
-									DATETIME('now') AS DateTimeChanged,
+                                    Time AS DateTimeCreated,
+                                    DATETIME('now') AS DateTimeChanged,
                                     State AS Watched_Value1,
                                     Service AS Watched_Value2,
                                     '' AS Watched_Value3,
@@ -644,22 +656,3 @@ def get_all_devices(db):
 
 #-------------------------------------------------------------------------------
 
-#-------------------------------------------------------------------------------
-def insertOnlineHistory(db):
-    sql = db.sql #TO-DO
-    startTime = timeNowTZ()
-    # Add to History
-
-    History_All = db.read("SELECT * FROM Devices")
-    History_All_Devices  = len(History_All)
-
-    History_Archived = db.read("SELECT * FROM Devices WHERE dev_Archived = 1")
-    History_Archived_Devices  = len(History_Archived)
-
-    History_Online = db.read("SELECT * FROM Devices WHERE dev_PresentLastScan = 1")
-    History_Online_Devices  = len(History_Online)
-    History_Offline_Devices = History_All_Devices - History_Archived_Devices - History_Online_Devices
-
-    sql.execute ("INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices, Archived_Devices) "+
-                 "VALUES ( ?, ?, ?, ?, ?)", (startTime, History_Online_Devices, History_Offline_Devices, History_All_Devices, History_Archived_Devices ) )
-    db.commitDB()

server/networkscan.py

@@ -2,7 +2,7 @@
 
 import conf
 
-from database import insertOnlineHistory
+
 from device import create_new_devices, print_scan_stats, save_scanned_devices, update_devices_data_from_scan
 from helper import timeNowTZ
 from logger import mylog
@@ -232,4 +232,45 @@ def insert_events (db):
                     FROM Devices, CurrentScan
                     WHERE dev_MAC = cur_MAC                        
                       AND dev_LastIP <> cur_IP """ )
-    mylog('debug','[Events] - Events end')
+    mylog('debug','[Events] - Events end')
+    
+    
+#-------------------------------------------------------------------------------
+def insertOnlineHistory(db):
+    sql = db.sql  # TO-DO: Implement sql object
+
+    scanTimestamp = timeNowTZ()
+
+    # Query to fetch all relevant device counts in one go
+    query = """
+    SELECT
+        COUNT(*) AS allDevics,
+        SUM(CASE WHEN dev_Archived = 1 THEN 1 ELSE 0 END) AS archivedDevices,
+        SUM(CASE WHEN dev_PresentLastScan = 1 THEN 1 ELSE 0 END) AS onlineDevices,
+        SUM(CASE WHEN dev_PresentLastScan = 0 AND dev_AlertDeviceDown = 1 THEN 1 ELSE 0 END) AS downDevices
+    FROM Devices
+    """
+    
+    deviceCounts = db.read(query)[0]  # Assuming db.read returns a list of rows, take the first (and only) row
+
+    allDevics = deviceCounts['allDevics']
+    archivedDevices = deviceCounts['archivedDevices']
+    onlineDevices = deviceCounts['onlineDevices']
+    downDevices = deviceCounts['downDevices']
+    
+    offlineDevices = allDevics - archivedDevices - onlineDevices
+
+    # Prepare the insert query using parameterized inputs
+    insert_query = """
+        INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices, Archived_Devices, Offline_Devices)
+        VALUES (?, ?, ?, ?, ?, ?)
+    """
+    
+    mylog('debug', f'[Presence graph] Sql query: {insert_query} with values: {scanTimestamp}, {onlineDevices}, {downDevices}, {allDevics}, {archivedDevices}, {offlineDevices}')
+
+    # Insert the gathered data into the history table
+    sql.execute(insert_query, (scanTimestamp, onlineDevices, downDevices, allDevics, archivedDevices, offlineDevices))
+
+    db.commitDB()
+
+

server/plugin.py

@@ -129,7 +129,7 @@ def run_plugin_scripts(db, all_plugins, runType, pluginsState = plugins_state())
 
         if shouldRun:            
             # Header
-            updateState(f"Plugins: {prefix}")
+            updateState(f"Plugin: {prefix}")
                         
             print_plugin_info(plugin, ['display_name'])
             mylog('debug', ['[Plugins] CMD: ', get_plugin_setting_obj(plugin, "CMD")["value"]])