You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/06/17 23:36:35 UTC

mesos git commit: Display allocated resources in the webui agent listing.

Repository: mesos
Updated Branches:
  refs/heads/master 9921e4609 -> f4ce11d94


Display allocated resources in the webui agent listing.

Review: https://reviews.apache.org/r/48885/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f4ce11d9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f4ce11d9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f4ce11d9

Branch: refs/heads/master
Commit: f4ce11d94ad0832adba66785da6ea8a0b82cddc1
Parents: 9921e46
Author: Tomasz Janiszewski <ja...@gmail.com>
Authored: Fri Jun 17 16:35:04 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Jun 17 16:36:13 2016 -0700

----------------------------------------------------------------------
 src/webui/master/static/agents.html | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/f4ce11d9/src/webui/master/static/agents.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/agents.html b/src/webui/master/static/agents.html
index 98da21d..98712c6 100644
--- a/src/webui/master/static/agents.html
+++ b/src/webui/master/static/agents.html
@@ -13,10 +13,10 @@
     <tr>
       <th data-key="id">ID</th>
       <th data-key="hostname">Host</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 / Total)</th>
+      <th data-key="resources.gpus">GPUs (Allocated / Total)</th>
+      <th data-key="resources.mem">Mem (Allocated / Total)</th>
+      <th data-key="resources.disk">Disk (Allocated / Total)</th>
       <th data-key="registered_time">Registered</th>
       <th data-key="reregistered_time">Re-Registered</th>
     </tr>
@@ -34,12 +34,19 @@
       </button>
     </td>
     <td>{{agent.hostname}}</td>
-    <td>{{agent.resources.cpus | number}}</td>
-    <td>{{agent.resources.gpus | number}}</td>
-    <td>{{agent.resources.mem * (1024 * 1024) | dataSize}}</td>
-    <td>{{agent.resources.disk * (1024 * 1024) | dataSize}}</td>
     <td>
-
+      {{agent.used_resources.cpus | number}} / {{agent.resources.cpus | number}}
+    </td>
+    <td>
+      {{agent.used_resources.gpus | number}} / {{agent.resources.gpus | number}}
+    </td>
+    <td>
+      {{agent.used_resources.mem * (1024 * 1024) | dataSize}} / {{agent.resources.mem * (1024 * 1024) | dataSize}}
+    </td>
+    <td>
+      {{agent.used_resources.disk * (1024 * 1024) | dataSize}} / {{agent.resources.disk * (1024 * 1024) | dataSize}}
+    </td>
+    <td>
       <m-timestamp value="{{agent.registered_time * 1000}}"></m-timestamp>
     </td>
     <td>