Merge pull request #16 from diggyk/master

Added support for pinging in the hermes client

bin/hermes

@@ -99,6 +99,24 @@ def request_post(path, json):
     return response
 
 
+def ping_server(args):
+    """Ping the Hermes API server and ensure it responds.  Return output
+    appropriate for a Nagios-style monitoring service.
+    """
+    try:
+        response = request_get("/api/v1/eventtypes?limit=1")
+    except Exception as exc:
+        print "CRIT: Error in Hermes API server response"
+        print ""
+        traceback.print_exc(file=sys.stdout)
+        sys.exit(2)
+
+    print "OK: Hermes server seems ok"
+    print ""
+    print "Successfully ran a simple query against the Hermes API"
+    sys.exit(0)
+
+
 def print_labor(labor, fates):
     """Print the details of a labor to standard out
 
@@ -117,16 +135,18 @@ def print_labor(labor, fates):
     else:
         target_time_str = ""
 
-    print "[{}] {}: \n\tcreated on {} {} \n\tby event {} {}  {}".format(
+    print "[{}] {}: \n\tcreated on {} {} \n\tby event {} {}".format(
         labor["id"],
         labor["host"]["hostname"],
         creation_time,
         target_time_str,
         labor["creationEvent"]["eventType"]["category"],
-        labor["creationEvent"]["eventType"]["state"],
-        labor["creationEvent"]["note"] or ""
+        labor["creationEvent"]["eventType"]["state"]
     )
 
+    if labor["creationEvent"]["note"]:
+        print "\tNote: \"{}\"".format(labor["creationEvent"]["note"])
+
     if labor.get("questId", None):
         print "\n\tPart of Quest [{}] created by {}".format(
             labor["quest"]["id"],
@@ -457,6 +477,7 @@ def list_host_labors_monitoring(args):
         print "OK: No open labors for this host"
         sys.exit(0)
 
+
 def list_labors(args):
     logging.debug("list_labors()")
 
@@ -879,6 +900,12 @@ def parse_cli_args():
     )
     event_create_parser.set_defaults(func=create_event)
 
+    # monitoring ping command line parser
+    ping_parser = subparsers.add_parser(
+        "ping", help="Perform a ping of the Hermes API server"
+    )
+    ping_parser.set_defaults(func=ping_server)
+
     # quest command line parser
     quest_parser = subparsers.add_parser(
         "quest", help="Create and list Quests"