smecontribs/smeserver-mailstats
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get email report working

Browse Source
This commit is contained in:
Brian Read 2024-06-06 14:56:19 +01:00
parent c0cc10f417
commit 0bc452c38a
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
root/opt/mailstats/templates/mailstats.html.pt
View File

@ -37,7 +37,8 @@
</head> </head>
<body> <body>
<!---Navigation here--> <!---Navigation here-->
<h1>${title}</h1> <br />
<h2>${title}</h2>
<br /> <br />
<table border="1"> <table border="1">
<thead> <thead>

29
root/usr/bin/mailstats.py
View File

@ -14,6 +14,13 @@
# 4. Percentages for main table # 4. Percentages for main table
# 5. Percentages and sort for Sub tables # 5. Percentages and sort for Sub tables
# #
# Centos7:
# yum install python3-chameleon --enablerepo=epel
# yum install html2text --enablerepo=epel
#
# Rocky8:
#
#
from datetime import datetime, timedelta from datetime import datetime, timedelta
import sys import sys
from chameleon import PageTemplateFile,PageTemplate from chameleon import PageTemplateFile,PageTemplate
@ -39,8 +46,8 @@ html_page_dir = data_file_path+"/opt/mailstats/html/"
template_dir = data_file_path+"/opt/mailstats/templates/" template_dir = data_file_path+"/opt/mailstats/templates/"
logs_dir = data_file_path+"/opt/mailstats/logs/" logs_dir = data_file_path+"/opt/mailstats/logs/"
#E-Smith Config DBs #E-Smith Config DBs
#db_dir = "/home/e-smith/db" db_dir = "/home/e-smith/db/"
db_dir = "/home/brianr/SME11Build/GITFiles/smecontribs/smeserver-mailstats/" #db_dir = "/home/brianr/SME11Build/GITFiles/smecontribs/smeserver-mailstats/"
# Column numbering # Column numbering
Hour = 0 Hour = 0
@ -603,9 +610,11 @@ if __name__ == "__main__":
SARejectLevel = int(get_value(ConfigDB, "spamassassin", "RejectLevel","12")) #12 #$cdb->get('spamassassin')->prop('RejectLevel'); SARejectLevel = int(get_value(ConfigDB, "spamassassin", "RejectLevel","12")) #12 #$cdb->get('spamassassin')->prop('RejectLevel');
SATagLevel = int(get_value(ConfigDB, "spamassassin", "TagLevel","4")) #4 #$cdb->get('spamassassin')->prop('TagLevel'); SATagLevel = int(get_value(ConfigDB, "spamassassin", "TagLevel","4")) #4 #$cdb->get('spamassassin')->prop('TagLevel');
EmailAddress = get_value(ConfigDB,"mailstats","Email","Admin") EmailAddress = get_value(ConfigDB,"mailstats","Email","admin@"+DomainName)
EmailTextOrHTML = get_value(ConfigDB,"mailstats","EmailTextOrHTML","Text") #Text or Both or None if '@' not in EmailAddress:
EmailHost = get_value(ConfigDB,"mailstats","EmailHost","mail.bjsystems.co.uk") #Default will be localhost EmailAddress = EmailAddress+"@"+DomainName
EmailTextOrHTML = get_value(ConfigDB,"mailstats","EmailTextOrHTML","Both") #Text or Both or None
EmailHost = get_value(ConfigDB,"mailstats","EmailHost","localhost") #Default will be localhost
EmailPort = int(get_value(ConfigDB,"mailstats","EmailPort","25")) EmailPort = int(get_value(ConfigDB,"mailstats","EmailPort","25"))
EMailSMTPUser = get_value(ConfigDB,"mailstats","EmailUser") #None = default => no authenticatioon needed EMailSMTPUser = get_value(ConfigDB,"mailstats","EmailUser") #None = default => no authenticatioon needed
EMailSMTPPassword = get_value(ConfigDB,"mailstats","EmailPassword") EMailSMTPPassword = get_value(ConfigDB,"mailstats","EmailPassword")
@ -630,7 +639,7 @@ if __name__ == "__main__":
log_file = logs_dir+'current.log' log_file = logs_dir+'current.log'
log_entries,skip_count = read_in_yesterday_log_file(log_file) log_entries,skip_count = read_in_yesterday_log_file(log_file)
if len(log_entries) == 0: if len(log_entries) == 0:
print(f"No records found in {data_file}") print(f"No records found in {log_file}")
quit() quit()
else: else:
print(f"Found {len(log_entries)} entries in log for for {formatted_yesterday} skipped {skip_count}") print(f"Found {len(log_entries)} entries in log for for {formatted_yesterday} skipped {skip_count}")
@ -888,7 +897,7 @@ if __name__ == "__main__":
previous_date_str = previous_date.strftime(day_format) previous_date_str = previous_date.strftime(day_format)
navigation_str_html = "<div class='linksattop'>\ navigation_str_html = "<div class='linksattop'>\
<a class='prevlink' href='http://${DomainName}/mailstats/mailstats_for_${PreviousDate}.html'>Previous</a>\ <a class='prevlink' href='http://${DomainName}/mailstats/mailstats_for_${PreviousDate}.html'>Previous</a>\
<div class='divseeinbrowser'><a class='seeinbrowser' href='http://${DomainName}/mailstats/mailstats-${TodayDate}.html'>See in browser</a></div>\ <div class='divseeinbrowser'><a class='seeinbrowser' href='http://${DomainName}/mailstats/mailstats_for_${TodayDate}.html'>See in browser</a></div>\
<a class='nextlink' href='http://${DomainName}/mailstats/mailstats_for_${NextDate}.html'>Next</a>\ <a class='nextlink' href='http://${DomainName}/mailstats/mailstats_for_${NextDate}.html'>Next</a>\
</div>" </div>"
template = PageTemplate(navigation_str_html) template = PageTemplate(navigation_str_html)
@ -934,7 +943,7 @@ if __name__ == "__main__":
) )
else: else:
# No authentication # No authentication
print("Sending non authenticated") print(f"Sending non authenticated {EmailAddress} {EmailHost}")
try: try:
send_email( send_email(
subject="Mailstats for "+formatted_yesterday, subject="Mailstats for "+formatted_yesterday,
@ -945,8 +954,8 @@ if __name__ == "__main__":
HTML_content=html_content, HTML_content=html_content,
Text_content=text_content Text_content=text_content
) )
except exception as e: except Exception as e:
Print(f"Email EXcpetion {e}") print(f"Email Exception {e}")

11
root/usr/bin/runmailstats.sh Normal file → Executable file
View File

@ -1,3 +1,14 @@
#!/bin/bash #!/bin/bash
exec 1> >(logger -t $(basename $0)) 2>&1 exec 1> >(logger -t $(basename $0)) 2>&1
perl /usr/bin/mailstats.pl /var/log/qpsmtpd/\@* /var/log/qpsmtpd/current /var/log/sqpsmtpd/\@* /var/log/sqpsmtpd/current perl /usr/bin/mailstats.pl /var/log/qpsmtpd/\@* /var/log/qpsmtpd/current /var/log/sqpsmtpd/\@* /var/log/sqpsmtpd/current
# and run new python one - start by copying and decoding log files
cd /var/log/qpsmtpd
cat \@* current >/opt/mailstats/logs/current1 2>/dev/null
cd /var/log/sqpsmtpd
cat \@* current >/opt/mailstats/logs/current2 2>/dev/null
cd /opt/mailstats/logs
ls -l
cat current1 current2 2>/dev/null | tai64nlocal > current.log
python3 /usr/bin/mailstats.py
echo "Done"