You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2018/01/04 18:40:51 UTC
hadoop git commit: HDFS-12961. Ozone: Use relative resource urls in
KSM/SCM web ui. Contributed by Elek, Marton.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 45118257a -> a018c2949
HDFS-12961. Ozone: Use relative resource urls in KSM/SCM web ui. Contributed by Elek, Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a018c294
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a018c294
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a018c294
Branch: refs/heads/HDFS-7240
Commit: a018c294937f24f2f473b0e532a3dfae276f08cc
Parents: 4511825
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Thu Jan 4 10:39:23 2018 -0800
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Thu Jan 4 10:39:23 2018 -0800
----------------------------------------------------------------------
.../hadoop-hdfs/src/main/webapps/ksm/index.html | 28 ++++++++++----------
.../hadoop-hdfs/src/main/webapps/ksm/ksm.js | 2 +-
.../hadoop-hdfs/src/main/webapps/scm/index.html | 28 ++++++++++----------
.../hadoop-hdfs/src/main/webapps/scm/scm.js | 4 +--
.../src/main/webapps/static/ozone.js | 16 +++++------
.../src/main/webapps/static/templates/menu.html | 10 +++----
6 files changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a018c294/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/index.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/index.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/index.html
index 7f4e57b..bee42bf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/index.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/index.html
@@ -26,11 +26,11 @@
<title>HDFS Key Space Manager</title>
- <link href="/static/bootstrap-3.0.2/css/bootstrap.min.css" rel="stylesheet">
- <link href="/static/hadoop.css" rel="stylesheet">
- <link href="/static/nvd3-1.8.5.min.css" rel="stylesheet">
+ <link href="static/bootstrap-3.0.2/css/bootstrap.min.css" rel="stylesheet">
+ <link href="static/hadoop.css" rel="stylesheet">
+ <link href="static/nvd3-1.8.5.min.css" rel="stylesheet">
- <link href="/static/ozone.css" rel="stylesheet">
+ <link href="static/ozone.css" rel="stylesheet">
</head>
@@ -49,7 +49,7 @@
<a class="navbar-brand" href="#">HDFS KSM</a>
</div>
<navmenu
- metrics="{ 'Ksm metrics' : '/#!/metrics/ksm', 'Rpc metrics' : '/#!/metrics/rpc'}"></navmenu>
+ metrics="{ 'Ksm metrics' : '#!/metrics/ksm', 'Rpc metrics' : '#!/metrics/rpc'}"></navmenu>
</div>
</header>
@@ -57,14 +57,14 @@
<ng-view></ng-view>
</div><!-- /.container -->
-<script src="/static/jquery-1.10.2.min.js"></script>
-<script src="/static/angular-1.6.4.min.js"></script>
-<script src="/static/angular-route-1.6.4.min.js"></script>
-<script src="/static/d3-3.5.17.min.js"></script>
-<script src="/static/nvd3-1.8.5.min.js"></script>
-<script src="/static/angular-nvd3-1.0.9.min.js"></script>
-<script src="/static/ozone.js"></script>
-<script src="/ksm.js"></script>
-<script src="/static/bootstrap-3.0.2/js/bootstrap.min.js"></script>
+<script src="static/jquery-1.10.2.min.js"></script>
+<script src="static/angular-1.6.4.min.js"></script>
+<script src="static/angular-route-1.6.4.min.js"></script>
+<script src="static/d3-3.5.17.min.js"></script>
+<script src="static/nvd3-1.8.5.min.js"></script>
+<script src="static/angular-nvd3-1.0.9.min.js"></script>
+<script src="static/ozone.js"></script>
+<script src="ksm.js"></script>
+<script src="static/bootstrap-3.0.2/js/bootstrap.min.js"></script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a018c294/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ksm.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ksm.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ksm.js
index 98240a4..7fb52b1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ksm.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ksm.js
@@ -61,7 +61,7 @@
};
- $http.get("/jmx?qry=Hadoop:service=KeySpaceManager,name=KSMMetrics")
+ $http.get("jmx?qry=Hadoop:service=KeySpaceManager,name=KSMMetrics")
.then(function (result) {
var groupedMetrics = {others: [], nums: {}};
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a018c294/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/index.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/index.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/index.html
index 6d044d9..3407f51 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/index.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/index.html
@@ -26,11 +26,11 @@
<title>HDFS Storage Container Manager</title>
- <link href="/static/bootstrap-3.0.2/css/bootstrap.min.css" rel="stylesheet">
- <link href="/static/hadoop.css" rel="stylesheet">
- <link href="/static/nvd3-1.8.5.min.css" rel="stylesheet">
+ <link href="static/bootstrap-3.0.2/css/bootstrap.min.css" rel="stylesheet">
+ <link href="static/hadoop.css" rel="stylesheet">
+ <link href="static/nvd3-1.8.5.min.css" rel="stylesheet">
- <link href="/static/ozone.css" rel="stylesheet">
+ <link href="static/ozone.css" rel="stylesheet">
</head>
@@ -51,7 +51,7 @@
<navmenu
- metrics="{ 'Rpc metrics' : '/#!/metrics/rpc'}"></navmenu>
+ metrics="{ 'Rpc metrics' : '#!/metrics/rpc'}"></navmenu>
</div>
@@ -63,14 +63,14 @@
</div><!-- /.container -->
-<script src="/static/jquery-1.10.2.min.js"></script>
-<script src="/static/angular-1.6.4.min.js"></script>
-<script src="/static/angular-route-1.6.4.min.js"></script>
-<script src="/static/d3-3.5.17.min.js"></script>
-<script src="/static/nvd3-1.8.5.min.js"></script>
-<script src="/static/angular-nvd3-1.0.9.min.js"></script>
-<script src="/static/ozone.js"></script>
-<script src="/scm.js"></script>
-<script src="/static/bootstrap-3.0.2/js/bootstrap.min.js"></script>
+<script src="static/jquery-1.10.2.min.js"></script>
+<script src="static/angular-1.6.4.min.js"></script>
+<script src="static/angular-route-1.6.4.min.js"></script>
+<script src="static/d3-3.5.17.min.js"></script>
+<script src="static/nvd3-1.8.5.min.js"></script>
+<script src="static/angular-nvd3-1.0.9.min.js"></script>
+<script src="static/ozone.js"></script>
+<script src="scm.js"></script>
+<script src="static/bootstrap-3.0.2/js/bootstrap.min.js"></script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a018c294/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js
index c88fe97..bcfa8b7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js
@@ -26,11 +26,11 @@
},
controller: function ($http) {
var ctrl = this;
- $http.get("/jmx?qry=Hadoop:service=BlockManager,name=*")
+ $http.get("jmx?qry=Hadoop:service=BlockManager,name=*")
.then(function (result) {
ctrl.blockmanagermetrics = result.data.beans[0];
});
- $http.get("/jmx?qry=Hadoop:service=SCMNodeManager,name=SCMNodeManagerInfo")
+ $http.get("jmx?qry=Hadoop:service=SCMNodeManager,name=SCMNodeManagerInfo")
.then(function (result) {
ctrl.nodemanagermetrics = result.data.beans[0];
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a018c294/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
index 57e1ab8..37cafef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
@@ -40,7 +40,7 @@
transclude: true,
controller: function ($http) {
var ctrl = this;
- $http.get("/jmx?qry=Hadoop:service=*,name=*,component=ServerRuntime")
+ $http.get("jmx?qry=Hadoop:service=*,name=*,component=ServerRuntime")
.then(function (result) {
ctrl.jmx = result.data.beans[0]
})
@@ -50,7 +50,7 @@
templateUrl: 'static/templates/jvm.html',
controller: function ($http) {
var ctrl = this;
- $http.get("/jmx?qry=java.lang:type=Runtime")
+ $http.get("jmx?qry=java.lang:type=Runtime")
.then(function (result) {
ctrl.jmx = result.data.beans[0];
@@ -73,7 +73,7 @@
'</tabs>',
controller: function ($http) {
var ctrl = this;
- $http.get("/jmx?qry=Hadoop:service=*,name=RpcActivityForPort*")
+ $http.get("jmx?qry=Hadoop:service=*,name=RpcActivityForPort*")
.then(function (result) {
ctrl.metrics = result.data.beans;
})
@@ -246,11 +246,11 @@
bindings: {
metrics: '<'
},
- templateUrl: '/static/templates/menu.html',
+ templateUrl: 'static/templates/menu.html',
controller: function ($http) {
var ctrl = this;
ctrl.docs = false;
- $http.head("/docs/index.html")
+ $http.head("docs/index.html")
.then(function (result) {
ctrl.docs = true;
},function(){
@@ -260,12 +260,12 @@
});
angular.module('ozone').component('config', {
- templateUrl: '/static/templates/config.html',
+ templateUrl: 'static/templates/config.html',
controller: function ($scope, $http) {
var ctrl = this;
ctrl.selectedTags = [];
- $http.get("/conf?cmd=getOzoneTags&group=ozone")
+ $http.get("conf?cmd=getOzoneTags&group=ozone")
.then(function (response) {
ctrl.tags = response.data;
@@ -284,7 +284,7 @@
ctrl.loadAll = function () {
console.log("Displaying all configs");
- $http.get("/conf?cmd=getPropertyByTag&tags=" + ctrl.tags + "&group=ozone").then(function (response) {
+ $http.get("conf?cmd=getPropertyByTag&tags=" + ctrl.tags + "&group=ozone").then(function (response) {
ctrl.configs = response.data;
console.log(ctrl.configs)
for (var idx in ctrl.configs) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a018c294/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/menu.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/menu.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/menu.html
index 4769e69..95f1b48 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/menu.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/menu.html
@@ -33,7 +33,7 @@
aria-hidden="true"></span></a></li>
</ul>
</li>
- <li><a href="/#!/config">Configuration</a></li>
+ <li><a href="#!/config">Configuration</a></li>
<li ng-show="$ctrl.docs"><a href="/docs">Documentation</a></li>
<li>
<a class="dropdown-toggle"
@@ -46,13 +46,13 @@
<span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="toolsMenu">
- <li><a href="/jmx">JMX <span
+ <li><a href="jmx">JMX <span
aria-hidden="true"></span></a></li>
- <li><a href="/conf">Config <span
+ <li><a href="conf">Config <span
aria-hidden="true"></a></li>
- <li><a href="/stacks">Stacks <span
+ <li><a href="stacks">Stacks <span
aria-hidden="true"></a></li>
- <li><a href="/logLevel">Log levels <span
+ <li><a href="logLevel">Log levels <span
aria-hidden="true"></a></li>
</ul>
</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org