Remove logs from monitor

DomGarguilo · Nov 25, 2024 · e42cff3 · e42cff3
1 parent 325f7e6
commit e42cff3
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 728 deletions.
diff --git a/assemble/conf/log4j2-service.properties b/assemble/conf/log4j2-service.properties
@@ -67,14 +67,6 @@ appender.audit.policies.size.size=512MB
 appender.audit.strategy.type = DefaultRolloverStrategy
 appender.audit.strategy.max = 10
 
-appender.monitor.type = AccumuloMonitor
-appender.monitor.name = MonitorLog
-appender.monitor.filter.threshold.type = ThresholdFilter
-appender.monitor.filter.threshold.level = warn
-#appender.monitor.async = true
-#appender.monitor.maxThreads = 2
-#appender.monitor.queueSize = 1024
-
 logger.zookeeper.name = org.apache.zookeeper
 logger.zookeeper.level = error
 
@@ -90,5 +82,3 @@ logger.accumulo.level = debug
 rootLogger.level = info
 rootLogger.appenderRef.console.ref = STDERR
 rootLogger.appenderRef.rolling.ref = LogFiles
-rootLogger.appenderRef.monitor.ref = MonitorLog
-
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -81,7 +81,6 @@
 import org.apache.accumulo.monitor.rest.compactions.external.ExternalCompactionInfo;
 import org.apache.accumulo.monitor.rest.compactions.external.RunningCompactions;
 import org.apache.accumulo.monitor.rest.compactions.external.RunningCompactorDetails;
-import org.apache.accumulo.monitor.util.logging.RecentLogs;
 import org.apache.accumulo.server.AbstractServer;
 import org.apache.accumulo.server.HighlyAvailableService;
 import org.apache.accumulo.server.ServerContext;
@@ -615,7 +614,6 @@ public static class CompactionStats {
   private final Map<HostAndPort,ScanStats> tserverScans = new HashMap<>();
   private final Map<HostAndPort,ScanStats> sserverScans = new HashMap<>();
   private final Map<HostAndPort,CompactionStats> allCompactions = new HashMap<>();
-  private final RecentLogs recentLogs = new RecentLogs();
   private final ExternalCompactionInfo ecInfo = new ExternalCompactionInfo();
 
   private long scansFetchedNanos = System.nanoTime();
@@ -1038,10 +1036,6 @@ public boolean isActiveService() {
     return monitorInitialized.get();
   }
 
-  public RecentLogs recentLogs() {
-    return recentLogs;
-  }
-
   public Optional<HostAndPort> getCoordinatorHost() {
     return coordinatorHost;
   }

diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogResource.java
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/SanitizedLogEvent.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/SanitizedLogEvent.java
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/SingleLogEvent.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/SingleLogEvent.java
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusInformation.java
@@ -31,8 +31,6 @@ public class StatusInformation {
   public String tServerStatus = null;
   public String coordinatorStatus = null;
 
-  public Integer logNumber = 0;
-  public boolean logsHaveError = false;
   public Integer problemNumber = 0;
 
   public StatusInformation() {}
@@ -44,18 +42,14 @@ public StatusInformation() {}
    * @param gcStatus Status for the GC
    * @param tServerStatus Status for the tserver
    * @param coordinatorStatus Status for the Compaction Coordinator
-   * @param logNumber Number of log reports
-   * @param logsHaveError Check if log reports include errors
    * @param problemNumber Number of problems per table
    */
   public StatusInformation(String managerStatus, String gcStatus, String tServerStatus,
-      String coordinatorStatus, Integer logNumber, boolean logsHaveError, Integer problemNumber) {
+      String coordinatorStatus, Integer problemNumber) {
     this.managerStatus = managerStatus;
     this.gcStatus = gcStatus;
     this.tServerStatus = tServerStatus;
     this.coordinatorStatus = coordinatorStatus;
-    this.logNumber = logNumber;
-    this.logsHaveError = logsHaveError;
     this.problemNumber = problemNumber;
 
   }

diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/status/StatusResource.java
@@ -97,7 +97,7 @@ public StatusInformation getTables() {
     }
 
     return new StatusInformation(managerStatus.toString(), gcStatus.toString(),
-        tServerStatus.toString(), coordinatorStatus.toString(), monitor.recentLogs().numEvents(),
-        monitor.recentLogs().eventsIncludeErrors(), monitor.getProblemSummary().entrySet().size());
+        tServerStatus.toString(), coordinatorStatus.toString(),
+        monitor.getProblemSummary().entrySet().size());
   }
 }