Merge lp:~jjo/charm-helpers/fix-check_haproxy_sh-lp1521279 into lp:charm-helpers

[JuanJo Ciarlante]

[Felipe Reyes (freyes)]

This patch looks good to me, I tested it using trusty-icehouse and trusty-liberty, there are no visible regressions and it fixes liberty.

[0] trusty-icehouse:
root@juju-freyes-machine-4:~# /usr/local/lib/nagios/plugins/check_haproxy.sh
OK: All haproxy instances (6) looking good
root@juju-freyes-machine-4:~# service haproxy stop
 * Stopping haproxy haproxy
   ...done.
root@juju-freyes-machine-4:~# /usr/local/lib/nagios/plugins/check_haproxy.sh
CRITICAL: keystone-1 keystone-0 keystone-2 keystone-1 keystone-0 keystone-2
root@juju-freyes-machine-4:~# service haproxy start
 * Starting haproxy haproxy
   ...done.
root@juju-freyes-machine-4:~# /usr/local/lib/nagios/plugins/check_haproxy.sh
OK: All haproxy instances (6) looking good

[1] trusty-liberty:
root@juju-freyes-machine-4:~# /usr/local/lib/nagios/plugins/check_haproxy.sh
CRITICAL: keystone-1 keystone-0 keystone-2 keystone-1 keystone-0 keystone-2
root@juju-freyes-machine-4:~# service haproxy status
haproxy is running.
root@juju-freyes-machine-4:~# dpkg -l haproxy
Desired=Unknown/Install/Remove/Purge/Hold
| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
||/ Name Version Architecture Description
+++-===============================================-============================-============================-===================================================================================================
ii haproxy 1.5.14-1ubuntu0.15.10.1~clou amd64 fast and reliable load balancing reverse proxy
root@juju-freyes-machine-4:~# /usr/local/lib/nagios/plugins/check_haproxy.sh #<-patched
OK: All haproxy instances (6) looking good

review: Approve

[Liam Young (gnuoy)]

Thanks for the fix jjo and thanks for the testing freyes. It LGTM.

review: Approve

=== modified file 'charmhelpers/contrib/openstack/files/check_haproxy.sh'
--- charmhelpers/contrib/openstack/files/check_haproxy.sh	2015-02-17 07:11:43 +0000
+++ charmhelpers/contrib/openstack/files/check_haproxy.sh	2015-11-30 19:10:36 +0000
@@ -9,15 +9,17 @@
 CRITICAL=0
 NOTACTIVE=''
 LOGFILE=/var/log/nagios/check_haproxy.log
-AUTH=$(grep -r "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
+AUTH=$(grep -r "stats auth" /etc/haproxy | awk 'NR=1{print $4}')
 
-for appserver in $(grep '    server' /etc/haproxy/haproxy.cfg | awk '{print $2'});
+typeset -i N_INSTANCES=0
+for appserver in $(awk '/^\s+server/{print $2}' /etc/haproxy/haproxy.cfg)
 do
-    output=$(/usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 8888 --regex="class=\"(active|backup)(2|3).*${appserver}" -e ' 200 OK')
+    N_INSTANCES=N_INSTANCES+1
+    output=$(/usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 8888 -u '/;csv' --regex=",${appserver},.*,UP.*" -e ' 200 OK')
     if [ $? != 0 ]; then
         date >> $LOGFILE
         echo $output >> $LOGFILE
-        /usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 8888 -v | grep $appserver >> $LOGFILE 2>&1
+        /usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 8888 -u '/;csv' -v | grep ",${appserver}," >> $LOGFILE 2>&1
         CRITICAL=1
         NOTACTIVE="${NOTACTIVE} $appserver"
     fi
@@ -28,5 +30,5 @@
     exit 2
 fi
 
-echo "OK: All haproxy instances looking good"
+echo "OK: All haproxy instances ($N_INSTANCES) looking good"
 exit 0