From a2ff2ebf0218dd0d1dd72ce1fc71e22576890ef2 Mon Sep 17 00:00:00 2001 From: Nagasai Vinaykumar Kapalavai Date: Tue, 31 Jul 2018 11:13:26 -0400 Subject: [PATCH] Fixes for Some oschecks Currently, (Ceilometer, cinder and nova) checks will throw an error if result is empty (for ex: nova flavor list) even though the api is working. With the proposed fix it will just look for the api response and doesn't matter about the result indeed. Change-Id: Ib27d2856fa0f0c794e9ebb348cb84d3d839adffe Closes-Bug: #1784650 --- monitoring-for-openstack/oschecks/ceilometer.py | 3 --- monitoring-for-openstack/oschecks/cinder.py | 3 --- monitoring-for-openstack/oschecks/nova.py | 3 --- 3 files changed, 9 deletions(-) diff --git a/monitoring-for-openstack/oschecks/ceilometer.py b/monitoring-for-openstack/oschecks/ceilometer.py index 58d8713..4785a0e 100644 --- a/monitoring-for-openstack/oschecks/ceilometer.py +++ b/monitoring-for-openstack/oschecks/ceilometer.py @@ -45,9 +45,6 @@ def _check_ceilometer_api(): elapsed, meters = utils.timeit(meters_list) - if not meters: - utils.critical("Unable to contact Ceilometer API.") - if elapsed > options.critical: utils.critical("Get meters took more than %d seconds, " "it's too long.|response_time=%d" % diff --git a/monitoring-for-openstack/oschecks/cinder.py b/monitoring-for-openstack/oschecks/cinder.py index 9f11d0d..c623d15 100644 --- a/monitoring-for-openstack/oschecks/cinder.py +++ b/monitoring-for-openstack/oschecks/cinder.py @@ -50,9 +50,6 @@ def _check_cinder_api(): utils.critical(str(ex)) elapsed, quotas = utils.timeit(quotas_list) - if not quotas: - utils.critical("Unable to contact cinder API.") - if elapsed > options.critical: utils.critical("Get quotas took more than %d seconds, " "it's too long.|response_time=%d" % diff --git a/monitoring-for-openstack/oschecks/nova.py b/monitoring-for-openstack/oschecks/nova.py index 1d290e1..5c84f02 100644 --- a/monitoring-for-openstack/oschecks/nova.py +++ b/monitoring-for-openstack/oschecks/nova.py @@ -47,9 +47,6 @@ def _check_nova_api(): utils.critical(str(ex)) elapsed, flavors = utils.timeit(flavors_list) - if not flavors: - utils.critical("Unable to contact nova API.") - if elapsed > options.critical: utils.critical("Get flavors took more than %d seconds, " "it's too long.|response_time=%d" %