diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp index ed4e9c284131..3deb2bbc7357 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp @@ -20,6 +20,7 @@ <%@ page contentType="text/html;charset=UTF-8" import="org.apache.hadoop.conf.Configuration" import="org.apache.hadoop.hbase.HBaseConfiguration" + import="org.apache.hadoop.hbase.rest.model.VersionModel" import="org.apache.hadoop.hbase.util.VersionInfo" import="java.util.Date"%> <% @@ -83,6 +84,11 @@ String listenPort = conf.get("hbase.rest.port", "8080"); Value Description + + JVM Version + <%= new VersionModel(getServletContext()).getJVMVersion() %> + JVM vendor and version + HBase Version <%= VersionInfo.getVersion() %>, revision=<%= VersionInfo.getRevision() %> 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 31c6ebfaa90a..cdc216828c8f 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 @@ -299,6 +299,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); Value Description + + JVM Version + <% JvmVersion.getVersion() %> + JVM vendor and version + HBase Version <% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %>HBase version and revision 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 b21a9c34944f..388357d6eb0f 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 @@ -32,6 +32,7 @@ org.apache.hadoop.hbase.HBaseConfiguration; org.apache.hadoop.hbase.io.hfile.CacheConfig; org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ServerInfo; +org.apache.hadoop.hbase.util.JvmVersion; org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; <%doc>If json AND bcn is NOT an empty string presume it a block cache view request. @@ -165,6 +166,11 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; Value Description + + JVM Version + <% JvmVersion.getVersion() %> + JVM vendor and version + HBase Version <% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %> diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon index e2d29eef2803..9536b8d0dd3c 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon @@ -25,6 +25,7 @@ java.util.Map; java.util.concurrent.atomic.LongAdder; org.apache.hadoop.hbase.ServerName; org.apache.hadoop.hbase.tool.CanaryTool.RegionStdOutSink; +org.apache.hadoop.hbase.util.JvmVersion;