Ceilometer checks fixes

- fixes printing help to console
- fixes Traceback "Gone: Gone (HTTP 410) (Request-ID: <snip/>)" because
  of stack using Gnocchi instead

Change-Id: Ic71b774a87ffbfa4fd4dec0821f6a0cff0a166ef
Closes-bug: rhbz#1393328

monitoring-for-openstack/oschecks/ceilometer.py

@@ -18,7 +18,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import json
+import re
+
 from oschecks import utils
+from ceilometerclient.openstack.common.apiclient import exceptions
 
 
 def _check_ceilometer_api():
@@ -29,7 +33,15 @@ def _check_ceilometer_api():
                             help='Critical timeout for Ceilometer APIs calls')
     options, client = ceilometer.setup()
 
-    elapsed, meters = utils.timeit(client.meters.list)
+    def meters_list():
+        try:
+            result = client.meters.list()
+        except exceptions.Gone as ex:
+            msg = json.loads(ex.response.content)
+            utils.warning(re.sub(r'\s\s*', ' ', msg['error_message']))
+        return result
+
+    elapsed, meters = utils.timeit(meters_list)
     if not meters:
         utils.critical("Unable to contact Ceilometer API.")
 

monitoring-for-openstack/oschecks/utils.py

@@ -189,7 +189,7 @@ class Ceilometer(object):
             self.base_argv)
         if options.help:
             options.command = None
-            self.do_help(options)
+            self.ceilometer.do_help(options)
             sys.exit(2)
         client_kwargs = vars(options)
         return options, client.get_client(api_version, **client_kwargs)