This is an automated email from the ASF dual-hosted git repository.
DomGarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 250fa91b9c Ordered server components in NavBar, added more server host
links (#6445)
250fa91b9c is described below
commit 250fa91b9c795dcce14bda2fbadf9ead1e324c1e
Author: Dave Marion <[email protected]>
AuthorDate: Thu Jun 25 18:01:12 2026 -0400
Ordered server components in NavBar, added more server host links (#6445)
---
.../org/apache/accumulo/monitor/resources/js/ec.js | 9 +++++++++
.../org/apache/accumulo/monitor/resources/js/recovery.js | 16 +++++++++++++---
.../org/apache/accumulo/monitor/resources/js/scans.js | 11 ++++++++++-
.../org/apache/accumulo/monitor/templates/navbar.ftl | 8 ++++----
4 files changed, 36 insertions(+), 8 deletions(-)
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
index 35d85e6f1f..ffabcb1932 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
@@ -54,6 +54,15 @@ $(function () {
targets: '_all',
defaultContent: '—'
},
+ {
+ "targets": 0,
+ "render": function (data, type, row) {
+ if (type === 'display') {
+ return renderServerMetricsLink('COMPACTOR', row.queueName, data);
+ }
+ return data;
+ }
+ },
{
"targets": "duration",
"render": function (data, type, row) {
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/recovery.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/recovery.js
index 1b0d9904dd..1125498f33 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/recovery.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/recovery.js
@@ -154,9 +154,19 @@ $(function () {
"stateSave": true,
"colReorder": true,
"columnDefs": [{
- targets: '_all',
- defaultContent: '—'
- }],
+ targets: '_all',
+ defaultContent: '—'
+ },
+ {
+ "targets": 0,
+ "render": function (data, type, row) {
+ if (type === 'display') {
+ return renderServerMetricsLink(row.type, row.resourceGroup, data);
+ }
+ return data;
+ }
+ }
+ ],
"columns": [{
"data": "server"
},
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js
index 0f3bddee07..be385eecb9 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js
@@ -40,6 +40,15 @@ $(function () {
targets: '_all',
defaultContent: '—'
},
+ {
+ "targets": 0,
+ "render": function (data, type, row) {
+ if (type === 'display') {
+ return renderServerMetricsLink(row.type, row.resourceGroup, data);
+ }
+ return data;
+ }
+ },
{
"targets": "duration",
"render": function (data, type, row) {
@@ -56,7 +65,7 @@ $(function () {
}
],
"columns": [{
- "data": "server",
+ "data": "server"
},
{
"data": "type"
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
index c0a7d0a00f..f67cdb03f4 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
@@ -39,11 +39,11 @@
<span id="statusNotification" class="icon-dot
normal"></span> Servers
</a>
<ul class="dropdown-menu">
- <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="manager"><span><span
id="managerStatusNotification" class="icon-dot
normal"></span> Manager Server</span><span id="managerStatusCount"
class="server-count"></span></a></li>
- <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="tservers"><span><span
id="serverStatusNotification" class="icon-dot
normal"></span> Tablet Servers</span><span id="serverStatusCount"
class="server-count"></span></a></li>
- <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="sservers"><span><span
id="sserverStatusNotification" class="icon-dot
normal"></span> Scan Servers</span><span id="sserverStatusCount"
class="server-count"></span></a></li>
<li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="compactors"><span><span
id="compactorStatusNotification" class="icon-dot
normal"></span> Compactors</span><span id="compactorStatusCount"
class="server-count"></span></a></li>
- <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="gc"><span><span
id="gcStatusNotification" class="icon-dot
normal"></span> Garbage collector</span><span id="gcStatusCount"
class="server-count"></span></a></li>
+ <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="gc"><span><span
id="gcStatusNotification" class="icon-dot
normal"></span> Garbage Collector</span><span id="gcStatusCount"
class="server-count"></span></a></li>
+ <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="manager"><span><span
id="managerStatusNotification" class="icon-dot
normal"></span> Managers</span><span id="managerStatusCount"
class="server-count"></span></a></li>
+ <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="sservers"><span><span
id="sserverStatusNotification" class="icon-dot
normal"></span> Scan Servers</span><span id="sserverStatusCount"
class="server-count"></span></a></li>
+ <li><a class="link-body-emphasis dropdown-item d-flex
justify-content-between align-items-center gap-3" href="tservers"><span><span
id="serverStatusNotification" class="icon-dot
normal"></span> Tablet Servers</span><span id="serverStatusCount"
class="server-count"></span></a></li>
</ul>
</li>
<li>