Added exception handler and fixed bug of the lock file

ceilometer

@@ -2,18 +2,19 @@
 
 import calendar
 import ConfigParser
+import errno
 import httplib
 import json
 import math
 import optparse
 import os
+import socket
 import sys
 import time
 
 from filelock import FileLock
 
 class api_response():
-
     __status = None
     __data = None
     __msg = None
@@ -43,32 +44,23 @@ class api_response():
 
 class api_request():
     @staticmethod
-    def httpGet(url, host, port, header):
-        conn = httplib.HTTPConnection(host, port)
-        conn.request("GET", url, headers = header)
-        res = conn.getresponse()
-        response = api_response(res.status, res.read(), res.msg)
-        return response
-    @staticmethod
-    def httpsGet(url, host, port, header):
-        conn = httplib.HTTPSConnection(host, port)
-        conn.request("GET", url, headers = header)
-        res = conn.getresponse()
-        response = api_response(res.status, res.read(), res.msg)
-        return response
-    @staticmethod
-    def httpPost(url, host, port, params, headers):
-        conn = httplib.HTTPConnection(host, port)
-        conn.request("POST", url, params, headers)
-        res = conn.getresponse()
-        response = api_response(res.status, res.read(), res.msg)
-        return response
-    @staticmethod
-    def httpsPost(url, host, port, params, headers):
-        conn = httplib.HTTPSConnection(host, port)
-        conn.request("POST", url, params, headers)
+    def call(protocol, url, host, port, header, params=None):
+        if (protocol == 'http'):
+            conn = httplib.HTTPConnection(host, port)
+        else:
+            conn = httplib.HTTPSConnection(host, port)
+        try:
+            if params is None:
+                conn.request("GET", url, headers = header)
+            else:
+                conn.request("POST", url, params, header)
+        except socket.error as e:
+            print 'Exception: ' + str(e)
+            sys.exit()
+
         res = conn.getresponse()
         response = api_response(res.status, res.read(), res.msg)
+
         return response
 
 def getToken(protocol, server, port, tenant, username, password):
@@ -79,23 +71,22 @@ def getToken(protocol, server, port, tenant, username, password):
         parser_token.readfp(open(token_file_path))
 
     if (not parser_token.get('token', 'expires')) or (int(float(parser_token.get('token', 'expires')) - time.time()) <= 0):
-        auth = '{"auth": {"tenantName": "%s", "passwordCredentials": {"username": "%s", "password": "%s"}}}' % (tenant, username, password)
+        params = '{"auth": {"tenantName": "%s", "passwordCredentials": {"username": "%s", "password": "%s"}}}' % (tenant, username, password)
         header = {"Content-Type": "application/json", "Accept": "application/json"}
-        if protocol == 'http':
-            res = api_request.httpPost('/v2.0/tokens', server, port, auth, header)
-        else:
-            res = api_request.httpsPost('/v2.0/tokens', server, port, auth, header)
-
+        res = api_request.call(protocol, '/v2.0/tokens', server, port, header, params)
         res_json = json.loads(res.getData())
-
-        timestamp = calendar.timegm(time.strptime(res_json['access']['token']['expires'],"%Y-%m-%dT%H:%M:%SZ"))
-
-        parser_token.set('token', 'id', res_json['access']['token']['id'])
-        parser_token.set('token', 'expires', str(timestamp))
-
-        with FileLock(token_file_path):
-            with open(token_file_path, 'w') as configfile:
-                parser_token.write(configfile)
+        
+        try:
+            timestamp = calendar.timegm(time.strptime(res_json['access']['token']['expires'],"%Y-%m-%dT%H:%M:%SZ"))
+            parser_token.set('token','id', res_json['access']['token']['id'])
+            parser_token.set('token', 'expires', str(timestamp))
+
+            with FileLock(token_file_path):
+                with open(token_file_path, 'w') as configfile:
+                    parser_token.write(configfile)
+        except KeyError as e:
+            print 'Exception: Wrong Keystone Credentials'
+            sys.exit()
 
     return parser_token.get('token', 'id')
 
@@ -105,23 +96,24 @@ def getMeter(protocol, server, port, token_id, meter, resource_id):
     elif meter in ('network.incoming.bytes', 'network.outgoing.bytes'):
         url = "/v2/meters/%s?q.field=metadata.instance_id&q.op=eq&q.value=%s&limit=1" % (meter, resource_id)
     else:
-        return "Sorry, Unknown Meter"
+        return "Unknown Meter"
 
-    if protocol == 'http':
-        res_json = json.loads(api_request.httpGet(url, server, port, {"X-Auth-Token": token_id}).getData())
-    else:
-        res_json = json.loads(api_request.httpsGet(url, server, port, {"X-Auth-Token": token_id}).getData())
+    try:
+        res_json = json.loads(api_request.call(protocol, url, server, port, {"X-Auth-Token": token_id}).getData())
+        if res_json:
+            return res_json[0]['counter_volume']
+        else:
+            return 'Sample Not Found'
 
-    if res_json:
-        return res_json[0]['counter_volume']
-    else:
-        return 'Sorry, Sample Not Found'
+    except ValueError as e:
+        print 'Exception: Wrong Ceilometer Port'
+        sys.exit()
 
 def main():
-    config_file_path = os.path.join(os.path.dirname(__file__), 'proxy.conf')
+    config_file_path = os.path.join(os.path.dirname(__file__), 'credentials.conf')
     parser_config = ConfigParser.SafeConfigParser()
     parser_config.readfp(open(config_file_path))
-
+    
     token_id = getToken(
         parser_config.get('keystone', 'protocol'),
         parser_config.get('keystone', 'server'),

ceilometer-curl-test

+#!/usr/bin/env python
+
+import calendar
+import ConfigParser
+import httplib
+import json
+import math
+import optparse
+import os
+import sys
+import time
+
+from filelock import FileLock
+
+class api_response():
+
+    __status = None
+    __data = None
+    __msg = None
+
+    def __init__(self, status, data, msg):
+        self.setStatus(status)
+        self.setData(data)
+        self.setMsg(msg)
+
+    def setStatus(self, status):
+        self.__status = status
+
+    def getStatus(self):
+        return self.__status
+
+    def setData(self, data):
+        self.__data = data
+
+    def getData(self):
+        return self.__data
+
+    def setMsg(self, msg):
+        self.__msg = msg
+
+    def getMsg(self):
+        return self.__msg
+
+class api_request():
+    @staticmethod
+    def httpGet(url, host, port, header):
+        conn = httplib.HTTPConnection(host, port)
+        conn.request("GET", url, headers = header)
+        res = conn.getresponse()
+        response = api_response(res.status, res.read(), res.msg)
+        return response
+    @staticmethod
+    def httpsGet(url, host, port, header):
+        conn = httplib.HTTPSConnection(host, port)
+        conn.request("GET", url, headers = header)
+        res = conn.getresponse()
+        response = api_response(res.status, res.read(), res.msg)
+        return response
+    @staticmethod
+    def httpPost(url, host, port, params, headers):
+        conn = httplib.HTTPConnection(host, port)
+        conn.request("POST", url, params, headers)
+        res = conn.getresponse()
+        response = api_response(res.status, res.read(), res.msg)
+        return response
+    @staticmethod
+    def httpsPost(url, host, port, params, headers):
+        conn = httplib.HTTPSConnection(host, port)
+        conn.request("POST", url, params, headers)
+        res = conn.getresponse()
+        response = api_response(res.status, res.read(), res.msg)
+        return response
+
+def getToken(protocol, server, port, tenant, username, password):
+    token_file_path = os.path.join(os.path.dirname(__file__), 'token_backup')
+    parser_token = ConfigParser.SafeConfigParser()
+
+    with FileLock(token_file_path):
+        parser_token.readfp(open(token_file_path))
+
+    if (not parser_token.get('token', 'expires')) or (int(float(parser_token.get('token', 'expires')) - time.time()) <= 0):
+        auth = '{"auth": {"tenantName": "%s", "passwordCredentials": {"username": "%s", "password": "%s"}}}' % (tenant, username, password)
+        header = {"Content-Type": "application/json", "Accept": "application/json"}
+        if protocol == 'http':
+            res = api_request.httpPost('/v2.0/tokens', server, port, auth, header)
+        else:
+            res = api_request.httpsPost('/v2.0/tokens', server, port, auth, header)
+
+        res_json = json.loads(res.getData())
+
+        timestamp = calendar.timegm(time.strptime(res_json['access']['token']['expires'],"%Y-%m-%dT%H:%M:%SZ"))
+
+        parser_token.set('token', 'id', res_json['access']['token']['id'])
+        parser_token.set('token', 'expires', str(timestamp))
+
+        with FileLock(token_file_path):
+            with open(token_file_path, 'w') as configfile:
+                parser_token.write(configfile)
+
+    return parser_token.get('token', 'id')
+
+def getMeter(protocol, server, port, token_id, meter, resource_id):
+    if meter in ('cpu', 'cpu_util', 'disk.ephemeral.size', 'disk.root.size', 'memory', 'vcpus'):
+        url = "/v2/meters/%s?q.field=resource_id&q.op=eq&q.value=%s&limit=1" % (meter, resource_id)
+    elif meter in ('network.incoming.bytes', 'network.outgoing.bytes'):
+        url = "/v2/meters/%s?q.field=metadata.instance_id&q.op=eq&q.value=%s&limit=1" % (meter, resource_id)
+    else:
+        return "Sorry, Unknown Meter"
+
+    if protocol == 'http':
+        res_json = json.loads(api_request.httpGet(url, server, port, {"X-Auth-Token": token_id}).getData())
+    else:
+        res_json = json.loads(api_request.httpsGet(url, server, port, {"X-Auth-Token": token_id}).getData())
+
+    if res_json:
+        return res_json[0]['counter_volume']
+    else:
+        return 'Sorry, Sample Not Found'
+
+def main():
+    config_file_path = os.path.join(os.path.dirname(__file__), 'proxy.conf')
+    parser_config = ConfigParser.SafeConfigParser()
+    parser_config.readfp(open(config_file_path))
+
+    token_id = getToken(
+        parser_config.get('keystone', 'protocol'),
+        parser_config.get('keystone', 'server'),
+        parser_config.get('keystone', 'port'),
+        parser_config.get('keystone', 'tenant'),
+        parser_config.get('keystone', 'username'),
+        parser_config.get('keystone', 'password')
+    )
+
+#    print getMeter(
+#        parser_config.get('ceilometer', 'protocol'),
+#        parser_config.get('ceilometer', 'server'),
+#        parser_config.get('ceilometer', 'port'),
+#        token_id,
+#        sys.argv[1],
+#        sys.argv[2]
+#    )
+
+    server = '141.250.2.118'
+    protocol = 'http'
+    port = '8774'
+
+    url = "/v2/ea26dfda4a1c43a79c94a0720510c308/os-fping/ded7f200-fb21-4577-acd3-d16e2260207b"
+
+    res_json = json.loads(api_request.httpGet(url, server, port, {"X-Auth-Token": token_id}).getData())
+    print json.dumps(res_json, sort_keys=True, indent=4, separators=(',', ': '))
+
+if __name__ == "__main__":
+    main()

ceilometer.sh

 #!/bin/bash
 
-python "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/ceilometer $1 $2  
+#python "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/ceilometer $1 $2  
+python /usr/lib/zabbix/externalscripts/zabbix-external-scripts/ceilometer $1 $2  

filelock.py

 import os
 import time
 import errno
- 
+
 class FileLockException(Exception):
     pass
  
@@ -11,7 +11,7 @@ class FileLock(object):
         compatible as it doesn't rely on msvcrt or fcntl for the locking.
     """
  
-    def __init__(self, file_name, timeout=10, delay=.05):
+    def __init__(self, file_name, timeout=90, delay=.05):
         """ Prepare the file locker. Specify the file to lock and optionally
             the maximum timeout and the delay between each attempt to lock.
         """
@@ -35,9 +35,11 @@ class FileLock(object):
                 break;
             except OSError as e:
                 if e.errno != errno.EEXIST:
-                    raise 
-                if (time.time() - start_time) >= self.timeout:
-                    raise FileLockException("Timeout occured.")
+                    raise
+                if time.time() - os.stat(self.lockfile)[7] >= 60: # if the file is locked since 60 seconds
+                    os.remove(self.lockfile)
+                #if (time.time() - start_time) >= self.timeout:
+                    #raise FileLockException("Timeout occured.")
                 time.sleep(self.delay)
         self.is_locked = True