From a1e24b172f97d2e4fe5a799f2dd047e7615ed34d Mon Sep 17 00:00:00 2001 From: Feilong Wang Date: Sat, 16 May 2020 11:10:43 +1200 Subject: [PATCH] Show cluster health status 1. Show health status on cluster list table 2. Show health status and health status reason on the cluster details page Change-Id: I4d0751fc39d90cddc909b28ca0767bc811b6c3b8 Task: 39794 Story: 2007682 --- .../container-infra/clusters/clusters.module.js | 12 ++++++++++++ .../container-infra/clusters/details/overview.html | 4 ++++ .../notes/show-health-status-ff92b2fe2bfad5ae.yaml | 5 +++++ 3 files changed, 21 insertions(+) create mode 100644 releasenotes/notes/show-health-status-ff92b2fe2bfad5ae.yaml diff --git a/magnum_ui/static/dashboard/container-infra/clusters/clusters.module.js b/magnum_ui/static/dashboard/container-infra/clusters/clusters.module.js index 74be56c0..dbec39b7 100644 --- a/magnum_ui/static/dashboard/container-infra/clusters/clusters.module.js +++ b/magnum_ui/static/dashboard/container-infra/clusters/clusters.module.js @@ -73,6 +73,9 @@ .setProperty('status', { label: gettext('Status') }) + .setProperty('health_status', { + label: gettext('Health Status') + }) .setProperty('master_count', { label: gettext('Master Count') }) @@ -99,6 +102,10 @@ id: 'status', priority: 1 }) + .append({ + id: 'health_status', + priority: 1 + }) .append({ id: 'master_count', priority: 2 @@ -146,6 +153,11 @@ {label: gettext('UPDATE IN PROGRESS'), key: 'UPDATE_IN_PROGRESS'} ] }) + .append({ + 'label': gettext('Health Status'), + 'name': 'health_status', + 'singleton': true + }) .append({ 'label': gettext('Master Count'), 'name': 'master_count', diff --git a/magnum_ui/static/dashboard/container-infra/clusters/details/overview.html b/magnum_ui/static/dashboard/container-infra/clusters/details/overview.html index b7eb65dc..ffe66726 100644 --- a/magnum_ui/static/dashboard/container-infra/clusters/details/overview.html +++ b/magnum_ui/static/dashboard/container-infra/clusters/details/overview.html @@ -101,6 +101,10 @@
{$ ctrl.cluster.status $}
Status Reason
{$ ctrl.cluster.status_reason | noValue $}
+
Health Status
+
{$ ctrl.cluster.health_status $}
+
Health Status Reason
+
{$ ctrl.cluster.health_status_reason | noValue $}
diff --git a/releasenotes/notes/show-health-status-ff92b2fe2bfad5ae.yaml b/releasenotes/notes/show-health-status-ff92b2fe2bfad5ae.yaml new file mode 100644 index 00000000..9625966b --- /dev/null +++ b/releasenotes/notes/show-health-status-ff92b2fe2bfad5ae.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Show health status on cluster list table and show health status + and health status reason on the cluster details page.