vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 01:26:11 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add history graph to Devices and presence (in development)

Browse Source 
- A change in the database is necessary
- change scan-script (pialert.py) was changed to write more data into the database
- update Chart.js to 2.9.4
This commit is contained in:
leiweibau
2022-07-12 23:52:58 +02:00
parent 49748aa564
commit c12fccb2f7
5 changed files with 16230 additions and 3648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
back/pialert.py
View File

@@ -697,6 +697,17 @@ def print_scan_stats ():
(cycle,))
print (' IP Changes.........: ' + str ( sql.fetchone()[0]) )
# Add to History
sql.execute("SELECT * FROM Devices")
History_All = sql.fetchall()
History_All_Devices = len(History_All)
sql.execute("SELECT * FROM CurrentScan")
History_Online = sql.fetchall()
History_Online_Devices = len(History_Online)
History_Offline_Devices = History_All_Devices - History_Online_Devices
sql.execute ("INSERT INTO Online_History (Scan_Date, Online_Devices, Down_Devices, All_Devices) "+
"VALUES ( ?, ?, ?, ?)", (startTime, History_Online_Devices, History_Offline_Devices, History_All_Devices ) )
#-------------------------------------------------------------------------------
def create_new_devices ():
# arpscan - Insert events for new devices
@@ -940,7 +951,7 @@ def update_devices_data_from_scan ():
# New Apple devices -> Cycle 15
print_log ('Update devices - 6 Cycle for Apple devices')
sql.execute ("""UPDATE Devices SET dev_ScanCycle = 1
sql.execute ("""UPDATE Devices SET dev_ScanCycle = 15
WHERE dev_FirstConnection = ?
AND UPPER(dev_Vendor) LIKE '%APPLE%' """,
(startTime,) )

55
front/devices.php
View File

@@ -9,6 +9,7 @@
<?php
require 'php/templates/header.php';
require 'php/templates/graph.php';
?>
<!-- Page ------------------------------------------------------------------ -->
@@ -24,6 +25,60 @@
<!-- Main content ---------------------------------------------------------- -->
<section class="content">
<script src="lib/AdminLTE/bower_components/chart.js/Chart.js"></script>
<canvas id="myChart" style="width:100%; height: 150px; margin-bottom: 15px;"></canvas>
<script>
var xValues = [<?php pia_graph_devices_data($Pia_Graph_Device_Time); ?>];
new Chart("myChart", {
type: "line",
data: {
labels: xValues,
datasets: [{
label: 'All Devices',
data: [<?php pia_graph_devices_data($Pia_Graph_Device_All); ?>],
borderColor: "#00c0ef",
fill: false,
pointStyle: 'circle',
pointRadius: 2,
pointHoverRadius: 2
},{
label: 'Online Devices',
data: [<?php pia_graph_devices_data($Pia_Graph_Device_Online); ?>],
borderColor: "#00a65a",
fill: false,
pointStyle: 'circle',
pointRadius: 2,
pointHoverRadius: 2
}, {
label: 'Offline/Down Devices',
data: [<?php pia_graph_devices_data($Pia_Graph_Device_Down); ?>],
borderColor: "#dd4b39",
fill: false,
pointStyle: 'circle',
pointRadius: 2,
pointHoverRadius: 2
}]
},
options: {
legend: {display: false},
scales: {
yAxes: [{
ticks: {
beginAtZero:false,
fontColor: '#B0B0B0'
},
}],
xAxes: [{
ticks: {
fontColor: '#B0B0B0'
},
}]
}
}
});
</script>
<!-- top small box 1 ------------------------------------------------------- -->
<div class="row">

19730
front/lib/AdminLTE/bower_components/chart.js/Chart.js vendored
View File

File diff suppressed because it is too large Load Diff

25
front/php/templates/graph.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
$Pia_Graph_Device_Time = array();
$Pia_Graph_Device_All = array();
$Pia_Graph_Device_Online = array();
$Pia_Graph_Device_Down = array();
$db = new SQLite3('../db/pialert.db');
$results = $db->query('SELECT * FROM Online_History ORDER BY Scan_Date DESC LIMIT 40');
while ($row = $results->fetchArray()) {
$time_raw = explode(' ', $row['Scan_Date']);
$time = explode(':', $time_raw[1]);
array_push($Pia_Graph_Device_Time, $time[0].':'.$time[1]);
array_push($Pia_Graph_Device_Down, $row['Down_Devices']);
array_push($Pia_Graph_Device_All, $row['All_Devices']);
array_push($Pia_Graph_Device_Online, $row['Online_Devices']);
}
function pia_graph_devices_data($Pia_Graph_Array) {
$Pia_Graph_Array_rev = array_reverse($Pia_Graph_Array);
foreach ($Pia_Graph_Array_rev as $result) {
echo "'".$result."'";
echo ",";
}
}
?>

55
front/presence.php
View File

@@ -9,6 +9,7 @@
<?php
require 'php/templates/header.php';
require 'php/templates/graph.php';
?>
<!-- Page ------------------------------------------------------------------ -->
@@ -24,6 +25,60 @@
<!-- Main content ---------------------------------------------------------- -->
<section class="content">
<script src="lib/AdminLTE/bower_components/chart.js/Chart.js"></script>
<canvas id="myChart" style="width:100%; height: 150px; margin-bottom: 15px;"></canvas>
<script>
var xValues = [<?php pia_graph_devices_data($Pia_Graph_Device_Time); ?>];
new Chart("myChart", {
type: "line",
data: {
labels: xValues,
datasets: [{
label: 'All Devices',
data: [<?php pia_graph_devices_data($Pia_Graph_Device_All); ?>],
borderColor: "#00c0ef",
fill: false,
pointStyle: 'circle',
pointRadius: 2,
pointHoverRadius: 2
},{
label: 'Online Devices',
data: [<?php pia_graph_devices_data($Pia_Graph_Device_Online); ?>],
borderColor: "#00a65a",
fill: false,
pointStyle: 'circle',
pointRadius: 2,
pointHoverRadius: 2
}, {
label: 'Offline/Down Devices',
data: [<?php pia_graph_devices_data($Pia_Graph_Device_Down); ?>],
borderColor: "#dd4b39",
fill: false,
pointStyle: 'circle',
pointRadius: 2,
pointHoverRadius: 2
}]
},
options: {
legend: {display: false},
scales: {
yAxes: [{
ticks: {
beginAtZero:false,
fontColor: '#B0B0B0'
},
}],
xAxes: [{
ticks: {
fontColor: '#B0B0B0'
},
}]
}
}
});
</script>
<!-- top small box 1 ------------------------------------------------------- -->
<div class="row">