Changeset 4060 for monitoring

Timestamp:

11/19/13 16:46:25 (11 years ago)

Author:

sanmai

Message:

• Fix redirects from http URLs to https URLs, taking care of the query, etc.

File:

• monitoring/plugins/mpi/generic_tla_monitoring.py (modified) (8 diffs)

monitoring/plugins/mpi/generic_tla_monitoring.py

@@ -276 +276 @@
     #if authorize is None : authorize = True
 
-    try:
+    try : 
         port_number = int(port_number)
     except ValueError : 
@@ -282 +282 @@
          "message"   : 'The port number specified, "{0}", cannot be converted to an integer.'.format(port_number)
        }
+    except TypeError : 
+        port_number = None
 
     def handle_connection_failure(problem_description) :
@@ -302 +304 @@
                                           strict = True)
         elif protocol == 'https' :
+
+            
             conn = httplib.HTTPSConnection(host = host, 
                                            port = port_number, 
@@ -314 +318 @@
         return {
                 "code"      : "CRITICAL", 
-                "message"   : 'HTTP connection to host %s failed.' % (host)
+                "message"   : '{protocol} connection on port {port_number} to host "{host}" failed.'.format(protocol = protocol, 
+                                                                                                            port_number = port_number, 
+                                                                                                            host = host)
                }
     else :
@@ -344 +350 @@
 
                 if well_formed :
+
                     return {
                             "code"      : "OK", 
-                            "message"   : 'Host %s is up and returns well-formed data at "%s".' % (host, http_path)
+                            "message"   : 'Host "{host}" is up and returns well-formed data at "{http_path}".'.format(host = host, http_path = http_path)
                            }
                 else :
                     return {
                             "code"      : "CRITICAL", 
-                            "message"   : 'Host %s is up but returns non-well-formed data at "%s".' % (host, http_path)
+                            "message"   : 'Host "{host}" is up but returns non-well-formed data at "{http_path}".'.format(host = host, http_path = http_path)
                             }
 
@@ -357 +364 @@
                 new_location_URL = dict(response.getheaders())['location']
 
-                parsed_new_location_URL = urlparse.urlparse(new_location_URL)
+                parsed_new_location_URL = urlparse.urlsplit(new_location_URL)
+                new_http_path = parsed_new_location_URL.path
+                if parsed_new_location_URL.query != '' : 
+                    new_http_path = new_http_path + '?' + parsed_new_location_URL.query
                
-                if parsed_new_location_URL.scheme == protocol and host == parsed_new_location_URL.netloc and http_path == parsed_new_location_URL.path :
+                if parsed_new_location_URL.scheme == protocol and host == parsed_new_location_URL.netloc and http_path == new_http_path :
                     return {
-                              "code"      : "CRITICAL", 
-                              "message"   : 'Host %s is up but the response to GET "%s" implies an infinite redirection (to "%s").' % (host, http_path, http_path)
+                              "code"    : "CRITICAL", 
+                              "message" : 'Host "{host}" is up but the response to GET "{http_path}" implies an infinite redirection to itself.'.format(host = host, http_path = http_path)
                             }
 
-                else :  
+                else : 
+
+                    pdb.set_trace()
 
                     return check_condition(host        = parsed_new_location_URL.netloc, 
-                                           http_path   = parsed_new_location_URL.path, 
+                                           http_path   = new_http_path, 
                                            protocol    = parsed_new_location_URL.scheme, 
                                            HTTP_method = HTTP_method, 
-                                           port_number = port_number, 
+                                           port_number = parsed_new_location_URL.port, 
                                            authorize   = authorize,
                                            validator   = validator, 
@@ -379 +391 @@
                 return {
                         "code"      : "OK", 
-                        "message"   : 'Host %s is up and requests authorization at "%s".' % (host, http_path)
+                        "message"   : 'Host "{host}" is up and requests authorization at "{http_path}".'.format(host = host, http_path = http_path)
                        }
 
@@ -389 +401 @@
                 return {
                         "code"      : "CRITICAL", 
-                        "message"   : 'Host %s has a problem with the URL path component "%s".' % (host, http_path)
+                        "message"   : 'Host "{host}" has a problem with the URL path component "{http_path}}".'.format(host = host, http_path = http_path)
                        }