diff --git a/.travis.yml b/.travis.yml index 7bbc434..43393e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,4 @@ script: - tox env: - TOXENV=flake8 - - TOXENV=py26 - TOXENV=py27 diff --git a/app/static/js/ceph.dash.js b/app/static/js/ceph.dash.js index be245fd..3ddf240 100644 --- a/app/static/js/ceph.dash.js +++ b/app/static/js/ceph.dash.js @@ -309,15 +309,24 @@ $(function () { // *overall status* clusterStatusOverall = data['health']['overall_status']; - clusterHealthSummary = data['health']['summary']; + if (data['health']['status'] || false) { + clusterStatusOverall = data['health']['status']; + } + clusterHealthSummary = []; + if (data['health']['summary'] || false) { + $.each(data['health']['summary'], function(index, check) { + clusterHealthSummary.push(check['summary']); + }); + } + if (data['health']['checks'] || false) { + $.each(data['health']['checks'], function(index, check) { + clusterHealthSummary.push(check['summary']['message']); + }); + } // *monitor state* monmapMons = data['monmap']['mons']; - if (monmapMons.length > 1) { - timechekMons = data['health']['timechecks']['mons']; - } else { - timechekMons = data['health']['health']['health_services'][0]['mons']; - } + quorumMons = data['quorum_names']; // }}} // Update Content {{{ @@ -414,7 +423,7 @@ $(function () { // update overall cluster status details $("#overall_status").append('