Modified WebUI to display quota under `roles` tab. Review: https://reviews.apache.org/r/57828/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/52dfc2f0 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/52dfc2f0 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/52dfc2f0 Branch: refs/heads/master Commit: 52dfc2f0082756e480f3099adca1b2fa50180807 Parents: b66047f Author: Jay Guo <[email protected]> Authored: Mon Mar 27 18:31:17 2017 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Mon Mar 27 18:33:18 2017 -0700 ---------------------------------------------------------------------- src/webui/master/static/roles.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/52dfc2f0/src/webui/master/static/roles.html ---------------------------------------------------------------------- diff --git a/src/webui/master/static/roles.html b/src/webui/master/static/roles.html index a8ca03e..7578852 100644 --- a/src/webui/master/static/roles.html +++ b/src/webui/master/static/roles.html @@ -14,10 +14,10 @@ <th data-key="name" data-sort>Role</th> <th data-key="weight">Weight</th> <th data-key="frameworks.length">Frameworks</th> - <th data-key="resources.cpus">CPUs</th> - <th data-key="resources.gpus">GPUs</th> - <th data-key="resources.mem">Mem</th> - <th data-key="resources.disk">Disk</th> + <th data-key="resources.cpus">CPUs (Allocated / Quota)</th> + <th data-key="resources.gpus">GPUs (Allocated / Quota)</th> + <th data-key="resources.mem">Mem (Allocated / Quota)</th> + <th data-key="resources.disk">Disk (Allocated / Quota)</th> </tr> </thead> <tbody> @@ -25,10 +25,10 @@ <td>{{role.name}}</td> <td>{{role.weight | number}}</td> <td>{{role.frameworks.length | number}}</td> - <td>{{role.resources.cpus | decimalFloat}}</td> - <td>{{role.resources.gpus | decimalFloat}}</td> - <td>{{role.resources.mem * (1024 * 1024) | dataSize}}</td> - <td>{{role.resources.disk * (1024 * 1024) | dataSize}}</td> + <td>{{role.resources.cpus | decimalFloat}} / {{(role.quota.guarantee.cpus || 0) | decimalFloat}}</td> + <td>{{role.resources.gpus | decimalFloat}} / {{(role.quota.guarantee.gpus || 0) | decimalFloat}}</td> + <td>{{role.resources.mem * (1024 * 1024) | dataSize}} / {{(role.quota.guarantee.mem || 0) * (1024 * 1024) | dataSize}}</td> + <td>{{role.resources.disk * (1024 * 1024) | dataSize}} / {{(role.quota.guarantee.disk || 0) * (1024 * 1024) | dataSize}}</td> </tr> </tbody> </table>
