diff --git a/root/var/lib/zabbix/bin/util_parse_mail_in b/root/var/lib/zabbix/bin/util_parse_mail_in index 8205bfa..0ece15c 100644 --- a/root/var/lib/zabbix/bin/util_parse_mail_in +++ b/root/var/lib/zabbix/bin/util_parse_mail_in @@ -26,16 +26,16 @@ my $what = $ARGV[0] || ''; # This is the list of plugins we can get stats for # you can set the regex used to identify a line in the logs my %denied = ( - dnsbl => qr{dnsbl\s+90}, + dnsbl => qr{(dnsbl\s+90|naughty\s+90\d\s+\(dnsbl\))}, rhsbl => qr{rhsbl\s+90}, uribl => qr{uribl\s+90}, clamav => qr{virus::clam(av|dscan)\s+90}, check_earlytalker => qr{(check_)?earlytalker\s+90}, check_basicheaders => qr{(check_basic)?headers\s+90}, check_goodrcptto => qr{(check_)?goodrcptto\s+90}, - check_spamhelo => qr{(check_spam)?helo\s+90}, + check_spamhelo => qr{((check_spam)?helo\s+90|naughty\s+90\d\s+\(helo\))}, fcrdns => qr{fcrdns\s+90}, - karma => qr{karma\s+90}, + karma => qr{(karma\s+90|naughty\s+90\d\s+\(karma\))}, spf => qr{sender_permitted_from\s+90}, tls_failed => qr{tls\s+90}, resolvable_fromhost => qr{(require_)?resolvable_fromhost}