diff --git a/back/report_sample.html b/back/report_sample.html
index 5d55f531..5a535cf9 100755
--- a/back/report_sample.html
+++ b/back/report_sample.html
@@ -46,6 +46,7 @@
Event Type |
Device name |
Comments |
+ Device Vendor |
| 00:00:00:ef:a5:6c |
@@ -54,6 +55,7 @@
New Device |
(name not found) |
|
+ |
| 00:00:00:ef:a5:6c |
@@ -62,6 +64,7 @@
New Device |
(name not found) |
|
+ |
@@ -83,6 +86,7 @@
Event Type |
Device name |
Comments |
+ Device Vendor |
| 00:00:00:ef:a5:6c |
diff --git a/back/webhook_json_sample.json b/back/webhook_json_sample.json
index 562ca570..940630d0 100755
--- a/back/webhook_json_sample.json
+++ b/back/webhook_json_sample.json
@@ -24,7 +24,8 @@
"IP": "192.168.1.1",
"Event Type": "New Device",
"Device name": "(name not found)",
- "Comments": null
+ "Comments": null,
+ "Device Vendor": null
}],
"down_devices": [],
"events": [{
@@ -33,14 +34,16 @@
"IP": "192.168.1.92",
"Event Type": "Disconnected",
"Device name": "(name not found)",
- "Comments": null
+ "Comments": null,
+ "Device Vendor": null
}, {
"MAC": "74:ac:74:ac:74:ac",
"Datetime": "2023-01-30 22:15:09",
"IP": "192.168.1.150",
"Event Type": "Disconnected",
"Device name": "(name not found)",
- "Comments": null
+ "Comments": null,
+ "Device Vendor": null
}],
"ports": [{
"new": {
diff --git a/pialert/reporting.py b/pialert/reporting.py
index 25d851f6..dd89ec5d 100755
--- a/pialert/reporting.py
+++ b/pialert/reporting.py
@@ -184,7 +184,8 @@ def send_notifications (db):
if 'new_devices' in conf.INCLUDED_SECTIONS :
# Compose New Devices Section
- sqlQuery = """SELECT eve_MAC as MAC, eve_DateTime as Datetime, dev_LastIP as IP, eve_EventType as "Event Type", dev_Name as "Device name", dev_Comments as Comments FROM Events_Devices
+ sqlQuery = """SELECT eve_MAC as MAC, eve_DateTime as Datetime, dev_LastIP as IP, eve_EventType as "Event Type", dev_Name as "Device name", dev_Comments as Comments, dev_Vendor as "Device Vendor"
+ FROM Events_Devices
WHERE eve_PendingAlertEmail = 1
AND eve_EventType = 'New Device'
ORDER BY eve_DateTime"""
@@ -200,7 +201,8 @@ def send_notifications (db):
if 'down_devices' in conf.INCLUDED_SECTIONS :
# Compose Devices Down Section
- sqlQuery = """SELECT eve_MAC as MAC, eve_DateTime as Datetime, dev_LastIP as IP, eve_EventType as "Event Type", dev_Name as "Device name", dev_Comments as Comments FROM Events_Devices
+ sqlQuery = """SELECT eve_MAC as MAC, eve_DateTime as Datetime, dev_LastIP as IP, eve_EventType as "Event Type", dev_Name as "Device name", dev_Comments as Comments, dev_Vendor as "Device Vendor"
+ FROM Events_Devices
WHERE eve_PendingAlertEmail = 1
AND eve_EventType = 'Device Down'
ORDER BY eve_DateTime"""
@@ -216,7 +218,8 @@ def send_notifications (db):
if 'events' in conf.INCLUDED_SECTIONS :
# Compose Events Section
- sqlQuery = """SELECT eve_MAC as MAC, eve_DateTime as Datetime, dev_LastIP as IP, eve_EventType as "Event Type", dev_Name as "Device name", dev_Comments as Comments FROM Events_Devices
+ sqlQuery = """SELECT eve_MAC as MAC, eve_DateTime as Datetime, dev_LastIP as IP, eve_EventType as "Event Type", dev_Name as "Device name", dev_Comments as Comments, dev_Vendor as "Device Vendor"
+ FROM Events_Devices
WHERE eve_PendingAlertEmail = 1
AND eve_EventType IN ('Connected','Disconnected',
'IP Changed')