Repository: hadoop Updated Branches: refs/heads/branch-3.1 2543a9dd7 -> b11c22866
YARN-8119. [UI2] Timeline Server address' url scheme should be removed while accessing via KNOX. Contributed by Sunil G. (cherry picked from commit f32d6275ba9e377fb722e2440986033d7ce8b602) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b11c2286 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b11c2286 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b11c2286 Branch: refs/heads/branch-3.1 Commit: b11c228660f41ac7336ee03f0b95efda23ff7096 Parents: 2543a9d Author: Rohith Sharma K S <[email protected]> Authored: Thu Apr 5 23:32:35 2018 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Thu Apr 5 23:34:40 2018 +0530 ---------------------------------------------------------------------- .../hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b11c2286/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js index af55036..d047ed1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js @@ -61,6 +61,7 @@ function updateConfigs(application) { url: getTimeLineURL(rmhost), success: function(data) { timelinehost = data.property.value; + timelinehost = timelinehost.replace(/(^\w+:|^)\/\//, ''); ENV.hosts.timelineWebAddress = timelinehost; var address = timelinehost.split(":")[0]; @@ -94,6 +95,7 @@ function updateConfigs(application) { url: getTimeLineV1URL(rmhost), success: function(data) { timelinehost = data.property.value; + timelinehost = timelinehost.replace(/(^\w+:|^)\/\//, ''); ENV.hosts.timelineV1WebAddress = timelinehost; var address = timelinehost.split(":")[0]; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
