summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker/openshift_checks/logging/curator.py
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-02 06:16:32 -0400
committerGitHub <noreply@github.com>2017-08-02 06:16:32 -0400
commitb22ebdcce1c5ffea48cf95695d654d112da5c812 (patch)
tree3122d150cc46d2b28e3c9908b04bf2c714822412 /roles/openshift_health_checker/openshift_checks/logging/curator.py
parentbeb5deaedb105acd113807597858069a38553952 (diff)
parent04154a21237f9da6ee64bf57097d125b85b99a5f (diff)
downloadopenshift-b22ebdcce1c5ffea48cf95695d654d112da5c812.tar.gz
openshift-b22ebdcce1c5ffea48cf95695d654d112da5c812.tar.bz2
openshift-b22ebdcce1c5ffea48cf95695d654d112da5c812.tar.xz
openshift-b22ebdcce1c5ffea48cf95695d654d112da5c812.zip
Merge pull request #4592 from juanvallejo/jvallejo/verify-fluentd-logging-config
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/logging/curator.py')
-rw-r--r--roles/openshift_health_checker/openshift_checks/logging/curator.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/logging/curator.py b/roles/openshift_health_checker/openshift_checks/logging/curator.py
index f82ae64d7..32d853d57 100644
--- a/roles/openshift_health_checker/openshift_checks/logging/curator.py
+++ b/roles/openshift_health_checker/openshift_checks/logging/curator.py
@@ -9,11 +9,11 @@ class Curator(LoggingCheck):
name = "curator"
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")
- curator_pods, error = super(Curator, self).get_pods_for_component(
+ curator_pods, error = self.get_pods_for_component(
self.logging_namespace,
"curator",
)
@@ -23,7 +23,6 @@ class Curator(LoggingCheck):
if check_error:
msg = ("The following Curator deployment issue was found:"
- "\n-------\n"
"{}".format(check_error))
return {"failed": True, "changed": False, "msg": msg}
@@ -39,7 +38,7 @@ class Curator(LoggingCheck):
"Is Curator correctly deployed?"
)
- not_running = super(Curator, self).not_running_pods(pods)
+ not_running = self.not_running_pods(pods)
if len(not_running) == len(pods):
return (
"The Curator pod is not currently in a running state,\n"