diff options
Diffstat (limited to 'files/munin/dovecot')
| -rw-r--r-- | files/munin/dovecot | 71 |
1 files changed, 17 insertions, 54 deletions
diff --git a/files/munin/dovecot b/files/munin/dovecot index 1f9e3b4..86feb4b 100644 --- a/files/munin/dovecot +++ b/files/munin/dovecot @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Munin Plugin # to count logins to your dovecot mailserver @@ -28,7 +28,7 @@ ###################### # Configuration ###################### -STAT_FILE=${STAT_FILE:-/var/lib/munin/plugin-state/plugin-dovecot.state} +STAT_FILE=/var/lib/munin/plugin-state/plugin-dovecot.state EXPR_BIN=/usr/bin/expr LOGFILE=${logfile:-/var/log/mail.log} ###################### @@ -47,8 +47,6 @@ if [ "$1" = "config" ]; then echo 'login_ssl.label SSL Logins' echo 'login_imap.label IMAP Logins' echo 'login_pop3.label POP3 Logins' - echo 'login_imap_proxy.label IMAP Proxy Logins' - echo 'login_pop3_proxy.label POP3 Proxy Logins' echo 'connected.label Connected Users' exit 0 fi @@ -62,8 +60,6 @@ if [ ! -r $STAT_FILE ]; then echo "SSL=0" >> $STAT_FILE echo "IMAP=0" >> $STAT_FILE echo "POP3=0" >> $STAT_FILE - echo "IMAP_PROXY=0" >> $STAT_FILE - echo "POP3_PROXY=0" >> $STAT_FILE fi ############################# @@ -71,8 +67,8 @@ fi ###################### # Total Logins ###################### -echo -en "login_total.value " -NEW_TOTAL=$(egrep '[dovecot]?.*(Login|started proxying)' $LOGFILE | grep "`date '+%b %d'`" | sort | wc -l) +/bin/echo -en "login_total.value " +NEW_TOTAL=$(egrep 'dovecot.*Login' $LOGFILE | grep "`date '+%b %e'`" | sort | wc -l) OLD_TOTAL=$(grep TOTAL $STAT_FILE | cut -f2 -d '=') TOTAL=$($EXPR_BIN $NEW_TOTAL - $OLD_TOTAL) if [ $TOTAL -gt 0 ]; then @@ -84,20 +80,15 @@ echo -n ###################### # Connected Users ###################### -DISCONNECTS=$(egrep '[dovecot]?.*(Disconnected|Connection closed|disconnecting)' $LOGFILE | sort | wc -l) -CONNECTS=$(egrep '[dovecot]?.*(Login|started proxying)' $LOGFILE | sort | wc -l) -DISCON=$($EXPR_BIN $CONNECTS - $DISCONNECTS) -if [ $DISCON -lt 0 ]; then - DISCON=0 -fi -echo -en "connected.value " -echo $DISCON +CONNECTS=$(doveadm -f flow who -1 |wc -l) +/bin/echo -en "connected.value " +echo $CONNECTS echo -n ###################### # TLS Logins ###################### -echo -en "login_tls.value " -NEW_TLS=$(egrep '[dovecot]?.*Login.*TLS' $LOGFILE | grep "`date '+%b %d'`" | sort | wc -l) +/bin/echo -en "login_tls.value " +NEW_TLS=$(egrep 'dovecot.*Login.*TLS' $LOGFILE | grep "`date '+%b %e'`" | sort | wc -l) OLD_TLS=$(grep TLS $STAT_FILE | cut -f2 -d '=') TLS=$($EXPR_BIN $NEW_TLS - $OLD_TLS) if [ $TLS -gt 0 ]; then @@ -109,8 +100,8 @@ echo -n ###################### # SSL Logins ###################### -echo -en "login_ssl.value " -NEW_SSL=$(egrep '[dovecot]?.*Login.*SSL' $LOGFILE | grep "`date '+%b %d'`" | sort | wc -l) +/bin/echo -en "login_ssl.value " +NEW_SSL=$(egrep 'dovecot.*Login.*SSL' $LOGFILE | grep "`date '+%b %e'`" | sort | wc -l) OLD_SSL=$(grep SSL $STAT_FILE | cut -f2 -d '=') SSL=$($EXPR_BIN $NEW_SSL - $OLD_SSL) if [ $SSL -gt 0 ]; then @@ -122,9 +113,9 @@ echo -n ###################### # IMAP Logins ###################### -echo -en "login_imap.value " -NEW_IMAP=$(egrep '[dovecot]?.*imap.*Login' $LOGFILE | grep "`date '+%b %d'`" | sort | wc -l) -OLD_IMAP=$(grep 'IMAP=' $STAT_FILE | cut -f2 -d '=') +/bin/echo -en "login_imap.value " +NEW_IMAP=$(egrep 'dovecot.*imap.*Login' $LOGFILE | grep "`date '+%b %e'`" | sort | wc -l) +OLD_IMAP=$(grep IMAP $STAT_FILE | cut -f2 -d '=') IMAP=$($EXPR_BIN $NEW_IMAP - $OLD_IMAP) if [ $IMAP -gt 0 ]; then echo "$IMAP" @@ -135,9 +126,9 @@ echo -n ###################### # POP3 Logins ###################### -echo -en "login_pop3.value " -NEW_POP3=$(egrep '[dovecot]?.*pop3.*Login' $LOGFILE | grep "`date '+%b %d'`" | sort | wc -l) -OLD_POP3=$(grep 'POP3=' $STAT_FILE | cut -f2 -d '=') +/bin/echo -en "login_pop3.value " +NEW_POP3=$(egrep 'dovecot.*pop3.*Login' $LOGFILE | grep "`date '+%b %e'`" | sort | wc -l) +OLD_POP3=$(grep POP3 $STAT_FILE | cut -f2 -d '=') POP3=$($EXPR_BIN $NEW_POP3 - $OLD_POP3) if [ $POP3 -gt 0 ]; then echo "$POP3" @@ -146,32 +137,6 @@ else fi echo -n ###################### -# POP3 Proxy Logins -###################### -echo -en "login_pop3_proxy.value " -NEW_POP3_PROXY=$(egrep '[dovecot]?.*pop3.*started proxying' $LOGFILE | grep "`date '+%b %d'`" | sort | wc -l) -OLD_POP3_PROXY=$(grep POP3_PROXY $STAT_FILE | cut -f2 -d '=') -POP3_PROXY=$($EXPR_BIN $NEW_POP3_PROXY - $OLD_POP3_PROXY) -if [ $POP3_PROXY -gt 0 ]; then - echo "$POP3_PROXY" -else - echo "0" -fi -echo -n -###################### -# IMAP Proxy Logins -###################### -echo -en "login_imap_proxy.value " -NEW_IMAP_PROXY=$(egrep '[dovecot]?.*imap*started proxying' $LOGFILE | grep "`date '+%b %d'`" | sort | wc -l) -OLD_IMAP_PROXY=$(grep IMAP_PROXY $STAT_FILE | cut -f2 -d '=') -IMAP_PROXY=$($EXPR_BIN $NEW_IMAP_PROXY - $OLD_IMAP_PROXY) -if [ $IMAP_PROXY -gt 0 ]; then - echo "$IMAP_PROXY" -else - echo "0" -fi -echo -n -###################### # Save the new values ###################### echo "TOTAL=$NEW_TOTAL" > $STAT_FILE @@ -179,5 +144,3 @@ echo "TLS=$NEW_TLS" >> $STAT_FILE echo "SSL=$NEW_SSL" >> $STAT_FILE echo "IMAP=$NEW_IMAP" >> $STAT_FILE echo "POP3=$NEW_POP3" >> $STAT_FILE -echo "POP3_PROXY=$NEW_POP3_PROXY" >> $STAT_FILE -echo "IMAP_PROXY=$NEW_IMAP_PROXY" >> $STAT_FILE |