diff --git a/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl b/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl index 6082ab250f..74ec350e61 100644 --- a/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl +++ b/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl @@ -48,7 +48,7 @@
- Set up Auto Refresh (Preview) + Set up Auto Refresh
diff --git a/deploy-board/deploy_board/templates/groups/asg_config.tmpl b/deploy-board/deploy_board/templates/groups/asg_config.tmpl index 9656425aed..0522868bb7 100644 --- a/deploy-board/deploy_board/templates/groups/asg_config.tmpl +++ b/deploy-board/deploy_board/templates/groups/asg_config.tmpl @@ -70,6 +70,7 @@
+
@@ -102,6 +103,14 @@ function loadAsgScheduledActions() { }); } +function loadAsgSuspendedProcesses() { + $("#suspendedProcessesPid").addClass("panel panel-default"); + var asg_suspended_processes_url = "/groups/{{ group_name }}/autoscaling/get_suspended_processes/"; + $.get(asg_suspended_processes_url, function(response) { + $("#suspendedProcessesPid").html(response); + }); +} + function loadAsgPolicy() { $("#scalingPolicyPid").addClass("panel panel-default"); var asg_policy_url = "/groups/{{ group_name }}/autoscaling/get_asg_policy/"; @@ -121,6 +130,7 @@ function loadAsgAlarms() { function getAdvancedSetting() { loadAsgPolicy(); loadAsgScheduledActions(); + loadAsgSuspendedProcesses(); loadAsgAlarms(); } diff --git a/deploy-board/deploy_board/templates/groups/asg_processes.tmpl b/deploy-board/deploy_board/templates/groups/asg_processes.tmpl new file mode 100644 index 0000000000..30f4fe527a --- /dev/null +++ b/deploy-board/deploy_board/templates/groups/asg_processes.tmpl @@ -0,0 +1,52 @@ +{% load utils %} +{% include "panel_heading.tmpl" with panel_title="Suspended Processes" panel_body_id="asSuspendedProcessId" direction="down" %} +
+ +
+ + + + + + + {% for process in process_suspended_status %} + + + + + + {% endfor%} +
Process NameStateClick to ...
+ {{ process.name }} + + {% if process.suspended == True %}

Suspended

{% else %}

Active

{% endif %} +
+ {% if process.suspended == True %} {% else %} {% endif %} +
+
+ + +
diff --git a/deploy-board/deploy_board/templates/groups/host_az_dist.tmpl b/deploy-board/deploy_board/templates/groups/host_az_dist.tmpl index a5c4fe866f..b554fdc613 100644 --- a/deploy-board/deploy_board/templates/groups/host_az_dist.tmpl +++ b/deploy-board/deploy_board/templates/groups/host_az_dist.tmpl @@ -1,11 +1,36 @@ {% load utils %} {% block content %} -
+

Host Distribution Among Availability Zones

+
+ + + + + + + {% for l, d, p in label_data_percentage %} + + + + + + {% endfor%} +
Availability ZoneHost CountPercentage
+ {{ l }} + + {{ d }} + + {{ p }}% +
+

==============================

+ Total: {{ total }} hosts +
+