From 3d5e272453611f37d570076460b2406b4b76cffc Mon Sep 17 00:00:00 2001 From: Randeep Singh Date: Thu, 14 Dec 2023 11:28:30 -0500 Subject: [PATCH 1/4] Fixed broken links This fixes #403 --- _docs-2/administration/in-depth-install.md | 16 ++++++++-------- _docs-2/administration/upgrading.md | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_docs-2/administration/in-depth-install.md b/_docs-2/administration/in-depth-install.md index 81b1f8b1f..28b775dcb 100644 --- a/_docs-2/administration/in-depth-install.md +++ b/_docs-2/administration/in-depth-install.md @@ -103,9 +103,8 @@ manually or run `accumulo-cluster create-config`. Logging is configured in [accumulo-env.sh] to use three log4j configuration files in `conf/`. The file used depends on the Accumulo command or service being run. Logging for most Accumulo services -(i.e. Manager, TabletServer, Garbage Collector) is configured by [log4j-service.properties] except for -the Monitor which is configured by [log4j-monitor.properties]. All Accumulo commands (i.e `init`, -`shell`, etc) are configured by [log4j.properties]. +(i.e. Manager, TabletServer, Garbage Collector) is configured by [log4j2-service.properties]. All Accumulo commands (i.e `init`, +`shell`, etc) are configured by [log4j2.properties]. ### Configure accumulo-env.sh @@ -521,7 +520,7 @@ set by `ACCUMULO_LOG_DIR` in [accumulo-env.sh]. Accumulo logs many user-initiated actions, and whether they succeeded or failed, to an slf4j logger named `org.apache.accumulo.audit`. This logger can be configured in the user's logging framework -(such as log4j or logback). In the tarball, the configuration file `conf/log4j-service.properties` +(such as log4j or logback). In the tarball, the configuration file `conf/log4j2-service.properties` demonstrates basic audit logging with example configuration options for log4j. ## Recovery @@ -753,6 +752,7 @@ Please check the release notes for your Accumulo version or use the [monitor.port.log4j]: {% purl monitor.port.log4j %} [monitor.port.client]: {% purl monitor.port.client %} [tserver.port.client]: {% purl tserver.port.client %} +[sserver.port.client]: {% purl sserver.port.client %} [gc.port.client]: {% purl gc.port.client %} [manager.port.client]: {% purl manager.port.client %} [trace.port.client]: {% purl trace.port.client %} @@ -775,9 +775,9 @@ Please check the release notes for your Accumulo version or use the [accumulo-client.properties]: {% durl configuration/files#accumulo-clientproperties %} [gc]: {% durl configuration/files#gc %} [monitor-host]: {% durl configuration/files#monitor %} -[manager]: {% durl configuration/files#managers %} -[tserver]: {% durl configuration/files#tservers %} +[manager]: {% durl configuration/files#manager %} +[tserver]: {% durl configuration/files#tserver %} [tracers]: {% durl configuration/files#tracers %} -[log4j-service.properties]: {% durl configuration/files#log4j-serviceproperties %} +[log4j2-service.properties]: {% durl configuration/files#log4j2-serviceproperties %} [log4j-monitor.properties]: {% durl configuration/files#log4j-monitorproperties %} -[log4j.properties]: {% durl configuration/files#log4jproperties %} +[log4j2.properties]: {% durl configuration/files#log4j2properties %} diff --git a/_docs-2/administration/upgrading.md b/_docs-2/administration/upgrading.md index 498acea0d..3475ac378 100644 --- a/_docs-2/administration/upgrading.md +++ b/_docs-2/administration/upgrading.md @@ -21,7 +21,7 @@ The basic upgrade sequence is: configure it in your environment - start ZooKeeper and HDFS. - (optional - but recommended) create a ZooKeeper snapshot -- (optional - but recommended) validate the ZooKeeper ACLs. See [ZooKeeper ACLs]({% durl troubleshooting/ZooKeeper#ACLs %}) +- (optional - but recommended) validate the ZooKeeper ACLs. See [ZooKeeper ACLs]({% durl troubleshooting/zookeeper#zookeeper-acls %}) - (required if not using the provided scripts to start 2.1) run the `RenameMasterDirInZK` utility - (optional) run the pre-upgrade utility to convert the configuration in ZooKeeper - start Accumulo 2.1 for the first time to complete the upgrade From 2063f85ed31dc23b7ab539f410e88d374abe4ed5 Mon Sep 17 00:00:00 2001 From: Randeep Singh Date: Mon, 18 Dec 2023 10:49:40 -0500 Subject: [PATCH 2/4] added monitor_port_log4j column in server properties file --- _docs-2/configuration/server-properties.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_docs-2/configuration/server-properties.md b/_docs-2/configuration/server-properties.md index 3ada55a7e..9ffb96f0d 100644 --- a/_docs-2/configuration/server-properties.md +++ b/_docs-2/configuration/server-properties.md @@ -119,6 +119,7 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con | **monitor.*** | **Available since:** 1.3.5
Properties in this category affect the behavior of the monitor web server. | | monitor.lock.check.interval | **Available since:** 1.5.1
The amount of time to sleep between checking for the Monitor ZooKeeper lock
**type:** TIMEDURATION, **zk mutable:** no, **default value:** `5s` | | monitor.port.client | **Available since:** 1.3.5
The listening port for the monitor's http service
**type:** PORT, **zk mutable:** no, **default value:** `9995` | +| monitor.port.log4j | **Available since:** 1.3.5
The listening port for the monitor's http service
**type:** PORT, **zk mutable:** no, **default value:** `9995` | | monitor.resources.external | **Available since:** 2.0.0
A JSON Map of Strings. Each String should be an HTML tag of an external resource (JS or CSS) to be imported by the Monitor. Be sure to wrap with CDATA tags. If this value is set, all of the external resources in the `` tag of the Monitor will be replaced with the tags set here. Be sure the jquery tag is first since other scripts will depend on it. The resources that are used by default can be seen in accumulo/server/monitor/src/main/resources/templates/default.ftl
**type:** STRING, **zk mutable:** no, **default value:** empty | | monitor.ssl.exclude.ciphers | **Available since:** 1.6.1
A comma-separated list of disallowed SSL Ciphers, see monitor.ssl.include.ciphers to allow ciphers
**type:** STRING, **zk mutable:** no, **default value:** empty | | monitor.ssl.include.ciphers | **Available since:** 1.6.1
A comma-separated list of allows SSL Ciphers, see monitor.ssl.exclude.ciphers to disallow ciphers
**type:** STRING, **zk mutable:** no, **default value:** empty | From 40240f84e2b8b8b2086eb30f899c4339f3a83c99 Mon Sep 17 00:00:00 2001 From: rsingh433 <74160026+rsingh433@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:11:59 -0500 Subject: [PATCH 3/4] Update _docs-2/configuration/server-properties.md Co-authored-by: Dom G. --- _docs-2/configuration/server-properties.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs-2/configuration/server-properties.md b/_docs-2/configuration/server-properties.md index 9ffb96f0d..467dde23d 100644 --- a/_docs-2/configuration/server-properties.md +++ b/_docs-2/configuration/server-properties.md @@ -119,7 +119,7 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con | **monitor.*** | **Available since:** 1.3.5
Properties in this category affect the behavior of the monitor web server. | | monitor.lock.check.interval | **Available since:** 1.5.1
The amount of time to sleep between checking for the Monitor ZooKeeper lock
**type:** TIMEDURATION, **zk mutable:** no, **default value:** `5s` | | monitor.port.client | **Available since:** 1.3.5
The listening port for the monitor's http service
**type:** PORT, **zk mutable:** no, **default value:** `9995` | -| monitor.port.log4j | **Available since:** 1.3.5
The listening port for the monitor's http service
**type:** PORT, **zk mutable:** no, **default value:** `9995` | +| monitor.port.log4j | **Available since:** 1.3.5
The listening port for the monitor's http service
**type:** PORT, **zk mutable:** no, **default value:** `9995` | | monitor.resources.external | **Available since:** 2.0.0
A JSON Map of Strings. Each String should be an HTML tag of an external resource (JS or CSS) to be imported by the Monitor. Be sure to wrap with CDATA tags. If this value is set, all of the external resources in the `` tag of the Monitor will be replaced with the tags set here. Be sure the jquery tag is first since other scripts will depend on it. The resources that are used by default can be seen in accumulo/server/monitor/src/main/resources/templates/default.ftl
**type:** STRING, **zk mutable:** no, **default value:** empty | | monitor.ssl.exclude.ciphers | **Available since:** 1.6.1
A comma-separated list of disallowed SSL Ciphers, see monitor.ssl.include.ciphers to allow ciphers
**type:** STRING, **zk mutable:** no, **default value:** empty | | monitor.ssl.include.ciphers | **Available since:** 1.6.1
A comma-separated list of allows SSL Ciphers, see monitor.ssl.exclude.ciphers to disallow ciphers
**type:** STRING, **zk mutable:** no, **default value:** empty | From ad25607d5bb4e326adec48e48208c5f2d6c8c6c5 Mon Sep 17 00:00:00 2001 From: Randeep Singh Date: Tue, 19 Dec 2023 10:03:10 -0500 Subject: [PATCH 4/4] Removed irrelevant monitor_port_log4j from in-depth-install and server-properties file --- _docs-2/administration/in-depth-install.md | 2 -- _docs-2/configuration/server-properties.md | 1 - 2 files changed, 3 deletions(-) diff --git a/_docs-2/administration/in-depth-install.md b/_docs-2/administration/in-depth-install.md index 28b775dcb..de0e6c46d 100644 --- a/_docs-2/administration/in-depth-install.md +++ b/_docs-2/administration/in-depth-install.md @@ -37,7 +37,6 @@ their value in [accumulo.properties]. |Port | Description | Property Name |-----|-------------|-------------- |4445 | Shutdown Port (Accumulo MiniCluster) | n/a -|4560 | Accumulo monitor (for centralized log display) | [monitor.port.log4j] |9132 | Accumulo Compaction Coordinator | [compaction.coordinator.port.client] |9133 | Accumulo Compactor | [compactor.port.client] |9995 | Accumulo HTTP monitor | [monitor.port.client] @@ -749,7 +748,6 @@ Please check the release notes for your Accumulo version or use the [instance.volumes.replacements]: {% purl instance.volumes.replacements %} [instance.zookeeper.host]: {% purl instance.zookeeper.host %} [instance.secret]: {% purl instance.secret %} -[monitor.port.log4j]: {% purl monitor.port.log4j %} [monitor.port.client]: {% purl monitor.port.client %} [tserver.port.client]: {% purl tserver.port.client %} [sserver.port.client]: {% purl sserver.port.client %} diff --git a/_docs-2/configuration/server-properties.md b/_docs-2/configuration/server-properties.md index 467dde23d..3ada55a7e 100644 --- a/_docs-2/configuration/server-properties.md +++ b/_docs-2/configuration/server-properties.md @@ -119,7 +119,6 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con | **monitor.*** | **Available since:** 1.3.5
Properties in this category affect the behavior of the monitor web server. | | monitor.lock.check.interval | **Available since:** 1.5.1
The amount of time to sleep between checking for the Monitor ZooKeeper lock
**type:** TIMEDURATION, **zk mutable:** no, **default value:** `5s` | | monitor.port.client | **Available since:** 1.3.5
The listening port for the monitor's http service
**type:** PORT, **zk mutable:** no, **default value:** `9995` | -| monitor.port.log4j | **Available since:** 1.3.5
The listening port for the monitor's http service
**type:** PORT, **zk mutable:** no, **default value:** `9995` | | monitor.resources.external | **Available since:** 2.0.0
A JSON Map of Strings. Each String should be an HTML tag of an external resource (JS or CSS) to be imported by the Monitor. Be sure to wrap with CDATA tags. If this value is set, all of the external resources in the `` tag of the Monitor will be replaced with the tags set here. Be sure the jquery tag is first since other scripts will depend on it. The resources that are used by default can be seen in accumulo/server/monitor/src/main/resources/templates/default.ftl
**type:** STRING, **zk mutable:** no, **default value:** empty | | monitor.ssl.exclude.ciphers | **Available since:** 1.6.1
A comma-separated list of disallowed SSL Ciphers, see monitor.ssl.include.ciphers to allow ciphers
**type:** STRING, **zk mutable:** no, **default value:** empty | | monitor.ssl.include.ciphers | **Available since:** 1.6.1
A comma-separated list of allows SSL Ciphers, see monitor.ssl.exclude.ciphers to disallow ciphers
**type:** STRING, **zk mutable:** no, **default value:** empty |