cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a text option for webhooks and different repoting levels

Browse Source
This commit is contained in:
Antoine
2022-10-20 09:42:26 +01:00
parent c289e74e4a
commit 1cefbe0299
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
back/pialert.py
View File

@@ -1614,14 +1614,22 @@ def send_webhook (_json, _html):
except NameError: # variable not defined, use a default
webhookRequestMethod = 'GET'
# Event level reporting (int, 0=none, 1=internet only, 2=new devices & 1, 3=down devices & 2, 4= events & 3 i.e. everything)
try:
eventLevel = EVENT_LEVEL
except NameError: # variable not defined, use a default
eventLevel = 4 # report on everythin
# use data type based on specified payload type
if webhookPayload == 'json':
payloadData = _json
if webhookPayload == 'html':
payloadData = _html
if webhookPayload == 'text':
payloadData = to_text(_json, eventLevel)
#Define slack-compatible payload
_json_payload={
_json_payload = { "text": payloadData } if webhookPayload == 'text' else {
"username": "Pi.Alert",
"text": "There are new notifications",
"attachments": [{
@@ -1816,7 +1824,38 @@ def logResult (stdout, stderr):
if stdout != None:
append_file_binary (LOG_PATH + '/stdout.log', stdout)
#-------------------------------------------------------------------------------
def to_text(_json, eventLevel):
payloadData = ""
if len(_json['internet']) > 0 and eventLevel > 0:
payloadData += "INTERNET\n"
for event in _json['internet']:
payloadData += event[3] + ' on ' + event[2] + '. ' + event[4] + '. New address:' + event[1] + '\n'
if len(_json['new_devices']) > 0 and eventLevel > 1:
payloadData += "NEW DEVICES:\n"
for event in _json['new_devices']:
if event[4] is None:
event[4] = event[11]
payloadData += event[1] + ' - ' + event[4] + '\n'
if len(_json['down_devices']) > 0 and eventLevel > 2:
write_file (LOG_PATH + '/down_devices_example.log', _json['down_devices'])
payloadData += 'DOWN DEVICES:\n'
for event in _json['down_devices']:
if event[4] is None:
event[4] = event[11]
payloadData += event[1] + ' - ' + event[4] + '\n'
if len(_json['events']) > 0 and eventLevel > 3:
payloadData += "EVENTS:\n"
for event in _json['events']:
if event[8] != "Internet":
payloadData += event[8] + " on " + event[1] + " " + event[3] + " at " + event[2] + "\n"
return payloadData
#===============================================================================
# BEGIN
#===============================================================================