Merge branch 'master' into mbruzek-openshift-openstack

2 files changed, 7 insertions, 8 deletions

diff --git a/roles/openshift_health_checker/openshift_checks/logging/elasticsearch.py b/roles/openshift_health_checker/openshift_checks/logging/elasticsearch.py
index 986a01f38..7f8c6ebdc 100644
--- a/roles/openshift_health_checker/openshift_checks/logging/elasticsearch.py
+++ b/roles/openshift_health_checker/openshift_checks/logging/elasticsearch.py
@@ -170,7 +170,7 @@ class Elasticsearch(LoggingCheck):
         """
         errors = []
         for pod_name in pods_by_name.keys():
-            df_cmd = 'exec {} -- df --output=ipcent,pcent /elasticsearch/persistent'.format(pod_name)
+            df_cmd = '-c elasticsearch exec {} -- df --output=ipcent,pcent /elasticsearch/persistent'.format(pod_name)
             disk_output = self.exec_oc(df_cmd, [], save_as_name='get_pv_diskspace.json')
             lines = disk_output.splitlines()
             # expecting one header looking like 'IUse% Use%' and one body line
diff --git a/roles/openshift_health_checker/openshift_checks/logging/kibana.py b/roles/openshift_health_checker/openshift_checks/logging/kibana.py
index 3b1cf8baa..16ec3a7f6 100644
--- a/roles/openshift_health_checker/openshift_checks/logging/kibana.py
+++ b/roles/openshift_health_checker/openshift_checks/logging/kibana.py
@@ -5,12 +5,11 @@ Module for performing checks on a Kibana logging deployment
 import json
 import ssl
 
-try:
-    from urllib2 import HTTPError, URLError
-    import urllib2
-except ImportError:
-    from urllib.error import HTTPError, URLError
-    import urllib.request as urllib2
+# pylint can't find the package when its installed in virtualenv
+# pylint: disable=import-error,no-name-in-module
+from ansible.module_utils.six.moves.urllib import request
+# pylint: disable=import-error,no-name-in-module
+from ansible.module_utils.six.moves.urllib.error import HTTPError, URLError
 
 from openshift_checks.logging.logging import LoggingCheck, OpenShiftCheckException
 
@@ -65,7 +64,7 @@ class Kibana(LoggingCheck):
         # Verify that the url is returning a valid response
         try:
             # We only care if the url connects and responds
-            return_code = urllib2.urlopen(url, context=ctx).getcode()
+            return_code = request.urlopen(url, context=ctx).getcode()
         except HTTPError as httperr:
             return httperr.reason
         except URLError as urlerr: