Webui improvements.

1 files changed, 25 insertions, 12 deletions

diff --git a/core/src/main/twirl/masterui/index.scala.html b/core/src/main/twirl/masterui/index.scala.html
index ddf6163765..31ca8f4132 100644
--- a/core/src/main/twirl/masterui/index.scala.html
+++ b/core/src/main/twirl/masterui/index.scala.html
@@ -1,37 +1,50 @@
-@(jobs: List[spark.deploy.master.JobInfo], workers: List[spark.deploy.master.WorkerInfo])
+@(state: spark.deploy.MasterState)
 @import spark.deploy.master._
 
-@common.html.layout(title = "Master WebUI") {
-  
-  <!-- Cluster Summary (Workers) -->
+@common.html.layout(title = "Spark Master on " + state.uri) {
+      
+  <!-- Cluster Details -->
+  <div class="row">
+    <div class="span12">
+      <ul class="unstyled">
+        <li><strong>URI:</strong> spark://@(state.uri)</li>
+        <li><strong>Number of Workers:</strong> @state.workers.size </li>
+        <li><strong>Cores:</strong> @state.workers.map(_.cores).sum Total, @state.workers.map(_.coresUsed).sum Used</li>
+        <li><strong>Memory:</strong> @state.workers.map(_.memory).sum Total,  @state.workers.map(_.memoryUsed).sum Used</li>
+        <li><strong>Jobs:</strong> @state.activeJobs.size Running, @state.completedJobs.size Completed </li>
+      </ul>
+    </div>
+  </div>
+
+  <!-- Worker Summary -->
   <div class="row">
     <div class="span12">
       <h3> Cluster Summary </h3>
       <br/>
-      @worker_table(workers)
+      @worker_table(state.workers)
     </div>
   </div>
-  
+
   <hr/>
-  
+
   <!-- Job Summary (Running) -->
   <div class="row">
     <div class="span12">
       <h3> Running Jobs </h3>
       <br/>
-      @job_table(jobs.filter(j => j.state == JobState.WAITING || j.state == JobState.RUNNING))
+      @job_table(state.activeJobs)
     </div>
   </div>
-  
+
   <hr/>
-  
+
   <!-- Job Summary (Completed) -->
   <div class="row">
     <div class="span12">
       <h3> Completed Jobs </h3>
       <br/>
-      @job_table(jobs.filter(j => j.state == JobState.FINISHED || j.state == JobState.FAILED))
+      @job_table(state.completedJobs)
     </div>
   </div>
-  
+
 }
\ No newline at end of file