You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/09/17 20:19:53 UTC
[21/51] [abbrv] flink git commit: [FLINK-2357] [web dashboard]
Auto-update overview page
http://git-wip-us.apache.org/repos/asf/flink/blob/907f773c/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 b11513b..07e09c2 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
@@ -38,7 +38,7 @@ limitations under the License.
<tr ng-repeat="job in jobs" ui-sref="single-job.plan({ jobid: job.jid })">
<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.duration}} ms</td>
<td>{{job.name}}</td>
<td>{{job.jid}}</td>
<td class="label-group">
http://git-wip-us.apache.org/repos/asf/flink/blob/907f773c/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 5a91719..7e9d196 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html
@@ -28,12 +28,10 @@ limitations under the License.
<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'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}
- -
- {{ job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}
- </div>
- <div class="navbar-info last first">{{job['end-time'] - job['start-time']}} ms</div>
+ <div class="navbar-info first last hidden-xs hidden-sm">{{ job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}<span ng-if="job['end-time'] > -1">
+ -
+ {{ job['end-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }}</span></div>
+ <div ng-if="job.duration > -1" class="navbar-info last first">{{job.duration}} 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/907f773c/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 aca3959..dcc19f7 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
@@ -23,7 +23,7 @@ limitations under the License.
<div class="panel-info first">ID: {{ node.id }}</div>
<div ng-if="node.description" class="panel-info">
<div class="label-group">
- <bs-label status="{{status}}" ng-repeat="(index, status) in stateList">{{node.vertex.groupvertex[status]}}</bs-label>
+ <bs-label status="{{status}}" ng-repeat="(index, status) in stateList">{{node.vertex.tasks[status]}}</bs-label>
</div>
</div>
</div>
@@ -40,7 +40,7 @@ limitations under the License.
</thead>
<tbody>
<tr ng-repeat="vertex in node.vertex.groupvertex.groupmembers">
- <td>{{ vertex.vertexname | humanizeTaskName }}</td>
+ <td>{{ vertex.name | humanizeTaskName }}</td>
<td>
<bs-label status="{{vertex.vertexstatus}}">{{vertex.vertexstatus}}</bs-label>
</td>
http://git-wip-us.apache.org/repos/asf/flink/blob/907f773c/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 9a18a39..11ccaa3 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
@@ -26,8 +26,6 @@ limitations under the License.
<thead>
<tr>
<th>Start Time</th>
- <th>End Time</th>
- <th>Duration</th>
<th>Job Name</th>
<th>Job ID</th>
<th>Tasks</th>
@@ -37,8 +35,6 @@ limitations under the License.
<tbody>
<tr ng-repeat="job in jobs" ui-sref="single-job.plan({ jobid: job.jid })">
<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">
http://git-wip-us.apache.org/repos/asf/flink/blob/907f773c/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 de39ad9..31812b7 100644
--- a/flink-runtime-web/web-dashboard/web/partials/overview.html
+++ b/flink-runtime-web/web-dashboard/web/partials/overview.html
@@ -83,8 +83,6 @@ limitations under the License.
<thead>
<tr>
<th>Start Time</th>
- <th>End Time</th>
- <th>Duration</th>
<th>Job Name</th>
<th>Job ID</th>
<th>Tasks</th>
@@ -94,8 +92,6 @@ limitations under the License.
<tbody>
<tr ng-repeat="job in runningJobs" ui-sref="single-job.plan({ jobid: job.jid })">
<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.name}}</td>
<td>{{job.jid}}</td>
<td class="label-group">
@@ -130,7 +126,7 @@ limitations under the License.
<tr ng-repeat="job in finishedJobs" ui-sref="single-job.plan({ jobid: job.jid })">
<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.duration}} ms</td>
<td>{{job.name}}</td>
<td>{{job.jid}}</td>
<td class="label-group">