diff --git a/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon b/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon index 813c7b8..4379ef5 100644 --- a/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon +++ b/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon @@ -56,15 +56,15 @@ boolean first = true; <%if format.equals("json")%> [<%for MonitoredTask task : tasks%><%if first%><%java>first = false;<%else>,<% task.toJSON() %>] <%else> -
- Show All Monitored Tasks | - Show non-RPC Tasks | - Show All RPC Handler Tasks | - Show Active RPC Calls | - Show Client Operations | +

Tasks

+
+ Show All Monitored Tasks + Show non-RPC Tasks + Show All RPC Handler Tasks + Show Active RPC Calls + Show Client Operations View as JSON
-

Recent tasks

<%if tasks.isEmpty()%> No tasks currently running on this node. <%else> diff --git a/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon b/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon index dca34d7..220fd7d 100644 --- a/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -55,7 +55,7 @@ org.apache.hadoop.hbase.HTableDescriptor; --> -HBase Master: <% master.getServerName().getHostAndPort() %> +HBase Master: <% master.getServerName() %> @@ -87,13 +87,12 @@ org.apache.hadoop.hbase.HTableDescriptor;
- -

Master Attributes

- +

Attributes

+
- + - + @@ -132,10 +131,10 @@ org.apache.hadoop.hbase.HTableDescriptor; <%def catalogTables> -

Catalog Tables

+

Tables

Attribute NameValueDescription
HBase Version<% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and svn revision
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 svn revision
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
- + <%if (frags != null) %> @@ -162,7 +161,6 @@ org.apache.hadoop.hbase.HTableDescriptor; <%def userTables> -

User Tables

<%java> HTableDescriptor[] tables = admin.listTables(); HConnectionManager.deleteConnection(admin.getConfiguration(), false); @@ -170,7 +168,7 @@ org.apache.hadoop.hbase.HTableDescriptor; <%if (tables != null && tables.length > 0)%>
TableCatalog TableFrag.
- + <%if (frags != null) %> @@ -200,7 +198,7 @@ org.apache.hadoop.hbase.HTableDescriptor;
TableUser TableFrag.
- + <%java> ServerName [] serverNames = servers.toArray(new ServerName[servers.size()]); Arrays.sort(serverNames); @@ -208,21 +206,19 @@ org.apache.hadoop.hbase.HTableDescriptor; // TODO: this is incorrect since this conf might differ from RS to RS // or be set to 0 to get ephemeral ports int infoPort = master.getConfiguration().getInt("hbase.regionserver.info.port", 60030); - String hostname = serverName.getHostname() + ":" + infoPort; - String url = "http://" + hostname + "/"; + String url = "http://" + serverName.getHostname() + ":" + infoPort + "/"; HServerLoad hsl = master.getServerManager().getLoad(serverName); String loadStr = hsl == null? "-": hsl.toString(); if (hsl != null) { totalRegions += hsl.getNumberOfRegions(); totalRequests += hsl.getNumberOfRequests(); } - long startCode = serverName.getStartcode(); - + <%java> } - +
AddressStart CodeLoad
ServerNameLoad
<% hostname %><% startCode %><% serverName %><% loadStr %>
<% serverName %><% loadStr %>
Total: servers: <% servers.size() %> requestsPerSecond=<% totalRequests %>, numberOfOnlineRegions=<% totalRegions %>
Total: servers: <% servers.size() %>requestsPerSecond=<% totalRequests %>, numberOfOnlineRegions=<% totalRegions %>

Load is requests per second and count of regions loaded

@@ -230,20 +226,18 @@ org.apache.hadoop.hbase.HTableDescriptor; <%def deadRegionServers> -

Dead Region Servers

+

Dead Region Servers

<%if (deadServers != null && deadServers.size() > 0)%> - + <%java> ServerName [] deadServerNames = deadServers.toArray(new ServerName[deadServers.size()]); Arrays.sort(deadServerNames); for (ServerName deadServerName: deadServerNames) { int infoPort = master.getConfiguration().getInt("hbase.regionserver.info.port", 60030); - String hostname = deadServerName.getHostname() + ":" + infoPort; - long startcode = deadServerName.getStartcode(); - + <%java> } diff --git a/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon index b6faa19..c24864f 100644 --- a/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -34,6 +34,7 @@ org.apache.hadoop.hbase.HConstants; org.apache.hadoop.hbase.HServerInfo; org.apache.hadoop.hbase.HServerLoad; org.apache.hadoop.hbase.HRegionInfo; +org.apache.hadoop.hbase.ServerName; <%if format.equals("json") %> <& ../common/TaskMonitorTmpl; filter = filter; format = "json" &> @@ -41,8 +42,10 @@ org.apache.hadoop.hbase.HRegionInfo; <%java> HServerInfo serverInfo = null; + ServerName serverName = null; try { serverInfo = regionServer.getHServerInfo(); + serverName = regionServer.getServerName(); } catch (IOException e) { e.printStackTrace(); } @@ -58,13 +61,13 @@ org.apache.hadoop.hbase.HRegionInfo; --> -HBase Region Server: <% serverInfo.getServerAddress().getHostname() %>:<% serverInfo.getServerAddress().getPort() %> +HBase Region Server: <% serverName %>:<% serverInfo.getServerAddress().getPort() %> -

Region Server: <% serverInfo.getServerAddress().getHostname() %>:<% serverInfo.getServerAddress().getPort() %>

+

RegionServer: <% serverName %>


-

Region Server Attributes

-
AddressStart Code
ServerName
<% hostname %><% startcode %>
<% deadServerName %>
+

Attributes

+
+++ - + @@ -91,7 +97,7 @@ org.apache.hadoop.hbase.HRegionInfo; <& ../common/TaskMonitorTmpl; filter = filter &> -

Online Regions

+

Regions

<%if (onlineRegions != null && onlineRegions.size() > 0) %>
Attribute NameValueDescription
HBase Version<% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and svn revision
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
Metrics<% metrics.toString() %>RegionServer Metrics; file and heap sizes are in megabytes
Zookeeper Quorum<% regionServer.getZooKeeper().getQuorum() %>Addresses of all registered ZK servers
diff --git a/src/main/resources/hbase-webapps/static/hbase.css b/src/main/resources/hbase-webapps/static/hbase.css index a3efcae..1fbdba1 100644 --- a/src/main/resources/hbase-webapps/static/hbase.css +++ b/src/main/resources/hbase-webapps/static/hbase.css @@ -20,9 +20,12 @@ table { border: thin solid DodgerBlue } tr { border: thin solid DodgerBlue } td { border: thin solid DodgerBlue } th { border: thin solid DodgerBlue } -#logo {float: left;} +#logo {float: right;} #logo img {border: none;} -#page_title {padding-top: 27px;} +#page_title {} +#tasks_menu { + padding: 10px; +} div.warning { border: 1px solid #666;
Region NameStart KeyEnd KeyMetrics