RC: Active-Passive with TLS (#3200)

* Remove TLS note

* Images & migrate dbs  text

* Upgrade fixed to flexible changes

* Changelog

content/rc/changelog/march-2024.md

@@ -13,4 +13,8 @@ aliases: []
 
 ### Fixed subscriptions through Google Cloud Marketplace
 
-You can now use your [Google Cloud Marketplace]({{<relref "/rc/cloud-integrations/gcp-marketplace/">}}) account to pay for your Fixed subscriptions as well as your Flexible subscriptions. 
+You can now use your [Google Cloud Marketplace]({{<relref "/rc/cloud-integrations/gcp-marketplace/">}}) account to pay for your Fixed subscriptions as well as your Flexible subscriptions. 
+
+### Active-Passive with TLS
+
+[Active-Passive]({{<relref "/rc/databases/migrate-databases#sync-using-active-passive">}}) now supports source databases that require connections over TLS. See [Migrate data]({{<relref "/rc/databases/migrate-databases">}}) for more information.

content/rc/databases/migrate-databases.md

@@ -52,48 +52,70 @@ To migrate data using Active-Passive syncing, specify the target database as an
 {{< note >}}
 Before you use Active-Passive, be aware of the following limitations:
 
-- An error will appear when syncing the two databases if the source database has [Transport Layer Security (TLS)]({{< relref  "/rc/security/database-security/tls-ssl" >}}) enabled. [Contact support](https://redis.com/company/support/) if you want to migrate a TLS-enabled database using Active-Passive.
 - An error will appear when syncing the two databases if the source and target databases are hosted on different Redis Cloud accounts. [Contact support](https://redis.com/company/support/) if you want to migrate a database between accounts using Active-Passive.
+
 - As long as Active-Passive is enabled, data in the target database will not expire and will not be evicted regardless of the set [data eviction policy]({{<relref "rc/databases/configuration/data-eviction-policies.md">}}). We recommend that you turn off Active-Passive after the databases are synced. 
 {{< /note >}}
 
 ### Detailed Active-Passive syncing process
 
-If the databases belong to the same Redis Cloud account, follow these detailed steps to migrate data using Active-Passive syncing:
+Follow these detailed steps to migrate data using Active-Passive syncing:
+
+1.  Select **Databases** from the [Redis Cloud console](https://app.redislabs.com/) menu and select the target database in the list.
 
-1.  Select **Databases** from the [Redis Cloud console](https://app.redislabs.com/) menu and select the source database in the list.
+    {{<image filename="images/rc/migrate-database-select-source.png" alt="Select the target database from the database list." >}}{{< /image >}}
 
-    {{<image filename="images/rc/migrate-database-select-source.png" alt="Select the source database from the database list." >}}{{< /image >}}
+4.  From the **Configuration** tab of the target database, select **Edit database**.
 
-2.  Select the **Copy** button next to the **Public endpoint** details for the source database to copy the endpoint details to the Clipboard.
+    {{<image filename="images/rc/migrate-data-target-edit.png" alt="Use the **Edit Database** button to change the configuration of the target database." >}}{{< /image >}}
 
-    {{<image filename="images/rc/database-public-endpoint-copy.png" alt="The Copy button copies the public endpoint details to the Clipboard." >}}{{< /image >}}
+5.  In the **Durability** section, enable **Active-Passive Redis** and then select **Add Source**.
 
-3.  Use the database list drop-down to select the target database.
+    {{<image filename="images/rc/migrate-data-active-passive-enable.png" alt="Active-Passive settings are located in the **Durability** section of the database **Configuration** tab." >}}{{< /image >}}
 
-    {{<image filename="images/rc/migrate-data-select-target-list.png" alt="Use the database list drop-down to select the target database." width="50%">}}{{< /image >}}
+    {{<image filename="images/rc/button-database-uri-add.png" alt="Use the **Add Source** button to specify the source of the Active-Passive replica." width="150px">}}{{< /image >}}
 
-4.  From the **Configuration** tab of the target database, select **Edit database**.
+6. This will open the **Add Active-Passive Redis** screen. Select where the source database is located.
 
-    {{<image filename="images/rc/migrate-data-target-edit.png" alt="Use the **Edit Database** button to change the configuration of the target database." >}}{{< /image >}}
+    {{<image filename="images/rc/migrate-data-add-active-passive.png" alt="The Add Active-Passive Redis screen." >}}{{< /image >}}
 
-5.  In the **Durability** section, enable **Active-Passive Redis** and then select **Add URI**.
+    - Select **Current account** if the source database is located in this Redis Cloud account. 
+
+        Select the source database from the **Source database** list. You can type in the database's name to find it.
 
-    {{<image filename="images/rc/migrate-data-active-passive-enable.png" alt="Active-Passive settings are located in the **Durability** section of the database **Configuration** tab." >}}{{< /image >}}
+        {{<image filename="images/rc/database-add-account-path-list.png" alt="Select the Source database from the database list." >}}{{< /image >}}
+
+    - If the source database is hosted externally, select **External**.
+
+        1.  In the **Enter the source URI** field, type `redis://` and then paste in the public endpoint details. 
+
+            {{<image filename="images/rc/migrate-data-specify-source-uri.png" alt="The source URI must be specified using the 'redis://' protocol." >}}{{< /image >}}
+
+        1. Select if the source database requires Transport Layer Security (TLS).
+
+            - If the source database requires TLS, select **TLS** and enter the public server certificate in the **Server Certificate** field.
+
+            {{<image filename="images/rc/migrate-data-tls-server-cert.png" alt="The Server Certificate field." >}}{{< /image >}}
+
+            - If the source database requires client authentication, select **Mutual TLS**.
+
+                1. Enter the public server certificate in the **Server Certificate** field.
+
+                    {{<image filename="images/rc/migrate-data-tls-server-cert.png" alt="The Server Certificate field." >}}{{< /image >}}
 
-    {{<image filename="images/rc/button-database-uri-add.png" alt="Use the **Add URI** button to specify the source of the Active-Passive replica." >}}{{< /image >}}
+                1. Select **Download** to download the client certificate. 
 
-6.  In the text box, type `redis://` and then paste in the public endpoint details. 
+                    {{<image filename="images/rc/migrate-data-tls-client-cert.png" alt="The Client Certificate field. Select Download to download the client certificate." >}}{{< /image >}}
 
-    {{<image filename="images/rc/migrate-data-specify-source-uri.png" alt="The source URI must be specified using the 'redis://' protocol." >}}{{< /image >}}
+                1. Configure the source database to accept the client certificate.
 
-    Select **Save** to make sure you've specified the source URI correctly.
+7. Select **Save Active-Passive** to save your Active-Passive settings.
 
-    {{<image filename="images/rc/icon-database-save.png" alt="The **Save** button verifies the Source URI and you can't save until it validates." >}}{{< /image >}}
+    {{<image filename="images/rc/icon-database-save-active-passive.png" alt="The **Save** button verifies the Source URI and you can't save until it validates." >}}{{< /image >}}
 
-    If the endpoint cannot be verified, make sure that you've copied the details directly from the source database and that the value you entered starts with `redis://`.
+    For an external database, Redis will verify the endpoint at this step. If the endpoint cannot be verified, make sure that you've copied the details directly from the source database and that the value you entered starts with `redis://`.
 
-7.  Select **Save Database** to begin updating the database.
+8.  Select **Save Database** to begin updating the database.
 
     {{<image filename="images/rc/button-database-save.png" alt="Use the **Save Database** button to save your changes, deploy the database, and to start data migration." >}}{{< /image >}}
 

content/rc/subscriptions/upgrade-fixed-flexible.md

@@ -46,8 +46,6 @@ You can migrate the databases in your Fixed subscription to your new Flexible su
 {{< note >}}
 Before you follow this guide, be aware of the following limitations:
 
-- If one or more of the databases in your Fixed subscription has [Transport Layer Security (TLS)]({{< relref  "/rc/security/database-security/tls-ssl" >}}) enabled, you won't be able to migrate your databases between subscriptions using this guide. Use the [Transfer via import]({{<relref "/rc/databases/migrate-databases#transfer-via-import">}}) method or [contact support](https://redis.com/company/support/) if you want to migrate a TLS-enabled database using Active-Passive.
-
 - This guide is for migrating databases between subscriptions in the same Redis Cloud console account. [Contact support](https://redis.com/company/support/) if you want to migrate a database between accounts using Active-Passive.
 
 - As long as Active-Passive is enabled, data in the target database will not expire and will not be evicted regardless of the set [data eviction policy]({{<relref "rc/databases/configuration/data-eviction-policies.md">}}). We recommend that you turn off Active-Passive after the databases are synced. 
@@ -59,11 +57,17 @@ Before you follow this guide, be aware of the following limitations:
 
     {{<image filename="images/rc/button-database-edit.png" alt="The Edit database button lets you change selected database properties." >}}{{< /image >}}
 
-1. In the **Durability** section, enable **Active-Passive Redis** and then select **Add Account's Path**.
+1. In the **Durability** section, enable **Active-Passive Redis** and then select **Add Source**.
+
+    {{<image filename="images/rc/migrate-data-active-passive-enable.png" alt="Active-Passive settings are located in the **Durability** section of the database **Configuration** tab." >}}{{< /image >}}
+
+    {{<image filename="images/rc/button-database-uri-add.png" alt="Use the **Add Source** button to specify the source of the Active-Passive replica." width="150px">}}{{< /image >}}
+
+1. This will open the **Add Active-Passive Redis** screen. Select **Current account** to connect a database in your current account.
 
-    {{<image filename="images/rc/button-database-add-account-path.png" alt="Use the Add Account's Path button to specify the source of the Active-Passive replica." >}}{{< /image >}}
+    {{<image filename="images/rc/migrate-data-add-active-passive.png" alt="The Add Active-Passive Redis screen." >}}{{< /image >}}
 
-1. Select the first database in your Fixed subscription from the list. This will be your source database. You can type in the database's name to find it.
+1. Select the first database in your Fixed subscription from the **Source database** list. This will be your source database. You can type in the database's name to find it.
 
     {{<image filename="images/rc/database-add-account-path-list.png" alt="Select the Source database from the database list." >}}{{< /image >}}