Merge lp:~cjwatson/charms/trusty/haproxy/nrpe-handle-backports into lp:charms/trusty/haproxy

[Colin Watson]

Fix Nagios checks to handle haproxy 1.5.

Fix Nagios checks to handle haproxy 1.5.

dumpstats has changed the HTML classes used to denote UP statuses from active2/active3/backup2/backup3 to active3/active4/backup3/backup4.

[Adam Israel (aisrael)]

Hi Colin,

I had the chance to review this merge proposal today. The change you've made is pretty straightforward, and all tests are passing. LGTM. +1

review: Approve

[Tim Van Steenburgh (tvansteenburgh)]

+1, LGTM, thanks Colin!

review: Approve

=== modified file 'files/nrpe/check_haproxy.sh'
--- files/nrpe/check_haproxy.sh	2013-03-27 15:41:26 +0000
+++ files/nrpe/check_haproxy.sh	2015-04-24 16:20:34 +0000
@@ -11,9 +11,16 @@
 LOGFILE=/var/log/nagios/check_haproxy.log
 AUTH=$(grep -r "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
 
+HAPROXY_VERSION="$(dpkg-query -W --showformat='${Version}\n' haproxy)"
+if dpkg --compare-versions "$HAPROXY_VERSION" ge 1.5; then
+    CLASS_REGEX='(active|backup)(3|4)'
+else
+    CLASS_REGEX='(active|backup)(2|3)'
+fi
+
 for appserver in $(grep '    server' /etc/haproxy/haproxy.cfg | awk '{print $2'});
 do
-    output=$(/usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 10000 --regex="class=\"(active|backup)(2|3).*${appserver}" -e ' 200 OK')
+    output=$(/usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 10000 --regex="class=\"$CLASS_REGEX.*${appserver}" -e ' 200 OK')
     if [ $? != 0 ]; then
         date >> $LOGFILE
         echo $output >> $LOGFILE