This is an automated email from the ASF dual-hosted git repository.
bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new bd618c1 Added quota consumption to the roles table in the webui.
bd618c1 is described below
commit bd618c175a70e60c1aa5dae42e01652ac29f7861
Author: Benjamin Mahler <[email protected]>
AuthorDate: Tue Jul 9 22:44:48 2019 -0400
Added quota consumption to the roles table in the webui.
This keeps the existing 'Allocation + Offered' column, rather than
removing it. However, it would be nice to add additional columns
for reservation, offered resources, and allocation quantities. Then
we can remove the old 'Allocation + Offered' column, but will
probably want to introduce the ability for the user to enable /
disable columns while viewing.
Review: https://reviews.apache.org/r/71043
---
src/webui/app/roles/roles.html | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/webui/app/roles/roles.html b/src/webui/app/roles/roles.html
index 6b08b91..45e2a33 100644
--- a/src/webui/app/roles/roles.html
+++ b/src/webui/app/roles/roles.html
@@ -11,14 +11,22 @@
class="table table-striped table-bordered table-condensed">
<thead>
<tr>
- <th data-key="name" data-sort class="ascending vertically-center"
rowspan="2">Role</th>
- <th data-key="weight" class="vertically-center" rowspan="2">Weight</th>
- <th data-key="frameworks.length" class="vertically-center"
rowspan="2">Frameworks</th>
- <th data-key="resources.cpus" class="group-column"
colspan="4">Allocation + Offered</th>
- <th data-key="resources.gpus" class="group-column"
colspan="4">Guarantee</th>
- <th data-key="resources.mem" class="group-column" colspan="4">Limit</th>
+ <th data-key="name" data-sort class="ascending vertically-center"
rowspan="3">Role</th>
+ <th data-key="weight" class="vertically-center" rowspan="3">Weight</th>
+ <th data-key="frameworks.length" class="vertically-center"
rowspan="3">Frameworks</th>
+ <th class="group-column" colspan="4" rowspan="2">Allocation +
Offered</th>
+ <th class="group-column" colspan="12">Quota</th>
</tr>
<tr>
+ <th class="group-column" colspan="4"
class="end-group-column">Consumption <span class="glyphicon
glyphicon-question-sign" aria-hidden="true" tooltip="Allocated or
Reserved"/></th>
+ <th class="group-column" colspan="4"
class="end-group-column">Guarantee</th>
+ <th class="group-column" colspan="4" class="end-group-column">Limit</th>
+ </tr>
+ <tr>
+ <th data-key="resources.cpus" class="begin-group-column">CPU</th>
+ <th data-key="resources.gpus">GPU</th>
+ <th data-key="resources.mem">Mem</th>
+ <th data-key="resources.disk" class="end-group-column">Disk</th>
<th data-key="resources.cpus" class="begin-group-column">CPU</th>
<th data-key="resources.gpus">GPU</th>
<th data-key="resources.mem">Mem</th>
@@ -52,6 +60,19 @@
</td>
<td class="begin-group-column">
+ {{(role.quota.consumed.cpus | decimalFloat) || "-"}}
+ </td>
+ <td>
+ {{(role.quota.consumed.gpus | decimalFloat) || "-"}}
+ </td>
+ <td>
+ {{((role.quota.consumed.mem * (1024 * 1024) || NaN) | dataSize) ||
"-"}}
+ </td>
+ <td class="end-group-column">
+ {{((role.quota.consumed.disk * (1024 * 1024) || NaN) | dataSize) ||
"-"}}
+ </td>
+
+ <td class="begin-group-column">
{{(role.quota.guarantee.cpus | decimalFloat) || "-"}}
</td>
<td>
