You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by jj...@apache.org on 2017/02/17 07:45:41 UTC
eagle git commit: [EAGLE-866] Refactor HBase JMX Metric with
appropriate navigation path
Repository: eagle
Updated Branches:
refs/heads/master d9bb79952 -> 26e1f0677
[EAGLE-866] Refactor HBase JMX Metric with appropriate navigation path
<!--
{% comment %}
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.
{% endcomment %}
-->
Refactor HBase JMX Metric with appropriate navigation path
https://issues.apache.org/jira/browse/EAGLE-866
Author: koone <lu...@126.com>
Closes #797 from koone/EAGLE-866.
Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/26e1f067
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/26e1f067
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/26e1f067
Branch: refs/heads/master
Commit: 26e1f067704e5059b4c71fddacd29c0fb3f51335
Parents: d9bb799
Author: koone <lu...@126.com>
Authored: Fri Feb 17 07:45:26 2017 +0000
Committer: r7raul1984 <ta...@yhd.com>
Committed: Fri Feb 17 07:45:26 2017 +0000
----------------------------------------------------------------------
.../src/main/webapp/app/apps/hbase/index.html | 6 ++++++
.../src/main/webapp/app/apps/hadoop_metric/index.js | 16 ++++++++--------
.../hadoop_metric/partials/backupMasterList.html | 2 +-
.../app/apps/hadoop_metric/partials/hdfs/index.html | 2 +-
.../app/apps/hadoop_metric/partials/overview.html | 2 +-
.../hadoop_metric/partials/region/regionList.html | 2 +-
eagle-hadoop-metric/src/main/webapp/app/index.html | 6 ------
7 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/eagle/blob/26e1f067/eagle-hadoop-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.html
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.html b/eagle-hadoop-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.html
new file mode 100644
index 0000000..5fb6b5f
--- /dev/null
+++ b/eagle-hadoop-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.html
@@ -0,0 +1,6 @@
+<htm>
+ <body>
+ <h1>Hadoop Metric Monitor Application!</h1>
+ <i><b>url</b>: /apps/hbase</i>
+ </body>
+</htm>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/eagle/blob/26e1f067/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.js
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.js b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.js
index 43ab12a..d4789b2 100644
--- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.js
+++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/index.js
@@ -23,35 +23,35 @@
var hadoopMetricApp = register(['ngRoute', 'ngAnimate', 'ui.router', 'eagle.service']);
hadoopMetricApp.route("HadoopMetric", {
- url: "/hadoopMetric?startTime&endTime",
+ url: "/hadoopService/HBase/overview?startTime&endTime",
site: true,
templateUrl: "partials/overview.html",
controller: "overviewCtrl",
resolve: {time: true}
}).route("HadoopMetric_HDFS", {
- url: "/hadoopMetric/hdfs",
+ url: "/hadoopService/hdfs",
site: true,
templateUrl: "partials/hdfs/index.html",
controller: "hdfsCtrl",
resolve: {time: true}
}).route("regionDetail", {
- url: "/hadoopMetric/regionDetail/:hostname",
+ url: "/hadoopService/HBase/regionDetail/:hostname",
site: true,
templateUrl: "partials/region/regionDetail.html",
controller: "regionDetailCtrl",
resolve: {time: true}
}).route("regionList", {
- url: "/hadoopMetric/regionList",
+ url: "/hadoopService/HBase/regionList",
site: true,
templateUrl: "partials/region/regionList.html",
controller: "regionListCtrl"
}).route("backupMasterList", {
- url: "/hadoopMetric/backupMasterList",
+ url: "/hadoopService/HBase/backupMasterList",
site: true,
templateUrl: "partials/backupMasterList.html",
controller: "backupMasterListCtrl"
}).route("masterDetail", {
- url: "/hadoopMetric/:hostname?startTime&endTime",
+ url: "/hadoopService/HBase/:hostname?startTime&endTime",
site: true,
reloadOnSearch: false,
templateUrl: "partials/overview.html",
@@ -61,8 +61,8 @@
hadoopMetricApp.portal({
name: "Services", icon: "heartbeat", list: [
- {name: "HBase", path: "hadoopMetric"},
- {name: "HDFS", path: "hadoopMetric/hdfs"}
+ {name: "HBase", path: "hadoopService/HBase/overview"},
+ {name: "HDFS", path: "hadoopService/hdfs"}
]
}, true);
http://git-wip-us.apache.org/repos/asf/eagle/blob/26e1f067/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html
index 96c8016..13e20c9 100644
--- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html
+++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/backupMasterList.html
@@ -37,7 +37,7 @@
<tbody>
<tr ng-repeat="item in backupMasterList">
<td>
- <a ui-sref="masterDetail({siteId: site, hostname: item.tags.hostname})" target="_blank">{{item.tags.hostname}}</a>
+ <a ui-sref="masterDetail({siteId: site, hostname: item.tags.hostname})">{{item.tags.hostname}}</a>
</td>
<td>{{item.tags.rack}}</td>
<td>{{item.tags.site}}</td>
http://git-wip-us.apache.org/repos/asf/eagle/blob/26e1f067/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/hdfs/index.html
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/hdfs/index.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/hdfs/index.html
index cf5960a..33acb15 100644
--- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/hdfs/index.html
+++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/hdfs/index.html
@@ -16,4 +16,4 @@
limitations under the License.
-->
-HDFS Page
\ No newline at end of file
+HDFS Page
http://git-wip-us.apache.org/repos/asf/eagle/blob/26e1f067/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html
index 3a864d3..86a1591 100644
--- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html
+++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html
@@ -40,7 +40,7 @@
</tr>
<tr>
<td>
- <a ui-sref="backupMasterList({siteId: site})" target="_blank">
+ <a ui-sref="backupMasterList({siteId: site})">
<span ng-show="hmasterstandbynum">{{hmasterstandbynum}}</span></a>
<span ng-show="!hmasterstandbynum">0</span>
</td>
http://git-wip-us.apache.org/repos/asf/eagle/blob/26e1f067/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionList.html
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionList.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionList.html
index 507de72..d1a7440 100644
--- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionList.html
+++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionList.html
@@ -37,7 +37,7 @@
<tbody>
<tr ng-repeat="item in regionserverList">
<td>
- <a ui-sref="regionDetail({siteId: site, hostname: item.tags.hostname})" target="_blank">{{item.tags.hostname}}</a>
+ <a ui-sref="regionDetail({siteId: site, hostname: item.tags.hostname})">{{item.tags.hostname}}</a>
</td>
<td>{{item.tags.rack}}</td>
<td>{{item.tags.site}}</td>
http://git-wip-us.apache.org/repos/asf/eagle/blob/26e1f067/eagle-hadoop-metric/src/main/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/eagle-hadoop-metric/src/main/webapp/app/index.html b/eagle-hadoop-metric/src/main/webapp/app/index.html
deleted file mode 100644
index 765d8a6..0000000
--- a/eagle-hadoop-metric/src/main/webapp/app/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<htm>
- <body>
- <h1>Hadoop Metric Monitor Application!</h1>
- <i><b>url</b>: /apps/hadoop_metric</i>
- </body>
-</htm>
\ No newline at end of file