fix sensu checks

sensu/plugins/check-cinder-sessions.py

@@ -19,7 +19,7 @@
 import subprocess
 import sys
 
-from novaclient.v2.client import Client as nova_client
+from novaclient.v1_1.client import Client as nova_client
 
 CREDS = {
     'username': os.environ['OS_USERNAME'],
@@ -74,7 +74,7 @@ def main():
                 print "Volume %s is 'in-use' but not " \
                       "connected" % vol['id']
                 failure = True
-    except Exeception as e:
+    except Exception as e:
         print "Could not run check: %s" % e
         sys.exit(2)
     sys.exit(failure)

sensu/plugins/check-glance-store.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python2.7
 
+import argparse
 import logging
 import os
 import pytz
@@ -23,7 +24,13 @@
     'region_name': 'RegionOne',
 }
 
-store_directory = os.environ['GLANCE_IMAGE_DIR']
+
+argparser = argparse.ArgumentParser()
+argparser.add_argument('--imagedir', help='Glance file store image directory',
+                    default='/var/lib/glance/images')
+options = argparser.parse_args()
+
+store_directory = options.imagedir
 
 if 'OS_CACERT' in os.environ.keys():
     glance_auth['ca_cert'] = os.environ['OS_CACERT']
@@ -36,7 +43,7 @@
                                             endpoint_type='publicURL')
 
 # logging.basicConfig(level=logging.DEBUG)
-glance = client.Client('1', endpoint=endpoint, token=auth_token)
+glance = client.Client('2', endpoint=endpoint, token=auth_token)
 glance.format = 'json'
 
 # Fetch the list of files in store_directory matching the UUID regex
@@ -52,7 +59,7 @@
 glance_images = []
 for x in glance.images.list():
     if x.status == 'active':
-        tz_aware_time = pytz.utc.localize(parser.parse(x.created_at))
+        tz_aware_time = parser.parse(x.created_at)
         glance_images.append((x.id, x.size, tz_aware_time))
 
 # Check all active images 1 hour or older are present

sensu/plugins/metrics-nova-state.py

@@ -6,7 +6,7 @@
 import time
 import os
 
-from novaclient.v3 import Client
+from novaclient.v1_1 import Client
 
 DEFAULT_SCHEME = '{}.nova.states'.format(socket.gethostname())
 

sensu/plugins/metrics-nova.py

@@ -11,7 +11,7 @@
 import time
 import os
 
-from novaclient.v3 import Client
+from novaclient.v1_1 import Client
 
 DEFAULT_SCHEME = '{}.nova.hypervisors'.format(socket.gethostname())