This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ae603b67dac180ceb9084c4f088a8cea6fea3550
Merge: cfb4563cf6 fa3de844d1
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Nov 20 21:09:29 2024 +0000
Merge branch '2.1' into 3.1
.../src/main/java/org/apache/accumulo/core/conf/Property.java | 10 +---------
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 11 -----------
.../accumulo/monitor/rest/tservers/TabletServerResource.java | 3 +--
3 files changed, 2 insertions(+), 22 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index a0d5399240,0fa037366c..32d08169bc
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -878,14 -994,41 +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"),
- @Deprecated(since = "2.1.0")
- TRACE_PREFIX("trace.", null, PropertyType.PREFIX,
- "Properties in this category affect the behavior of distributed
tracing.", "1.3.5"),
- @Deprecated(since = "2.1.0")
- TRACE_SPAN_RECEIVERS("trace.span.receivers",
"org.apache.accumulo.tracer.ZooTraceClient",
- PropertyType.CLASSNAMELIST, "A list of span receiver classes to send
trace spans.", "1.7.0"),
- @Deprecated(since = "2.1.0")
- TRACE_SPAN_RECEIVER_PREFIX("trace.span.receiver.", null,
PropertyType.PREFIX,
- "Prefix for span receiver configuration properties.", "1.7.0"),
- @Deprecated(since = "2.1.0")
- TRACE_ZK_PATH("trace.zookeeper.path", Constants.ZTRACERS,
PropertyType.STRING,
- "The zookeeper node where tracers are registered.", "1.7.0"),
- @Deprecated(since = "2.1.0")
- TRACE_PORT("trace.port.client", "12234", PropertyType.PORT,
- "The listening port for the trace server.", "1.3.5"),
- @Deprecated(since = "2.1.0")
- TRACE_TABLE("trace.table", "trace", PropertyType.STRING,
- "The name of the table to store distributed traces.", "1.3.5"),
- @Deprecated(since = "2.1.0")
- TRACE_USER("trace.user", "root", PropertyType.STRING,
- "The name of the user to store distributed traces.", "1.3.5"),
- @Sensitive
- @Deprecated(since = "2.1.0")
- TRACE_PASSWORD("trace.password", "secret", PropertyType.STRING,
- "The password for the user used to store distributed traces.", "1.3.5"),
- @Sensitive
- @Deprecated(since = "2.1.0")
- TRACE_TOKEN_PROPERTY_PREFIX("trace.token.property.", null,
PropertyType.PREFIX,
- "The prefix used to create a token for storing distributed traces. For"
- + " each property required by trace.token.type, place this prefix
in front of it.",
- "1.5.0"),
- @Deprecated(since = "2.1.0")
- TRACE_TOKEN_TYPE("trace.token.type", PasswordToken.class.getName(),
PropertyType.CLASSNAME,
- "An AuthenticationToken type supported by the authorizer.", "1.5.0"),
-
// per table properties
TABLE_PREFIX("table.", null, PropertyType.PREFIX,
"Properties in this category affect tablet server treatment of tablets,"
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 0c1b780bbc,80dd69b8cd..f25aa8f545
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -115,23 -115,16 +115,16 @@@ public class Monitor extends AbstractSe
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 ServerOpts(), args)) {
+ try (Monitor monitor = new Monitor(new ConfigOpts(), args)) {
monitor.runServer();
}
}
- Monitor(ServerOpts opts, String[] args) {
+ 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);
