summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker/openshift_checks/logging/kibana.py
diff options
context:
space:
mode:
authorjuanvallejo <jvallejo@redhat.com>2017-06-26 17:41:40 -0400
committerjuanvallejo <jvallejo@redhat.com>2017-08-01 17:25:40 -0400
commit04154a21237f9da6ee64bf57097d125b85b99a5f (patch)
tree1d17e8bceefd45e8da6741813fc136c892b27429 /roles/openshift_health_checker/openshift_checks/logging/kibana.py
parent01e48932d615dd17c316c1b9ab00216ab0f3f78d (diff)
downloadopenshift-04154a21237f9da6ee64bf57097d125b85b99a5f.tar.gz
openshift-04154a21237f9da6ee64bf57097d125b85b99a5f.tar.bz2
openshift-04154a21237f9da6ee64bf57097d125b85b99a5f.tar.xz
openshift-04154a21237f9da6ee64bf57097d125b85b99a5f.zip
add fluentd logging driver config check
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/logging/kibana.py')
-rw-r--r--roles/openshift_health_checker/openshift_checks/logging/kibana.py18
1 files changed, 6 insertions, 12 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/logging/kibana.py b/roles/openshift_health_checker/openshift_checks/logging/kibana.py
index 60f94e106..efb14ab42 100644
--- a/roles/openshift_health_checker/openshift_checks/logging/kibana.py
+++ b/roles/openshift_health_checker/openshift_checks/logging/kibana.py
@@ -21,13 +21,11 @@ class Kibana(LoggingCheck):
name = "kibana"
tags = ["health", "logging"]
- logging_namespace = None
-
def run(self):
"""Check various things and gather errors. Returns: result as hash"""
self.logging_namespace = self.get_var("openshift_logging_namespace", default="logging")
- kibana_pods, error = super(Kibana, self).get_pods_for_component(
+ kibana_pods, error = self.get_pods_for_component(
self.logging_namespace,
"kibana",
)
@@ -40,7 +38,6 @@ class Kibana(LoggingCheck):
if check_error:
msg = ("The following Kibana deployment issue was found:"
- "\n-------\n"
"{}".format(check_error))
return {"failed": True, "changed": False, "msg": msg}
@@ -118,7 +115,11 @@ class Kibana(LoggingCheck):
"""
# Get logging url
- get_route = self._exec_oc("get route logging-kibana -o json", [])
+ get_route = self.exec_oc(
+ self.logging_namespace,
+ "get route logging-kibana -o json",
+ [],
+ )
if not get_route:
return None, 'no_route_exists'
@@ -217,10 +218,3 @@ class Kibana(LoggingCheck):
).format(error=error)
return error
return None
-
- def _exec_oc(self, cmd_str, extra_args):
- return super(Kibana, self).exec_oc(
- self.logging_namespace,
- cmd_str,
- extra_args,
- )