Repository: flink Updated Branches: refs/heads/master 7a629fc59 -> 121b12b7c
http://git-wip-us.apache.org/repos/asf/flink/blob/121b12b7/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html index 6d88b23..c52d67f 100644 --- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html +++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html @@ -20,7 +20,7 @@ limitations under the License. <split> <div id="canvas" class="split"> <div class="canvas-wrapper"> - <div job-plan="job-plan" plan="plan" jobid="{{jobid}}" set-node="changeNode(nodeid)" class="main-canvas"></div> + <div job-plan="job-plan" plan="plan" watermarks="watermarks" jobid="{{jobid}}" set-node="changeNode(nodeid)" class="main-canvas"></div> </div> </div> <div id="job-panel" class="split"> @@ -30,6 +30,7 @@ limitations under the License. <li ui-sref-active="active"><a ui-sref=".subtasks({nodeid: nodeid})">Subtasks</a></li> <li ui-sref-active="active"><a ui-sref=".taskmanagers({nodeid: nodeid})">TaskManagers</a></li> <li ui-sref-active="active"><a ui-sref=".metrics({nodeid: nodeid})">Metrics</a></li> + <li ui-sref-active="active"><a ui-sref=".watermarks({nodeid: nodeid})">Watermarks</a></li> <li ui-sref-active="active"><a ui-sref=".accumulators({nodeid: nodeid})">Accumulators</a></li> <li ui-sref-active="active"><a ui-sref=".checkpoints({nodeid: nodeid})">Checkpoints</a></li> <li ng-if="job.state == 'RUNNING'" ui-sref-active="active"><a ui-sref=".backpressure({nodeid: nodeid})">Back Pressure</a></li> http://git-wip-us.apache.org/repos/asf/flink/blob/121b12b7/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.watermarks.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.watermarks.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.watermarks.html new file mode 100644 index 0000000..9a8095a --- /dev/null +++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node-list.watermarks.html @@ -0,0 +1,45 @@ + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +--> +<table class="table table-body-hover table-clickable table-activable"> + <thead> + <tr> + <th>Name</th> + <th>Low Watermark</th> + <th>Parallelism</th> + <th>Status</th> + </tr> + </thead> + <tbody ng-repeat="v in job.vertices" ng-class="{ active: v.id == nodeid }" ng-click="changeNode(v.id)"> + <tr ng-if="v.type == 'regular'"> + <td class="td-long">{{ v.name | humanizeText }}</td> + <td>{{ watermarks[v.id]["lowWatermark"] | humanizeWatermark }}</td> + <td>{{ v.parallelism }}</td> + <td> + <bs-label status="{{v.status}}">{{v.status}}</bs-label> + </td> + </tr> + <tr ng-if="nodeid && v.id == nodeid"> + <td colspan="4"> + <div ng-show="hasWatermark(v.id)" ng-include=" 'partials/jobs/job.plan.node.watermarks.html' "></div> + <div ng-show="!hasWatermark(v.id)">No Watermarks</div> + </td> + </tr> + </tbody> +</table> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flink/blob/121b12b7/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.watermarks.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.watermarks.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.watermarks.html new file mode 100644 index 0000000..f1530a5 --- /dev/null +++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.node.watermarks.html @@ -0,0 +1,33 @@ + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +--> +<table class="table table-hover table-clickable table-activable table-inner"> + <thead> + <tr> + <th>Subtask</th> + <th>Watermark</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="(subtaskIndex, watermark) in watermarks[nodeid]['watermarks']"> + <td>{{ subtaskIndex | increment }}</td> + <td>{{ watermark | humanizeWatermark }}</td> + </tr> + </tbody> +</table> \ No newline at end of file
