diff --git a/management/reporting/ui/panel-user-activity.html b/management/reporting/ui/panel-user-activity.html index 31981f25..b5acbb51 100644 --- a/management/reporting/ui/panel-user-activity.html +++ b/management/reporting/ui/panel-user-activity.html @@ -61,6 +61,7 @@ diff --git a/management/reporting/ui/panel-user-activity.js b/management/reporting/ui/panel-user-activity.js index 7ec5e24d..7542b523 100644 --- a/management/reporting/ui/panel-user-activity.js +++ b/management/reporting/ui/panel-user-activity.js @@ -137,8 +137,11 @@ Vue.component('panel-user-activity', function(resolve, reject) { combine_received_mail_fields: function() { // remove these fields this.received_mail.combine_fields([ + 'remote_host', + 'remote_ip', 'dkim_reason', 'dmarc_reason', + 'failure_info', 'postgrey_reason', 'postgrey_delay', 'spam_score', diff --git a/management/reporting/uidata/user_activity.2.sql b/management/reporting/uidata/user_activity.2.sql index a2a433e7..45614707 100644 --- a/management/reporting/uidata/user_activity.2.sql +++ b/management/reporting/uidata/user_activity.2.sql @@ -4,8 +4,10 @@ SELECT -- mta_connection connect_time, mta_connection.service AS service, sasl_username, disposition, +remote_host, remote_ip, -- mta_accept envelope_from, spf_result, dkim_result, dkim_reason, dmarc_result, dmarc_reason, +failure_info, -- mta_delivery postgrey_result, postgrey_reason, postgrey_delay, spam_score, spam_result, message_size, orig_to FROM mta_accept diff --git a/management/reporting/uidata/user_activity.py b/management/reporting/uidata/user_activity.py index 8d2ea945..ed135ba1 100644 --- a/management/reporting/uidata/user_activity.py +++ b/management/reporting/uidata/user_activity.py @@ -113,6 +113,8 @@ def user_activity(conn, args): 'connect_time', 'service', 'sasl_username', + 'remote_host', + 'remote_ip', # mta_accept 'envelope_from', @@ -122,6 +124,7 @@ def user_activity(conn, args): 'dkim_reason', 'dmarc_result', 'dmarc_reason', + 'failure_info', # mta_delivery 'orig_to', @@ -136,13 +139,16 @@ def user_activity(conn, args): { 'type':'datetime', 'format': '%Y-%m-%d %H:%M:%S' },# connect_time 'text/plain', # mta_connection.service 'text/email', # sasl_username + 'text/plain', # remote_host + 'text/plain', # remote_ip 'text/email', # envelope_from 'text/plain', # disposition 'text/plain', # spf_result 'text/plain', # dkim_result 'text/plain', # dkim_result 'text/plain', # dmarc_result - 'text/plain', # dmarc_result + 'text/plain', # dmarc_reason + 'text/plain', # failure_info 'text/email', # orig_to 'text/plain', # postgrey_result 'text/plain', # postgrey_reason