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

Merge branch 'main' of https://github.com/leiweibau/Pi.Alert

Browse Source
This commit is contained in:
Joshua
2022-07-19 18:45:09 +10:00
parent 6e05338fbb 65b788bc54
commit 8f3e8aaa5d
9 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
back/pialert.py
View File

@@ -711,12 +711,15 @@ def print_scan_stats ():
sql.execute("SELECT * FROM Devices") sql.execute("SELECT * FROM Devices")
History_All = sql.fetchall() History_All = sql.fetchall()
History_All_Devices = len(History_All) History_All_Devices = len(History_All)
sql.execute("SELECT * FROM Devices WHERE dev_Archived = 1")
History_Archived = sql.fetchall()
History_Archived_Devices = len(History_Archived)
sql.execute("""SELECT * FROM CurrentScan WHERE cur_ScanCycle = ? """, (cycle,)) sql.execute("""SELECT * FROM CurrentScan WHERE cur_ScanCycle = ? """, (cycle,))
History_Online = sql.fetchall() History_Online = sql.fetchall()
History_Online_Devices = len(History_Online) History_Online_Devices = len(History_Online)
History_Offline_Devices = History_All_Devices - History_Online_Devices 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) "+ sql.execute ("INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices, Archived_Devices, ScanCycle) "+
"VALUES ( ?, ?, ?, ?)", (startTime, History_Online_Devices, History_Offline_Devices, History_All_Devices ) ) "VALUES ( ?, ?, ?, ?, ?, ?)", (startTime, History_Online_Devices, History_Offline_Devices, History_All_Devices, History_Archived_Devices, cycle ) )
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
def create_new_devices (): def create_new_devices ():
@@ -961,7 +964,7 @@ def update_devices_data_from_scan ():
# New Apple devices -> Cycle 15 # New Apple devices -> Cycle 15
print_log ('Update devices - 6 Cycle for Apple devices') print_log ('Update devices - 6 Cycle for Apple devices')
sql.execute ("""UPDATE Devices SET dev_ScanCycle = 15 sql.execute ("""UPDATE Devices SET dev_ScanCycle = 1
WHERE dev_FirstConnection = ? WHERE dev_FirstConnection = ?
AND UPPER(dev_Vendor) LIKE '%APPLE%' """, AND UPPER(dev_Vendor) LIKE '%APPLE%' """,
(startTime,) ) (startTime,) )

3
front/devices.php
View File

@@ -118,7 +118,8 @@
var pia_js_online_history_time = [<?php pia_graph_devices_data($Pia_Graph_Device_Time); ?>]; var pia_js_online_history_time = [<?php pia_graph_devices_data($Pia_Graph_Device_Time); ?>];
var pia_js_online_history_ondev = [<?php pia_graph_devices_data($Pia_Graph_Device_Online); ?>]; var pia_js_online_history_ondev = [<?php pia_graph_devices_data($Pia_Graph_Device_Online); ?>];
var pia_js_online_history_dodev = [<?php pia_graph_devices_data($Pia_Graph_Device_Down); ?>]; var pia_js_online_history_dodev = [<?php pia_graph_devices_data($Pia_Graph_Device_Down); ?>];
pia_draw_graph_online_history(pia_js_online_history_time, pia_js_online_history_ondev, pia_js_online_history_dodev); var pia_js_online_history_ardev = [<?php pia_graph_devices_data($Pia_Graph_Device_Arch); ?>];
pia_draw_graph_online_history(pia_js_online_history_time, pia_js_online_history_ondev, pia_js_online_history_dodev, pia_js_online_history_ardev);
</script> </script>
<!-- datatable ------------------------------------------------------------- --> <!-- datatable ------------------------------------------------------------- -->

16
front/js/graph_online_history.js
View File

@@ -1,24 +1,30 @@
function pia_draw_graph_online_history(pia_js_graph_online_history_time, pia_js_graph_online_history_ondev, pia_js_graph_online_history_dodev) { function pia_draw_graph_online_history(pia_js_graph_online_history_time, pia_js_graph_online_history_ondev, pia_js_graph_online_history_dodev, pia_js_graph_online_history_ardev) {
var xValues = pia_js_graph_online_history_time; var xValues = pia_js_graph_online_history_time;
new Chart("OnlineChart", { new Chart("OnlineChart", {
type: "bar", type: "bar",
data: { data: {
labels: xValues, labels: xValues,
datasets: [{ datasets: [{
label: 'Online Devices', label: 'Online',
data: pia_js_graph_online_history_ondev, data: pia_js_graph_online_history_ondev,
borderColor: "#00a65a", borderColor: "rgba(0, 166, 89)",
fill: true, fill: true,
backgroundColor: "rgba(0, 166, 89, .6)", backgroundColor: "rgba(0, 166, 89, .6)",
pointStyle: 'circle', pointStyle: 'circle',
pointRadius: 3, pointRadius: 3,
pointHoverRadius: 3 pointHoverRadius: 3
}, { }, {
label: 'Offline/Down Devices', label: 'Offline/Down',
data: pia_js_graph_online_history_dodev, data: pia_js_graph_online_history_dodev,
borderColor: "#dd4b39", borderColor: "rgba(222, 74, 56)",
fill: true, fill: true,
backgroundColor: "rgba(222, 74, 56, .6)", backgroundColor: "rgba(222, 74, 56, .6)",
}, {
label: 'Archived',
data: pia_js_graph_online_history_ardev,
borderColor: "rgba(220,220,220)",
fill: true,
backgroundColor: "rgba(220,220,220, .6)",
}] }]
}, },
options: { options: {

1
front/maintenance.php
View File

@@ -373,7 +373,6 @@ if (submit && isset($_POST['langselector_set'])) {
<script> <script>
// delete devices with emty macs // delete devices with emty macs
function askDeleteDevicesWithEmptyMACs () { function askDeleteDevicesWithEmptyMACs () {
// Ask // Ask

2
front/php/templates/graph.php
View File

@@ -3,6 +3,7 @@ $Pia_Graph_Device_Time = array();
$Pia_Graph_Device_All = array(); $Pia_Graph_Device_All = array();
$Pia_Graph_Device_Online = array(); $Pia_Graph_Device_Online = array();
$Pia_Graph_Device_Down = array(); $Pia_Graph_Device_Down = array();
$Pia_Graph_Device_Arch = array();
$db = new SQLite3('../db/pialert.db'); $db = new SQLite3('../db/pialert.db');
$results = $db->query('SELECT * FROM Online_History ORDER BY Scan_Date DESC LIMIT 144'); $results = $db->query('SELECT * FROM Online_History ORDER BY Scan_Date DESC LIMIT 144');
while ($row = $results->fetchArray()) { while ($row = $results->fetchArray()) {
@@ -12,6 +13,7 @@ while ($row = $results->fetchArray()) {
array_push($Pia_Graph_Device_Down, $row['Down_Devices']); array_push($Pia_Graph_Device_Down, $row['Down_Devices']);
array_push($Pia_Graph_Device_All, $row['All_Devices']); array_push($Pia_Graph_Device_All, $row['All_Devices']);
array_push($Pia_Graph_Device_Online, $row['Online_Devices']); array_push($Pia_Graph_Device_Online, $row['Online_Devices']);
array_push($Pia_Graph_Device_Arch, $row['Archived_Devices']);
} }
function pia_graph_devices_data($Pia_Graph_Array) { function pia_graph_devices_data($Pia_Graph_Array) {
$Pia_Graph_Array_rev = array_reverse($Pia_Graph_Array); $Pia_Graph_Array_rev = array_reverse($Pia_Graph_Array);

3
front/presence.php
View File

@@ -119,7 +119,8 @@
var pia_js_online_history_time = [<?php pia_graph_devices_data($Pia_Graph_Device_Time); ?>]; var pia_js_online_history_time = [<?php pia_graph_devices_data($Pia_Graph_Device_Time); ?>];
var pia_js_online_history_ondev = [<?php pia_graph_devices_data($Pia_Graph_Device_Online); ?>]; var pia_js_online_history_ondev = [<?php pia_graph_devices_data($Pia_Graph_Device_Online); ?>];
var pia_js_online_history_dodev = [<?php pia_graph_devices_data($Pia_Graph_Device_Down); ?>]; var pia_js_online_history_dodev = [<?php pia_graph_devices_data($Pia_Graph_Device_Down); ?>];
pia_draw_graph_online_history(pia_js_online_history_time, pia_js_online_history_ondev, pia_js_online_history_dodev); var pia_js_online_history_ardev = [<?php pia_graph_devices_data($Pia_Graph_Device_Arch); ?>];
pia_draw_graph_online_history(pia_js_online_history_time, pia_js_online_history_ondev, pia_js_online_history_dodev, pia_js_online_history_ardev);
</script> </script>
<!-- /.row --> <!-- /.row -->

3
install/pialert.cron
View File

@@ -10,7 +10,6 @@
TZ=TIMEZONE TZ=TIMEZONE
0 3 * * 1 python /home/pi/pialert/back/pialert.py update_vendors >/home/pi/pialert/log/pialert.vendors.log 2>&1 0 3 * * 1 python /home/pi/pialert/back/pialert.py update_vendors >/home/pi/pialert/log/pialert.vendors.log 2>&1
*/1 * * * * python /home/pi/pialert/back/pialert.py internet_IP >/home/pi/pialert/log/pialert.IP.log 2>&1 */3 * * * * python /home/pi/pialert/back/pialert.py internet_IP >/home/pi/pialert/log/pialert.IP.log 2>&1
*/5 * * * * python /home/pi/pialert/back/pialert.py 1 >/home/pi/pialert/log/pialert.1.log 2>&1 */5 * * * * python /home/pi/pialert/back/pialert.py 1 >/home/pi/pialert/log/pialert.1.log 2>&1
*/15 * * * * python /home/pi/pialert/back/pialert.py 15 >/home/pi/pialert/log/pialert.15.log 2>&1
*/30 * * * * cp /home/pi/pialert/db/pialert.db /home/pi/pialert/config/pialert.db_bak */30 * * * * cp /home/pi/pialert/db/pialert.db /home/pi/pialert/config/pialert.db_bak

5
install/pialert_patch_DB.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/bin/sh
echo "Create backup before insert new table"
cp ../db/pialert.db ../db/pialert.db.bak
echo "Insert new table 'Online_History' to pialert.db"
sqlite3 ../db/pialert.db "CREATE TABLE 'Online_History' ('Index' INTEGER, 'Scan_Date' TEXT, 'Online_Devices' INTEGER, 'Down_Devices' INTEGER, 'All_Devices' INTEGER, 'Archived_Devices' INTEGER, PRIMARY KEY('Index' AUTOINCREMENT));"

BIN
tar/pialert_latest.tar Normal file
View File

Binary file not shown.