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 dfaf8e9d2b Remove unused Monitor endpoints /compactions and /problems
(#6506)
dfaf8e9d2b is described below
commit dfaf8e9d2ba06d8a4a1b870b6aa83e43c922c180
Author: Amanda Villarreal <[email protected]>
AuthorDate: Tue Aug 25 10:21:16 2026 -0500
Remove unused Monitor endpoints /compactions and /problems (#6506)
* Remove unused monitor endpoint /compactions
* Remove unused endpoint /problems
---
.../org/apache/accumulo/monitor/view/WebViews.java | 45 -----------
.../accumulo/monitor/resources/js/compactions.js | 89 ----------------------
.../accumulo/monitor/templates/compactions.ftl | 41 ----------
3 files changed, 175 deletions(-)
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index 2dafa85d67..8694c4d797 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -18,7 +18,6 @@
*/
package org.apache.accumulo.monitor.view;
-import static
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_BLANK_OK;
import static
org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_TABLE_ID;
import static
org.apache.accumulo.monitor.util.ParameterValidator.HOSTNAME_PORT_REGEX;
@@ -291,24 +290,6 @@ public class WebViews {
return model;
}
- /**
- * Returns the compactions template
- *
- * @return Scans model
- */
- @GET
- @Path("compactions")
- @Template(name = "/default.ftl")
- public Map<String,Object> getCompactions() {
-
- Map<String,Object> model = getModel();
- model.put("title", "Active Compactions");
- model.put("template", "compactions.ftl");
- model.put("js", "compactions.js");
-
- return model;
- }
-
/**
* Returns the active compactions template.
*
@@ -437,30 +418,4 @@ public class WebViews {
return model;
}
-
- /**
- * Returns problem report template
- *
- * @param table Table ID to display problem details
- * @return Problem report model
- */
- @GET
- @Path("problems")
- @Template(name = "/default.ftl")
- public Map<String,Object> getProblems(
- @QueryParam(TABLE_PARAM_KEY) @Pattern(regexp = ALPHA_NUM_REGEX_BLANK_OK)
String table) {
-
- Map<String,Object> model = getModel();
- model.put("title", "Per-Table Problem Report");
-
- model.put("template", "problems.ftl");
- model.put("js", "problems.js");
-
- if (table != null && !table.isBlank()) {
- model.put("table", table);
- }
-
- return model;
- }
-
}
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/compactions.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/compactions.js
deleted file mode 100644
index 62108d86ff..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/compactions.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-"use strict";
-
-var compactionsList;
-/**
- * Creates active compactions table
- */
-$(function () {
- // Create a table for compactions list
- compactionsList = new DataTable('#compactionsList', {
- "ajax": {
- "url": contextPath + 'rest/compactions',
- "dataSrc": "compactions"
- },
- "stateSave": true,
- "layout": {
- "topStart": null,
- "topEnd": null,
- "bottomStart": "pageLength",
- "bottomEnd": "paging"
- },
- "columnDefs": [{
- "targets": "duration",
- "render": function (data, type, row) {
- if (type === 'display') data = timeDuration(data);
- return data;
- }
- },
- {
- "targets": "date",
- "render": function (data, type, row) {
- if (type === 'display') data = dateFormat(data);
- return data;
- }
- }
- ],
- "columns": [{
- "data": "server",
- "type": "html",
- "render": function (data, type, row, meta) {
- if (type === 'display') {
- data = renderServerMetricsLink('COMPACTOR', '', row.server);
- }
- return data;
- }
- },
- {
- "data": "count"
- },
- {
- "data": "oldest"
- },
- {
- "data": "fetched"
- },
- ]
- });
-});
-
-/**
- * Generates the compactions table
- */
-function refreshCompactionsTable() {
- if (compactionsList) compactionsList.ajax.reload(null, false); // user
paging is not reset on reload
-}
-
-/**
- * Used to redraw the page
- */
-function refresh() {
- refreshCompactionsTable();
-}
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/compactions.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/compactions.ftl
deleted file mode 100644
index 72a32cbe5e..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/compactions.ftl
+++ /dev/null
@@ -1,41 +0,0 @@
-<#--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
- <div class="row">
- <div class="col-xs-12">
- <h3>${title}</h3>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-12">
- <table id="compactionsList" class="table caption-top table-bordered
table-striped table-condensed">
- <caption><span class="table-caption">Compactions</span><br
/></caption>
- <thead>
- <tr>
- <th class="firstcell">Server </th>
- <th title="Number of compactions presently
running"># </th>
- <th class="duration" title="The age of the oldest compaction
on this server.">Oldest Age </th>
- <th class="date" title="Last time data was fetched. Server
fetches on page refresh, at most every minute.">Fetched</th>
- </tr>
- </thead>
- <tbody></tbody>
- </table>
- </div>
- </div>
