Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-27406 Make /prometheus endpoint accessible from HBase UI (#4833) 

Signed-off-by: Andor Molnar <andor@apache.org>
Signed-off-by: Balazs Meszaros <meszibalu@apache.org>
(cherry picked from commit dffc8e0fbe)
This commit is contained in:
Luca Kovács 2022-10-20 12:50:12 +02:00 committed by Balazs Meszaros
parent fc4191afa1
commit a31b1486b7
6 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
View File

@ -58,7 +58,17 @@ String listenPort = conf.get("hbase.rest.port", "8080");
<li class="active"><a href="/rest.jsp">Home</a></li> <li class="active"><a href="/rest.jsp">Home</a></li>
<li><a href="/logs/">Local logs</a></li> <li><a href="/logs/">Local logs</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/jmx">Metrics Dump</a></li> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Metrics <span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a target="_blank" href="/jmx">JMX</a></li>
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
</ul>
</li>
<li><a href="/prof">Profiler</a></li> <li><a href="/prof">Profiler</a></li>
<% if (HBaseConfiguration.isShowConfInServlet()) { %> <% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li> <li><a href="/conf">HBase Configuration</a></li>

12
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

@ -162,7 +162,17 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<li><a href="/logs/">Local Logs</a></li> <li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug Dump</a></li> <li><a href="/dump">Debug Dump</a></li>
<li><a href="/jmx">Metrics Dump</a></li> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Metrics <span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a target="_blank" href="/jmx">JMX</a></li>
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
</ul>
</li>
<li><a href="/prof">Profiler</a></li> <li><a href="/prof">Profiler</a></li>
<%if HBaseConfiguration.isShowConfInServlet()%> <%if HBaseConfiguration.isShowConfInServlet()%>
<li><a href="/conf">HBase Configuration</a></li> <li><a href="/conf">HBase Configuration</a></li>

12
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View File

@ -114,7 +114,17 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
<li><a href="/rsOperationDetails.jsp">Operation Details</a></li> <li><a href="/rsOperationDetails.jsp">Operation Details</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug Dump</a></li> <li><a href="/dump">Debug Dump</a></li>
<li><a href="/jmx">Metrics Dump</a></li> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Metrics <span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a target="_blank" href="/jmx">JMX</a></li>
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
</ul>
</li>
<li><a href="/prof">Profiler</a></li> <li><a href="/prof">Profiler</a></li>
<%if HBaseConfiguration.isShowConfInServlet()%> <%if HBaseConfiguration.isShowConfInServlet()%>
<li><a href="/conf">HBase Configuration</a></li> <li><a href="/conf">HBase Configuration</a></li>

12
hbase-server/src/main/resources/hbase-webapps/master/header.jsp
View File

@ -69,7 +69,17 @@
<li><a href="/logs/">Local Logs</a></li> <li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug Dump</a></li> <li><a href="/dump">Debug Dump</a></li>
<li><a href="/jmx">Metrics Dump</a></li> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Metrics <span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a target="_blank" href="/jmx">JMX</a></li>
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
</ul>
</li>
<li><a href="/prof">Profiler</a></li> <li><a href="/prof">Profiler</a></li>
<% if (HBaseConfiguration.isShowConfInServlet()) { %> <% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li> <li><a href="/conf">HBase Configuration</a></li>

12
hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp
View File

@ -56,7 +56,17 @@
<li><a href="/rsOperationDetails.jsp">Operation Details</a></li> <li><a href="/rsOperationDetails.jsp">Operation Details</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug Dump</a></li> <li><a href="/dump">Debug Dump</a></li>
<li><a href="/jmx">Metrics Dump</a></li> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Metrics <span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a target="_blank" href="/jmx">JMX</a></li>
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
</ul>
</li>
<li><a href="/prof">Profiler</a></li> <li><a href="/prof">Profiler</a></li>
<% if (HBaseConfiguration.isShowConfInServlet()) { %> <% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li> <li><a href="/conf">HBase Configuration</a></li>

12
hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
View File

@ -66,7 +66,17 @@ String compact = conf.get("hbase.regionserver.thrift.compact", "false");
<li class="active"><a href="/">Home</a></li> <li class="active"><a href="/">Home</a></li>
<li><a href="/logs/">Local logs</a></li> <li><a href="/logs/">Local logs</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/jmx">Metrics Dump</a></li> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Metrics <span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a target="_blank" href="/jmx">JMX</a></li>
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
</ul>
</li>
<li><a href="/prof">Profiler</a></li> <li><a href="/prof">Profiler</a></li>
<% if (HBaseConfiguration.isShowConfInServlet()) { %> <% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li> <li><a href="/conf">HBase Configuration</a></li>