Merge pull request #523 from paulfantom/master

[netdata.git] / charts.d / postfix.chart.sh

diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
index 1086ad54eea0cc112c8d6f58c9cf2c8c3391e0ef..f4f710275432ec52c3eed037feec626c5401ea24 100755 (executable)
--- a/charts.d/postfix.chart.sh
+++ b/charts.d/postfix.chart.sh
@@ -7,6 +7,8 @@ postfix_postqueue=
 # how frequently to collect queue size
 postfix_update_every=15
 
+postfix_priority=60000
+
 postfix_check() {
        # this should return:
        #  - 0 to enable the chart
@@ -32,7 +34,7 @@ postfix_check() {
 
        if [ -z "$postfix_postqueue" -o ! -x  "$postfix_postqueue" ]
        then
-               echo >&2 "postfix: cannot find postqueue. Please set 'postfix_postqueue=/path/to/postqueue' in $confd/postfix.conf"
+               echo >&2 "$PROGRAM_NAME: postfix: cannot find postqueue. Please set 'postfix_postqueue=/path/to/postqueue' in $confd/postfix.conf"
                return 1
        fi
 
@@ -41,9 +43,9 @@ postfix_check() {
 
 postfix_create() {
 cat <<EOF
-CHART postfix.qemails '' "Postfix Queue Emails" "emails" postfix postfix line 5000 $postfix_update_every
+CHART postfix.qemails '' "Postfix Queue Emails" "emails" queue postfix.queued.emails line $((postfix_priority + 1)) $postfix_update_every
 DIMENSION emails '' absolute 1 1
-CHART postfix.qsize '' "Postfix Queue Emails Size" "emails size in KB" postfix postfix area 5001 $postfix_update_every
+CHART postfix.qsize '' "Postfix Queue Emails Size" "emails size in KB" queue postfix.queued.size area $((postfix_priority + 2)) $postfix_update_every
 DIMENSION size '' absolute 1 1
 EOF
 
@@ -68,6 +70,9 @@ postfix_update() {
        # be very carefull with eval:
        # prepare the script and always egrep at the end the lines that are usefull, so that
        # even if something goes wrong, no other code can be executed
+       postfix_q_emails=0
+       postfix_q_size=0
+
        eval "`$postfix_postqueue -p |\
                grep "^--" |\
                sed -e "s/-- \([0-9]\+\) Kbytes in \([0-9]\+\) Requests.$/local postfix_q_size=\1\nlocal postfix_q_emails=\2/g" |\