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

improve pushsafer support

Browse Source 
Thanks to Final-Hawk
70b6ccc523
This commit is contained in:
leiweibau
2022-07-21 21:22:39 +02:00
parent 19da0da0a4
commit 5d5c75dba7
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
back/pialert.py
View File

@@ -1229,8 +1229,8 @@ def email_reporting ():
mail_text = mail_text.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE ) mail_text = mail_text.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE )
mail_html = mail_html.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE ) mail_html = mail_html.replace ('<PIALERT_VERSION_DATE>', VERSION_DATE )
mail_text = mail_text.replace ('<PIALERT_YEAR>', VERSION_YEAR ) # mail_text = mail_text.replace ('<PIALERT_YEAR>', VERSION_YEAR )
mail_html = mail_html.replace ('<PIALERT_YEAR>', VERSION_YEAR ) # mail_html = mail_html.replace ('<PIALERT_YEAR>', VERSION_YEAR )
# Compose Internet Section # Compose Internet Section
print (' Formating report...') print (' Formating report...')
@@ -1264,7 +1264,7 @@ def email_reporting ():
mail_section_new_devices = False mail_section_new_devices = False
mail_text_new_devices = '' mail_text_new_devices = ''
mail_html_new_devices = '' mail_html_new_devices = ''
text_line_template = ' {}\t{}\t{}\t{}\t{}\n' text_line_template = '{}\t{}\n\t{}\t{}\n\t{}\t{}\n\t{}\t{}\n\t{}\t{}\n\n'
html_line_template = '<tr>\n'+ \ html_line_template = '<tr>\n'+ \
' <td> <a href="{}{}"> {} </a> </td>\n <td> {} </td>\n'+\ ' <td> <a href="{}{}"> {} </a> </td>\n <td> {} </td>\n'+\
' <td> {} </td>\n <td> {} </td>\n <td> {} </td>\n</tr>\n' ' <td> {} </td>\n <td> {} </td>\n <td> {} </td>\n</tr>\n'
@@ -1277,9 +1277,8 @@ def email_reporting ():
for eventAlert in sql : for eventAlert in sql :
mail_section_new_devices = True mail_section_new_devices = True
mail_text_new_devices += text_line_template.format ( mail_text_new_devices += text_line_template.format (
eventAlert['eve_MAC'], eventAlert['eve_DateTime'], 'Name: ', eventAlert['dev_Name'], 'MAC: ', eventAlert['eve_MAC'], 'IP: ', eventAlert['eve_IP'],
eventAlert['eve_IP'], eventAlert['dev_Name'], 'Time: ', eventAlert['eve_DateTime'], 'More Info: ', eventAlert['eve_AdditionalInfo'])
eventAlert['eve_AdditionalInfo'])
mail_html_new_devices += html_line_template.format ( mail_html_new_devices += html_line_template.format (
REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'], REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
eventAlert['eve_DateTime'], eventAlert['eve_IP'], eventAlert['eve_DateTime'], eventAlert['eve_IP'],
@@ -1292,7 +1291,7 @@ def email_reporting ():
mail_section_devices_down = False mail_section_devices_down = False
mail_text_devices_down = '' mail_text_devices_down = ''
mail_html_devices_down = '' mail_html_devices_down = ''
text_line_template = ' {}\t{}\t{}\t{}\n' text_line_template = '{}\t{}\n\t{}\t{}\n\t{}\t{}\n\t{}\t{}\n\n'
html_line_template = '<tr>\n'+ \ html_line_template = '<tr>\n'+ \
' <td> <a href="{}{}"> {} </a> </td>\n <td> {} </td>\n'+ \ ' <td> <a href="{}{}"> {} </a> </td>\n <td> {} </td>\n'+ \
' <td> {} </td>\n <td> {} </td>\n</tr>\n' ' <td> {} </td>\n <td> {} </td>\n</tr>\n'
@@ -1305,8 +1304,8 @@ def email_reporting ():
for eventAlert in sql : for eventAlert in sql :
mail_section_devices_down = True mail_section_devices_down = True
mail_text_devices_down += text_line_template.format ( mail_text_devices_down += text_line_template.format (
eventAlert['eve_MAC'], eventAlert['eve_DateTime'], 'Name: ', eventAlert['dev_Name'], 'MAC: ', eventAlert['eve_MAC'],
eventAlert['eve_IP'], eventAlert['dev_Name']) 'Time: ', eventAlert['eve_DateTime'],'IP: ', eventAlert['eve_IP'])
mail_html_devices_down += html_line_template.format ( mail_html_devices_down += html_line_template.format (
REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'], REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
eventAlert['eve_DateTime'], eventAlert['eve_IP'], eventAlert['eve_DateTime'], eventAlert['eve_IP'],
@@ -1319,7 +1318,7 @@ def email_reporting ():
mail_section_events = False mail_section_events = False
mail_text_events = '' mail_text_events = ''
mail_html_events = '' mail_html_events = ''
text_line_template = ' {}\t{}\t{}\t{}\t{}\t{}\n' text_line_template = '{}\t{}\n\t{}\t{}\n\t{}\t{}\n\t{}\t{}\n\t{}\t{}\n\t{}\t{}\n\n'
html_line_template = '<tr>\n <td>'+ \ html_line_template = '<tr>\n <td>'+ \
' <a href="{}{}"> {} </a> </td>\n <td> {} </td>\n'+ \ ' <a href="{}{}"> {} </a> </td>\n <td> {} </td>\n'+ \
' <td> {} </td>\n <td> {} </td>\n <td> {} </td>\n'+ \ ' <td> {} </td>\n <td> {} </td>\n <td> {} </td>\n'+ \
@@ -1334,9 +1333,9 @@ def email_reporting ():
for eventAlert in sql : for eventAlert in sql :
mail_section_events = True mail_section_events = True
mail_text_events += text_line_template.format ( mail_text_events += text_line_template.format (
eventAlert['eve_MAC'], eventAlert['eve_DateTime'], 'Name: ', eventAlert['dev_Name'], 'MAC: ', eventAlert['eve_MAC'],
eventAlert['eve_IP'], eventAlert['eve_EventType'], 'IP: ', eventAlert['eve_IP'],'Time: ', eventAlert['eve_DateTime'],
eventAlert['dev_Name'], eventAlert['eve_AdditionalInfo']) 'Event: ', eventAlert['eve_EventType'],'More Info: ', eventAlert['eve_AdditionalInfo'])
mail_html_events += html_line_template.format ( mail_html_events += html_line_template.format (
REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'], REPORT_DEVICE_URL, eventAlert['eve_MAC'], eventAlert['eve_MAC'],
eventAlert['eve_DateTime'], eventAlert['eve_IP'], eventAlert['eve_DateTime'], eventAlert['eve_IP'],
@@ -1359,13 +1358,14 @@ def email_reporting ():
send_email (mail_text, mail_html) send_email (mail_text, mail_html)
else : else :
print (' Skip mail...') print (' Skip mail...')
else :
print (' No changes to report...')
if REPORT_PUSHSAFER : if REPORT_PUSHSAFER :
print (' Sending report by PUSHSAFER...') print (' Sending report by PUSHSAFER...')
send_pushsafer (mail_text) send_pushsafer (mail_text)
else : else :
print (' Skip PUSHSAFER...') print (' Skip PUSHSAFER...')
else :
print (' No changes to report...')
# Clean Pending Alert Events # Clean Pending Alert Events
@@ -1388,8 +1388,8 @@ def email_reporting ():
def send_pushsafer (_Text): def send_pushsafer (_Text):
url = 'https://www.pushsafer.com/api' url = 'https://www.pushsafer.com/api'
post_fields = { post_fields = {
"t" : 'Pi.Alert Message', # "t" : 'Pi.Alert Message',
"m" : 'Something has changed', "m" : _Text,
"s" : 11, "s" : 11,
"v" : 3, "v" : 3,
"i" : 148, "i" : 148,