You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by me...@apache.org on 2022/10/20 10:52:12 UTC
[hbase] branch branch-2 updated: HBASE-27406 Make /prometheus endpoint accessible from HBase UI (#4833)
This is an automated email from the ASF dual-hosted git repository.
meszibalu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new a31b1486b74 HBASE-27406 Make /prometheus endpoint accessible from HBase UI (#4833)
a31b1486b74 is described below
commit a31b1486b74a017a194a326629bd01d32dde2343
Author: Luca Kovács <ko...@gmail.com>
AuthorDate: Thu Oct 20 12:50:12 2022 +0200
HBASE-27406 Make /prometheus endpoint accessible from HBase UI (#4833)
Signed-off-by: Andor Molnar <an...@apache.org>
Signed-off-by: Balazs Meszaros <me...@apache.org>
(cherry picked from commit dffc8e0fbefda603e3c0557bc2ceac600152675e)
---
hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp | 12 +++++++++++-
.../apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 12 +++++++++++-
.../apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 12 +++++++++++-
.../src/main/resources/hbase-webapps/master/header.jsp | 12 +++++++++++-
.../src/main/resources/hbase-webapps/regionserver/header.jsp | 12 +++++++++++-
.../src/main/resources/hbase-webapps/thrift/thrift.jsp | 12 +++++++++++-
6 files changed, 66 insertions(+), 6 deletions(-)
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 3deb2bbc735..df8f0838d6c 100644
--- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
+++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
@@ -58,7 +58,17 @@ String listenPort = conf.get("hbase.rest.port", "8080");
<li class="active"><a href="/rest.jsp">Home</a></li>
<li><a href="/logs/">Local logs</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>
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li>
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 cd989a2d219..49bebd35ef3 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
@@ -162,7 +162,17 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</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>
<%if HBaseConfiguration.isShowConfInServlet()%>
<li><a href="/conf">HBase Configuration</a></li>
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 2068c760799..23330096cf3 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
@@ -114,7 +114,17 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
<li><a href="/rsOperationDetails.jsp">Operation Details</a></li>
<li><a href="/logLevel">Log Level</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>
<%if HBaseConfiguration.isShowConfInServlet()%>
<li><a href="/conf">HBase Configuration</a></li>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp
index 3da82c95c75..29bdaa857ad 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp
@@ -69,7 +69,17 @@
<li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</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>
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li>
diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp
index edbecc424c6..1c5318b19b9 100644
--- a/hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp
@@ -56,7 +56,17 @@
<li><a href="/rsOperationDetails.jsp">Operation Details</a></li>
<li><a href="/logLevel">Log Level</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>
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li>
diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
index cb22007bea6..dea59123099 100644
--- a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
+++ b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
@@ -66,7 +66,17 @@ String compact = conf.get("hbase.regionserver.thrift.compact", "false");
<li class="active"><a href="/">Home</a></li>
<li><a href="/logs/">Local logs</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>
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li>