Changeset 1998

Timestamp:

07/02/12 12:58:03 (12 years ago)

Author:

dietuyt

Message:

Fixed string formatting to be compatible with python < 2.6

Location:

monitoring/plugins/mpi

Files:

• check_clarin_comp_reg.py (modified) (1 diff)
• check_clarin_vlo.py (modified) (3 diffs)
• check_lat_cql_endpoint.py (modified) (3 diffs)

monitoring/plugins/mpi/check_clarin_comp_reg.py

@@ -45 +45 @@
         return {
                 "code"      : "OK", 
-                "message"   : 'Host "{0}", service "{1}" is up.'.format(host, DESCRIPTION)
+                "message"   : 'Host %s, service %s is up.' % (host, DESCRIPTION)
                 }
     else:
         return {
                 "code"      : "CRITICAL", 
-                "message"   : 'Host "{0}", service "{1}" has a problem.'.format(host, DESCRIPTION)
+                "message"   : 'Host %s, service %s has a problem.' % (host, DESCRIPTION)
                 }
 

monitoring/plugins/mpi/check_clarin_vlo.py

@@ -6 +6 @@
 
 nagios_codes = {
-                'OK'        : 0,
-                'WARNING'   : 1,
-                'CRITICAL'  : 2,
-                'UNKNOWN'   : 3,
-                'DEPENDENT' : 4
-                }
+'OK'        : 0,
+'WARNING'   : 1,
+'CRITICAL'  : 2,
+'UNKNOWN'   : 3,
+'DEPENDENT' : 4
+}
 
 def usage():
@@ -18 +18 @@
         usage() calls nagios_return()
     """
-    nagios_return('UNKNOWN',
-                  "usage: {0} -h host".format(sys.argv[0]))
+    nagios_return('UNKNOWN',"usage: {0} -h host".format(sys.argv[0]))
 
 def nagios_return(code, response):
@@ -42 +41 @@
     
     if r1.status == 200:
-        return {
-                "code"      : "OK", 
-                "message"   : 'Host "{0}", service "{1}" is up.'.format(host, DESCRIPTION)
-                }
+        return { "code"      : "OK", "message"   : 'Host %s, service %s is up.' % (host, DESCRIPTION) }
     else:
-        return {
-                "code"      : "CRITICAL", 
-                "message"   : 'Host "{0}", service "{1}" has a problem!'.format(host, DESCRIPTION)
-                }
-
+        return { "code"      : "CRITICAL", "message"   : 'Host %s, service %s has a problem!' % (host, DESCRIPTION) }
 
 def main():

monitoring/plugins/mpi/check_lat_cql_endpoint.py

@@ -36 +36 @@
 def check_response_data_validity(data) :
     data_tree_root_element  = xml.etree.ElementTree.XML(text = data)
-
-    valid_root_element_tag  = "{{{0}}}explainResponse".format(CQL_NAMESPACE)
-
+        
+    valid_root_element_tag  = "{%s}explainResponse" % (CQL_NAMESPACE)
+        
     if data_tree_root_element.tag == valid_root_element_tag :
         return True
@@ -64 +64 @@
             return {
                     "code"      : "OK", 
-                    "message"   : 'Host "{0}", service "{1}" is up and returns valid data.'.format(host, DESCRIPTION)
+                    "message"   : 'Host %s, service %s is up and returns valid data.' % (host, DESCRIPTION)
                    }
         else :
             return {
                     "code"      : "CRITICAL", 
-                    "message"   : 'Host "{0}", service "{1}" is up but returns invalid data!'.format(host, DESCRIPTION)
+                    "message"   : 'Host %s, service %s is up but returns invalid data!' % (host, DESCRIPTION)
                    }
 
@@ -75 +75 @@
         return {
                 "code"      : "CRITICAL", 
-                "message"   : 'Host "{0}", service "{1}" has a problem.'.format(host, DESCRIPTION)
+                "message"   : 'Host %s, service %s has a problem.' % (host, DESCRIPTION)
                }