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

Rework of notification templates 0.5

Browse Source
This commit is contained in:
Jokob-sk
2023-01-31 23:55:15 +11:00
parent d4eddf042d
commit f70a3a4207
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
back/pialert.py
View File

@@ -2242,12 +2242,16 @@ def send_notifications ():
mail_text = mail_text.replace ('<SECTION_EVENTS>', notiStruc.text + '\n') mail_text = mail_text.replace ('<SECTION_EVENTS>', notiStruc.text + '\n')
mail_html = mail_html.replace ('<EVENTS_TABLE>', notiStruc.html) mail_html = mail_html.replace ('<EVENTS_TABLE>', notiStruc.html)
if 'ports' in INCLUDED_SECTIONS and changedPorts_json_struc is not None: if 'ports' in INCLUDED_SECTIONS:
# collect "ports" for the webhook json
if changedPorts_json_struc is not None:
json_ports = changedPorts_json_struc.json["data"] json_ports = changedPorts_json_struc.json["data"]
notiStruc = construct_notifications("", "Events", True, changedPorts_json_struc) notiStruc = construct_notifications("", "Ports", True, changedPorts_json_struc)
mail_html = mail_html.replace ('<PORTS_TABLE>', notiStruc.html) mail_html = mail_html.replace ('<PORTS_TABLE>', notiStruc.html)
# mail_text = mail_text.replace ('<PORTS_TABLE>', notiStruc.text + '\n')
mail_text = mail_text.replace ('<PORTS_TABLE>', "Ports changed! Check PiAlert for details!" + '\n')
json_final = { json_final = {
"internet": json_internet, "internet": json_internet,
@@ -2330,6 +2334,9 @@ def send_notifications ():
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
def construct_notifications(sqlQuery, tableTitle, skipText = False, suppliedJsonStruct = None): def construct_notifications(sqlQuery, tableTitle, skipText = False, suppliedJsonStruct = None):
if suppliedJsonStruct is None and sqlQuery == "":
return noti_struc("", "", "")
table_attributes = {"style" : "border-collapse: collapse; font-size: 12px; color:#70707", "width" : "100%", "cellspacing" : 0, "cellpadding" : "3px", "bordercolor" : "#C0C0C0", "border":"1"} table_attributes = {"style" : "border-collapse: collapse; font-size: 12px; color:#70707", "width" : "100%", "cellspacing" : 0, "cellpadding" : "3px", "bordercolor" : "#C0C0C0", "border":"1"}
headerProps = "width='120px' style='color:blue; font-size: 16px;' bgcolor='#909090' " headerProps = "width='120px' style='color:blue; font-size: 16px;' bgcolor='#909090' "
thProps = "width='120px' style='color:#F0F0F0' bgcolor='#909090' " thProps = "width='120px' style='color:#F0F0F0' bgcolor='#909090' "
@@ -2337,10 +2344,10 @@ def construct_notifications(sqlQuery, tableTitle, skipText = False, suppliedJson
build_direction = "TOP_TO_BOTTOM" build_direction = "TOP_TO_BOTTOM"
text_line = '{}\t{}\n' text_line = '{}\t{}\n'
if sqlQuery != "": if suppliedJsonStruct is None:
json_struc = get_table_as_json(sqlQuery) json_struc = get_table_as_json(sqlQuery)
else: else:
json_struc = suppliedJson json_struc = suppliedJsonStruct
json = json_struc.json json = json_struc.json
html = "" html = ""
@@ -3426,8 +3433,6 @@ class serviceSchedule:
return result return result
# print("Hello my name is " + self.scheduleObject)
#=============================================================================== #===============================================================================
# BEGIN # BEGIN
#=============================================================================== #===============================================================================

3
back/report_template.txt
View File

@@ -13,3 +13,6 @@ Events
Internet Internet
---------------------- ----------------------
<SECTION_INTERNET> <SECTION_INTERNET>
Ports
----------------------
<PORTS_TABLE>