Merge branch 'main' into release-rs-apr

Author: rrelledge

content/operate/rs/databases/import-export/import-data.md

@@ -23,6 +23,8 @@ Importing data erases all existing content in the database.
 
 ## Import data into a database
 
+### Cluster Manager UI method
+
 To import data into a database using the Cluster Manager UI:
 
 1. On the **Databases** screen, select the database from the list, then select **Configuration**.
@@ -33,6 +35,41 @@ To import data into a database using the Cluster Manager UI:
     See [Supported storage locations](#supported-storage-locations) for more information about each storage location type.
 1. Select **Import**.
 
+### REST API method
+
+To import data into a database using the REST API, send an [import database request]({{<relref "/operate/rs/references/rest-api/requests/bdbs/actions/import">}}):
+
+```sh
+POST /v1/bdbs/<database-id>/actions/import
+{
+  "dataset_import_sources": [
+    {
+      "type": "<location-type>",
+      // additional fields, depending on location_type
+    },
+    {
+      "type": "<location-type>",
+      // additional fields, depending on location_type
+    }
+  ]
+}
+```
+
+- Replace `<database-id>` with the destination database's ID.
+
+- Replace the data source's `<location-type>` with the relevant value from the following options:
+
+    | Location type | "type" value |
+    |---------------|--------------|
+    | FTPS | "url" |
+    | SFTP | "sftp" |
+    | Amazon S3 | "s3" |
+    | Google Cloud Storage | "gs" |
+    | Microsoft Azure Storage | "abs" |
+    | NAS/Local Storage | "mount_point" |
+
+See the following storage location sections for REST API request examples for each location type.
+
 ## Supported storage locations {#supported-storage-services}
 
 Data can be imported from a local mount point, transferred to [a URI](https://en.wikipedia.org/wiki/Uniform_Resource_Identifier) using FTP/SFTP, or stored on cloud provider storage.
@@ -70,6 +107,20 @@ Example: `ftp://username:[email protected]/home/backups/<filename>.rdb`
 
 Select **Add path** to add another import file path.
 
+Example [import database REST API request]({{<relref "/operate/rs/references/rest-api/requests/bdbs/actions/import">}}):
+
+```sh
+POST /v1/bdbs/<database-id>/actions/import
+{
+  "dataset_import_sources": [
+    {
+      "type": "url",
+      "url": "ftp://<ftp_user>:<ftp_password>@example.com/<path>/<filename>.rdb.gz"
+    }
+  ]
+}
+```
+
 ### Local mount point
 
 Before importing data from a local mount point, make sure that:
@@ -100,6 +151,20 @@ As of version 6.2.12, Redis Enterprise reads files directly from the mount point
 
 Select **Add path** to add another import file path.
 
+Example [import database REST API request]({{<relref "/operate/rs/references/rest-api/requests/bdbs/actions/import">}}):
+
+```sh
+POST /v1/bdbs/<database-id>/actions/import
+{
+  "dataset_import_sources": [
+    {
+      "type": "mount_point",
+      "path": "/<path>/<filename>.rdb.gz"
+    }
+  ]
+}
+```
+
 ### SFTP server
 
 Before importing data from an SFTP server, make sure that:
@@ -138,6 +203,20 @@ Example: `sftp://username:[email protected]/home/backups/[filename].rdb`
 
 Select **Add path** to add another import file path.
 
+Example [import database REST API request]({{<relref "/operate/rs/references/rest-api/requests/bdbs/actions/import">}}):
+
+```sh
+POST /v1/bdbs/<database-id>/actions/import
+{
+  "dataset_import_sources": [
+    {
+      "type": "sftp",
+      "sftp_url": "sftp://<sftp_user>@example.com/<path>/<filename>.rdb"
+    }
+  ]
+}
+```
+
 ### AWS Simple Storage Service {#aws-s3}
 
 Before you choose to import data from an [Amazon Web Services](https://aws.amazon.com/) (AWS) Simple Storage Service (S3) bucket, make sure you have:
@@ -175,6 +254,24 @@ To connect to an S3-compatible storage location:
 
     Replace `<filepath>` with the location of the S3 CA certificate `ca.pem`.
 
+Example [import database REST API request]({{<relref "/operate/rs/references/rest-api/requests/bdbs/actions/import">}}):
+
+```sh
+POST /v1/bdbs/<database-id>/actions/import
+{
+  "dataset_import_sources": [
+    {
+      "type": "s3",
+      "bucket_name": "backups",
+      "subdir": "test-db",
+      "filename": "<filename>.rdb",
+      "access_key_id": "XXXXXXXXXXXXX",
+      "secret_access_key": "XXXXXXXXXXXXXXXX"
+    }
+  ]
+}
+```
+
 ### Google Cloud Storage
 
 Before you import data from a [Google Cloud](https://developers.google.com/console/) storage bucket, make sure you have:
@@ -198,6 +295,26 @@ In the Redis Enterprise Software Cluster Manager UI, when you enter the import l
 - In the **Private key** field, enter the `private_key` from the service account key.
     Replace `\n` with new lines.
 
+Example [import database REST API request]({{<relref "/operate/rs/references/rest-api/requests/bdbs/actions/import">}}):
+
+```sh
+POST /v1/bdbs/<database-id>/actions/import
+{
+  "dataset_import_sources": [
+    {
+      "type": "gs",
+      "bucket_name": "backups",
+      "client_id": "XXXXXXXX",
+      "client_email": "[email protected]",
+      "subdir": "test-db",
+      "filename": "<filename>.rdb",
+      "private_key_id": "XXXXXXXXXXXXX",
+      "private_key": "XXXXXXXXXXXXXXXX"
+    }
+  ]
+}
+```
+
 ### Azure Blob Storage
 
 Before you choose to import from Azure Blob Storage, make sure that you have:
@@ -220,6 +337,24 @@ In the Redis Enterprise Software Cluster Manager UI, when you enter the import l
 
 - In the **Azure Account Key** field, enter the storage account key.
 
+Example [import database REST API request]({{<relref "/operate/rs/references/rest-api/requests/bdbs/actions/import">}}):
+
+```sh
+POST /v1/bdbs/<database-id>/actions/import
+{
+  "dataset_import_sources": [
+    {
+      "type": "abs",
+      "container": "backups",
+      "subdir": "test-db",
+      "filename": "<filename>.rdb",
+      "account_name": "name",
+      "account_key": "XXXXXXXXXXXXXXXX" // Or you can use "sas_token": "XXXXXXXXXXXXXXXXXX" instead
+    }
+  ]
+}
+```
+
 ## Importing into an Active-Active database
 
 When importing data into an Active-Active database, there are two options:

content/operate/rs/installing-upgrading/install/customize-user-and-group.md

@@ -10,22 +10,26 @@ linkTitle: Customize user and group
 weight: 40
 ---
 
-By default, Redis Enterprise Software is installed with the user:group `redislabs:redislabs`. See [Access control]({{< relref "/operate/rs/security/access-control" >}}) for user and group security information.
+By default, Redis Enterprise Software is installed with the user:group `redislabs:redislabs`.
 
 During installation, you can specify the user and group that own all Redis Enterprise Software processes.
 
-If you specify the user only, then installation is run with the primary group that the user belongs to.
+## Considerations
 
-{{< note >}}
 - Custom installation user is supported on Red Hat Enterprise Linux.
-- When you install with custom directories, the installation does not run as an RPM file.
-- You must create the user and group before attempting to install Redis Software.
+
+- You must create the user and group before installing Redis Enterprise Software.
+
+- You must install Redis Enterprise Software on all nodes in the cluster with the same user and group.
+
 - You can specify an LDAP user as the installation user.
-{{< /note >}}
 
-To customize the user or group during [installation]({{< relref "/operate/rs/installing-upgrading/install/install-on-linux" >}}), include the `--os-user` or `--os-group` [command-line options]({{< relref "/operate/rs/installing-upgrading/install/install-script" >}}) when you run the `install.sh` script. For example:
+- If you specify the user only, then installation is run with the primary group that the user belongs to.
+
+## Install with custom user or group
+
+To customize the user or group during [installation]({{< relref "/operate/rs/installing-upgrading/install/install-on-linux" >}}), include the `--os-user` or `--os-group` [command-line options]({{< relref "/operate/rs/installing-upgrading/install/install-script" >}}) when you run the `install.sh` script.
 
 ```sh
 sudo ./install.sh --os-user <user> --os-group <group>
 ```
-

content/operate/rs/references/rest-api/requests/users/authorize.md

@@ -13,13 +13,13 @@ weight: $weight
 
 | Method | Path | Description |
 |--------|------|-------------|
-| [POST](#post-authorize) | `/v1/users/authorize` | Authorize a user |
+| [POST](#post-authorize) | `/v1/users/authorize` | Generate a token to authorize an authenticated user |
 
 ## Authorize user {#post-authorize}
 
     POST /v1/users/authorize
 
-Generate a JSON Web Token (JWT) for a user to use as authorization to access the REST API.
+Generates a JSON Web Token (JWT) for a user to use as authorization to access the REST API. The request authentication header must include the relevant username and password.
 
 ### Request {#post-request}
 
@@ -29,12 +29,13 @@ Generate a JSON Web Token (JWT) for a user to use as authorization to access the
 
 #### Example JSON body
 
-  ```json
-  {
-      "username": "[email protected]",
-      "password": "my_password"
-  }
-  ```
+The request body is optional unless you want to specify the token's time to live:
+
+```json
+{
+  "ttl": <time_in_seconds>
+}
+```
 
 #### Request headers
 | Key    | Value            | Description         |
@@ -44,19 +45,19 @@ Generate a JSON Web Token (JWT) for a user to use as authorization to access the
 
 #### Request body
 
-Include a [JWT authorize object]({{< relref "/operate/rs/references/rest-api/objects/jwt_authorize" >}}) with a valid username and password in the request body.
+Optionally include a JSON object in the request body to specify the time to live (`ttl`), which determines the amount of time in seconds the token will be valid. The default `ttl` is `300` seconds. The minimum `ttl` is `1` second and the maximum `ttl` is `86400` seconds.
 
 ### Response {#post-response}
 
 Returns a JSON object that contains the generated access token.
 
 #### Example JSON body
 
-  ```json
-  {
-      "access_token": "eyJ5bGciOiKIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXViOjE0NjU0NzU0ODYsInVpZFI1IjEiLCJleHAiOjE0NjU0Nz30OTZ9.2xYXumd1rDoE0edFzcLElMOHsshaqQk2HUNgdsUKxMU"
-  }
-  ```
+```json
+{
+  "access_token": "eyJ5bGciOiKIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXViOjE0NjU0..."
+}
+```
 
 ### Error codes {#post-error-codes}
 
@@ -72,6 +73,6 @@ The following are possible `error_code` values:
 
 | Code | Description |
 |------|-------------|
-| [200 OK](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.2.1) | The user is authorized. |
-| [400 Bad Request](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.1) | The request could not be understood by the server due to malformed syntax. |
-| [401 Unauthorized](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.2) | The user is unauthorized. |
+| [200 OK](https://www.rfc-editor.org/rfc/rfc9110.html#name-200-ok) | The user is authorized. |
+| [400 Bad Request](https://www.rfc-editor.org/rfc/rfc9110.html#name-400-bad-request) | The request could not be understood by the server due to malformed syntax. |
+| [401 Unauthorized](https://www.rfc-editor.org/rfc/rfc9110.html#name-401-unauthorized) | The user is unauthorized. |