From 4b4aa1c08de65689c8b109d9669e714d4a2a8028 Mon Sep 17 00:00:00 2001 From: avivfisher Date: Thu, 6 Jun 2024 17:47:07 +0300 Subject: [PATCH 1/4] Add s3_ca_cert documentation (#293) * Add s3_ca_cert documentation * Add s3_ca_cert to command syntax --------- Co-authored-by: Rachel Elledge <86307637+rrelledge@users.noreply.github.com> --- .../rs/references/cli-utilities/rladmin/cluster/config.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/operate/rs/references/cli-utilities/rladmin/cluster/config.md b/content/operate/rs/references/cli-utilities/rladmin/cluster/config.md index 0e58c35242..2f8a8b2eb1 100644 --- a/content/operate/rs/references/cli-utilities/rladmin/cluster/config.md +++ b/content/operate/rs/references/cli-utilities/rladmin/cluster/config.md @@ -43,6 +43,7 @@ Updates the cluster configuration. [ min_sentinel_TLS_version { 1.2 | 1.3 } ] [ reserved_ports ] [ s3_url ] + [ s3_ca_cert ] [ saslauthd_ldap_conf ] [ sentinel_tls_mode { allowed | required | disabled } ] [ sentinel_cipher_suites ] @@ -81,6 +82,7 @@ Updates the cluster configuration. | min_sentinel_TLS_version | `1.2`
`1.3` | The minimum TLS protocol version that is supported for the discovery service | | reserved_ports | list of ports/port ranges | List of reserved ports and/or port ranges to avoid using for database endpoints (for example `reserved_ports 11000 13000-13010`) | | s3_url | string | The URL of S3 export and import | +| s3_ca_cert | string | The CA certificate filepath for S3 export and import | | saslauthd_ldap_conf | filepath | Updates LDAP authentication configuration for the cluster | | sentinel_cipher_suites | list of ciphers | Cipher suites used by the discovery service (supported ciphers are implemented by the [cipher_suites.go]() package) | | sentinel_tls_mode | `allowed`
`required`
`disabled` | Define the SSL policy for the discovery service
(previously named `sentinel_ssl_policy`) | From f487b8a8cdb05848050e05f0ce8be40df2baeae0 Mon Sep 17 00:00:00 2001 From: Andy Stark Date: Thu, 6 Jun 2024 15:52:33 +0100 Subject: [PATCH 2/4] Fix to quickstart install instructions --- .../ingest/quick-start-guide.md | 60 +------------------ 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/content/integrate/redis-data-integration/ingest/quick-start-guide.md b/content/integrate/redis-data-integration/ingest/quick-start-guide.md index 252ad04c02..26f9cc47b5 100644 --- a/content/integrate/redis-data-integration/ingest/quick-start-guide.md +++ b/content/integrate/redis-data-integration/ingest/quick-start-guide.md @@ -41,64 +41,8 @@ and is already set up for the RDI collector to use. ### Install RDI -Follow the steps below to install RDI: - -1. Open a shell terminal. -1. Set the `RDI_VERSION` environment variable using the following command: - - ```bash - export RDI_VERSION= - ``` -3. Download the RDI CLI tool for your OS. The example command lines below show to how to - do this with the [`curl`](https://curl.se/) tool: - - Ubuntu 20.04 - - ``` bash - sudo curl https://qa-onprem.s3.amazonaws.com/redis-di/$RDI_VERSION/bin/ubuntu-20.04/redis-di -o /usr/local/bin/redis-di - ``` - - - Ubuntu 18.04 - - ``` bash - sudo curl https://qa-onprem.s3.amazonaws.com/redis-di/$RDI_VERSION/bin/ubuntu-18.04/redis-di -o /usr/local/bin/redis-di - ``` - - - RHEL 8 - - ``` bash - sudo curl https://qa-onprem.s3.amazonaws.com/redis-di/$RDI_VERSION/bin/rhel-8.9/redis-di -o /usr/local/bin/redis-di - ``` - - - RHEL 7 - - ``` bash - sudo curl https://qa-onprem.s3.amazonaws.com/redis-di/$RDI_VERSION/bin/rhel-7.9/redis-di -o /usr/local/bin/redis-di - ``` - - {{}}If you are not a root user, you should download RDI to a folder - where you have write permissions and run - [`redis-di`]({{< relref "/integrate/redis-data-integration/ingest/reference/cli/redis-di" >}}) - directly from that folder in - the following steps. - {{}} - -1. Download and expand the compressed RDI installation file using the following - commands. This will create a subfolder named `rdi/`. - - ``` bash - curl https://qa-onprem.s3.amazonaws.com/redis-di/$RDI_VERSION/rdi-installation-$RDI_VERSION.tar.gz -O - tar -xvf rdi-installation-$RDI_VERSION.tar.gz - ``` - -1. Install RDI with the - [`redis-di`]({{< relref "/integrate/redis-data-integration/ingest/reference/cli/redis-di-install" >}}) - tool, using the commands below: - - ``` bash - sudo chmod +x /usr/local/bin/redis-di - cd rdi_install/$RDI_VERSION - sudo redis-di install - ``` +Install RDI using the instructions in the +[installation guide]({{< relref "/integrate/redis-data-integration/ingest/installation" >}}) During the installation, RDI asks you for the pathname of the folder where you want to store the pipeline templates. You will need this pathname later when you From 754b39bf81746ef56685860757ff1449bdc77d65 Mon Sep 17 00:00:00 2001 From: Andy Stark Date: Thu, 6 Jun 2024 16:00:06 +0100 Subject: [PATCH 3/4] Another small fix --- .../redis-data-integration/ingest/quick-start-guide.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/content/integrate/redis-data-integration/ingest/quick-start-guide.md b/content/integrate/redis-data-integration/ingest/quick-start-guide.md index 26f9cc47b5..c70a201172 100644 --- a/content/integrate/redis-data-integration/ingest/quick-start-guide.md +++ b/content/integrate/redis-data-integration/ingest/quick-start-guide.md @@ -44,10 +44,9 @@ and is already set up for the RDI collector to use. Install RDI using the instructions in the [installation guide]({{< relref "/integrate/redis-data-integration/ingest/installation" >}}) -During the installation, RDI asks you for the pathname of the folder where you -want to store the pipeline templates. You will need this pathname later when you -prepare the pipeline for deployment (see [Prepare the pipeline](#prepare-the-pipeline) -below). +RDI will create the pipeline template for your chosen source database type at +`/opt/rdi/config`. You will need this pathname later when you prepare the pipeline for deployment +(see [Prepare the pipeline](#prepare-the-pipeline) below). At the end of the installation, RDI CLI will prompt you to set the access secrets for both the source PostgreSQL database and the Redis RDI database. RDI needs these to From e61d54bfb6459cca7ff6a7a45f9e0d2df4caa920 Mon Sep 17 00:00:00 2001 From: Andy Stark Date: Thu, 6 Jun 2024 16:06:41 +0100 Subject: [PATCH 4/4] Another fix --- .../redis-data-integration/ingest/quick-start-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/integrate/redis-data-integration/ingest/quick-start-guide.md b/content/integrate/redis-data-integration/ingest/quick-start-guide.md index c70a201172..596234f77e 100644 --- a/content/integrate/redis-data-integration/ingest/quick-start-guide.md +++ b/content/integrate/redis-data-integration/ingest/quick-start-guide.md @@ -58,7 +58,7 @@ replica if you want (this will double the RAM requirements to 250MB). ### Prepare the pipeline -During the installation, RDI asked you for a folder path to place the pipeline templates. +During the installation, RDI placed the pipeline templates at `/opt/rdi/config`. If you go to that folder and run the `ll` command, you will see the pipeline configuration file, `config.yaml`, and the `jobs` folder (see the page about [Pipelines]({{< relref "/integrate/redis-data-integration/ingest/data-pipelines/data-pipelines" >}}) for more information). Use Redis Insight to open