Merge changes from release/7.0 into dev-reorg

modules/ROOT/nav.adoc

@@ -569,6 +569,7 @@ include::cli:partial$cbcli/nav.adoc[]
   *** xref:cli:cbstats/cbstats-vkey.adoc[vkey]
   *** xref:cli:cbstats/cbstats-warmup.adoc[warmup]
   *** xref:cli:cbstats/cbstats-workload.adoc[workload]
+ ** xref:cli:cbsummary.adoc[cbsummary]
  ** xref:cli:cbtools/cbtransfer.adoc[cbtransfer]
  ** xref:cli:cbtools/cbworkloadgen.adoc[cbworkloadgen]
  ** xref:cli:couchbase-server.adoc[couchbase-server]
@@ -590,7 +591,7 @@ include::cli:partial$cbcli/nav.adoc[]
     ***** xref:rest-api:rest-get-rebalance-retry.adoc[Getting Rebalance-Retry Status]
     ***** xref:rest-api:rest-cancel-rebalance-retry.adoc[Canceling Rebalance Retries]
     ***** xref:rest-api:rest-limit-rebalance-moves.adoc[Limiting Concurrent vBucket Moves]
-   **** xref:rest-api:rest-get-internal-setting.adoc[Viewing Internal Settings]
+   **** xref:rest-api:rest-get-internal-setting.adoc[Managing Internal Settings]
    **** xref:rest-api:rest-manage-cluster-connections.adoc[Managing Cluster Connections]
    **** xref:rest-api:rest-get-cluster-tasks.adoc[Getting Cluster Tasks]
    **** xref:rest-api:rest-statistics.adoc[Getting Cluster Statistics]
@@ -718,7 +719,6 @@ include::cli:partial$cbcli/nav.adoc[]
    **** xref:rest-api:rest-authorization.adoc[Authorization API]
     ***** xref:rest-api:rbac.adoc[Role-Based Access Control (RBAC)]
    **** xref:rest-api:rest-setting-security.adoc[Configure On-the-Wire Security]
-   **** xref:rest-api:rest-setting-security.adoc[Manage Encryption Settings]
    **** xref:rest-api:rest-secret-mgmt.adoc[Secret Management API]
 * xref:xdcr-reference:xdcr-reference-intro.adoc[XDCR Reference]
  ** xref:xdcr-reference:xdcr-advanced-settings.adoc[Advanced Settings]

modules/audit-event-reference/pages/audit-event-reference.adoc

@@ -105,6 +105,9 @@ The following events are generated by Couchbase Server in response to calls made
 | REST API | create collection | 8261 | Collection was created | N | Data
 | REST API | drop collection | 8262 | Collection was dropped | N | Data
 | REST API | set manifest | 8263 | Setting bucket manifest | N | Data
+| REST API | authentication failure | 8264 | REST operation failed due to authentication failure | N | Admin
+| REST API | RBAC information retrieved | 8265 | RBAC information was retrieved | Y | Admin
+| REST API | Admin password reset | 8266 | Admin password was reset | N | Admin
 |===
 
 [#data-service-event-list-table]
@@ -176,7 +179,25 @@ The following events are generated by the Query and Index Services, in response
 | Query and Index Services | DROP FUNCTION statement | 28707 | A N1QL DROP FUNCTION statement was executed | Y | Admin
 | Query and Index Services | EXECUTE FUNCTION statement | 28708 | A N1QL EXECUTE FUNCTION statement was executed | Y | Admin
 | Query and Index Services | /admin/tasks API request | 28709 | An HTTP request was made to the API at /admin/tasks. | Y | Admin
-| Query and Index Services | /admin/indexes/tasks API request | 287010 | An HTTP request was made to the API at /admin/indexes/tasks. | Y | Admin
+| Query and Index Services | /admin/indexes/tasks API request | 28710 | An HTTP request was made to the API at /admin/indexes/tasks. | Y | Admin
+| Query and Index Services | /admin/dictionary_cache API request | 28711 | An HTTP request was made to the API at /admin/dictionary_cache | Y | Admin
+| Query and Index Services | /admin/indexes/dictionary_cache API request | 28712 | An HTTP request was made to the API at /admin/indexes/dictionary_cache | Y | Admin
+| Query and Index Services | CREATE SCOPE statement | 28713 | A N1QL CREATE SCOPE statement was executed | Y | Admin
+| Query and Index Services | DROP SCOPE statement | 28714 | A N1QL DROP SCOPE statement was executed | Y | Admin
+| Query and Index Services | CREATE COLLECTION statement | 28715 | A N1QL CREATE COLLECTION statement was executed | Y | Admin
+| Query and Index Services | DROP COLLECTION statement | 28716 | A N1QL DROP COLLECTION statement was executed | Y | Admin
+| Query and Index Services | FLUSH COLLECTION statement | 28717 | A N1QL FLUSH COLLECTION statement was executed | Y | Admin
+| Query and Index Services | UPDATE STATISTICS statement | 28718 | A N1QL UPDATE STATISTICS statement was executed | Y | Admin
+| Query and Index Services | ADVISE statement | 28719 | A N1QL ADVISE statement was executed | Y | Admin
+| Query and Index Services | START TRANSACTION statement | 28720 | A N1QL START TRANSACTION statement was executed | Y | Admin
+| Query and Index Services | COMMIT TRANSACTION statement | 28721 | A N1QL COMMIT TRANSACTION statement was executed | Y | Admin
+| Query and Index Services | ROLLBACK TRANSACTION statement | 28722 | A N1QL ROLLBACK TRANSACTION statement was executed | Y | Admin
+| Query and Index Services | ROLLBACK TRANSACTION TO SAVEPOINT statement | 28723 | A N1QL ROLLBACK TRANSACTION TO SAVEPOINT statement was executed | Y | Admin
+| Query and Index Services | SET TRANSACTION ISOLATION statement | 28724 | A N1QL SET TRANSACTION ISOLATION statement was executed | Y | Admin
+| Query and Index Services | SAVEPOINT statement | 28725 | A N1QL SAVEPOINT statement was executed | Y | Admin
+| Query and Index Services | /admin/transactions API request | 28726 | An HTTP request was made to the API at /admin/transactions. | Y | Admin
+| Query and Index Services | /admin/indexes/transactions API request | 28727 | An HTTP request was made to the API at /admin/indexes/transactions. | Y | Admin
+| Query and Index Services | N1QL backup / restore API request | 28728 | An HTTP request was made to archive or restore N1QL metadata | Y | Admin
 |===
 
 [#search-service-event-list-table]
@@ -195,6 +216,7 @@ The following events are generated by the Search Service, in response to index a
 | Search Service | GC run | 24582 | GC run was triggered | N | Admin
 | Search Service | CPU profile | 24583 | CPU profiling was started | N | Admin
 | Search Service | Memory profile | 24584 | Memory profiling was started | N | Admin
+| Search Service | Access denied | 24585 | User has been denied access due to invalid permissions/credentials | N | Admin
 |===
 
 [#eventing-service-event-list-table]
@@ -224,6 +246,8 @@ The following events are generated by the Eventing Service, in response to the d
 | Eventing Service | Import Functions | 32784 | Import a list of functions | Y | Admin
 | Eventing Service | Export Functions | 32785 | Export the list of functions | Y | Admin
 | Eventing Service | List Running | 32786 | Eventing running function list was read | Y | Admin
+| Eventing Service | Authentication Failure | 32787 | Authentication failed | Y | Admin
+| Eventing Service | Authorization Failure | 32788 | Authorization failed | Y | Admin
 |===
 
 [#analytics-service-event-list-table]
@@ -273,6 +297,7 @@ The following events are generated by the Analytics Service, in response to conf
 | Backup Service | Examine repository | 45071 | A document was retrieved from the repository backups  | Y | Admin
 | Backup Service | Delete repository | 45072 | A repository was deleted | Y | Admin
 | Backup Service | Delete backup | 45073 | An active repository backup was deleted | Y | Admin
+| Backup Service | Access denied | 45074 | A user has been denied access to the REST API due to invalid permissions or credentials | Y | Admin
 |===
 
 [#view-engine-event-list-table]

modules/cli/pages/cbsummary.adoc

@@ -0,0 +1,60 @@
+= cbsummary
+:description: pass:q[The `cbsummary` tool connects to a set of Couchbase clusters, and generates a summary report.]
+:page-topic-type: reference
+
+[abstract]
+{description}
+
+== Description
+
+The `cbsummary` tool connects to a set of Couchbase clusters specified in a configuration file and generates a summary report.
+
+The config file contains JSON specifying an array of information on each cluster, giving the Couchbase credentials to login, and one or more IP addresses for cluster nodes.
+
+The default report format includes RAM and core utilization across each specified cluster, since that information is useful in determining compliance with Couchbase licenses.
+If you specify `--csv`, then the report is generated in CSV instead of JSON.
+If, instead, you specify `--full`, then a much more detailed report is generated.
+
+The summary report is sent to the file `cbsummary.out.<timestamp>`, unless a different filename is specified with the `--output` option.
+
+== Syntax
+
+The syntax for `cbsummary` is as follows:
+
+----
+cbsummary --config=<config file> [--output=<output file>] [--full]
+----
+
+== Options
+
+Command options are as follows:
+
+[cols="3,3"]
+|===
+| Option | Description
+
+| `--config [config file]`
+| Configuration file listing clusters and credentials to connect and generate a summary.
+
+| `--csv`
+| Generate the report in CSV format.
+Note that this format is not compatible with full reports.
+
+| `--full`
+| Generate an extensive report instead of just core and RAM usage.
+
+| `-h --help`
+| Print a help message and exit.
+
+| `--output [output file]`
+| Name of the output file. The default naming convention for the report is `cbsummary.out.<timestamp>`.
+|===
+
+== Examples
+
+An example config file giving information about 2 clusters is:
+
+  { "clusters": [
+    {"login": "Administrator", "pass": "password1", "nodes": ["http://192.168.1.1:8091"]},
+    {"login": "Administrator", "pass": "password2", "nodes": ["http://192.166.1.1:8091","http://192.16.1.2:8091"]}
+  ]}