From b8e4d21acd8c7f03ca6e761cabf68acc8de71208 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Thu, 20 Dec 2012 16:49:42 -0800 Subject: [PATCH] Restyle --- .../hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon | 16 +- .../tmpl/master/AssignmentManagerStatusTmpl.jamon | 2 + .../hbase/tmpl/master/MasterStatusTmpl.jamon | 220 +- .../hbase/tmpl/master/RegionServerListTmpl.jamon | 22 +- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 19 +- .../hbase/tmpl/regionserver/RegionListTmpl.jamon | 18 +- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 26 +- .../main/resources/hbase-webapps/master/table.jsp | 26 +- .../hbase-webapps/master/tablesDetailed.jsp | 9 +- .../src/main/resources/hbase-webapps/master/zk.jsp | 7 +- .../static/css/bootstrap-responsive.css | 823 ++++-- .../static/css/bootstrap-responsive.min.css | 4 +- .../hbase-webapps/static/css/bootstrap.css | 3060 +++++++++++++------- .../hbase-webapps/static/css/bootstrap.min.css | 4 +- .../resources/hbase-webapps/static/css/hbase.css | 1 + .../hbase-webapps/static/hbase_logo_small.png | Bin 0 -> 1926 bytes .../resources/hbase-webapps/static/js/bootstrap.js | 820 ++++-- .../hbase-webapps/static/js/bootstrap.min.js | 2 +- .../hbase-webapps/static/js/jquery.min.js | 6 +- .../main/resources/hbase-webapps/static/js/tab.js | 15 +- 20 files changed, 3388 insertions(+), 1712 deletions(-) create mode 100644 hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon index e1861dc..b4a5fea 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon @@ -56,14 +56,14 @@ boolean first = true; [<%for MonitoredTask task : tasks%><%if first%><%java>first = false;<%else>,<% task.toJSON() %>] <%else>

Tasks

-
- Show All Monitored Tasks - Show non-RPC Tasks - Show All RPC Handler Tasks - Show Active RPC Calls - Show Client Operations - View as JSON -
+ <%if tasks.isEmpty()%>

No tasks currently running on this node.

<%else> diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon index 497603c..efa8165 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon @@ -76,6 +76,7 @@ if (toRemove > 0) { <%if !rit.isEmpty() %> +

Regions in Transition

@@ -95,5 +96,6 @@ if (toRemove > 0) { <%if removed > 0 %> (<% removed %> more regions in transition not shown) + 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 9587af8..fb6fbea 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 @@ -73,7 +73,7 @@ org.apache.hadoop.hbase.HBaseConfiguration; - HBase Master + HBase Logo
RegionStateRIT time (ms)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%if frags != null %> - - - - - - - - - - - - - - - - - - - - - - - - - - -
Attribute NameValueDescription
HBase Version<% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and revision
HBase Compiled<% org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <% org.apache.hadoop.hbase.util.VersionInfo.getUser() %>When HBase version was compiled and by whom
Hadoop Version<% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %>Hadoop version and revision
Hadoop Compiled<% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %>When Hadoop version was compiled and by whom
HBase Root Directory<% FSUtils.getRootDir(master.getConfiguration()).toString() %>Location of HBase home directory
HBase Cluster ID<% master.getClusterId() != null ? master.getClusterId() : "Not set" %>Unique identifier generated for each HBase cluster
Load average<% StringUtils.limitDecimalTo2(master.getServerManager().getAverageLoad()) %>Average number of regions per regionserver. Naive computation.
Fragmentation<% frags.get("-TOTAL-") != null ? frags.get("-TOTAL-").intValue() + "%" : "n/a" %>Overall fragmentation of all tables, including .META. and -ROOT-.
Zookeeper Quorum<% master.getZooKeeperWatcher().getQuorum() %>Addresses of all registered ZK servers. For more, see zk dump.
Coprocessors<% java.util.Arrays.toString(master.getCoprocessors()) %>Coprocessors currently loaded by the master
HMaster Start Time<% new Date(master.getMasterStartTime()) %>Date stamp of when this HMaster was started
HMaster Active Time<% new Date(master.getMasterActiveTime()) %>Date stamp of when this HMaster became active
+
+

Software Attributes

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%if frags != null %> + + + + + + + + + + + + + + + + + + + + + + + + + + +
Attribute NameValueDescription
HBase Version<% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and revision
HBase Compiled<% org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <% org.apache.hadoop.hbase.util.VersionInfo.getUser() %>When HBase version was compiled and by whom
Hadoop Version<% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %>Hadoop version and revision
Hadoop Compiled<% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %>When Hadoop version was compiled and by whom
HBase Root Directory<% FSUtils.getRootDir(master.getConfiguration()).toString() %>Location of HBase home directory
HBase Cluster ID<% master.getClusterId() != null ? master.getClusterId() : "Not set" %>Unique identifier generated for each HBase cluster
Load average<% StringUtils.limitDecimalTo2(master.getServerManager().getAverageLoad()) %>Average number of regions per regionserver. Naive computation.
Fragmentation<% frags.get("-TOTAL-") != null ? frags.get("-TOTAL-").intValue() + "%" : "n/a" %>Overall fragmentation of all tables, including .META. and -ROOT-.
Zookeeper Quorum<% master.getZooKeeperWatcher().getQuorum() %>Addresses of all registered ZK servers. For more, see zk dump.
Coprocessors<% java.util.Arrays.toString(master.getCoprocessors()) %>Coprocessors currently loaded by the master
HMaster Start Time<% new Date(master.getMasterStartTime()) %>Date stamp of when this HMaster was started
HMaster Active Time<% new Date(master.getMasterActiveTime()) %>Date stamp of when this HMaster became active
+
+ diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon index 169b868..b064d49 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon @@ -48,27 +48,27 @@ Arrays.sort(serverNames);
-