Index: tools/check-batch-cmd
===================================================================
--- tools/check-batch-cmd	(revision 10999)
+++ tools/check-batch-cmd	(revision 11053)
@@ -11,4 +11,5 @@
 import os
 import paramiko
+import subprocess
 import socket
 import sys
@@ -69,5 +70,5 @@
       raise CmdError((stderr, stdout))
     return stdout
-  except socket.error, e:
+  except (socket.error, paramiko.AuthenticationException) as e:
     raise ConnectError(e)
 
@@ -95,4 +96,6 @@
 
 def node_check(host):
+  """ Using multiple connect methods to do some basic health checking as well"""
+
   print "# Processing host", host
   datadump = gformat.get_yaml(host)
@@ -125,4 +128,11 @@
       except CmdError, e: 
         print "### Command error: %s" % e
+
+  try:
+    wl_release = subprocess.check_output(['snmpget', '-Oq', '-Ov',  '-c', 'public', '-v2c',
+      host, 'UCD-SNMP-MIB::ucdavis.84.4.1.2.6.119.108.45.118.101.114.1'])
+    datadump['wl_release'] = int(wl_release.replace('"',''))
+  except subprocess.CalledProcessError, ValueError:
+    pass
   gformat.store_yaml(datadump)