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 ae...@apache.org on 2017/10/06 05:10:55 UTC
hadoop git commit: HDFS-12602. Add Ozone config UI to KSM and SCM
index page. Contributed by Ajay Kumar.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 5cb060ac8 -> 50bd9f6d1
HDFS-12602. Add Ozone config UI to KSM and SCM index page. Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/50bd9f6d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/50bd9f6d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/50bd9f6d
Branch: refs/heads/HDFS-7240
Commit: 50bd9f6d1978edbf9bf42c9fa31e6392d5cc54dc
Parents: 5cb060a
Author: Anu Engineer <ae...@apache.org>
Authored: Thu Oct 5 22:07:47 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Thu Oct 5 22:07:47 2017 -0700
----------------------------------------------------------------------
.../src/main/webapps/ksm/ozone-config.html | 103 -------------------
.../webapps/static/templates/ozone-config.html | 103 +++++++++++++++++++
.../main/webapps/static/templates/tools.html | 2 +-
3 files changed, 104 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50bd9f6d/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ozone-config.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ozone-config.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ozone-config.html
deleted file mode 100644
index 72d2bb2..0000000
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/ksm/ozone-config.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
- 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.
- -->
-<html>
-<head>
- <meta charset="utf-8">
- <title>Ozone Config</title>
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link href="/static/bootstrap-3.0.2/css/bootstrap.min.css" rel="stylesheet">
- <link rel="stylesheet" type="text/css" href="/static/css/ozone-conf.css">
- <script src="/static/angular-1.6.4.min.js"></script>
- <script src="/static/angular-route-1.6.4.min.js"></script>
- <script src="/static/js/ozone-conf.js"></script>
-</head>
-
-<body class="htmlNoPages" ng-app="app" ng-controller="tagController">
-<div class="row btn-success">
- <div class="col-md-12 text-center">
- <h2>Ozone Configuration</h2>
- </div>
-</div>
-<div class="row top-buffer">
- <div class="col-md-3">
- <input type="text" class="form-control" placeholder="Search Properties"
- name="search" ng-model="search.$">
- </div>
- <div class="col-md-9">
- <div class="btn-group btn-group-justified">
- <a class="btn btn-primary" ng-click="loadAll()">All</a>
- <a class="btn btn-primary" ng-click="filterConfig('KSM')">KSM</a>
- <a class="btn btn-primary" ng-click="filterConfig('SCM')">SCM</a>
- </div>
- </div>
-</div>
-<div class="row">
- <div class="col-md-3">
- <table class="table table-striped table-condensed table-hover tagPanel">
- <colgroup>
- <col class="col-md-2">
- <col class="col-md-10">
- </colgroup>
- <thead>
- <tr>
- <th></th>
- <th>Tag</th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="tag in tags | filter:filterTags">
- <td>
- <input type="checkbox" name="{{tag}}" value="{{tag}}"
- ng-click="selected(tag)">
- </td>
- <td>{{tag}}</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="col-md-9">
- <table class="table table-striped table-condensed table-hover">
- <thead>
- <tr>
- <th>
- <a href="#" ng-click="sortBy('prop')">Property</a>
- <span class="sortorder" ng-show="propertyName === 'prop'"
- ng-class="{reverse: reverse}">
-
- </span>
- </th>
- <th>
- <a ng-click="sortBy('value')">Value</a>
- <span class="sortorder" ng-show="propertyName === 'value'"
- ng-class="{reverse: reverse}"></span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="config in configArray | filter:search | orderBy:propertyName:reverse">
- <td>{{config.prop}}</td>
- <td>{{config.value}}</td>
- </tr>
- </tbody>
- </table>
- </div>
-</div>
-</body>
-
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50bd9f6d/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/ozone-config.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/ozone-config.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/ozone-config.html
new file mode 100644
index 0000000..72d2bb2
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/ozone-config.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ 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.
+ -->
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Ozone Config</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="/static/bootstrap-3.0.2/css/bootstrap.min.css" rel="stylesheet">
+ <link rel="stylesheet" type="text/css" href="/static/css/ozone-conf.css">
+ <script src="/static/angular-1.6.4.min.js"></script>
+ <script src="/static/angular-route-1.6.4.min.js"></script>
+ <script src="/static/js/ozone-conf.js"></script>
+</head>
+
+<body class="htmlNoPages" ng-app="app" ng-controller="tagController">
+<div class="row btn-success">
+ <div class="col-md-12 text-center">
+ <h2>Ozone Configuration</h2>
+ </div>
+</div>
+<div class="row top-buffer">
+ <div class="col-md-3">
+ <input type="text" class="form-control" placeholder="Search Properties"
+ name="search" ng-model="search.$">
+ </div>
+ <div class="col-md-9">
+ <div class="btn-group btn-group-justified">
+ <a class="btn btn-primary" ng-click="loadAll()">All</a>
+ <a class="btn btn-primary" ng-click="filterConfig('KSM')">KSM</a>
+ <a class="btn btn-primary" ng-click="filterConfig('SCM')">SCM</a>
+ </div>
+ </div>
+</div>
+<div class="row">
+ <div class="col-md-3">
+ <table class="table table-striped table-condensed table-hover tagPanel">
+ <colgroup>
+ <col class="col-md-2">
+ <col class="col-md-10">
+ </colgroup>
+ <thead>
+ <tr>
+ <th></th>
+ <th>Tag</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="tag in tags | filter:filterTags">
+ <td>
+ <input type="checkbox" name="{{tag}}" value="{{tag}}"
+ ng-click="selected(tag)">
+ </td>
+ <td>{{tag}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="col-md-9">
+ <table class="table table-striped table-condensed table-hover">
+ <thead>
+ <tr>
+ <th>
+ <a href="#" ng-click="sortBy('prop')">Property</a>
+ <span class="sortorder" ng-show="propertyName === 'prop'"
+ ng-class="{reverse: reverse}">
+
+ </span>
+ </th>
+ <th>
+ <a ng-click="sortBy('value')">Value</a>
+ <span class="sortorder" ng-show="propertyName === 'value'"
+ ng-class="{reverse: reverse}"></span>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr ng-repeat="config in configArray | filter:search | orderBy:propertyName:reverse">
+ <td>{{config.prop}}</td>
+ <td>{{config.value}}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hadoop/blob/50bd9f6d/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
index 70ffe77..cd11021 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/templates/tools.html
@@ -26,7 +26,7 @@
<ul class="dropdown-menu" aria-labelledby="toolsMenu">
<li><a href="/jmx">JMX <span
aria-hidden="true"></span></a></li>
- <li><a href="/conf">Config <span
+ <li><a href="/static/templates/ozone-config.html">Config <span
aria-hidden="true"></a></li>
<li><a href="/stacks">Stacks <span
aria-hidden="true"></a></li>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org