Skip to content

Commit c23f541

Browse files
lucakovacsLuca Kovacs
lucakovacs
authored and
Luca Kovacs
committed
HBASE-27406 Make /prometheus endpoint accessible from HBase UI (apache#4833)
Signed-off-by: Andor Molnar <[email protected]> Signed-off-by: Balazs Meszaros <[email protected]> (cherry picked from commit dffc8e0) (cherry picked from commit a31b148) Change-Id: Id24f0f4215fe5bd46a5ace61ae33c5ee9c1ecebb
1 parent 8b9f099 commit c23f541

File tree

6 files changed

+66
-6
lines changed

6 files changed

+66
-6
lines changed

‎hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,17 @@ String listenPort = conf.get("hbase.rest.port", "8080");
5858
<li class="active"><a href="/rest.jsp">Home</a></li>
5959
<li><a href="/logs/">Local logs</a></li>
6060
<li><a href="/logLevel">Log Level</a></li>
61-
<li><a href="/jmx">Metrics Dump</a></li>
61+
<li class="nav-item dropdown">
62+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
63+
Metrics <span class="caret"></span>
64+
</a>
65+
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
66+
<li><a target="_blank" href="/jmx">JMX</a></li>
67+
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
68+
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
69+
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
70+
</ul>
71+
</li>
6272
<li><a href="/prof">Profiler</a></li>
6373
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
6474
<li><a href="/conf">HBase Configuration</a></li>

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,17 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
162162
<li><a href="/logs/">Local Logs</a></li>
163163
<li><a href="/logLevel">Log Level</a></li>
164164
<li><a href="/dump">Debug Dump</a></li>
165-
<li><a href="/jmx">Metrics Dump</a></li>
165+
<li class="nav-item dropdown">
166+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
167+
Metrics <span class="caret"></span>
168+
</a>
169+
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
170+
<li><a target="_blank" href="/jmx">JMX</a></li>
171+
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
172+
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
173+
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
174+
</ul>
175+
</li>
166176
<li><a href="/prof">Profiler</a></li>
167177
<%if HBaseConfiguration.isShowConfInServlet()%>
168178
<li><a href="/conf">HBase Configuration</a></li>

‎hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,17 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
113113
<li><a href="/logs/">Local Logs</a></li>
114114
<li><a href="/logLevel">Log Level</a></li>
115115
<li><a href="/dump">Debug Dump</a></li>
116-
<li><a href="/jmx">Metrics Dump</a></li>
116+
<li class="nav-item dropdown">
117+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
118+
Metrics <span class="caret"></span>
119+
</a>
120+
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
121+
<li><a target="_blank" href="/jmx">JMX</a></li>
122+
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
123+
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
124+
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
125+
</ul>
126+
</li>
117127
<li><a href="/prof">Profiler</a></li>
118128
<%if HBaseConfiguration.isShowConfInServlet()%>
119129
<li><a href="/conf">HBase Configuration</a></li>

‎hbase-server/src/main/resources/hbase-webapps/master/header.jsp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,17 @@
6969
<li><a href="/logs/">Local Logs</a></li>
7070
<li><a href="/logLevel">Log Level</a></li>
7171
<li><a href="/dump">Debug Dump</a></li>
72-
<li><a href="/jmx">Metrics Dump</a></li>
72+
<li class="nav-item dropdown">
73+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
74+
Metrics <span class="caret"></span>
75+
</a>
76+
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
77+
<li><a target="_blank" href="/jmx">JMX</a></li>
78+
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
79+
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
80+
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
81+
</ul>
82+
</li>
7383
<li><a href="/prof">Profiler</a></li>
7484
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
7585
<li><a href="/conf">HBase Configuration</a></li>

‎hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,17 @@
5555
<li><a href="/logs/">Local Logs</a></li>
5656
<li><a href="/logLevel">Log Level</a></li>
5757
<li><a href="/dump">Debug Dump</a></li>
58-
<li><a href="/jmx">Metrics Dump</a></li>
58+
<li class="nav-item dropdown">
59+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
60+
Metrics <span class="caret"></span>
61+
</a>
62+
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
63+
<li><a target="_blank" href="/jmx">JMX</a></li>
64+
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
65+
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
66+
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
67+
</ul>
68+
</li>
5969
<li><a href="/prof">Profiler</a></li>
6070
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
6171
<li><a href="/conf">HBase Configuration</a></li>

‎hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,17 @@ String compact = conf.get("hbase.regionserver.thrift.compact", "false");
6666
<li class="active"><a href="/">Home</a></li>
6767
<li><a href="/logs/">Local logs</a></li>
6868
<li><a href="/logLevel">Log Level</a></li>
69-
<li><a href="/jmx">Metrics Dump</a></li>
69+
<li class="nav-item dropdown">
70+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
71+
Metrics <span class="caret"></span>
72+
</a>
73+
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
74+
<li><a target="_blank" href="/jmx">JMX</a></li>
75+
<li><a target="_blank" href="/jmx?description=true">JMX with description</a></li>
76+
<li><a target="_blank" href="/prometheus">Prometheus</a></li>
77+
<li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li>
78+
</ul>
79+
</li>
7080
<li><a href="/prof">Profiler</a></li>
7181
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
7282
<li><a href="/conf">HBase Configuration</a></li>

0 commit comments

Comments
 (0)