You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2015/10/29 13:22:45 UTC
[12/13] flink git commit: [FLINK-2934] Remove placeholder pages for
job.statistics, taskmanager.log and taskmanager.stdout
[FLINK-2934] Remove placeholder pages for job.statistics, taskmanager.log and taskmanager.stdout
This closes #1307
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1fd386e7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1fd386e7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1fd386e7
Branch: refs/heads/master
Commit: 1fd386e74c14f54a7ffc7d9bf62c96c790aea635
Parents: 680b5a9
Author: Sachin Goel <sa...@gmail.com>
Authored: Wed Oct 28 18:00:54 2015 +0530
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Oct 29 11:01:51 2015 +0100
----------------------------------------------------------------------
.../web-dashboard/app/partials/jobs/job.jade | 3 --
.../app/partials/jobs/job.statistics.jade | 35 --------------------
.../app/partials/taskmanager/taskmanager.jade | 7 ----
.../taskmanager/taskmanager.logfile.jade | 17 ----------
.../taskmanager/taskmanager.stdout.jade | 17 ----------
.../web-dashboard/app/scripts/index.coffee | 18 ----------
flink-runtime-web/web-dashboard/web/js/index.js | 23 +------------
.../web-dashboard/web/partials/jobs/job.html | 1 -
.../web/partials/taskmanager/taskmanager.html | 2 --
9 files changed, 1 insertion(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1fd386e7/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
index 9da922a..d0291a4 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
@@ -44,9 +44,6 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main-additional(ng-if="job")
li(ui-sref-active='active')
a(ui-sref=".plan.overview") Plan
- li(ui-sref-active='active')
- a(ui-sref=".statistics") Job Accumulators / Statistics
-
//- li(ui-sref-active='active' ng-if="job['end-time'] > -1")
li(ui-sref-active='active')
a(ui-sref=".timeline") Timeline
http://git-wip-us.apache.org/repos/asf/flink/blob/1fd386e7/flink-runtime-web/web-dashboard/app/partials/jobs/job.statistics.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.statistics.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.statistics.jade
deleted file mode 100644
index 22dac9a..0000000
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.statistics.jade
+++ /dev/null
@@ -1,35 +0,0 @@
-//
- 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.table.table-properties
- thead
- tr
- th(colspan="2")
- | Some statistics
-
- tbody
- tr
- td Operator
- td 1
-
- tr
- td Parallelism
- td 2
-
- tr
- td Subtasks-per-instance
- td 3
http://git-wip-us.apache.org/repos/asf/flink/blob/1fd386e7/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.jade
index 6eed3b2..23809de 100644
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.jade
@@ -31,13 +31,6 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main-additional(ng-if="metrics
li(ui-sref-active='active')
a(ui-sref=".metrics") Metrics
- li(ui-sref-active='active')
- a(ui-sref=".log") Logs
-
- li(ui-sref-active='active')
- a(ui-sref=".stdout") Stdout
-
-
#content-inner.has-navbar-main-additional
div(ui-view="details")
http://git-wip-us.apache.org/repos/asf/flink/blob/1fd386e7/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.logfile.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.logfile.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.logfile.jade
deleted file mode 100644
index dacca9d..0000000
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.logfile.jade
+++ /dev/null
@@ -1,17 +0,0 @@
-//
- 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.
-
http://git-wip-us.apache.org/repos/asf/flink/blob/1fd386e7/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.stdout.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.stdout.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.stdout.jade
deleted file mode 100644
index dacca9d..0000000
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.stdout.jade
+++ /dev/null
@@ -1,17 +0,0 @@
-//
- 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.
-
http://git-wip-us.apache.org/repos/asf/flink/blob/1fd386e7/flink-runtime-web/web-dashboard/app/scripts/index.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/index.coffee b/flink-runtime-web/web-dashboard/app/scripts/index.coffee
index af1aa3a..b90ee34 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/index.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/index.coffee
@@ -197,12 +197,6 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
templateUrl: "partials/jobs/job.timeline.vertex.html"
controller: 'JobTimelineVertexController'
- .state "single-job.statistics",
- url: "/statistics"
- views:
- details:
- templateUrl: "partials/jobs/job.statistics.html"
-
.state "single-job.exceptions",
url: "/exceptions"
views:
@@ -243,18 +237,6 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
details:
templateUrl: "partials/taskmanager/taskmanager.metrics.html"
- .state "single-manager.log",
- url: "/logfile"
- views:
- details:
- templateUrl: "partials/taskmanager/taskmanager.logfile.html"
-
- .state "single-manager.stdout",
- url: "/stdout"
- views:
- details:
- templateUrl: "partials/taskmanager/taskmanager.stdout.html"
-
.state "jobmanager",
url: "/jobmanager"
views: