mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added support of 'postgrey' in 'mail.pm'. #102

This commit is contained in:
Jordi Sanfeliu 2017-06-20 11:26:08 +02:00
parent 1b053c7b56
commit 7c338f7e20
1 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/mail.pm
View File

@ -400,6 +400,21 @@ sub mail_update {
if(/ postfix\/smtpd\[\d+\]: NOQUEUE: reject: RCPT from /) {
$rbl++;
}
# postgrey
if(lc($mail->{greylist}) eq "postgrey") {
if(/ action=greylist, reason=new, /) {
$gl_greylisted++;
}
if(/ action=greylist, reason=early-retry /) {
$gl_greylisted++;
}
if(/ action=pass, reason=triplet found, /) {
$gl_records++;
}
if(/ action=pass, reason=client whitelist, /) {
$gl_whitelisted++;
}
}
}
}
close(IN);
@ -1356,19 +1371,32 @@ sub mail_cgi {
undef(@tmp);
undef(@tmpz);
undef(@CDEF);
push(@tmp, "AREA:greylisted#4444EE:Greylisted");
push(@tmp, "GPRINT:greylisted:LAST: Current\\: %5.0lf\\n");
push(@tmp, "AREA:whitelisted#44EEEE:Whitelisted");
push(@tmp, "GPRINT:whitelisted:LAST: Current\\: %5.0lf\\n");
push(@tmp, "LINE2:greylisted#0000EE");
push(@tmp, "LINE2:whitelisted#00EEEE");
push(@tmp, "LINE2:records#EE0000:Records");
push(@tmp, "GPRINT:records:LAST: Current\\: %5.0lf\\n");
push(@tmpz, "AREA:greylisted#4444EE:Greylisted");
push(@tmpz, "AREA:whitelisted#44EEEE:Whitelisted");
push(@tmpz, "LINE2:greylisted#0000EE");
push(@tmpz, "LINE2:whitelisted#00EEEE");
push(@tmpz, "LINE2:records#EE0000:Records");
if(lc($mail->{greylist}) eq "milter-greylist") {
push(@tmp, "AREA:greylisted#4444EE:Greylisted");
push(@tmp, "GPRINT:greylisted:LAST: Current\\: %5.0lf\\n");
push(@tmp, "AREA:whitelisted#44EEEE:Whitelisted");
push(@tmp, "GPRINT:whitelisted:LAST: Current\\: %5.0lf\\n");
push(@tmp, "LINE2:greylisted#0000EE");
push(@tmp, "LINE2:whitelisted#00EEEE");
push(@tmp, "LINE2:records#EE0000:Records");
push(@tmp, "GPRINT:records:LAST: Current\\: %5.0lf\\n");
push(@tmpz, "AREA:greylisted#4444EE:Greylisted");
push(@tmpz, "AREA:whitelisted#44EEEE:Whitelisted");
push(@tmpz, "LINE2:greylisted#0000EE");
push(@tmpz, "LINE2:whitelisted#00EEEE");
push(@tmpz, "LINE2:records#EE0000:Records");
}
if(lc($mail->{greylist}) eq "postgrey") {
push(@tmp, "LINE2:greylisted#0000EE:Greylisted");
push(@tmp, "GPRINT:greylisted:LAST: Current\\: %5.0lf\\n");
push(@tmp, "LINE2:whitelisted#00EEEE:Whitelisted");
push(@tmp, "GPRINT:whitelisted:LAST: Current\\: %5.0lf\\n");
push(@tmp, "LINE2:records#EE00EE:Passed");
push(@tmp, "GPRINT:records:LAST: Current\\: %5.0lf\\n");
push(@tmpz, "LINE2:greylisted#0000EE:Greylisted");
push(@tmpz, "LINE2:whitelisted#00EEEE:Whitelisted");
push(@tmpz, "LINE2:records#EE00EE:Passed");
}
if(lc($config->{show_gaps}) eq "y") {
push(@tmp, "AREA:wrongdata#$colors->{gap}:");
push(@tmpz, "AREA:wrongdata#$colors->{gap}:");