From 270f2f01b44fc88eebbdb15c6cf58382509b6800 Mon Sep 17 00:00:00 2001 From: Andrew Kyle Purtell Date: Fri, 22 Jun 2012 18:55:16 +0000 Subject: [PATCH] HBASE-6256. ZK dump was missed in the move to new UI (Elliott Clark) git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1352995 13f79535-47bb-0310-9956-ffa450edef68 --- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +- .../tmpl/regionserver/RSStatusTmpl.jamon | 2 +- .../resources/hbase-webapps/master/table.jsp | 2 +- .../hbase-webapps/master/tablesDetailed.jsp | 2 +- .../resources/hbase-webapps/master/zk.jsp | 74 ++++++++++++++----- .../hbase-webapps/static/css/hbase.css | 1 + 6 files changed, 61 insertions(+), 22 deletions(-) diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 3b303d7e5f5..79567f899ea 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -92,7 +92,7 @@ org.apache.hadoop.hbase.HBaseConfiguration;
-
+

Master: <% master.getServerName().getHostname() %>

diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 3be34464d7d..93606d57f25 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -89,7 +89,7 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
-
+

RegionServer: <% serverName.getHostname() %>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index a2b42970deb..87772e90189 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -106,7 +106,7 @@
-
+

Table action request accepted

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp index d087029658b..6cd0656771a 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp @@ -71,7 +71,7 @@
-
+

User Tables

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp index c205d7fd22e..e02062efb85 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp @@ -34,24 +34,62 @@ %> - + - -ZooKeeper Dump - - - - -

ZooKeeper Dump

- -
-
-<%= ZKUtil.dump(watcher) %>
-
+ + + ZooKeeper Dump + + + - + + + + + + + + +
+
+
+ + + + + + HBase Region Server +
+ +
+
+
+
+ +
+
+
+

Zookeeper Dump

+
+ +
+
+
+ 
<%= ZKUtil.dump(watcher).trim() %>
+
+
+
+ + diff --git a/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css index 5fc6d316c5d..d7983d91834 100644 --- a/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css +++ b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css @@ -17,3 +17,4 @@ */ body { padding-top: 60px; } .logo img { float: right; } +.inner_header { margin-bottom: 1em;}