Merge branch '2.1' into 3.1

Author: dlmarion

core/src/main/java/org/apache/accumulo/core/conf/Property.java

@@ -878,14 +878,6 @@ public enum Property {
           + " The resources that are used by default can be seen in"
           + " `accumulo/server/monitor/src/main/resources/templates/default.ftl`.",
       "2.0.0"),
-  MONITOR_OBFUSCATE_EXTENTS("monitor.extents.obfuscate", "true", PropertyType.BOOLEAN,
-      "Obfuscates the table extent information displayed in the Monitor if true. Setting"
-          + " this to false will expose data in the row of the keys where tablets split. It"
-          + " is not recommended to set this to false if the Monitor is exposed to entities"
-          + " that should not see this information. The Monitor process reads this property"
-          + " from the accumulo.properties file only, not ZooKeeper, so it cannot be"
-          + " changed at runtime.",
-      "2.1.4"),
   // per table properties
   TABLE_PREFIX("table.", null, PropertyType.PREFIX,
       "Properties in this category affect tablet server treatment of tablets,"
@@ -1555,7 +1547,7 @@ public static boolean isValidTablePropertyKey(String key) {
 
       // others
       TSERV_NATIVEMAP_ENABLED, TSERV_SCAN_MAX_OPENFILES, MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME,
-      TSERV_SESSION_MAXIDLE, TSERV_UPDATE_SESSION_MAXIDLE, MONITOR_OBFUSCATE_EXTENTS);
+      TSERV_SESSION_MAXIDLE, TSERV_UPDATE_SESSION_MAXIDLE);
 
   /**
    * Checks if the given property may be changed via Zookeeper, but not recognized until the restart

server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java

@@ -115,7 +115,6 @@ public class Monitor extends AbstractServer implements HighlyAvailableService {
   private static final int REFRESH_TIME = 5;
 
   private final long START_TIME;
-  private final boolean obfuscateExtents;
 
   public static void main(String[] args) throws Exception {
     try (Monitor monitor = new Monitor(new ConfigOpts(), args)) {
@@ -126,12 +125,6 @@ public static void main(String[] args) throws Exception {
   Monitor(ConfigOpts opts, String[] args) {
     super("monitor", opts, args);
     START_TIME = System.currentTimeMillis();
-    // Using site configuration on purpose. We want to get the value from
-    // accumulo.properties file local to the Monitor. We don't want to
-    // enable someone to change this property dynamically and expose
-    // information.
-    obfuscateExtents =
-        getContext().getSiteConfiguration().getBoolean(Property.MONITOR_OBFUSCATE_EXTENTS);
   }
 
   private final AtomicLong lastRecalc = new AtomicLong(0L);
@@ -1056,8 +1049,4 @@ public Optional<HostAndPort> getCoordinatorHost() {
   public int getLivePort() {
     return livePort;
   }
-
-  public boolean isObfuscateExtents() {
-    return obfuscateExtents;
-  }
 }

server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java

@@ -320,8 +320,7 @@ private List<CurrentOperations> doCurrentOperations(List<TabletStats> tsStats) t
 
       KeyExtent extent = KeyExtent.fromThrift(info.extent);
       TableId tableId = extent.tableId();
-      String displayExtent = String.format("[%s]",
-          monitor.isObfuscateExtents() ? extent.obscured() : extent.endRow().toString());
+      String displayExtent = String.format("[%s]", extent.obscured());
 
       String tableName = monitor.getContext().getPrintableTableInfoFromId(tableId);