diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-17 11:10:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 11:10:14 -0800 |
| commit | a7d2785aa0b88ce7bbf429c583b19a38a373fb0a (patch) | |
| tree | ef4b98c23845c206bec2e918e78a4f9dc0d86c73 | |
| parent | b58e8c1136725db9ce11d01e01e42575ee25ab44 (diff) | |
| parent | 08cf02f0abbcf75a04d005afa4784dd4ea0e6b06 (diff) | |
| download | openshift-a7d2785aa0b88ce7bbf429c583b19a38a373fb0a.tar.gz openshift-a7d2785aa0b88ce7bbf429c583b19a38a373fb0a.tar.bz2 openshift-a7d2785aa0b88ce7bbf429c583b19a38a373fb0a.tar.xz openshift-a7d2785aa0b88ce7bbf429c583b19a38a373fb0a.zip | |
Merge pull request #6746 from juanvallejo/jvallejo/fix-elasticsearch-diskspace-check
Automatic merge from submit-queue.
include elasticsearch container name
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534988
Addresses cases where the elasticsearch pod with multiple containers does not have the `elasticsearch` container as its first one.
cc @sosiouxme
| -rw-r--r-- | roles/openshift_health_checker/openshift_checks/logging/elasticsearch.py | 2 |
1 files changed, 1 insertions, 1 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 |