Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12961. Ozone: Use relative resource urls in KSM/SCM web ui. Contributed by Elek, Marton.

This commit is contained in:
Xiaoyu Yao 2018-01-04 10:39:23 -08:00 committed by Owen O'Malley
parent 5766792cad
commit 5cc5149bd8
6 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/index.html
View File

@ -26,11 +26,11 @@
<title>HDFS Key Space Manager</title> <title>HDFS Key Space Manager</title>
<link href="/static/bootstrap-3.0.2/css/bootstrap.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/hadoop.css" rel="stylesheet">
<link href="/static/nvd3-1.8.5.min.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> </head>
@ -49,7 +49,7 @@
<a class="navbar-brand" href="#">HDFS KSM</a> <a class="navbar-brand" href="#">HDFS KSM</a>
</div> </div>
<navmenu <navmenu
metrics="{ 'Ksm metrics' : '/#!/metrics/ksm', 'Rpc metrics' : '/#!/metrics/rpc'}"></navmenu> metrics="{ 'Ksm metrics' : '#!/metrics/ksm', 'Rpc metrics' : '#!/metrics/rpc'}"></navmenu>
</div> </div>
</header> </header>
@ -57,14 +57,14 @@
<ng-view></ng-view> <ng-view></ng-view>
</div><!-- /.container --> </div><!-- /.container -->
<script src="/static/jquery-1.10.2.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-1.6.4.min.js"></script>
<script src="/static/angular-route-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/d3-3.5.17.min.js"></script>
<script src="/static/nvd3-1.8.5.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/angular-nvd3-1.0.9.min.js"></script>
<script src="/static/ozone.js"></script> <script src="static/ozone.js"></script>
<script src="/ksm.js"></script> <script src="ksm.js"></script>
<script src="/static/bootstrap-3.0.2/js/bootstrap.min.js"></script> <script src="static/bootstrap-3.0.2/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

2
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ksm.js
View File

@ -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) { .then(function (result) {
var groupedMetrics = {others: [], nums: {}}; var groupedMetrics = {others: [], nums: {}};

28
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/index.html
View File

@ -26,11 +26,11 @@
<title>HDFS Storage Container Manager</title> <title>HDFS Storage Container Manager</title>
<link href="/static/bootstrap-3.0.2/css/bootstrap.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/hadoop.css" rel="stylesheet">
<link href="/static/nvd3-1.8.5.min.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> </head>
@ -51,7 +51,7 @@
<navmenu <navmenu
metrics="{ 'Rpc metrics' : '/#!/metrics/rpc'}"></navmenu> metrics="{ 'Rpc metrics' : '#!/metrics/rpc'}"></navmenu>
</div> </div>
@ -63,14 +63,14 @@
</div><!-- /.container --> </div><!-- /.container -->
<script src="/static/jquery-1.10.2.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-1.6.4.min.js"></script>
<script src="/static/angular-route-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/d3-3.5.17.min.js"></script>
<script src="/static/nvd3-1.8.5.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/angular-nvd3-1.0.9.min.js"></script>
<script src="/static/ozone.js"></script> <script src="static/ozone.js"></script>
<script src="/scm.js"></script> <script src="scm.js"></script>
<script src="/static/bootstrap-3.0.2/js/bootstrap.min.js"></script> <script src="static/bootstrap-3.0.2/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

4
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/scm/scm.js
View File

@ -26,11 +26,11 @@
}, },
controller: function ($http) { controller: function ($http) {
var ctrl = this; var ctrl = this;
$http.get("/jmx?qry=Hadoop:service=BlockManager,name=*") $http.get("jmx?qry=Hadoop:service=BlockManager,name=*")
.then(function (result) { .then(function (result) {
ctrl.blockmanagermetrics = result.data.beans[0]; 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) { .then(function (result) {
ctrl.nodemanagermetrics = result.data.beans[0]; ctrl.nodemanagermetrics = result.data.beans[0];
}); });

16
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/ozone.js
View File

@ -40,7 +40,7 @@
transclude: true, transclude: true,
controller: function ($http) { controller: function ($http) {
var ctrl = this; var ctrl = this;
$http.get("/jmx?qry=Hadoop:service=*,name=*,component=ServerRuntime") $http.get("jmx?qry=Hadoop:service=*,name=*,component=ServerRuntime")
.then(function (result) { .then(function (result) {
ctrl.jmx = result.data.beans[0] ctrl.jmx = result.data.beans[0]
}) })
@ -50,7 +50,7 @@
templateUrl: 'static/templates/jvm.html', templateUrl: 'static/templates/jvm.html',
controller: function ($http) { controller: function ($http) {
var ctrl = this; var ctrl = this;
$http.get("/jmx?qry=java.lang:type=Runtime") $http.get("jmx?qry=java.lang:type=Runtime")
.then(function (result) { .then(function (result) {
ctrl.jmx = result.data.beans[0]; ctrl.jmx = result.data.beans[0];
@ -73,7 +73,7 @@
'</tabs>', '</tabs>',
controller: function ($http) { controller: function ($http) {
var ctrl = this; var ctrl = this;
$http.get("/jmx?qry=Hadoop:service=*,name=RpcActivityForPort*") $http.get("jmx?qry=Hadoop:service=*,name=RpcActivityForPort*")
.then(function (result) { .then(function (result) {
ctrl.metrics = result.data.beans; ctrl.metrics = result.data.beans;
}) })
@ -246,11 +246,11 @@
bindings: { bindings: {
metrics: '<' metrics: '<'
}, },
templateUrl: '/static/templates/menu.html', templateUrl: 'static/templates/menu.html',
controller: function ($http) { controller: function ($http) {
var ctrl = this; var ctrl = this;
ctrl.docs = false; ctrl.docs = false;
$http.head("/docs/index.html") $http.head("docs/index.html")
.then(function (result) { .then(function (result) {
ctrl.docs = true; ctrl.docs = true;
},function(){ },function(){
@ -260,12 +260,12 @@
}); });
angular.module('ozone').component('config', { angular.module('ozone').component('config', {
templateUrl: '/static/templates/config.html', templateUrl: 'static/templates/config.html',
controller: function ($scope, $http) { controller: function ($scope, $http) {
var ctrl = this; var ctrl = this;
ctrl.selectedTags = []; ctrl.selectedTags = [];
$http.get("/conf?cmd=getOzoneTags&group=ozone") $http.get("conf?cmd=getOzoneTags&group=ozone")
.then(function (response) { .then(function (response) {
ctrl.tags = response.data; ctrl.tags = response.data;
@ -284,7 +284,7 @@
ctrl.loadAll = function () { ctrl.loadAll = function () {
console.log("Displaying all configs"); 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; ctrl.configs = response.data;
console.log(ctrl.configs) console.log(ctrl.configs)
for (var idx in ctrl.configs) { for (var idx in ctrl.configs) {

10
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/menu.html
View File

@ -33,7 +33,7 @@
aria-hidden="true"></span></a></li> aria-hidden="true"></span></a></li>
</ul> </ul>
</li> </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 ng-show="$ctrl.docs"><a href="/docs">Documentation</a></li>
<li> <li>
<a class="dropdown-toggle" <a class="dropdown-toggle"
@ -46,13 +46,13 @@
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu" aria-labelledby="toolsMenu"> <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> aria-hidden="true"></span></a></li>
<li><a href="/conf">Config <span <li><a href="conf">Config <span
aria-hidden="true"></a></li> aria-hidden="true"></a></li>
<li><a href="/stacks">Stacks <span <li><a href="stacks">Stacks <span
aria-hidden="true"></a></li> aria-hidden="true"></a></li>
<li><a href="/logLevel">Log levels <span <li><a href="logLevel">Log levels <span
aria-hidden="true"></a></li> aria-hidden="true"></a></li>
</ul> </ul>
</li> </li>