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

Add in q/s/u psmtpd counts

Browse Source
This commit is contained in:
Brian Read 2024-12-31 15:51:48 +00:00
parent 9ebe02b80e
commit 9be485a1a9
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -902,8 +902,8 @@ def get_heading():
f"Internal SMTP connections accepted: {totalinternalsmtpsessions}" f"Internal SMTP connections accepted: {totalinternalsmtpsessions}"
if len(connection_type_counts)>0: if len(connection_type_counts)>0:
for connect_type in connection_type_counts.keys(): for connection_type in connection_type_counts.keys():
smtp_stats = smtp_stats + f"\nCount of {connection_type} connections:{connection_type_counts[connect_type]}" smtp_stats += f"\nCount of {connection_type} connections: {connection_type_counts[connection_type]}"
smtp_stats = smtp_stats + f"\nEmails per hour: {emailperhour:.1f}/hr\n"\ smtp_stats = smtp_stats + f"\nEmails per hour: {emailperhour:.1f}/hr\n"\
f"Average spam score (accepted): {spamavg or 0:.2f}\n"\ f"Average spam score (accepted): {spamavg or 0:.2f}\n"\
@ -1122,6 +1122,10 @@ if __name__ == "__main__":
rejectspamavg = 0 rejectspamavg = 0
DMARCSendCount = 0 DMARCSendCount = 0
totalexamined = 0 totalexamined = 0
total_qpsmtpd = 0
total_sqpsmtpd = 0
total_uqpsmtpd = 0
if sorted_len > 0: if sorted_len > 0:
if isThonny: if isThonny:
# Initial call to print the progress bar # Initial call to print the progress bar
@ -1135,9 +1139,10 @@ if __name__ == "__main__":
# Parse the timestamp string into a datetime object # Parse the timestamp string into a datetime object
dt = timestamp dt = timestamp
hour = dt.hour hour = dt.hour
#print(f"Abs:{hour} {timestamp}")
# parse the data # parse the data
parsed_data = parse_data(data) parsed_data = parse_data(data)
#if hour == 15:
# print(f"Abs:{hour} {timestamp} {parsed_data['sendurl']} {parsed_data['from-email']}")
#print(f"{parsed_data}") #print(f"{parsed_data}")
#Take out the mailstats email #Take out the mailstats email
if 'mailstats' in parsed_data['from-email'] and DomainName in parsed_data['from-email']: if 'mailstats' in parsed_data['from-email'] and DomainName in parsed_data['from-email']:
@ -1145,6 +1150,14 @@ if __name__ == "__main__":
# Save the data here if necessary # Save the data here if necessary
if saveData: if saveData:
save_summaries_to_db(anaysis_date_obj.strftime('%Y-%m-%d'),hour,parsed_data) save_summaries_to_db(anaysis_date_obj.strftime('%Y-%m-%d'),hour,parsed_data)
#Count the number of emails through each of qpsmtpd, uqpsmtpd and sqpsmtpd
# the forkserver column in the log indicates it.
if parsed_data['qpsmtpd'].startswith ('qpsmtpd'):
total_qpsmtpd +=1
elif parsed_data['qpsmtpd'].startswith ('sqpsmtpd'):
total_sqpsmtpd += 1
elif parsed_data['qpsmtpd'].startswith ('uqpsmtpd'):
total_uqpsmtpd +=1
# Increment Count in which headings it falls # Increment Count in which headings it falls
#Hourly count and column total #Hourly count and column total
columnCounts_2d[hour][Hour] += 1 columnCounts_2d[hour][Hour] += 1
@ -1330,7 +1343,9 @@ if __name__ == "__main__":
i = 0 i = 0
j = 0 j = 0
log_len = len(log_entries) log_len = len(log_entries)
connection_type_counts = defaultdict(int) #connection_type_counts = defaultdict(int)
connection_type_counts = {"qpsmtp":total_qpsmtpd,"sqpsmtp":total_sqpsmtpd,"uqpsmtp":total_uqpsmtpd}
print(f"Con:{connection_type_counts}")
if log_len > 0: if log_len > 0:
if isThonny: if isThonny:
print_progress_bar(0, log_len, prefix='Progress:', suffix='Complete', length=50) print_progress_bar(0, log_len, prefix='Progress:', suffix='Complete', length=50)
@ -1422,7 +1437,7 @@ if __name__ == "__main__":
line_graph=line_graph_html, line_graph=line_graph_html,
PreviousDate=previous_date_str, PreviousDate=previous_date_str,
NextDate=next_date_str, NextDate=next_date_str,
DomainName=DomainName DomainName=DomainName,
) )
except Exception as e: except Exception as e:
print(f"Chameleon template Exception {e}") print(f"Chameleon template Exception {e}")