You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/08/20 19:59:52 UTC
svn commit: r1375149 - in /incubator/mesos/trunk/src/webui/master/static:
framework.html frameworks.html home.html slaves.html
Author: benh
Date: Mon Aug 20 17:59:52 2012
New Revision: 1375149
URL: http://svn.apache.org/viewvc?rev=1375149&view=rev
Log:
Filter cpu numbers in webui (contributed by Ben Mahler,
https://reviews.apache.org/r/6503).
Modified:
incubator/mesos/trunk/src/webui/master/static/framework.html
incubator/mesos/trunk/src/webui/master/static/frameworks.html
incubator/mesos/trunk/src/webui/master/static/home.html
incubator/mesos/trunk/src/webui/master/static/slaves.html
Modified: incubator/mesos/trunk/src/webui/master/static/framework.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/framework.html?rev=1375149&r1=1375148&r2=1375149&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/framework.html (original)
+++ incubator/mesos/trunk/src/webui/master/static/framework.html Mon Aug 20 17:59:52 2012
@@ -48,11 +48,11 @@
</a>
</dd>
<dt>Active tasks:</dt>
- <dd>{{framework.tasks.length}}</dd>
+ <dd>{{framework.tasks.length | number}}</dd>
<dt>CPUs:</dt>
- <dd>{{framework.resources.cpus}}</dd>
+ <dd>{{framework.resources.cpus | number}}</dd>
<dt>Mem:</dt>
- <dd>{{framework.resources.mem / 1024 | number:2}} GB</dd>
+ <dd>{{framework.resources.mem / 1024 | number}} GB</dd>
</dl>
</div>
</div>
Modified: incubator/mesos/trunk/src/webui/master/static/frameworks.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/frameworks.html?rev=1375149&r1=1375148&r2=1375149&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/frameworks.html (original)
+++ incubator/mesos/trunk/src/webui/master/static/frameworks.html Mon Aug 20 17:59:52 2012
@@ -34,9 +34,9 @@
<td>{{framework.user}}</td>
<td><a href="{{'#/framework/' + framework.id}}">{{framework.name}}</a></td>
<td>{{framework.tasks.length}}</td>
- <td>{{framework.resources.cpus}}</td>
- <td>{{framework.resources.mem / 1024 | number:2}} GB</td>
- <td>{{framework.max_share * 100 | number:2}}%</td>
+ <td>{{framework.resources.cpus | number}}</td>
+ <td>{{framework.resources.mem / 1024 | number}} GB</td>
+ <td>{{framework.max_share * 100 | number}}%</td>
<td>
<a href="" rel="popover" ng-click="popover($event, 'bottom')" data-content="{{framework.registered_time * 1000 | mesosDate}}" data-original-title="Registered">
{{framework.registered_time * 1000 | relativeDate}}
Modified: incubator/mesos/trunk/src/webui/master/static/home.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/home.html?rev=1375149&r1=1375148&r2=1375149&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/home.html (original)
+++ incubator/mesos/trunk/src/webui/master/static/home.html Mon Aug 20 17:59:52 2012
@@ -50,23 +50,23 @@
<tbody>
<tr>
<th>Total</th>
- <td>{{total_cpus}}</td>
- <td>{{total_mem / 1024 | number:2}} GB</td>
+ <td>{{total_cpus | number}}</td>
+ <td>{{total_mem / 1024 | number}} GB</td>
</tr>
<tr>
<th>Used</th>
- <td>{{used_cpus}}</td>
- <td>{{used_mem / 1024 | number:2}} GB</td>
+ <td>{{used_cpus | number}}</td>
+ <td>{{used_mem / 1024 | number}} GB</td>
</tr>
<tr>
<th>Offered</th>
- <td>{{offered_cpus}}</td>
- <td>{{offered_mem / 1024 | number:2}} GB</td>
+ <td>{{offered_cpus | number}}</td>
+ <td>{{offered_mem / 1024 | number}} GB</td>
</tr>
<tr>
<th>Idle</th>
- <td>{{idle_cpus}}</td>
- <td>{{idle_mem / 1024 | number:2}} GB</td>
+ <td>{{idle_cpus | number}}</td>
+ <td>{{idle_mem / 1024 | number}} GB</td>
</tr>
</tbody>
</table>
@@ -102,9 +102,9 @@
<td>{{framework.user}}</td>
<td><a href="{{'#/framework/' + framework.id}}">{{framework.name}}</a></td>
<td>{{framework.tasks.length}}</td>
- <td>{{framework.resources.cpus}}</td>
- <td>{{framework.resources.mem / 1024 | number:2}} GB</td>
- <td>{{framework.max_share * 100 | number:2}}%</td>
+ <td>{{framework.resources.cpus | number}}</td>
+ <td>{{framework.resources.mem / 1024 | number}} GB</td>
+ <td>{{framework.max_share * 100 | number}}%</td>
<td>
<a href="" rel="popover" ng-click="popover($event, 'bottom')" data-content="{{framework.registered_time * 1000 | mesosDate}}" data-original-title="Registered">
{{framework.registered_time * 1000 | relativeDate}}
@@ -144,8 +144,8 @@
<a href="http://{{slave.webui_hostname}}:{{slave.webui_port}}/">
{{slave.hostname}}
</a>
- <td>{{slave.resources.cpus}}</td>
- <td>{{slave.resources.mem / 1024 | number:2}} GB</td>
+ <td>{{slave.resources.cpus | number}}</td>
+ <td>{{slave.resources.mem / 1024 | number}} GB</td>
<td>
<a href="" rel="popover" ng-click="popover($event, 'bottom')" data-content="{{slave.registered_time * 1000 | mesosDate}}" data-original-title="Registered">
{{slave.registered_time * 1000 | relativeDate}}
@@ -176,8 +176,8 @@
{{slaves[offer.slave_id].hostname}}
</a>
</td>
- <td>{{offer.resources.cpus}}</td>
- <td>{{offer.resources.mem / 1024 | number:2}} GB</td>
+ <td>{{offer.resources.cpus | number}}</td>
+ <td>{{offer.resources.mem / 1024 | number}} GB</td>
</tr>
</tbody>
</table>
Modified: incubator/mesos/trunk/src/webui/master/static/slaves.html
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/static/slaves.html?rev=1375149&r1=1375148&r2=1375149&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/static/slaves.html (original)
+++ incubator/mesos/trunk/src/webui/master/static/slaves.html Mon Aug 20 17:59:52 2012
@@ -25,8 +25,8 @@
</a>
</td>
<td><a href="#/slave/{{slave.id}}">{{slave.hostname}}</a></td>
- <td>{{slave.resources.cpus}}</td>
- <td>{{slave.resources.mem / 1024 | number:2}} GB</td>
+ <td>{{slave.resources.cpus | number}}</td>
+ <td>{{slave.resources.mem / 1024 | number}} GB</td>
<td>
<a href="" rel="popover" ng-click="popover($event, 'bottom')" data-content="{{slave.registered_time * 1000 | mesosDate}}" data-original-title="Registered">
{{slave.registered_time * 1000 | relativeDate}}