From 0b59882f1e4d7da7d228ee519841f1aa47d1d7ef Mon Sep 17 00:00:00 2001
From: salles <none>
Date: Fri, 21 Apr 2006 12:32:27 +0200
Subject: [PATCH] La bonne version maintenant

darcs-hash:20060421103227-72cb0-be55e940779039db2cf60a266ea6add35413fdc3.gz
---
 munin/amavis | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/munin/amavis b/munin/amavis
index 989af742..577bd6aa 100755
--- a/munin/amavis
+++ b/munin/amavis
@@ -14,8 +14,9 @@
 #       amavislog    - file where amavis logs are written
 #
 
-TEMP_FILE=/tmp/lrrd-amavis
-AMAVIS_LOG=/var/log/mail/mail.info
+TEMP_FILE=`tempfile`
+trap "rm -f ${TEMP_FILE}" EXIT
+AMAVIS_LOG=/var/log/mail.info
 OFFSET=/var/lib/munin/plugin-state/amavis.offset
 LOGTAIL=`which logtail`
 
@@ -33,22 +34,15 @@ fi
 
 if [ "$1" = "config" ]; then
 	echo 'graph_title Amavis filter statistics'
-	echo 'graph_order virus spam_maybe spam_sure total'
 	echo 'graph_vlabel nb'
-	echo 'virus.label virus'
-	echo 'spam_maybe.label probably spam'
-	echo 'spam_sure.label surely spam'
-	echo 'total.label total'
+	echo 'total.label Mails scannés'
+	echo "total.draw AREA"
+	echo 'virus.label Mails vérollés'
+	echo "virus.draw AREA"
 	exit 0
 fi
 
-logtail -o ${OFFSET} -f ${AMAVIS_LOG} ${OFFSET}  | grep 'amavis\[.*\]:' > ${TEMP_FILE}
-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`
+logtail -o ${OFFSET} -f ${AMAVIS_LOG} | grep 'amavis\[.*\]:' > ${TEMP_FILE}
 
-echo "virus.value ${virus}"
-echo "spam_maybe.value ${spamm}"
-echo "spam_sure.value ${spams}"
-echo "total.value ${total}"
+echo "total.value `cat ${TEMP_FILE} | wc -l`"
+echo "virus.value `grep -c infected ${TEMP_FILE}`"