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

💠down_reconnected support v0.75 #611

Browse Source
This commit is contained in:
jokob-sk
2024-05-26 16:52:07 +10:00
parent b3f81967c6
commit 0cf525bd30
14 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
front/events.php
View File

@@ -145,6 +145,9 @@
<th><?= lang('Events_TableHead_IP');?></th>
<th><?= lang('Events_TableHead_IPOrder');?></th>
<th><?= lang('Events_TableHead_AdditionalInfo');?></th>
<th>N/A</th>
<th>MAC</th>
<th><?= lang('Events_TableHead_PendingAlert');?></th>
</tr>
</thead>
</table>
@@ -236,7 +239,7 @@ function initializeDatatable () {
'pageLength' : tableRows,
'columnDefs' : [
{visible: false, targets: [0,5,6,7,8,10] },
{visible: false, targets: [0,5,6,7,8,10,11,12,13] },
{className: 'text-center', targets: [] },
{orderData: [8], targets: 7 },
{orderData: [10], targets: 9 },
@@ -251,6 +254,13 @@ function initializeDatatable () {
{targets: [3,4,5,6,7],
"createdCell": function (td, cellData, rowData, row, col) {
$(td).html (translateHTMLcodes (cellData));
} },
// PendingAlert
{targets: [14],
"createdCell": function (td, cellData, rowData, row, col) {
// console.log(cellData);
$(td).html (cellData);
} }
],
@@ -331,7 +341,7 @@ function getEvents (p_eventsType) {
$('#tableEventsBox')[0].className = 'box box-' + color;
$('#tableEventsTitle').html (tableTitle);
// Coluumns Visibility
// Columns Visibility
$('#tableEvents').DataTable().column(3).visible (!sesionCols);
$('#tableEvents').DataTable().column(4).visible (!sesionCols);
$('#tableEvents').DataTable().column(5).visible (sesionCols);

3
front/js/db_methods.js
View File

@@ -36,7 +36,8 @@ function checkDbLock() {
}
},
error: function() {
console.log('Error checking database lock status');
console.log('🟥 Error checking database lock status');
$(".header-status-locked-db").show()
}
});
}

2
front/php/server/events.php
View File

@@ -105,7 +105,7 @@ function getEvents() {
$periodDate = getDateFromPeriod();
// SQL
$SQL1 = 'SELECT eve_DateTime AS eve_DateTimeOrder, dev_name, dev_owner, eve_DateTime, eve_EventType, NULL, NULL, NULL, NULL, eve_IP, NULL, eve_AdditionalInfo, NULL, Dev_MAC
$SQL1 = 'SELECT eve_DateTime AS eve_DateTimeOrder, dev_name, dev_owner, eve_DateTime, eve_EventType, NULL, NULL, NULL, NULL, eve_IP, NULL, eve_AdditionalInfo, NULL, Dev_MAC, eve_PendingAlertEmail
FROM Events_Devices
WHERE eve_DateTime >= '. $periodDate;

1
front/php/templates/language/de_de.json
View File

@@ -266,6 +266,7 @@
"Events_TableHead_IPOrder": "IP Order",
"Events_TableHead_Order": "Order",
"Events_TableHead_Owner": "Eigent\u00fcmer",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "Zeige _START_ bis _END_ von _TOTAL_ Eintr\u00e4gen",
"Events_Table_nav_next": "N\u00e4chste",
"Events_Table_nav_prev": "Zur\u00fcck",

1
front/php/templates/language/en_us.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "IP Order",
"Events_TableHead_Order": "Order",
"Events_TableHead_Owner": "Owner",
"Events_TableHead_PendingAlert": "Pending Alert",
"Events_Table_info": "Showing _START_ to _END_ of _TOTAL_ entries",
"Events_Table_nav_next": "Next",
"Events_Table_nav_prev": "Previous",

1
front/php/templates/language/es_es.json
View File

@@ -264,6 +264,7 @@
"Events_TableHead_IPOrder": "Orden de IP",
"Events_TableHead_Order": "Ordenar",
"Events_TableHead_Owner": "Propietario",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "Mostrando el INICIO y el FINAL de TODAS las entradas",
"Events_Table_nav_next": "Siguiente",
"Events_Table_nav_prev": "Anterior",

1
front/php/templates/language/fr_fr.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "",
"Events_TableHead_Order": "",
"Events_TableHead_Owner": "Propri\u00e9taire",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "Affichage de _START_ \u00e0 _END_ sur _TOTAL_ entr\u00e9es",
"Events_Table_nav_next": "Suivant",
"Events_Table_nav_prev": "Pr\u00e9c\u00e9dent",

1
front/php/templates/language/it_it.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "Ordine IP",
"Events_TableHead_Order": "Ordine",
"Events_TableHead_Owner": "Proprietario",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "_START_ - _END_ di _TOTAL_ elementi",
"Events_Table_nav_next": "Prossimo",
"Events_Table_nav_prev": "Precedente",

1
front/php/templates/language/nb_no.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "",
"Events_TableHead_Order": "",
"Events_TableHead_Owner": "",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "",
"Events_Table_nav_next": "",
"Events_Table_nav_prev": "",

1
front/php/templates/language/pl_pl.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "Kolejno\u015b\u0107 IP",
"Events_TableHead_Order": "Kolejno\u015b\u0107",
"Events_TableHead_Owner": "W\u0142a\u015bciciel",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "Poka\u017c_START_do_KONIEC_wszystkich_wpis\u00f3w",
"Events_Table_nav_next": "Nast\u0119pna",
"Events_Table_nav_prev": "Poprzednia",

1
front/php/templates/language/pt_br.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "",
"Events_TableHead_Order": "",
"Events_TableHead_Owner": "",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "",
"Events_Table_nav_next": "",
"Events_Table_nav_prev": "",

1
front/php/templates/language/ru_ru.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "IP-\u0437\u0430\u043f\u0440\u043e\u0441",
"Events_TableHead_Order": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a",
"Events_TableHead_Owner": "\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "\u041f\u043e\u043a\u0430\u0437\u0430\u043d\u044b \u0441 _START_ \u043f\u043e _END_ \u0438\u0437 _TOTAL_ \u0437\u0430\u043f\u0438\u0441\u0435\u0439",
"Events_Table_nav_next": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f",
"Events_Table_nav_prev": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f",

1
front/php/templates/language/zh_cn.json
View File

@@ -254,6 +254,7 @@
"Events_TableHead_IPOrder": "",
"Events_TableHead_Order": "",
"Events_TableHead_Owner": "",
"Events_TableHead_PendingAlert": "",
"Events_Table_info": "",
"Events_Table_nav_next": "",
"Events_Table_nav_prev": "",

6
server/reporting.py
View File

@@ -46,12 +46,12 @@ def get_notifications (db):
# Disable reporting on events for devices where reporting is disabled based on the MAC address
sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0
WHERE eve_PendingAlertEmail = 1 AND eve_EventType != 'Device Down' AND eve_MAC IN
WHERE eve_PendingAlertEmail = 1 AND eve_EventType not in ('Device Down', 'Down Reconnected') AND eve_MAC IN
(
SELECT dev_MAC FROM Devices WHERE dev_AlertEvents = 0
)""")
sql.execute ("""UPDATE Events SET eve_PendingAlertEmail = 0
WHERE eve_PendingAlertEmail = 1 AND eve_EventType = 'Device Down' AND eve_MAC IN
WHERE eve_PendingAlertEmail = 1 AND eve_EventType in ('Device Down', 'Down Reconnected') AND eve_MAC IN
(
SELECT dev_MAC FROM Devices WHERE dev_AlertDeviceDown = 0
)""")
@@ -110,7 +110,7 @@ def get_notifications (db):
if 'down_reconnected' in sections:
# Compose Reconnected Down Section
# - select only Devices, that were previously down and now are Connected
# - select only Devices, that were previously down and now are Connected
sqlQuery = f"""
SELECT dev_Name, eve_MAC, dev_Vendor, eve_IP, eve_DateTime, eve_EventType
FROM Events_Devices AS reconnected_devices