ZOOKEEPER-1501. Nagios plugin always returns OK when it cannot connect to zookeeper. (Brian Sutherland via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1381902 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -243,6 +243,9 @@ BUGFIXES:
   ZOOKEEPER-1538. Improve space handling in zkServer.sh and zkEnv.sh. (Andrew
   Ferguson via mahadev)
 
+  ZOOKEEPER-1501. Nagios plugin always returns OK when it cannot connect to
+  zookeeper. (Brian Sutherland via mahadev)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

src/contrib/monitoring/check_zookeeper.py

@@ -74,6 +74,11 @@ class NagiosHandler(object):
                 elif (warning < critical and critical <= value) or (warning > critical and critical >= value):
                     critical_state.append(host)
 
+        if not values:
+            # Zookeeper may be down, not serving requests or we may have a bad configuration
+            print 'Critical, %s not found' % opts.key
+            return 2
+
         values = ' '.join(values)
         if critical_state:
             print 'Critical "%s" %s!|%s' % (opts.key, ', '.join(critical_state), values)