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/10/17 21:03:22 UTC
[02/21] flink git commit: [FLINK-2844] [web frontend] Make web
frontend URLs relative for YARN support
[FLINK-2844] [web frontend] Make web frontend URLs relative for YARN support
This closes #1246
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/45931095
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/45931095
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/45931095
Branch: refs/heads/master
Commit: 45931095180f4fee9426bdcfb8b713ff5da0b0d2
Parents: df44862
Author: Maximilian Michels <mx...@apache.org>
Authored: Thu Oct 15 14:35:16 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 17 18:45:02 2015 +0200
----------------------------------------------------------------------
.../app/scripts/common/services.coffee | 2 +-
.../modules/jobmanager/jobmanager.svc.coffee | 2 +-
.../app/scripts/modules/jobs/jobs.svc.coffee | 16 ++++++------
.../modules/overview/overview.svc.coffee | 2 +-
.../modules/taskmanager/taskmanager.svc.coffee | 4 +--
flink-runtime-web/web-dashboard/web/js/index.js | 26 ++++++++++----------
6 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/45931095/flink-runtime-web/web-dashboard/app/scripts/common/services.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/common/services.coffee b/flink-runtime-web/web-dashboard/app/scripts/common/services.coffee
index 5bb6358..40e3f46 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/common/services.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/common/services.coffee
@@ -22,7 +22,7 @@ angular.module('flinkApp')
@loadConfig = ->
deferred = $q.defer()
- $http.get "/config"
+ $http.get "config"
.success (data, status, headers, config) ->
deferred.resolve(data)
http://git-wip-us.apache.org/repos/asf/flink/blob/45931095/flink-runtime-web/web-dashboard/app/scripts/modules/jobmanager/jobmanager.svc.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/jobmanager/jobmanager.svc.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/jobmanager/jobmanager.svc.coffee
index 38411f8..e87565d 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/modules/jobmanager/jobmanager.svc.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/modules/jobmanager/jobmanager.svc.coffee
@@ -24,7 +24,7 @@ angular.module('flinkApp')
@loadConfig = ->
deferred = $q.defer()
- $http.get("/jobmanager/config")
+ $http.get("jobmanager/config")
.success (data, status, headers, config) ->
config = data
deferred.resolve(data)
http://git-wip-us.apache.org/repos/asf/flink/blob/45931095/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
index 05996a2..2e45cd9 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
@@ -86,7 +86,7 @@ angular.module('flinkApp')
@listJobs = ->
deferred = $q.defer()
- $http.get "/joboverview"
+ $http.get "joboverview"
.success (data, status, headers, config) =>
angular.forEach data, (list, listKey) =>
switch listKey
@@ -110,12 +110,12 @@ angular.module('flinkApp')
currentJob = null
deferreds.job = $q.defer()
- $http.get "/jobs/" + jobid
+ $http.get "jobs/" + jobid
.success (data, status, headers, config) =>
@setEndTimes(data.vertices)
@processVertices(data)
- $http.get "/jobs/" + jobid + "/config"
+ $http.get "jobs/" + jobid + "/config"
.success (jobConfig) ->
data = angular.extend(data, jobConfig)
@@ -157,7 +157,7 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) =>
vertex = @seekVertex(vertexid)
- $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasktimes"
+ $http.get "jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasktimes"
.success (data) =>
# TODO: change to subtasktimes
vertex.subtasks = data.subtasks
@@ -172,7 +172,7 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) =>
# vertex = @seekVertex(vertexid)
- $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid
+ $http.get "jobs/" + currentJob.jid + "/vertices/" + vertexid
.success (data) ->
subtasks = data.subtasks
@@ -186,11 +186,11 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) =>
# vertex = @seekVertex(vertexid)
- $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/accumulators"
+ $http.get "jobs/" + currentJob.jid + "/vertices/" + vertexid + "/accumulators"
.success (data) ->
accumulators = data['user-accumulators']
- $http.get "/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasks/accumulators"
+ $http.get "jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasks/accumulators"
.success (data) ->
subtaskAccumulators = data.subtasks
@@ -203,7 +203,7 @@ angular.module('flinkApp')
deferreds.job.promise.then (data) =>
- $http.get "/jobs/" + currentJob.jid + "/exceptions"
+ $http.get "jobs/" + currentJob.jid + "/exceptions"
.success (exceptions) ->
currentJob.exceptions = exceptions
http://git-wip-us.apache.org/repos/asf/flink/blob/45931095/flink-runtime-web/web-dashboard/app/scripts/modules/overview/overview.svc.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/overview/overview.svc.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/overview/overview.svc.coffee
index 9d7269d..6a8cf7e 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/modules/overview/overview.svc.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/modules/overview/overview.svc.coffee
@@ -24,7 +24,7 @@ angular.module('flinkApp')
@loadOverview = ->
deferred = $q.defer()
- $http.get("/overview")
+ $http.get("overview")
.success (data, status, headers, config) ->
overview = data
deferred.resolve(data)
http://git-wip-us.apache.org/repos/asf/flink/blob/45931095/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.svc.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.svc.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.svc.coffee
index d76ea9c..8b7a6dc 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.svc.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.svc.coffee
@@ -22,7 +22,7 @@ angular.module('flinkApp')
@loadManagers = () ->
deferred = $q.defer()
- $http.get("/taskmanagers")
+ $http.get("taskmanagers")
.success (data, status, headers, config) ->
deferred.resolve(data['taskmanagers'])
@@ -34,7 +34,7 @@ angular.module('flinkApp')
@loadMetrics = (taskmanagerid) ->
deferred = $q.defer()
- $http.get("/taskmanagers/" + taskmanagerid)
+ $http.get("taskmanagers/" + taskmanagerid)
.success (data, status, headers, config) ->
deferred.resolve(data['taskmanagers'])
http://git-wip-us.apache.org/repos/asf/flink/blob/45931095/flink-runtime-web/web-dashboard/web/js/index.js
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/js/index.js b/flink-runtime-web/web-dashboard/web/js/index.js
index c547f6f..18024e3 100644
--- a/flink-runtime-web/web-dashboard/web/js/index.js
+++ b/flink-runtime-web/web-dashboard/web/js/index.js
@@ -333,7 +333,7 @@ angular.module('flinkApp').service('MainService', ["$http", "flinkConfig", "$q",
this.loadConfig = function() {
var deferred;
deferred = $q.defer();
- $http.get("/config").success(function(data, status, headers, config) {
+ $http.get("config").success(function(data, status, headers, config) {
return deferred.resolve(data);
});
return deferred.promise;
@@ -356,7 +356,7 @@ angular.module('flinkApp').service('JobManagerConfigService', ["$http", "flinkCo
this.loadConfig = function() {
var deferred;
deferred = $q.defer();
- $http.get("/jobmanager/config").success(function(data, status, headers, config) {
+ $http.get("jobmanager/config").success(function(data, status, headers, config) {
config = data;
return deferred.resolve(data);
});
@@ -1015,7 +1015,7 @@ angular.module('flinkApp').service('JobsService', ["$http", "flinkConfig", "$log
this.listJobs = function() {
var deferred;
deferred = $q.defer();
- $http.get("/joboverview").success((function(_this) {
+ $http.get("joboverview").success((function(_this) {
return function(data, status, headers, config) {
angular.forEach(data, function(list, listKey) {
switch (listKey) {
@@ -1044,11 +1044,11 @@ angular.module('flinkApp').service('JobsService', ["$http", "flinkConfig", "$log
this.loadJob = function(jobid) {
currentJob = null;
deferreds.job = $q.defer();
- $http.get("/jobs/" + jobid).success((function(_this) {
+ $http.get("jobs/" + jobid).success((function(_this) {
return function(data, status, headers, config) {
_this.setEndTimes(data.vertices);
_this.processVertices(data);
- return $http.get("/jobs/" + jobid + "/config").success(function(jobConfig) {
+ return $http.get("jobs/" + jobid + "/config").success(function(jobConfig) {
data = angular.extend(data, jobConfig);
currentJob = data;
return deferreds.job.resolve(currentJob);
@@ -1104,7 +1104,7 @@ angular.module('flinkApp').service('JobsService', ["$http", "flinkConfig", "$log
return function(data) {
var vertex;
vertex = _this.seekVertex(vertexid);
- return $http.get("/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasktimes").success(function(data) {
+ return $http.get("jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasktimes").success(function(data) {
vertex.subtasks = data.subtasks;
return deferred.resolve(vertex);
});
@@ -1117,7 +1117,7 @@ angular.module('flinkApp').service('JobsService', ["$http", "flinkConfig", "$log
deferred = $q.defer();
deferreds.job.promise.then((function(_this) {
return function(data) {
- return $http.get("/jobs/" + currentJob.jid + "/vertices/" + vertexid).success(function(data) {
+ return $http.get("jobs/" + currentJob.jid + "/vertices/" + vertexid).success(function(data) {
var subtasks;
subtasks = data.subtasks;
return deferred.resolve(subtasks);
@@ -1131,10 +1131,10 @@ angular.module('flinkApp').service('JobsService', ["$http", "flinkConfig", "$log
deferred = $q.defer();
deferreds.job.promise.then((function(_this) {
return function(data) {
- return $http.get("/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/accumulators").success(function(data) {
+ return $http.get("jobs/" + currentJob.jid + "/vertices/" + vertexid + "/accumulators").success(function(data) {
var accumulators;
accumulators = data['user-accumulators'];
- return $http.get("/jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasks/accumulators").success(function(data) {
+ return $http.get("jobs/" + currentJob.jid + "/vertices/" + vertexid + "/subtasks/accumulators").success(function(data) {
var subtaskAccumulators;
subtaskAccumulators = data.subtasks;
return deferred.resolve({
@@ -1152,7 +1152,7 @@ angular.module('flinkApp').service('JobsService', ["$http", "flinkConfig", "$log
deferred = $q.defer();
deferreds.job.promise.then((function(_this) {
return function(data) {
- return $http.get("/jobs/" + currentJob.jid + "/exceptions").success(function(exceptions) {
+ return $http.get("jobs/" + currentJob.jid + "/exceptions").success(function(exceptions) {
currentJob.exceptions = exceptions;
return deferred.resolve(exceptions);
});
@@ -1308,7 +1308,7 @@ angular.module('flinkApp').service('TaskManagersService', ["$http", "flinkConfig
this.loadManagers = function() {
var deferred;
deferred = $q.defer();
- $http.get("/taskmanagers").success(function(data, status, headers, config) {
+ $http.get("taskmanagers").success(function(data, status, headers, config) {
return deferred.resolve(data['taskmanagers']);
});
return deferred.promise;
@@ -1318,7 +1318,7 @@ angular.module('flinkApp').service('TaskManagersService', ["$http", "flinkConfig
this.loadMetrics = function(taskmanagerid) {
var deferred;
deferred = $q.defer();
- $http.get("/taskmanagers/" + taskmanagerid).success(function(data, status, headers, config) {
+ $http.get("taskmanagers/" + taskmanagerid).success(function(data, status, headers, config) {
return deferred.resolve(data['taskmanagers']);
});
return deferred.promise;
@@ -1356,7 +1356,7 @@ angular.module('flinkApp').service('OverviewService', ["$http", "flinkConfig", "
this.loadOverview = function() {
var deferred;
deferred = $q.defer();
- $http.get("/overview").success(function(data, status, headers, config) {
+ $http.get("overview").success(function(data, status, headers, config) {
overview = data;
return deferred.resolve(data);
});