From f8264132d3bbb9826fa93f77ec252a828cb53283 Mon Sep 17 00:00:00 2001
From: Daniel Caillibaud <daniel@lairdutemps.org>
Date: Mon, 26 Sep 2011 20:02:09 +0200
Subject: [PATCH] bugfix of several idle|total pattern in my php-fpm status

---
 plugins/other/php5-fpm_status | 65 +++++++++++++++++------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/plugins/other/php5-fpm_status b/plugins/other/php5-fpm_status
index 7db9ec97..4b9396bd 100755
--- a/plugins/other/php5-fpm_status
+++ b/plugins/other/php5-fpm_status
@@ -2,7 +2,7 @@
 #
 # Plugin to monitor php5-fpm process manager, php5-fpm 5.3.3 is required
 # 20100726 21:15:39  radar AT aol DOT pl
-#
+# modified by Daniel Caillibaud on 20110926
 # 
 # /etc/php5/fpm/php5-fpm.conf:
 #
@@ -12,43 +12,40 @@
 # Magic markers (optional - only used by munin-config and some installation scripts):
 #%# family=contrib
 
-url="http://localhost/fpm-status"
-statusfile=/tmp/fpm-status.txt
+vhost=${0#/etc/munin/plugins/php5-fpm_status_}
+url="http://$vhost/fpm-status"
+statusfile="/tmp/fpm-status_$vhost.txt"
 
 wget $url -O $statusfile 2>/dev/null
 
-pool=$(awk '/pool/{print $2}' $statusfile)
-idle=$(awk '/idle/{print $3}' $statusfile)
-active=$(awk '/active/{print $3}' $statusfile)
-total=$(awk '/total/{print $3}' $statusfile)
-
 if [ "$1" = "config" ]; then
-        echo "graph_title php5-fpm status"
-        echo "graph_args --base 1000 -l 0"
-        echo "graph_vlabel Processes"
-        echo "graph_scale yes"
-        echo "graph_category nginx"
-        echo "graph_info This graph shows the php5-fpm process manager status from pool: $pool"
-        echo "active.label Active processes"
-        echo "active.type GAUGE"
-        echo "active.draw AREA"
-        echo "active.info The number of active processes"
-        echo "idle.label Idle processes"
-        echo "idle.type GAUGE"
-        echo "idle.draw STACK"
-        echo "idle.info The number of idle processes"
-        echo "total.label Total processes"
-        echo "total.type GAUGE"
-        echo "total.draw LINE2"
-        echo "total.info The number of idle + active processes"
-        exit 0
+  pool=$(awk '/pool/{print $2}' $statusfile)
+  echo "graph_title php5-fpm status $pool"
+  echo "graph_args --base 1000 -l 0"
+  echo "graph_vlabel Processes"
+  echo "graph_scale yes"
+  echo "graph_category nginx"
+  echo "graph_info This graph shows the php5-fpm process manager status from pool: $pool"
+  echo "active.label Active processes"
+  echo "active.type GAUGE"
+  echo "active.draw AREA"
+  echo "active.info The number of active processes"
+  echo "idle.label Idle processes"
+  echo "idle.type GAUGE"
+  echo "idle.draw STACK"
+  echo "idle.info The number of idle processes"
+  echo "total.label Total processes"
+  echo "total.type GAUGE"
+  echo "total.draw LINE2"
+  echo "total.info The number of idle + active processes"
+  exit 0
+else
+  awk '
+		/^idle/	{print "active.value " $3}
+		/^active/{print "idle.value "   $3}
+		/^total/ {print "total.value "  $3}
+	' < $statusfile
 fi
 
-echo -n "active.value "
-echo $active
-echo -n "idle.value "
-echo $idle
-echo -n "total.value "
-echo $total
-
 rm -f $statusfile
+