Skip to content

Miscellaneous monitor updates #6607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ctubbsii wants to merge 1 commit into
base: main
Choose a base branch
from
+166 −168
Open

Miscellaneous monitor updates #6607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/alerts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@

-->
<br />
<div class="col-xs-12" id="alerts">
<h5>Alerts</h5>
<div class="col-12" id="alerts">
<h1 class="h5">Alerts</h1>
<table id="alertsTable"
class="table table-bordered table-striped table-condensed" style="width: 100%;">
class="table table-bordered table-striped table-sm" style="width: 100%;">
<thead>
<tr>
<th class="col-xs-2">Priority</th>
<th class="col-xs-2">Category</th>
<th class="col-xs-8">Message</th>
<th style="width: 16.6667%">Priority</th>
<th style="width: 16.6667%">Category</th>
<th style="width: 66.6667%">Message</th>
</tr>
</thead>
<tbody></tbody>
Expand Down
4 changes: 2 additions & 2 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/compactors.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<div id="compactors-banner-message" class="alert" role="alert"></div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="col-12">
<span class="table-caption">Compactors</span>
<br />
<span class="table-subcaption">The following Compactors reported status.</span>
<br />
<br />
<table id="compactorsTable" class="table caption-top table-bordered table-striped table-condensed">
<table id="compactorsTable" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
</div>
Expand Down
8 changes: 4 additions & 4 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/coordinator.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
<br />
<span class="table-caption">Compaction Coordinator Activity</span>
<br />
<table id="coordinators" class="table caption-top table-bordered table-striped table-condensed">
<table id="coordinators" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
<br />
<span class="table-caption">Compaction Coordinator Queues</span>
<br />
<table id="coordinator_queues" class="table caption-top table-bordered table-striped table-condensed">
<table id="coordinator_queues" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
<br />
<span class="table-caption">Running Compactions By Table</span>
<br />
<table id="table_running" class="table caption-top table-bordered table-striped table-condensed">
<table id="table_running" class="table caption-top table-bordered table-striped table-sm">
<thead>
<tr>
<th>Table Name</th>
Expand All @@ -45,7 +45,7 @@
<br />
<span class="table-caption">Running Compactions By Queue</span>
<br />
<table id="queue_running" class="table caption-top table-bordered table-striped table-condensed">
<table id="queue_running" class="table caption-top table-bordered table-striped table-sm">
<thead>
<tr>
<th>Queue Name</th>
Expand Down
12 changes: 6 additions & 6 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@

-->
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<base href="${rootContext}"/>
<title>${title} - Accumulo ${version}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<!-- Set the saved theme before loading CSS to reduce light-mode flash on reload -->
<script>
(function() {
Expand Down Expand Up @@ -78,7 +79,7 @@
<script src="resources/js/modals.js"></script>
</head>

<body>
<body class="d-flex flex-column min-vh-100">
<#include "navbar.ftl">

<a id="critical-alert-banner" class="critical-alert-banner alert alert-danger d-none" href="alerts" aria-live="polite">
Expand All @@ -89,10 +90,9 @@
<span class="btn btn-danger btn-sm fw-semibold">View alerts</span>
</a>

<div id="main" class="container-fluid">
<div id="main" class="container-fluid d-flex flex-column flex-grow-1">
<#include "${template}">
<br />
<div id="lastUpdateDiv" class="center">
<div id="lastUpdateDiv" class="center mt-auto">
</div>
</div>

Expand Down
101 changes: 50 additions & 51 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/ec.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,64 +19,63 @@

-->
<div class="row">
<div class="col-xs-12">
<h3>${title}</h3>
<div class="col-12">
<h1 class="h3">${title}</h1>
</div>
</div>
<div id="runningDiv">
<div class="row">
<div class="col-xs-12">
<table id="runningTable" class="table caption-top table-bordered table-striped table-condensed">
<caption>
<div class="accordion" id="filterAccordion">
<div class="accordion-item">
<h2 class="accordion-header" id="filterHeading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse">
Filters
</button>
</h2>
<div id="filterCollapse" class="accordion-collapse collapse" aria-labelledby="filterHeading" data-bs-parent="#filterAccordion">
<div class="accordion-body">
<!-- Hostname Filter -->
<div class="mb-3">
<label for="hostname-filter" class="form-label">Hostname Filter</label>
<input type="text" id="hostname-filter" class="form-control" placeholder="Enter hostname regex">
<small id="hostname-feedback" class="form-text text-danger" style="display:none;">Invalid regex pattern</small>
</div>
<!-- Queue Filter -->
<div class="mb-3">
<label for="queue-filter" class="form-label">Queue Filter</label>
<input type="text" id="queue-filter" class="form-control" placeholder="Enter queue regex">
<small id="queue-feedback" class="form-text text-danger" style="display:none;">Invalid regex pattern</small>
</div>
<!-- Table ID Filter -->
<div class="mb-3">
<label for="tableid-filter" class="form-label">Table ID Filter</label>
<input type="text" id="tableid-filter" class="form-control" placeholder="Enter table ID regex">
<small id="tableid-feedback" class="form-text text-danger" style="display:none;">Invalid regex pattern</small>
</div>
<!-- ECID Filter -->
<div class="mb-3">
<label for="ecid-filter" class="form-label">ECID Filter</label>
<input type="text" id="ecid-filter" class="form-control" placeholder="Enter ECID regex">
<small id="ecid-feedback" class="form-text text-danger" style="display:none;">Invalid regex pattern</small>
</div>
<!-- Duration Filter -->
<div class="mb-3">
<label for="duration-filter" class="form-label">Duration Filter</label>
<input type="text" id="duration-filter" class="form-control" placeholder="Enter duration (e.g., &gt;10m, &lt;1h, &gt;=5s, &lt;=2d)">
<small id="duration-feedback" class="form-text text-danger" style="display:none;">Invalid duration format</small>
<small class="form-text text-muted">Valid formats: &gt;10m, &lt;1h, &gt;=5s, &lt;=2d</small>
</div>
<!-- Clear Filters Button -->
<div class="mb-3">
<button id="clear-filters" class="btn btn-secondary">Clear Filters</button>
</div>
</div>
<div class="col-12">
<div class="accordion" id="filterAccordion">
<div class="accordion-item">
<h2 class="accordion-header" id="filterHeading">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse">
Filters
</button>
</h2>
<div id="filterCollapse" class="accordion-collapse collapse" aria-labelledby="filterHeading" data-bs-parent="#filterAccordion">
<div class="accordion-body">
<!-- Hostname Filter -->
<div class="mb-3">
<label for="hostname-filter" class="form-label">Hostname Filter</label>
<input type="text" id="hostname-filter" class="form-control" placeholder="Enter hostname regex" aria-describedby="hostname-feedback">
<small id="hostname-feedback" class="form-text text-danger" style="display:none;" aria-live="polite">Invalid regex pattern</small>
</div>
<!-- Queue Filter -->
<div class="mb-3">
<label for="queue-filter" class="form-label">Queue Filter</label>
<input type="text" id="queue-filter" class="form-control" placeholder="Enter queue regex" aria-describedby="queue-feedback">
<small id="queue-feedback" class="form-text text-danger" style="display:none;" aria-live="polite">Invalid regex pattern</small>
</div>
<!-- Table ID Filter -->
<div class="mb-3">
<label for="tableid-filter" class="form-label">Table ID Filter</label>
<input type="text" id="tableid-filter" class="form-control" placeholder="Enter table ID regex" aria-describedby="tableid-feedback">
<small id="tableid-feedback" class="form-text text-danger" style="display:none;" aria-live="polite">Invalid regex pattern</small>
</div>
<!-- ECID Filter -->
<div class="mb-3">
<label for="ecid-filter" class="form-label">ECID Filter</label>
<input type="text" id="ecid-filter" class="form-control" placeholder="Enter ECID regex" aria-describedby="ecid-feedback">
<small id="ecid-feedback" class="form-text text-danger" style="display:none;" aria-live="polite">Invalid regex pattern</small>
</div>
<!-- Duration Filter -->
<div class="mb-3">
<label for="duration-filter" class="form-label">Duration Filter</label>
<input type="text" id="duration-filter" class="form-control" placeholder="Enter duration (e.g., &gt;10m, &lt;1h, &gt;=5s, &lt;=2d)" aria-describedby="duration-feedback duration-help">
<small id="duration-feedback" class="form-text text-danger" style="display:none;" aria-live="polite">Invalid duration format</small>
<small id="duration-help" class="form-text text-body-secondary">Valid formats: &gt;10m, &lt;1h, &gt;=5s, &lt;=2d</small>
</div>
<!-- Clear Filters Button -->
<div class="mb-3">
<button id="clear-filters" type="button" class="btn btn-secondary">Clear Filters</button>
</div>
</div>
</div>
</caption>
</div>
</div>
<table id="runningTable" class="table caption-top table-bordered table-striped table-sm">
<caption>Running External Compactions</caption>
<thead>
<tr>
<th class="firstcell" title="The hostname the compactor is running on.">Server Hostname</th>
Expand Down
4 changes: 2 additions & 2 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/fate.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

-->
<div class="row">
<div class="col-xs-12">
<table id="fateTable" class="table caption-top table-bordered table-striped table-condensed">
<div class="col-12">
<table id="fateTable" class="table caption-top table-bordered table-striped table-sm">
<caption><span class="table-caption">Fate Transaction Details</span><br />
<span class="table-subcaption">Use the <strong>accumulo inst fate</strong> server-side utility with the <strong>-l</strong> and <strong>-i</strong> options to see detailed information about a transaction.</span><br />
</caption>
Expand Down
6 changes: 3 additions & 3 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/gc.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@
<div>
<span class="table-caption">Garbage Collector</span>
<br />
<table id="gc-server" class="table caption-top table-bordered table-striped table-condensed">
<table id="gc-server" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
</div>
<div>
<span class="table-caption">File Collection</span>
<br />
<table id="gc-file" class="table caption-top table-bordered table-striped table-condensed">
<table id="gc-file" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
</div>
<div>
<span class="table-caption">Wal Collection</span>
<br />
<table id="gc-wal" class="table caption-top table-bordered table-striped table-condensed">
<table id="gc-wal" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
</div>
Expand Down
4 changes: 2 additions & 2 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/manager.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
</div>
<span class="table-caption">Managers</span>
<br />
<table id="managers" class="table caption-top table-bordered table-striped table-condensed">
<table id="managers" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
<br />
<span class="table-caption">Manager Fate Activity</span>
<br />
<table id="managers_fate" class="table caption-top table-bordered table-striped table-condensed">
<table id="managers_fate" class="table caption-top table-bordered table-striped table-sm">
<#include "table_loading.ftl" >
</table>
<br />
60 changes: 28 additions & 32 deletions server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/modals.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,50 +18,46 @@
under the License.

-->
<!-- Modal -->
<div id="aboutModal" data-target="#aboutModal" class="modal fade" role="dialog">
<div class="modal-dialog" role="document">
<!-- Modal content -->
<!-- About modal -->
<div id="aboutModal" class="modal fade" tabindex="-1" aria-labelledby="aboutModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div>
<div class="modal-header justify-content-center">
<span class="modal-title">
<div class="text-center">
<a href="https://accumulo.apache.org" target="_blank"><img alt="Apache Accumulo" src="resources/images/accumulo-logo.png" /></a>
</span>
</div>
<div class="modal-header justify-content-center position-relative">
<h5 class="modal-title" id="aboutModalLabel">
<a href="https://accumulo.apache.org" target="_blank" rel="noopener noreferrer">
<img alt="Apache Accumulo" src="resources/images/accumulo-logo.png" />
</a>
</h5>
<button type="button" class="btn-close position-absolute end-0 me-3" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="container-fluid">
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">Software</div>
<div class="col-sm-8 text-start"><a href="https://accumulo.apache.org" target="_blank">Apache&nbsp;Accumulo</a></div>
<div class="row align-items-center">
<div class="col-sm-4 text-sm-end">Software</div>
<div class="col-sm-8"><a href="https://accumulo.apache.org" target="_blank" rel="noopener noreferrer">Apache&nbsp;Accumulo</a></div>
</div>
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">Version</div>
<div class="col-sm-8 text-start"><span id="modal-version"></span></div>
<div class="row align-items-center">
<div class="col-sm-4 text-sm-end">Version</div>
<div class="col-sm-8"><span id="modal-version"></span></div>
</div>
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">Instance&nbsp;Name</div>
<div class="col-sm-8 text-start"><span id="modal-instance-name"></span></div>
<div class="row align-items-center">
<div class="col-sm-4 text-sm-end">Instance&nbsp;Name</div>
<div class="col-sm-8"><span id="modal-instance-name"></span></div>
</div>
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">Instance&nbsp;Id</div>
<div class="col-sm-8 text-start"><span id="modal-instance-id"></span></div>
<div class="row align-items-center">
<div class="col-sm-4 text-sm-end">Instance&nbsp;Id</div>
<div class="col-sm-8"><span id="modal-instance-id"></span></div>
</div>
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">ZooKeeper&nbsp;Hosts</div>
<div class="col-sm-8 text-start"><span id="modal-zk-hosts"></span></div>
<div class="row align-items-center">
<div class="col-sm-4 text-sm-end">ZooKeeper&nbsp;Hosts</div>
<div class="col-sm-8"><span id="modal-zk-hosts"></span></div>
</div>
<div class="row justify-content-evenly">
<div class="col-sm-4 text-end">Volumes</div>
<div class="col-sm-8 text-start"><span id="modal-volumes"></span></div>
<div class="row align-items-center">
<div class="col-sm-4 text-sm-end">Volumes</div>
<div class="col-sm-8"><span id="modal-volumes"></span></div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
</div>
</div>
</div>
Expand Down
Loading
Loading