accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [26/54] [abbrv] accumulo git commit: ACCUMULO-2181/3005 Porting Monitor
Date Thu, 06 Jul 2017 20:43:20 GMT
ACCUMULO-2181/3005 Porting Monitor

 * ACCUMULO-2181 Overall fixes to Javascript and navbar
    * Added error messages for overview

 * ACCUMULO-2181 Error banners
    * Initial add of error and log banners on pages
    * Removed current_date from Java and moved it to client-side.

 * ACCUMULO-2181 Header style changes, code style changes to the screen.css file

 * ACCUMULO-2181 Moved server activity tip to bottom of page

 * ACCUMULO-2181 Bootstrap for Monitor

    * Added bootstrap navbar
    * Changed colors on plots
    * Initial include of bootstrap alert
    * CSS modifications
    * Created about modal

 * ACCUMULO-2181/3005 Autofresh Feature

    * Implemented auto-refresh
    * Added status and log notifications to the sidebar
    * Added REST call for status
    * Changed timezone for overview plots

 * ACCUMULO-3005 Added REST calls for problems

 * ACCUMULO-2181/3005 Code fixes, initial POST implementation

    * Fixed overview plots timezone
    * Changed how select2 populates options
    * Added POST for clearing logs
    * Began implementation of POST for clearing problems

 * ACCUMULO-3005 New POST calls, JS improvements

    * Added POST calls for problems page
    * Added null/undefined handlers on javascript

 * ACCUMULO-2181 Style changes

 * ACCUMULO-2181 Fixed Chrome and auto-refresh bugs

 * ACCUMULO-3005 New REST calls

    * Added bad and dead servers to REST call
    * Added POST call to clear dead servers

 * ACCUMULO-2181 Changed web/ to resources/

 * ACCUMULO-2181/3005 Added Recovery List table

 * ACCUMULO-2181 Fixed clear problem calls

 * ACCUMULO-2181/3005 Documentation and minor improvements

    * Added documentation to Javascript code
    * Tables now load all tables on initial page load
    * Added a new value to the trace show REST API

 * ACCUMULO-3005 Reorganized file location

 * ACCUMULO-3005/2181 Added documentation

 * ACCUMULO-2181 Added tables to master page

ACCUMULO-2181 Updated flot version

ACCUMULO-2181 Moved auto-refresh function to be a global timer

ACCUMULO-2181 Style changes

ACCUMULO-2181 Fixed repeating caption in tservers

ACCUMULO-2181 Added missing error handling


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0ca5cd33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ca5cd33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ca5cd33

Branch: refs/heads/master
Commit: 0ca5cd3389f366e311d6f89f64cf68c3d0f3ca41
Parents: 02c8f8b
Author: Luis Tavarez <zeravat@outlook.com>
Authored: Wed Feb 8 15:52:15 2017 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jul 6 16:22:41 2017 -0400

----------------------------------------------------------------------
 assemble/src/main/assemblies/component.xml      |    1 +
 server/monitor/pom.xml                          |    2 +-
 .../org/apache/accumulo/monitor/Monitor.java    |   19 +-
 .../monitor/rest/api/AddlInformation.java       |   39 -
 .../monitor/rest/api/AllTimeTabletResults.java  |   39 -
 .../monitor/rest/api/AnnotationInformation.java |   30 -
 .../rest/api/BadTabletServerInformation.java    |   32 -
 .../monitor/rest/api/BadTabletServers.java      |   34 -
 .../monitor/rest/api/BasicResource.java         |  189 +
 .../accumulo/monitor/rest/api/BulkImport.java   |   39 -
 .../monitor/rest/api/BulkImportInformation.java |   34 -
 .../monitor/rest/api/CompactionsList.java       |   32 -
 .../monitor/rest/api/CompactionsTypes.java      |   34 -
 .../monitor/rest/api/CurrentOperations.java     |   43 -
 .../monitor/rest/api/CurrentTabletResults.java  |   31 -
 .../monitor/rest/api/DataInformation.java       |   29 -
 .../monitor/rest/api/DeadLoggerInformation.java |   39 -
 .../monitor/rest/api/DeadLoggerList.java        |   34 -
 .../monitor/rest/api/DeadServerInformation.java |   39 -
 .../monitor/rest/api/DeadServerList.java        |   33 -
 .../monitor/rest/api/GarbageCollection.java     |   39 -
 .../monitor/rest/api/GarbageCollectorCycle.java |   42 -
 .../rest/api/GarbageCollectorStatus.java        |   37 -
 .../accumulo/monitor/rest/api/LogEvent.java     |   38 -
 .../monitor/rest/api/MasterInformation.java     |   84 -
 .../rest/api/RecentTracesInformation.java       |   54 -
 .../monitor/rest/api/RecentTracesList.java      |   33 -
 .../rest/api/RecoveryStatusInformation.java     |   40 -
 .../rest/api/ReplicationInformation.java        |   33 -
 .../monitor/rest/api/ScanInformation.java       |   35 -
 .../apache/accumulo/monitor/rest/api/Scans.java |   33 -
 .../rest/api/ServerShuttingDownInformation.java |   31 -
 .../accumulo/monitor/rest/api/ServerStat.java   |   46 -
 .../accumulo/monitor/rest/api/ServerStats.java  |   33 -
 .../monitor/rest/api/ServersShuttingDown.java   |   33 -
 .../monitor/rest/api/TableInformation.java      |   99 -
 .../monitor/rest/api/TableInformationList.java  |   33 -
 .../monitor/rest/api/TableNamespace.java        |   37 -
 .../accumulo/monitor/rest/api/TablesList.java   |   33 -
 .../accumulo/monitor/rest/api/TabletServer.java |   44 -
 .../api/TabletServerBulkImportInformation.java  |   34 -
 .../rest/api/TabletServerDetailInformation.java |   33 -
 .../rest/api/TabletServerInformation.java       |  118 -
 .../monitor/rest/api/TabletServerSummary.java   |   41 -
 .../api/TabletServerWithTableInformation.java   |   28 -
 .../monitor/rest/api/TabletServers.java         |   37 -
 .../accumulo/monitor/rest/api/Totals.java       |   35 -
 .../monitor/rest/api/TraceInformation.java      |   36 -
 .../accumulo/monitor/rest/api/TraceList.java    |   44 -
 .../accumulo/monitor/rest/api/TraceType.java    |   39 -
 .../rest/api/TracesForTypeInformation.java      |   63 -
 .../monitor/rest/api/XMLInformation.java        |   81 -
 .../monitor/rest/api/ZKInformation.java         |   33 -
 .../accumulo/monitor/rest/api/ZooKeeper.java    |   31 -
 .../monitor/rest/api/bulkImport/BulkImport.java |   61 +
 .../api/bulkImport/BulkImportInformation.java   |   51 +
 .../rest/api/bulkImport/BulkImportResource.java |   72 +
 .../TabletServerBulkImportInformation.java      |   52 +
 .../api/garbageCollector/GarbageCollection.java |   63 +
 .../garbageCollector/GarbageCollectorCycle.java |   53 +
 .../GarbageCollectorResource.java               |  134 +
 .../GarbageCollectorStatus.java                 |   50 +
 .../rest/api/log/DeadLoggerInformation.java     |   57 +
 .../monitor/rest/api/log/DeadLoggerList.java    |   50 +
 .../accumulo/monitor/rest/api/log/LogEvent.java |   57 +
 .../monitor/rest/api/log/LogResource.java       |   75 +
 .../rest/api/master/MasterInformation.java      |  150 +
 .../monitor/rest/api/master/MasterResource.java |  247 +
 .../api/problem/ProblemDetailInformation.java   |   62 +
 .../api/problem/ProblemSummaryInformation.java  |   55 +
 .../rest/api/problem/ProblemsResource.java      |  173 +
 .../api/replication/ReplicationInformation.java |   55 +
 .../api/replication/ReplicationResource.java    |  200 +
 .../monitor/rest/api/scan/ScanInformation.java  |   53 +
 .../accumulo/monitor/rest/api/scan/Scans.java   |   50 +
 .../monitor/rest/api/scan/ScansResource.java    |   60 +
 .../rest/api/statistic/StatisticsResource.java  |  289 +
 .../rest/api/status/StatusInformation.java      |   69 +
 .../monitor/rest/api/status/StatusResource.java |  112 +
 .../monitor/rest/api/table/CompactionsList.java |   48 +
 .../rest/api/table/CompactionsTypes.java        |   52 +
 .../rest/api/table/TableInformation.java        |  131 +
 .../rest/api/table/TableInformationList.java    |   50 +
 .../monitor/rest/api/table/TableNamespace.java  |   57 +
 .../monitor/rest/api/table/TablesList.java      |   50 +
 .../monitor/rest/api/table/TablesResource.java  |  239 +
 .../monitor/rest/api/trace/AddlInformation.java |   62 +
 .../rest/api/trace/AnnotationInformation.java   |   46 +
 .../monitor/rest/api/trace/DataInformation.java |   45 +
 .../rest/api/trace/RecentTracesInformation.java |   73 +
 .../rest/api/trace/RecentTracesList.java        |   50 +
 .../api/trace/RecoveryStatusInformation.java    |   64 +
 .../rest/api/trace/TraceInformation.java        |   64 +
 .../monitor/rest/api/trace/TraceList.java       |   70 +
 .../monitor/rest/api/trace/TraceType.java       |   59 +
 .../api/trace/TracesForTypeInformation.java     |   77 +
 .../monitor/rest/api/trace/TracesResource.java  |  372 +
 .../rest/api/tserver/AllTimeTabletResults.java  |   67 +
 .../api/tserver/BadTabletServerInformation.java |   48 +
 .../rest/api/tserver/BadTabletServers.java      |   51 +
 .../rest/api/tserver/CurrentOperations.java     |   79 +
 .../rest/api/tserver/CurrentTabletResults.java  |   51 +
 .../rest/api/tserver/DeadServerInformation.java |   57 +
 .../rest/api/tserver/DeadServerList.java        |   50 +
 .../tserver/ServerShuttingDownInformation.java  |   45 +
 .../monitor/rest/api/tserver/ServerStat.java    |   54 +
 .../monitor/rest/api/tserver/ServerStats.java   |   50 +
 .../rest/api/tserver/ServersShuttingDown.java   |   50 +
 .../monitor/rest/api/tserver/TabletServer.java  |   49 +
 .../tserver/TabletServerDetailInformation.java  |   55 +
 .../api/tserver/TabletServerInformation.java    |  143 +
 .../rest/api/tserver/TabletServerResource.java  |  334 +
 .../rest/api/tserver/TabletServerSummary.java   |   67 +
 .../TabletServerWithTableInformation.java       |   46 +
 .../monitor/rest/api/tserver/TabletServers.java |   66 +
 .../accumulo/monitor/rest/api/xml/Totals.java   |   53 +
 .../monitor/rest/api/xml/XMLInformation.java    |  115 +
 .../monitor/rest/api/xml/XMLResource.java       |   67 +
 .../rest/api/zookeeper/ZKInformation.java       |   50 +
 .../monitor/rest/api/zookeeper/ZooKeeper.java   |   49 +
 .../rest/api/zookeeper/ZookeeperResource.java   |   52 +
 .../monitor/rest/resources/BasicResource.java   |   98 -
 .../rest/resources/BulkImportResource.java      |   64 -
 .../resources/GarbageCollectorResource.java     |   97 -
 .../monitor/rest/resources/LogResource.java     |   54 -
 .../monitor/rest/resources/MasterResource.java  |  205 -
 .../rest/resources/ProblemsResource.java        |   40 -
 .../rest/resources/ReplicationResource.java     |  188 -
 .../monitor/rest/resources/ScansResource.java   |   49 -
 .../rest/resources/StatisticsResource.java      |  175 -
 .../monitor/rest/resources/TablesResource.java  |  166 -
 .../rest/resources/TabletServerResource.java    |  255 -
 .../monitor/rest/resources/TracesResource.java  |  354 -
 .../monitor/rest/resources/XMLResource.java     |   52 -
 .../rest/resources/ZookeeperResource.java       |   41 -
 .../accumulo/monitor/rest/view/BulkImport.java  |   73 -
 .../monitor/rest/view/GarbageCollector.java     |   72 -
 .../accumulo/monitor/rest/view/Index.java       |  383 +
 .../accumulo/monitor/rest/view/Master.java      |   76 -
 .../accumulo/monitor/rest/view/Overview.java    |   73 -
 .../accumulo/monitor/rest/view/Replication.java |   72 -
 .../accumulo/monitor/rest/view/Scans.java       |   73 -
 .../monitor/rest/view/ServerActivity.java       |   80 -
 .../monitor/rest/view/TablesStatus.java         |  116 -
 .../monitor/rest/view/TabletServer.java         |  110 -
 .../accumulo/monitor/rest/view/Trace.java       |  150 -
 .../accumulo/monitor/servlets/BasicServlet.java |   12 +-
 .../accumulo/monitor/servlets/LogServlet.java   |  114 -
 .../accumulo/monitor/servlets/VisServlet.java   |  236 -
 .../org/apache/accumulo/monitor/util/Table.java |    3 +-
 .../src/main/resources/resources/bulkImport.js  |  210 +
 .../src/main/resources/resources/down.gif       |  Bin 0 -> 164 bytes
 .../src/main/resources/resources/favicon.png    |  Bin 0 -> 2195 bytes
 .../main/resources/resources/flot/LICENSE.txt   |   22 +
 .../main/resources/resources/flot/excanvas.js   | 1428 +++
 .../resources/resources/flot/excanvas.min.js    |    1 +
 .../resources/flot/jquery.colorhelpers.js       |  180 +
 .../resources/flot/jquery.colorhelpers.min.js   |    1 +
 .../resources/flot/jquery.flot.canvas.js        |  345 +
 .../resources/flot/jquery.flot.canvas.min.js    |    7 +
 .../resources/flot/jquery.flot.categories.js    |  190 +
 .../flot/jquery.flot.categories.min.js          |    7 +
 .../resources/flot/jquery.flot.crosshair.js     |  176 +
 .../resources/flot/jquery.flot.crosshair.min.js |    7 +
 .../resources/flot/jquery.flot.errorbars.js     |  353 +
 .../resources/flot/jquery.flot.errorbars.min.js |    7 +
 .../resources/flot/jquery.flot.fillbetween.js   |  226 +
 .../flot/jquery.flot.fillbetween.min.js         |    7 +
 .../resources/flot/jquery.flot.image.js         |  241 +
 .../resources/flot/jquery.flot.image.min.js     |    7 +
 .../resources/resources/flot/jquery.flot.js     | 3168 ++++++
 .../resources/resources/flot/jquery.flot.min.js |    8 +
 .../resources/flot/jquery.flot.navigate.js      |  346 +
 .../resources/flot/jquery.flot.navigate.min.js  |    7 +
 .../resources/resources/flot/jquery.flot.pie.js |  820 ++
 .../resources/flot/jquery.flot.pie.min.js       |    7 +
 .../resources/flot/jquery.flot.resize.js        |   59 +
 .../resources/flot/jquery.flot.resize.min.js    |    7 +
 .../resources/flot/jquery.flot.selection.js     |  360 +
 .../resources/flot/jquery.flot.selection.min.js |    7 +
 .../resources/flot/jquery.flot.stack.js         |  188 +
 .../resources/flot/jquery.flot.stack.min.js     |    7 +
 .../resources/flot/jquery.flot.symbol.js        |   71 +
 .../resources/flot/jquery.flot.symbol.min.js    |    7 +
 .../resources/flot/jquery.flot.threshold.js     |  142 +
 .../resources/flot/jquery.flot.threshold.min.js |    7 +
 .../resources/flot/jquery.flot.time.js          |  432 +
 .../resources/flot/jquery.flot.time.min.js      |    7 +
 .../src/main/resources/resources/flot/jquery.js | 9472 ++++++++++++++++++
 .../main/resources/resources/flot/jquery.min.js |    5 +
 .../src/main/resources/resources/functions.js   |  686 ++
 .../monitor/src/main/resources/resources/gc.js  |  278 +
 .../src/main/resources/resources/global.js      |   96 +
 .../src/main/resources/resources/listType.js    |  140 +
 .../monitor/src/main/resources/resources/log.js |  173 +
 .../src/main/resources/resources/master.js      |  265 +
 .../src/main/resources/resources/overview.js    |  293 +
 .../src/main/resources/resources/problems.js    |  232 +
 .../src/main/resources/resources/replication.js |  137 +
 .../src/main/resources/resources/scans.js       |  133 +
 .../src/main/resources/resources/screen.css     |  507 +
 .../src/main/resources/resources/server.js      |  429 +
 .../src/main/resources/resources/show.js        |  165 +
 .../src/main/resources/resources/sidebar.js     |  133 +
 .../src/main/resources/resources/summary.js     |  152 +
 .../src/main/resources/resources/table.js       |  208 +
 .../src/main/resources/resources/tables.js      |  355 +
 .../src/main/resources/resources/tservers.js    |  320 +
 .../monitor/src/main/resources/resources/up.gif |  Bin 0 -> 165 bytes
 .../monitor/src/main/resources/resources/vis.js |  506 +
 .../src/main/resources/resources/vis.js.old     |  409 +
 .../src/main/resources/templates/bulkImport.ftl |   28 +
 .../src/main/resources/templates/footer.ftl     |   44 +
 .../monitor/src/main/resources/templates/gc.ftl |   23 +
 .../src/main/resources/templates/header.ftl     |   14 +-
 .../src/main/resources/templates/index.ftl      |   72 +
 .../src/main/resources/templates/listType.ftl   |   32 +
 .../src/main/resources/templates/log.ftl        |   22 +
 .../src/main/resources/templates/master.ftl     |   29 +
 .../src/main/resources/templates/modals.ftl     |   39 +
 .../monitor/rest/view/BulkImport/bulkImport.ftl |  113 -
 .../monitor/rest/view/GarbageCollector/gc.ftl   |  169 -
 .../monitor/rest/view/Master/master.ftl         |   83 -
 .../monitor/rest/view/Overview/index.ftl        |  222 -
 .../rest/view/Replication/replication.ftl       |   86 -
 .../accumulo/monitor/rest/view/Scans/scans.ftl  |   74 -
 .../monitor/rest/view/ServerActivity/vis.ftl    |   97 -
 .../monitor/rest/view/TablesStatus/table.ftl    |   94 -
 .../monitor/rest/view/TablesStatus/tables.ftl   |  288 -
 .../monitor/rest/view/TabletServer/server.ftl   |  180 -
 .../monitor/rest/view/TabletServer/tservers.ftl |   94 -
 .../monitor/rest/view/Trace/listType.ftl        |   89 -
 .../accumulo/monitor/rest/view/Trace/show.ftl   |  135 -
 .../monitor/rest/view/Trace/summary.ftl         |  100 -
 .../src/main/resources/templates/overview.ftl   |   90 +
 .../src/main/resources/templates/problems.ftl   |   36 +
 .../main/resources/templates/replication.ftl    |   22 +
 .../src/main/resources/templates/scans.ftl      |   22 +
 .../src/main/resources/templates/server.ftl     |   49 +
 .../src/main/resources/templates/show.ftl       |   65 +
 .../src/main/resources/templates/sidebar.ftl    |   98 +-
 .../src/main/resources/templates/summary.ftl    |   33 +
 .../src/main/resources/templates/table.ftl      |   31 +
 .../src/main/resources/templates/tables.ftl     |   41 +
 .../src/main/resources/templates/tservers.ftl   |   29 +
 .../src/main/resources/templates/vis.ftl        |   72 +
 server/monitor/src/main/resources/web/down.gif  |  Bin 164 -> 0 bytes
 .../monitor/src/main/resources/web/favicon.png  |  Bin 2195 -> 0 bytes
 .../src/main/resources/web/flot/LICENSE.txt     |   22 -
 .../src/main/resources/web/flot/excanvas.js     | 1427 ---
 .../src/main/resources/web/flot/excanvas.min.js |    1 -
 .../resources/web/flot/jquery.colorhelpers.js   |  179 -
 .../web/flot/jquery.colorhelpers.min.js         |    1 -
 .../resources/web/flot/jquery.flot.crosshair.js |  167 -
 .../web/flot/jquery.flot.crosshair.min.js       |    1 -
 .../web/flot/jquery.flot.fillbetween.js         |  183 -
 .../web/flot/jquery.flot.fillbetween.min.js     |    1 -
 .../resources/web/flot/jquery.flot.image.js     |  238 -
 .../resources/web/flot/jquery.flot.image.min.js |    1 -
 .../src/main/resources/web/flot/jquery.flot.js  | 2599 -----
 .../main/resources/web/flot/jquery.flot.min.js  |    6 -
 .../resources/web/flot/jquery.flot.navigate.js  |  336 -
 .../web/flot/jquery.flot.navigate.min.js        |    1 -
 .../main/resources/web/flot/jquery.flot.pie.js  |  750 --
 .../resources/web/flot/jquery.flot.pie.min.js   |    1 -
 .../resources/web/flot/jquery.flot.resize.js    |   60 -
 .../web/flot/jquery.flot.resize.min.js          |    1 -
 .../resources/web/flot/jquery.flot.selection.js |  344 -
 .../web/flot/jquery.flot.selection.min.js       |    1 -
 .../resources/web/flot/jquery.flot.stack.js     |  184 -
 .../resources/web/flot/jquery.flot.stack.min.js |    1 -
 .../resources/web/flot/jquery.flot.symbol.js    |   70 -
 .../web/flot/jquery.flot.symbol.min.js          |    1 -
 .../resources/web/flot/jquery.flot.threshold.js |  103 -
 .../web/flot/jquery.flot.threshold.min.js       |    1 -
 .../src/main/resources/web/flot/jquery.js       | 8316 ---------------
 .../src/main/resources/web/flot/jquery.min.js   |   23 -
 .../monitor/src/main/resources/web/functions.js |  180 -
 .../monitor/src/main/resources/web/screen.css   |  437 -
 server/monitor/src/main/resources/web/up.gif    |  Bin 165 -> 0 bytes
 server/monitor/src/main/resources/web/vis.js    |  409 -
 281 files changed, 31307 insertions(+), 23082 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index 8053d8d..e043290 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -82,6 +82,7 @@
         <include>org.glassfish.jersey.media:jersey-media-jaxb</include>
         <include>org.glassfish.jersey.media:jersey-media-json-jackson</include>
         <include>org.javassist:javassist</include>
+        <include>log4j:log4j</include>
       </includes>
     </dependencySet>
   </dependencySets>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 1ab359f..af8e113 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -151,7 +151,7 @@
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
             <excludes>
-              <exclude>src/main/resources/web/flot/**/*.js</exclude>
+              <exclude>src/main/resources/resources/flot/**/*.js</exclude>
             </excludes>
           </configuration>
         </plugin>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
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
index 3359db8..03d81f1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -64,12 +64,8 @@ import org.apache.accumulo.fate.util.LoggingRunnable;
 import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.accumulo.monitor.servlets.LogServlet;
-import org.apache.accumulo.monitor.servlets.OperationServlet;
-import org.apache.accumulo.monitor.servlets.ProblemServlet;
 import org.apache.accumulo.monitor.servlets.ShellServlet;
 import org.apache.accumulo.monitor.servlets.StaticWebResourcesServlet;
-import org.apache.accumulo.monitor.servlets.VisServlet;
 import org.apache.accumulo.server.Accumulo;
 import org.apache.accumulo.server.AccumuloServerContext;
 import org.apache.accumulo.server.HighlyAvailableService;
@@ -470,11 +466,9 @@ public class Monitor implements HighlyAvailableService {
       try {
         log.debug("Creating monitor on port " + port);
         server = new EmbeddedWebServer(hostname, port);
-        server.addServlet(StaticWebResourcesServlet.class, "/web/*");
-        server.addServlet(OperationServlet.class, "/op");
-        server.addServlet(ProblemServlet.class, "/problems");
-        server.addServlet(LogServlet.class, "/log");
-        server.addServlet(VisServlet.class, "/vis");
+        server.addServlet(StaticWebResourcesServlet.class, "/resources/*");
+        // server.addServlet(OperationServlet.class, "/op");
+        // server.addServlet(ProblemServlet.class, "/problems");
         if (server.isUsingSsl())
           server.addServlet(ShellServlet.class, "/shell");
         server.addServlet(getRestServlet(), "/*");
@@ -561,7 +555,7 @@ public class Monitor implements HighlyAvailableService {
     final ResourceConfig rc = new ResourceConfig().register(FreemarkerMvcFeature.class)
         .register(new LoggingFeature(java.util.logging.Logger.getLogger(this.getClass().getSimpleName()))).register(JacksonFeature.class)
         .packages("org.apache.accumulo.monitor.rest").property(MvcFeature.TEMPLATE_BASE_PATH, "/templates").property(ServerProperties.TRACING, "ALL")
-        .property(ServletProperties.FILTER_STATIC_CONTENT_REGEX, "/web/.*");
+        .property(ServletProperties.FILTER_STATIC_CONTENT_REGEX, "/resources/.*");
     ServletHolder holder = new ServletHolder(new ServletContainer(rc));
     return holder;
   }
@@ -784,11 +778,6 @@ public class Monitor implements HighlyAvailableService {
     return START_TIME;
   }
 
-  // TODO Remove this after merging old and new monitor
-  public static void setStartTime(long start) {
-    START_TIME = start;
-  }
-
   public static List<Pair<Long,Double>> getLoadOverTime() {
     synchronized (loadOverTime) {
       return new ArrayList<>(loadOverTime);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AddlInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AddlInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AddlInformation.java
deleted file mode 100644
index d8163dc..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AddlInformation.java
+++ /dev/null
@@ -1,39 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AddlInformation {
-
-  public List<DataInformation> data;
-  public List<AnnotationInformation> annotations;
-
-  public AddlInformation() {
-    data = new ArrayList<>();
-    annotations = new ArrayList<>();
-  }
-
-  public void addData(DataInformation data) {
-    this.data.add(data);
-  }
-
-  public void addAnnotations(AnnotationInformation annotations) {
-    this.annotations.add(annotations);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AllTimeTabletResults.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AllTimeTabletResults.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AllTimeTabletResults.java
deleted file mode 100644
index 12ee9b8..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AllTimeTabletResults.java
+++ /dev/null
@@ -1,39 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class AllTimeTabletResults {
-
-  public String operation;
-  public int success, failure;
-  public Double queueStdDev, avgQueueTime, avgTime;
-  public double timeSpent, stdDev;
-
-  public AllTimeTabletResults() {}
-
-  public AllTimeTabletResults(String operation, int success, int failure, Double avgQueueTime, Double queueStdDev, Double avgTime, double stdDev,
-      double timeSpent) {
-    this.operation = operation;
-    this.success = success;
-    this.failure = failure;
-    this.avgQueueTime = avgQueueTime;
-    this.avgTime = avgTime;
-    this.queueStdDev = queueStdDev;
-    this.stdDev = stdDev;
-    this.timeSpent = timeSpent;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AnnotationInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AnnotationInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AnnotationInformation.java
deleted file mode 100644
index 141532e..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/AnnotationInformation.java
+++ /dev/null
@@ -1,30 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class AnnotationInformation {
-
-  public String annotation;
-  public long time;
-
-  public AnnotationInformation() {}
-
-  public AnnotationInformation(String annotation, long time) {
-    this.annotation = annotation;
-    this.time = time;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServerInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServerInformation.java
deleted file mode 100644
index 212ddc2..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServerInformation.java
+++ /dev/null
@@ -1,32 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-public class BadTabletServerInformation {
-
-  @XmlAttribute
-  public String id, status;
-
-  public BadTabletServerInformation() {}
-
-  public BadTabletServerInformation(String id, String status) {
-    this.id = id;
-    this.status = status;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServers.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServers.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServers.java
deleted file mode 100644
index 03e26c2..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BadTabletServers.java
+++ /dev/null
@@ -1,34 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BadTabletServers {
-
-  public List<BadTabletServerInformation> badTabletServer;
-
-  public BadTabletServers() {
-    badTabletServer = new ArrayList<>();
-  }
-
-  public void addBadServer(BadTabletServerInformation badTabletServer) {
-    this.badTabletServer.add(badTabletServer);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BasicResource.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BasicResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BasicResource.java
new file mode 100644
index 0000000..5c74e95
--- /dev/null
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BasicResource.java
@@ -0,0 +1,189 @@
+/*
+ * 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
+ *
+ *     http://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.
+ */
+package org.apache.accumulo.monitor.rest.api;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.accumulo.monitor.rest.api.bulkImport.BulkImportResource;
+import org.apache.accumulo.monitor.rest.api.garbageCollector.GarbageCollectorResource;
+import org.apache.accumulo.monitor.rest.api.log.LogResource;
+import org.apache.accumulo.monitor.rest.api.master.MasterResource;
+import org.apache.accumulo.monitor.rest.api.problem.ProblemsResource;
+import org.apache.accumulo.monitor.rest.api.replication.ReplicationResource;
+import org.apache.accumulo.monitor.rest.api.scan.ScansResource;
+import org.apache.accumulo.monitor.rest.api.statistic.StatisticsResource;
+import org.apache.accumulo.monitor.rest.api.status.StatusResource;
+import org.apache.accumulo.monitor.rest.api.table.TablesResource;
+import org.apache.accumulo.monitor.rest.api.trace.TracesResource;
+import org.apache.accumulo.monitor.rest.api.tserver.TabletServerResource;
+import org.apache.accumulo.monitor.rest.api.zookeeper.ZookeeperResource;
+
+/**
+ * BasicResource is used to set the path for the REST calls
+ *
+ * @since 2.0.0
+ *
+ */
+@Path("/rest")
+@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+public class BasicResource {
+
+  /**
+   * Generates Master REST calls
+   *
+   * @return master information in JSON
+   */
+  @Path("/master")
+  public MasterResource getMasterResource() {
+
+    return new MasterResource();
+  }
+
+  /**
+   * Generates Bulk Import REST calls
+   *
+   * @return bulk import information in JSON
+   */
+  @Path("/bulkImports")
+  public BulkImportResource getBulkImportResource() {
+
+    return new BulkImportResource();
+  }
+
+  /**
+   * Generates Garbage Collector REST calls
+   *
+   * @return garbage collector information in JSON
+   */
+  @Path("/gc")
+  public GarbageCollectorResource getGarbageCollectorResource() {
+
+    return new GarbageCollectorResource();
+  }
+
+  /**
+   * Generates Log REST calls
+   *
+   * @return log information in JSON
+   */
+  @Path("/logs")
+  public LogResource getLogResource() {
+
+    return new LogResource();
+  }
+
+  /**
+   * Generates Problem REST calls
+   *
+   * @return problem information in JSON
+   */
+  @Path("/problems")
+  public ProblemsResource getProblemsResource() {
+
+    return new ProblemsResource();
+  }
+
+  /**
+   * Generates Replication REST calls
+   *
+   * @return replication information in JSON
+   */
+  @Path("/replication")
+  public ReplicationResource getReplicationResource() {
+
+    return new ReplicationResource();
+  }
+
+  /**
+   * Generates Scan REST calls
+   *
+   * @return scan information in JSON
+   */
+  @Path("/scans")
+  public ScansResource getScansResource() {
+
+    return new ScansResource();
+  }
+
+  /**
+   * Generates Statistics REST calls
+   *
+   * @return statistic information in JSON
+   */
+  @Path("/statistics")
+  public StatisticsResource getStatisticsResource() {
+
+    return new StatisticsResource();
+  }
+
+  /**
+   * Generates Status REST calls
+   *
+   * @return status information in JSON
+   */
+  @Path("/status")
+  public StatusResource getStatusResource() {
+
+    return new StatusResource();
+  }
+
+  /**
+   * Generates Table REST calls
+   *
+   * @return table information in JSON
+   */
+  @Path("/tables")
+  public TablesResource getTablesResource() {
+
+    return new TablesResource();
+  }
+
+  /**
+   * Generates TServer REST calls and JSON object
+   *
+   * @return tserver information in JSON
+   */
+  @Path("/{parameter: tservers|json}")
+  public TabletServerResource getTabletServerResource() {
+
+    return new TabletServerResource();
+  }
+
+  /**
+   * Generates Trace REST calls
+   *
+   * @return trace information in JSON
+   */
+  @Path("/trace")
+  public TracesResource getTracesResource() {
+
+    return new TracesResource();
+  }
+
+  /**
+   * Generates Zookeeper REST calls
+   *
+   * @return zookeeper information in JSON
+   */
+  @Path("/zk")
+  public ZookeeperResource getZookeeperResource() {
+
+    return new ZookeeperResource();
+  }
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImport.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImport.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImport.java
deleted file mode 100644
index bd28d3a..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImport.java
+++ /dev/null
@@ -1,39 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BulkImport {
-
-  public List<BulkImportInformation> bulkImport;
-  public List<TabletServerBulkImportInformation> tabletServerBulkImport;
-
-  public BulkImport() {
-    bulkImport = new ArrayList<>();
-    tabletServerBulkImport = new ArrayList<>();
-  }
-
-  public void addBulkImport(BulkImportInformation bulkImport) {
-    this.bulkImport.add(bulkImport);
-  }
-
-  public void addTabletServerBulkImport(TabletServerBulkImportInformation tabletServerBulkImport) {
-    this.tabletServerBulkImport.add(tabletServerBulkImport);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImportInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImportInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImportInformation.java
deleted file mode 100644
index b23ba15..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/BulkImportInformation.java
+++ /dev/null
@@ -1,34 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import org.apache.accumulo.core.master.thrift.BulkImportState;
-
-public class BulkImportInformation {
-
-  public String filename;
-  public long age;
-  public BulkImportState state;
-
-  public BulkImportInformation() {}
-
-  public BulkImportInformation(String filename, long age, BulkImportState state) {
-    this.filename = filename;
-    this.age = age;
-    this.state = state;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsList.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsList.java
deleted file mode 100644
index 46333dd..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsList.java
+++ /dev/null
@@ -1,32 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class CompactionsList {
-
-  public Integer running, queued;
-
-  public CompactionsList() {
-    running = null;
-    queued = null;
-  }
-
-  public CompactionsList(Integer running, Integer queued) {
-    this.running = running;
-    this.queued = queued;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsTypes.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsTypes.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsTypes.java
deleted file mode 100644
index 7026232..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CompactionsTypes.java
+++ /dev/null
@@ -1,34 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class CompactionsTypes {
-
-  public CompactionsList scans, major, minor;
-
-  public CompactionsTypes() {
-    scans = new CompactionsList();
-    major = new CompactionsList();
-    minor = new CompactionsList();
-  }
-
-  public CompactionsTypes(CompactionsList scans, CompactionsList major, CompactionsList minor) {
-    this.scans = scans;
-    this.major = major;
-    this.minor = minor;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentOperations.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentOperations.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentOperations.java
deleted file mode 100644
index 6ef5d9c..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentOperations.java
+++ /dev/null
@@ -1,43 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class CurrentOperations {
-
-  public String name, tablet, tableID;
-  public long entries;
-  public double ingest, query;
-  public Double minorStdDev, minorAvgES, majorStdDev, majorAvgES, minorAvg, majorAvg;
-
-  public CurrentOperations() {}
-
-  public CurrentOperations(String name, String ID, String tablet, long entries, double ingest, double query, Double minorAvg, Double minorStdDev,
-      Double minorAvgES, Double majorAvg, Double majorStdDev, Double majorAvgES) {
-    this.name = name;
-    this.tableID = ID;
-    this.tablet = tablet;
-    this.entries = entries;
-    this.ingest = ingest;
-    this.query = query;
-    this.minorStdDev = minorStdDev;
-    this.minorAvgES = minorAvgES;
-    this.majorStdDev = majorStdDev;
-    this.majorAvgES = majorAvgES;
-    this.minorAvg = minorAvg;
-    this.majorAvg = majorAvg;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentTabletResults.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentTabletResults.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentTabletResults.java
deleted file mode 100644
index 76f7790..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/CurrentTabletResults.java
+++ /dev/null
@@ -1,31 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class CurrentTabletResults {
-
-  public Double currentMinorAvg, currentMinorStdDev, currentMajorAvg, currentMajorStdDev;
-
-  public CurrentTabletResults() {}
-
-  public CurrentTabletResults(Double currentMinorAvg, Double currentMinorStdDev, Double currentMajorAvg, Double currentMajorStdDev) {
-    this.currentMinorAvg = currentMinorAvg;
-    this.currentMinorStdDev = currentMinorStdDev;
-    this.currentMajorAvg = currentMajorAvg;
-    this.currentMajorStdDev = currentMajorStdDev;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DataInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DataInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DataInformation.java
deleted file mode 100644
index 24bf8d2..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DataInformation.java
+++ /dev/null
@@ -1,29 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class DataInformation {
-
-  public String key, value;
-
-  public DataInformation() {}
-
-  public DataInformation(String key, String value) {
-    this.key = key;
-    this.value = value;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerInformation.java
deleted file mode 100644
index 0552ece..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerInformation.java
+++ /dev/null
@@ -1,39 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-public class DeadLoggerInformation {
-
-  @XmlAttribute
-  public String server;
-
-  @XmlAttribute
-  public long lastStatus;
-
-  @XmlAttribute
-  public String status;
-
-  public DeadLoggerInformation() {}
-
-  public DeadLoggerInformation(String server, long lastStatus, String status) {
-    this.server = server;
-    this.lastStatus = lastStatus;
-    this.status = status;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerList.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerList.java
deleted file mode 100644
index 100b622..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadLoggerList.java
+++ /dev/null
@@ -1,34 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DeadLoggerList {
-
-  public List<DeadLoggerInformation> deadLogger;
-
-  public DeadLoggerList() {
-    deadLogger = new ArrayList<>();
-  }
-
-  public void addDeadLogger(DeadLoggerInformation deadLogger) {
-    this.deadLogger.add(deadLogger);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerInformation.java
deleted file mode 100644
index 951aab7..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerInformation.java
+++ /dev/null
@@ -1,39 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-public class DeadServerInformation {
-
-  @XmlAttribute
-  public String server;
-
-  @XmlAttribute
-  public long lastStatus;
-
-  @XmlAttribute
-  public String status;
-
-  public DeadServerInformation() {}
-
-  public DeadServerInformation(String server, long lastStatus, String status) {
-    this.server = server;
-    this.lastStatus = lastStatus;
-    this.status = status;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerList.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerList.java
deleted file mode 100644
index 396feba..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/DeadServerList.java
+++ /dev/null
@@ -1,33 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DeadServerList {
-
-  public List<DeadServerInformation> deadTabletServer;
-
-  public DeadServerList() {
-    deadTabletServer = new ArrayList<>();
-  }
-
-  public void addDeadServer(DeadServerInformation deadTabletServer) {
-    this.deadTabletServer.add(deadTabletServer);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollection.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollection.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollection.java
deleted file mode 100644
index b38b47e..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollection.java
+++ /dev/null
@@ -1,39 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import org.apache.accumulo.core.gc.thrift.GcCycleStats;
-
-public class GarbageCollection {
-
-  public static final GarbageCollection EMPTY = new GarbageCollection();
-
-  public GarbageCollectorCycle lastCycle = new GarbageCollectorCycle();
-  public GarbageCollectorCycle currentCycle = new GarbageCollectorCycle();
-
-  public GarbageCollection() {}
-
-  public GarbageCollection(GcCycleStats last, GcCycleStats current) {
-    this.lastCycle = new GarbageCollectorCycle(last);
-    this.currentCycle = new GarbageCollectorCycle(current);
-  }
-
-  public GarbageCollection(GarbageCollectorCycle last, GarbageCollectorCycle current) {
-    this.lastCycle = last;
-    this.currentCycle = current;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorCycle.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorCycle.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorCycle.java
deleted file mode 100644
index 11c8712..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorCycle.java
+++ /dev/null
@@ -1,42 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import org.apache.accumulo.core.gc.thrift.GcCycleStats;
-
-/**
- * Metrics about a single cycle of the garbage collector
- */
-public class GarbageCollectorCycle {
-
-  public static final GarbageCollectorCycle EMPTY = new GarbageCollectorCycle();
-
-  public long started, finished, candidates, inUse, deleted, errors;
-
-  public GarbageCollectorCycle() {
-    started = finished = candidates = inUse = deleted = errors = 0l;
-  }
-
-  public GarbageCollectorCycle(GcCycleStats thriftStats) {
-    this.started = thriftStats.started;
-    this.finished = thriftStats.finished;
-    this.candidates = thriftStats.candidates;
-    this.inUse = thriftStats.inUse;
-    this.deleted = thriftStats.deleted;
-    this.errors = thriftStats.errors;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorStatus.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorStatus.java
deleted file mode 100644
index ec7fc2b..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/GarbageCollectorStatus.java
+++ /dev/null
@@ -1,37 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import org.apache.accumulo.core.gc.thrift.GCStatus;
-
-public class GarbageCollectorStatus {
-
-  public static final GarbageCollectorStatus EMPTY = new GarbageCollectorStatus();
-
-  public GarbageCollection files = new GarbageCollection();
-
-  public GarbageCollection wals = new GarbageCollection();
-
-  public GarbageCollectorStatus() {}
-
-  public GarbageCollectorStatus(GCStatus status) {
-    if (null != status) {
-      files = new GarbageCollection(status.last, status.current);
-      wals = new GarbageCollection(status.lastLog, status.currentLog);
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/LogEvent.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/LogEvent.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/LogEvent.java
deleted file mode 100644
index 5375a27..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/LogEvent.java
+++ /dev/null
@@ -1,38 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-/**
- * A single message logged
- */
-public class LogEvent {
-
-  public long timestamp;
-  public Object application;
-  public int count;
-  public String level, message;
-
-  public LogEvent() {}
-
-  public LogEvent(long timestamp, Object application, int count, String level, String message) {
-    this.timestamp = timestamp;
-    this.application = application;
-    this.count = count;
-    this.level = level;
-    this.message = message;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/MasterInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/MasterInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/MasterInformation.java
deleted file mode 100644
index aaac632..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/MasterInformation.java
+++ /dev/null
@@ -1,84 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class MasterInformation {
-
-  public String master, lastGC, gcStatus, masterGoalState, masterState;
-
-  public Integer onlineTabletServers, totalTabletServers, tablets, unassignedTablets;
-  public long numentries;
-  public double osload, ingestrate, entriesRead, queryrate; // entriesReturned same as queryrate
-  public long holdTime;
-
-  public int tables, deadTabletServersCount;
-  public long lookups, uptime;
-
-  public BadTabletServers badTabletServers;
-  public ServersShuttingDown tabletServersShuttingDown;
-  public DeadServerList deadTabletServers;
-  public DeadLoggerList deadLoggers;
-
-  public MasterInformation() {
-    this.master = "No Masters running";
-    this.onlineTabletServers = 0;
-    this.totalTabletServers = 0;
-    this.lastGC = "0";
-    this.tablets = 0;
-    this.unassignedTablets = 0;
-    this.numentries = 0l;
-    this.ingestrate = 0d;
-    this.entriesRead = 0d;
-    this.queryrate = 0d;
-    this.holdTime = 0;
-    this.osload = 0l;
-  }
-
-  public MasterInformation(String master) {
-    this.master = master;
-  }
-
-  public MasterInformation(String master, int onlineTabletServers, int totalTabletServers, String lastGC, int tablets, int unassignedTablets, long entries,
-      double ingest, double entriesRead, double entriesReturned, long holdTime, double osLoad, int tables, int deadTabletServersCount, long lookups,
-      long uptime, String gcStatus, String masterGoalState, String masterState, BadTabletServers badTabletServers,
-      ServersShuttingDown tabletServersShuttingDown, DeadServerList deadTabletServers, DeadLoggerList deadLoggers) {
-
-    this.master = master;
-    this.onlineTabletServers = onlineTabletServers;
-    this.totalTabletServers = totalTabletServers;
-    this.lastGC = lastGC;
-    this.tablets = tablets;
-    this.unassignedTablets = unassignedTablets;
-    this.numentries = entries;
-    this.ingestrate = ingest;
-    this.entriesRead = entriesRead;
-    this.queryrate = entriesReturned;
-    this.holdTime = holdTime;
-    this.osload = osLoad;
-    this.tables = tables;
-    this.deadTabletServersCount = deadTabletServersCount;
-    this.lookups = lookups;
-    this.uptime = uptime;
-    this.gcStatus = gcStatus;
-    this.masterGoalState = masterGoalState;
-    this.masterState = masterState;
-    this.badTabletServers = badTabletServers;
-    this.tabletServersShuttingDown = tabletServersShuttingDown;
-    this.deadTabletServers = deadTabletServers;
-    this.deadLoggers = deadLoggers;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesInformation.java
deleted file mode 100644
index fcd2ba7..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesInformation.java
+++ /dev/null
@@ -1,54 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import org.apache.accumulo.tracer.thrift.RemoteSpan;
-
-public class RecentTracesInformation {
-
-  public String type;
-  public Long avg;
-
-  public int total = 0;
-
-  public long min = Long.MAX_VALUE, max = Long.MIN_VALUE;
-  private long totalMS = 0l;
-  public long histogram[] = new long[] {0l, 0l, 0l, 0l, 0l, 0l};
-
-  public RecentTracesInformation() {}
-
-  public RecentTracesInformation(String type) {
-    this.type = type;
-  }
-
-  public void addSpan(RemoteSpan span) {
-    total++;
-    long ms = span.stop - span.start;
-    totalMS += ms;
-    min = Math.min(min, ms);
-    max = Math.max(max, ms);
-    int index = 0;
-    while (ms >= 10 && index < histogram.length) {
-      ms /= 10;
-      index++;
-    }
-    histogram[index]++;
-
-    avg = total != 0 ? totalMS / total : null;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesList.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesList.java
deleted file mode 100644
index af9db3b..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecentTracesList.java
+++ /dev/null
@@ -1,33 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RecentTracesList {
-
-  public List<RecentTracesInformation> recentTraces;
-
-  public RecentTracesList() {
-    recentTraces = new ArrayList<>();
-  }
-
-  public void addTrace(RecentTracesInformation trace) {
-    recentTraces.add(trace);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecoveryStatusInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecoveryStatusInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecoveryStatusInformation.java
deleted file mode 100644
index 70ff26e..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/RecoveryStatusInformation.java
+++ /dev/null
@@ -1,40 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import org.apache.accumulo.core.master.thrift.RecoveryStatus;
-
-public class RecoveryStatusInformation {
-
-  public String name;
-  public Integer runtime;
-  public Double progress;
-
-  public RecoveryStatusInformation() {}
-
-  public RecoveryStatusInformation(String name, Integer runtime, Double progress) {
-    this.name = name;
-    this.runtime = runtime;
-    this.progress = progress;
-  }
-
-  public RecoveryStatusInformation(RecoveryStatus recovery) {
-    this.name = recovery.name;
-    this.runtime = recovery.runtime;
-    this.progress = recovery.progress;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ReplicationInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ReplicationInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ReplicationInformation.java
deleted file mode 100644
index b6d83a0..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ReplicationInformation.java
+++ /dev/null
@@ -1,33 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class ReplicationInformation {
-
-  public String tableName, peerName, remoteIdentifier, replicaSystemType;
-  public long filesNeedingReplication;
-
-  public ReplicationInformation() {}
-
-  public ReplicationInformation(String tableName, String peerName, String remoteIdentifier, String replicaSystemType, long filesNeedingReplication) {
-    this.tableName = tableName;
-    this.peerName = peerName;
-    this.remoteIdentifier = remoteIdentifier;
-    this.replicaSystemType = replicaSystemType;
-    this.filesNeedingReplication = filesNeedingReplication;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ScanInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ScanInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ScanInformation.java
deleted file mode 100644
index b859cbf..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ScanInformation.java
+++ /dev/null
@@ -1,35 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import org.apache.accumulo.core.master.thrift.TabletServerStatus;
-
-public class ScanInformation {
-
-  public String server;
-
-  public long scanCount;
-  public Long oldestScan;
-
-  public ScanInformation() {}
-
-  public ScanInformation(TabletServerStatus tserverInfo, long scanCount, Long oldestScan) {
-    this.server = tserverInfo.getName();
-    this.scanCount = scanCount;
-    this.oldestScan = oldestScan;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/Scans.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/Scans.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/Scans.java
deleted file mode 100644
index 0002cb4..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/Scans.java
+++ /dev/null
@@ -1,33 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Scans {
-
-  public List<ScanInformation> scans;
-
-  public Scans() {
-    scans = new ArrayList<>();
-  }
-
-  public void addScan(ScanInformation scan) {
-    scans.add(scan);
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerShuttingDownInformation.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerShuttingDownInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerShuttingDownInformation.java
deleted file mode 100644
index a4b4652..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerShuttingDownInformation.java
+++ /dev/null
@@ -1,31 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-public class ServerShuttingDownInformation {
-
-  @XmlAttribute
-  public String id;
-
-  public ServerShuttingDownInformation() {}
-
-  public ServerShuttingDownInformation(String id) {
-    this.id = id;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStat.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStat.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStat.java
deleted file mode 100644
index 67dbba8..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStat.java
+++ /dev/null
@@ -1,46 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-public class ServerStat {
-
-  public int max;
-  public boolean adjustMax;
-  public float significance;
-  public String description, name;
-  public boolean derived;
-
-  public ServerStat() {}
-
-  public ServerStat(int max, boolean adjustMax, float significance, String description, String name) {
-    this.max = max;
-    this.adjustMax = adjustMax;
-    this.significance = significance;
-    this.description = description;
-    this.derived = false;
-    this.name = name;
-  }
-
-  public ServerStat(int max, boolean adjustMax, float significance, String description, boolean derived, String name) {
-    this.max = max;
-    this.adjustMax = adjustMax;
-    this.significance = significance;
-    this.description = description;
-    this.derived = derived;
-    this.name = name;
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0ca5cd33/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStats.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStats.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStats.java
deleted file mode 100644
index aeaee54..0000000
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/api/ServerStats.java
+++ /dev/null
@@ -1,33 +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
- *
- *     http://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.
- */
-package org.apache.accumulo.monitor.rest.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ServerStats {
-
-  public List<ServerStat> serverStats;
-
-  public ServerStats() {
-    serverStats = new ArrayList<>();
-  }
-
-  public void addStats(ServerStat stat) {
-    serverStats.add(stat);
-  }
-}


Mime
View raw message