diff -u /usr/share/munin/plugins/amavis amavis --- /usr/share/munin/plugins/amavis 2011-01-26 13:51:27.547665105 +0100 +++ amavis 2011-02-16 14:34:41.850755138 +0100 @@ -134,8 +134,8 @@ fi total=$(cat ${TEMP_FILE} | wc -l) virus=$(grep INFECTED ${TEMP_FILE} | wc -l) - spamm=$(grep 'Passed.*Hits: 1[0-9][.]' ${TEMP_FILE} | wc -l) - spams=$(grep 'Passed.*Hits: [2-9][0-9][0-9]*[.]' ${TEMP_FILE} | wc -l) + spamm=$(grep 'Passed.*Hits: [4-9][.]' ${TEMP_FILE} | wc -l) + spams=$(grep 'Blocked SPAM' ${TEMP_FILE} | wc -l) /bin/rm -f $TEMP_FILE fi