flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [09/51] [abbrv] flink git commit: [FLINK-2357] [web dashboard] Changed overview and timeline
Date Thu, 17 Sep 2015 18:19:41 GMT
http://git-wip-us.apache.org/repos/asf/flink/blob/b29a5d44/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html b/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
index 97bff2c..b11513b 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/completed-jobs.html
@@ -36,13 +36,13 @@ limitations under the License.
     </thead>
     <tbody>
       <tr ng-repeat="job in jobs" ui-sref="single-job.plan({ jobid: job.jid })">
-        <td>{{job['start-time']}}</td>
-        <td>{{job['end-time']}}</td>
-        <td>{{job.duration}}</td>
+        <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
+        <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
+        <td>{{job['end-time'] - job['start-time']}} ms</td>
         <td>{{job.name}}</td>
         <td>{{job.jid}}</td>
         <td class="label-group">
-          <bs-label status="{{status}}" ng-repeat="(status, value) in job.operators">{{value}}</bs-label>
+          <bs-label status="{{status}}" ng-repeat="(status, value) in job.tasks">{{value}}</bs-label>
         </td>
         <td> 
           <bs-label status="{{job.state}}">{{job.state}}</bs-label>

http://git-wip-us.apache.org/repos/asf/flink/blob/b29a5d44/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
index 1995e6d..5a91719 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
@@ -25,15 +25,15 @@ limitations under the License.
   <div class="navbar-info first last hidden-xs hidden-sm">{{ job.jid }}</div>
   <div class="navbar-info first last">
     <div class="label-group">
-      <bs-label status="{{status}}" ng-repeat="(status, value) in job.operators">{{value}}</bs-label>
+      <bs-label status="{{status}}" ng-repeat="(status, value) in job.tasks">{{value}}</bs-label>
     </div>
   </div>
   <div class="navbar-info first last hidden-xs hidden-sm">
-    {{ job['start-time'] }}
+    {{ job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}
     - 
-    {{ job['end-time'] }}
+    {{ job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}
   </div>
-  <div class="navbar-info last first">{{job.duration}}</div>
+  <div class="navbar-info last first">{{job['end-time'] - job['start-time']}} ms</div>
 </nav>
 <nav ng-if="job" class="navbar navbar-default navbar-fixed-top navbar-main-additional">
   <ul class="nav nav-tabs">

http://git-wip-us.apache.org/repos/asf/flink/blob/b29a5d44/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.html
index 69bf8d9..aca3959 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.html
@@ -28,7 +28,7 @@ limitations under the License.
     </div>
   </div>
   <div class="panel-heading clearfix">
-    <div ng-if="node.description" class="panel-info first last"><span>{{ node.description
}}</span></div>
+    <div ng-if="node.description" class="panel-info first last"><span>{{ node.description
| humanizeTaskName }}</span></div>
   </div>
   <div class="panel-body">
     <table class="table table-hover table-clickable">
@@ -40,7 +40,7 @@ limitations under the License.
       </thead>
       <tbody>
         <tr ng-repeat="vertex in node.vertex.groupvertex.groupmembers">
-          <td>{{vertex.vertexname}}</td>
+          <td>{{ vertex.vertexname | humanizeTaskName }}</td>
           <td> 
             <bs-label status="{{vertex.vertexstatus}}">{{vertex.vertexstatus}}</bs-label>
           </td>

http://git-wip-us.apache.org/repos/asf/flink/blob/b29a5d44/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.vertex.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.vertex.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.vertex.html
index 4aade1c..36f38ab 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.vertex.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.timeline.vertex.html
@@ -19,7 +19,7 @@ limitations under the License.
 -->
 <div ng-if="vertex" class="panel panel-default panel-multi">
   <div class="panel-heading clearfix">
-    <div class="panel-title">{{ vertex.groupvertex.groupvertexname }}</div>
+    <div class="panel-title">{{ vertex.groupvertex.groupvertexname | humanizeTaskName
}}</div>
   </div>
   <div class="panel-body">
     <div class="canvas-wrapper">

http://git-wip-us.apache.org/repos/asf/flink/blob/b29a5d44/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html b/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
index 2fd44e4..9a18a39 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/running-jobs.html
@@ -36,13 +36,13 @@ limitations under the License.
     </thead>
     <tbody>
       <tr ng-repeat="job in jobs" ui-sref="single-job.plan({ jobid: job.jid })">
-        <td>{{job['start-time']}}</td>
-        <td>{{job['end-time']}}</td>
-        <td>{{job.duration}}</td>
+        <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
+        <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
+        <td>{{job['end-time'] - job['start-time']}} ms</td>
         <td>{{job.name}}</td>
         <td>{{job.jid}}</td>
         <td class="label-group">
-          <bs-label status="{{status}}" ng-repeat="(status, value) in job.operators">{{value}}</bs-label>
+          <bs-label status="{{status}}" ng-repeat="(status, value) in job.tasks">{{value}}</bs-label>
         </td>
         <td> 
           <bs-label status="{{job.state}}">{{job.state}}</bs-label>

http://git-wip-us.apache.org/repos/asf/flink/blob/b29a5d44/flink-runtime-web/web-dashboard/web/partials/overview.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/overview.html b/flink-runtime-web/web-dashboard/web/partials/overview.html
index db0a01d..de39ad9 100644
--- a/flink-runtime-web/web-dashboard/web/partials/overview.html
+++ b/flink-runtime-web/web-dashboard/web/partials/overview.html
@@ -29,7 +29,7 @@ limitations under the License.
           <div class="row">
             <div class="col-xs-3"><i class="fa fa-tasks fa-3x"></i></div>
             <div class="col-xs-9 text-right">
-              <div class="huge">3</div>
+              <div class="huge">{{overview.taskmanagers}}</div>
               <div>Task Managers</div>
             </div>
           </div>
@@ -38,7 +38,7 @@ limitations under the License.
           <div class="row">
             <div class="col-xs-3"><i class="fa fa-folder fa-3x"></i></div>
             <div class="col-xs-9 text-right">
-              <div class="huge">5</div>
+              <div class="huge">{{overview["slots-total"]}}</div>
               <div>Task Slots</div>
             </div>
           </div>
@@ -47,7 +47,7 @@ limitations under the License.
           <div class="row">
             <div class="col-xs-3"><i class="fa fa-folder-o fa-3x"></i></div>
             <div class="col-xs-9 text-right">
-              <div class="huge">2</div>
+              <div class="huge">{{overview["slots-available"]}}</div>
               <div>Available Task Slots</div>
             </div>
           </div>
@@ -59,16 +59,16 @@ limitations under the License.
         <div class="panel-heading">Total Jobs</div>
         <div class="list-group">
           <div class="list-group-item">
-            <div class="badge badge-primary">3</div>Running
+            <div class="badge badge-primary">{{overview["jobs-running"]}}</div>Running
           </div>
           <div class="list-group-item">
-            <div class="badge badge-success">6</div>Finished
+            <div class="badge badge-success">{{overview["jobs-finished"]}}</div>Finished
           </div>
           <div class="list-group-item">
-            <div class="badge badge-info">0</div>Canceled
+            <div class="badge badge-info">{{overview["jobs-cancelled"]}}</div>Canceled
           </div>
           <div class="list-group-item">
-            <div class="badge badge-danger">2</div>Failed
+            <div class="badge badge-danger">{{overview["jobs-failed"]}}</div>Failed
           </div>
         </div>
       </div>
@@ -93,13 +93,13 @@ limitations under the License.
         </thead>
         <tbody>
           <tr ng-repeat="job in runningJobs" ui-sref="single-job.plan({ jobid: job.jid
})">
-            <td>{{job['start-time']}}</td>
-            <td>{{job['end-time']}}</td>
+            <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
+            <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
             <td>{{job.duration}}</td>
-            <td>{{job.jobname}}</td>
+            <td>{{job.name}}</td>
             <td>{{job.jid}}</td>
             <td class="label-group">
-              <bs-label status="{{status}}" ng-repeat="(status, value) in job.operators">{{value}}</bs-label>
+              <bs-label status="{{status}}" ng-repeat="(status, value) in job.tasks">{{value}}</bs-label>
             </td>
             <td> 
               <bs-label status="{{job.state}}">{{job.state}}</bs-label>
@@ -128,13 +128,13 @@ limitations under the License.
         </thead>
         <tbody>
           <tr ng-repeat="job in finishedJobs" ui-sref="single-job.plan({ jobid: job.jid
})">
-            <td>{{job['start-time']}}</td>
-            <td>{{job['end-time']}}</td>
-            <td>{{job.duration}}</td>
-            <td>{{job.jobname}}</td>
+            <td>{{job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
+            <td>{{job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss'}}</td>
+            <td>{{job['end-time'] - job['start-time']}} ms</td>
+            <td>{{job.name}}</td>
             <td>{{job.jid}}</td>
             <td class="label-group">
-              <bs-label status="{{status}}" ng-repeat="(status, value) in job.operators">{{value}}</bs-label>
+              <bs-label status="{{status}}" ng-repeat="(status, value) in job.tasks">{{value}}</bs-label>
             </td>
             <td> 
               <bs-label status="{{job.state}}">{{job.state}}</bs-label>


Mime
View raw message