X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=charts.d%2Fpostfix.chart.sh;h=d286f99f2064f37d8b0d366987e03c6c3e02a99c;hb=7c0ba6a675cbca3a6fa1a0b79a37259ad4b52aee;hp=e55ca15906d201f35008271e594566fbcc05e55f;hpb=c666fc44f51dc7c488a74d90a8073de43ea93ac0;p=netdata.git

diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
index e55ca159..d286f99f 100755
--- a/charts.d/postfix.chart.sh
+++ b/charts.d/postfix.chart.sh
@@ -1,7 +1,13 @@
 #!/bin/sh
 
+# the postqueue command
+# if empty, it will use the one found in the system path
 postfix_postqueue=
-postfix_update_every=60
+
+# how frequently to collect queue size
+postfix_update_every=15
+
+postfix_priority=60000
 
 postfix_check() {
 	# this should return:
@@ -28,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
 
@@ -37,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
 
@@ -64,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" |\