| Attribute Name | Value | Description |
-| 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 |
@@ -132,10 +131,10 @@ org.apache.hadoop.hbase.HTableDescriptor;
<%def catalogTables>
-Catalog Tables
+Tables
- | Table |
+ Catalog Table |
<%if (frags != null) %>
Frag. |
%if>
@@ -162,7 +161,6 @@ org.apache.hadoop.hbase.HTableDescriptor;
%def>
<%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)%>
- | Table |
+ User Table |
<%if (frags != null) %>
Frag. |
%if>
@@ -200,7 +198,7 @@ org.apache.hadoop.hbase.HTableDescriptor;
%java>
- | Address | Start Code | Load |
+ | ServerName | Load |
<%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>
-| <% hostname %> | <% startCode %><% serverName %> | <% loadStr %> |
+| <% serverName %> | <% loadStr %> |
<%java>
}
%java>
-| 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>
<%def deadRegionServers>
-Dead Region Servers
+Dead Region Servers
<%if (deadServers != null && deadServers.size() > 0)%>
- | Address | Start Code |
+ | ServerName |
<%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>
-| <% hostname %> | <% startcode %> |
+| <% deadServerName %> |
<%java>
}
%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;
%import>
<%if format.equals("json") %>
<& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
@@ -41,8 +42,10 @@ org.apache.hadoop.hbase.HRegionInfo;
%if>
<%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
-
+Attributes
+
+
+
+
| Attribute Name | Value | Description |
-| 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 |
@@ -91,7 +97,7 @@ org.apache.hadoop.hbase.HRegionInfo;
<& ../common/TaskMonitorTmpl; filter = filter &>
-Online Regions
+Regions
<%if (onlineRegions != null && onlineRegions.size() > 0) %>
| Region Name | Start Key | End Key | Metrics |
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;