X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=charts.d%2Fpostfix.chart.sh;h=85604fcbe2f6e2fdd30c4c16b26d253f745495c7;hb=32e8eda4c4d6370e96233a69cab861b2ebb5cc9a;hp=b37dbd5502784c674649409bc0c400301ebd8131;hpb=3824a699715d85e0adf61570a4569d09922c7f5c;p=netdata.git

diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
old mode 100755
new mode 100644
index b37dbd55..85604fcb
--- a/charts.d/postfix.chart.sh
+++ b/charts.d/postfix.chart.sh
@@ -1,5 +1,11 @@
 # no need for shebang - this file is loaded from charts.d.plugin
 
+# netdata
+# real-time performance and health monitoring, done right!
+# (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
+# GPL v3+
+#
+
 # the postqueue command
 # if empty, it will use the one found in the system path
 postfix_postqueue=
@@ -17,24 +23,12 @@ postfix_check() {
 	# try to find the postqueue executable
 	if [ -z "$postfix_postqueue" -o ! -x "$postfix_postqueue" ]
 	then
-		postfix_postqueue="`which postqueue 2>/dev/null`"
-		if [ -z "$postfix_postqueue" -o ! -x "$postfix_postqueue" ]
-		then
-			local d=
-			for d in /sbin /usr/sbin /usr/local/sbin
-			do
-				if [ -x "$d/postqueue" ]
-				then
-					postfix_postqueue="$d/postqueue"
-					break
-				fi
-			done
-		fi
+		postfix_postqueue="$(which postqueue 2>/dev/null || command -v postqueue 2>/dev/null)"
 	fi
 
 	if [ -z "$postfix_postqueue" -o ! -x  "$postfix_postqueue" ]
 	then
-		echo >&2 "$PROGRAM_NAME: postfix: cannot find postqueue. Please set 'postfix_postqueue=/path/to/postqueue' in $confd/postfix.conf"
+		error "cannot find postqueue. Please set 'postfix_postqueue=/path/to/postqueue' in $confd/postfix.conf"
 		return 1
 	fi
 
@@ -43,9 +37,9 @@ postfix_check() {
 
 postfix_create() {
 cat <<EOF
-CHART postfix.qemails '' "Postfix Queue Emails" "emails" queue postfix.queued.emails line $((postfix_priority + 1)) $postfix_update_every
+CHART postfix_local.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" queue postfix.queued.size area $((postfix_priority + 2)) $postfix_update_every
+CHART postfix_local.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
 
@@ -73,17 +67,17 @@ postfix_update() {
 	postfix_q_emails=0
 	postfix_q_size=0
 
-	eval "`$postfix_postqueue -p |\
+	eval "$(run $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" |\
-		egrep "^local postfix_q_(emails|size)=[0-9]+$"`"
+		egrep "^local postfix_q_(emails|size)=[0-9]+$")"
 
 	# write the result of the work.
 	cat <<VALUESEOF
-BEGIN postfix.qemails $1
+BEGIN postfix_local.qemails $1
 SET emails = $postfix_q_emails
 END
-BEGIN postfix.qsize $1
+BEGIN postfix_local.qsize $1
 SET size = $postfix_q_size
 END
 VALUESEOF