RC RDI: Update screenshots and add specific steps for RDS/Aurora

Author: cmilesb

content/operate/rc/databases/rdi/define.md

@@ -57,12 +57,8 @@ After your pipeline is provisioned, you will be able to define your pipeline. Yo
 
 ### Configure a new pipeline
 
-1. In the [Redis Cloud console](https://cloud.redis.io/), go to your target database and select the **Data Pipeline** tab. If your pipeline is already provisioned, select **Complete setup** to go to the **Pipeline definition** section.
+1. In the [Redis Cloud console](https://cloud.redis.io/), go to your target database and select the **Data Pipeline** tab. If your pipeline is already provisioned, select **Complete setup** to go to the **Select data** section.
     {{<image filename="images/rc/rdi/rdi-complete-setup.png" alt="The complete setup button." width=200px >}}
-1. For the **Configure a new pipeline** option, select the Redis data type to write keys to the target. You can choose **Hash** or **JSON** if the target database supports JSON. 
-    {{<image filename="images/rc/rdi/rdi-configure-new-pipeline.png" alt="The Pipeline definition screen. Configure a new pipeline is selected." width=75% >}}
-    Select **Continue**.
-    {{<image filename="images/rc/rdi/rdi-continue-button.png" alt="The continue button." width=150px >}}
 1. Select the Schema and Tables you want to migrate to the target database from the **Source data selection** list. 
     {{<image filename="images/rc/rdi/rdi-select-source-data.png" alt="The select source data section. " width=75% >}}
 
@@ -87,6 +83,11 @@ After your pipeline is provisioned, you will be able to define your pipeline. Yo
     After you've selected the schemas and tables you want to sync, select **Continue**.
 
      {{<image filename="images/rc/rdi/rdi-continue-button.png" alt="The continue button." width=150px >}}
+    
+1. In the **Pipeline definition** section, select the Redis data type to write keys to the target. You can choose **Hash** or **JSON** if the target database supports JSON. 
+    {{<image filename="images/rc/rdi/rdi-configure-new-pipeline.png" alt="The pipeline definition screen." width=75% >}}
+    Select **Continue**.
+    {{<image filename="images/rc/rdi/rdi-continue-button.png" alt="The continue button." width=150px >}}
 
 1. Review the tables you selected in the **Summary**. If everything looks correct, select **Start ingest** to start ingesting data from your source database.
 

content/operate/rc/databases/rdi/setup.md

@@ -5,7 +5,7 @@ categories:
 - docs
 - operate
 - rc
-description: Prepare your source database and database credentials for Data integration.
+description: Prepare your source database, network setup, and database credentials for Data integration.
 hideListLinks: true
 weight: 1
 ---
@@ -38,18 +38,31 @@ See [Prepare source databases]({{<relref "/integrate/redis-data-integration/data
 - [MySQL and mariaDB]({{<relref "/integrate/redis-data-integration/data-pipelines/prepare-dbs/my-sql-mariadb">}})
 - [Oracle]({{<relref "/integrate/redis-data-integration/data-pipelines/prepare-dbs/oracle">}})
 - [SQL Server]({{<relref "/integrate/redis-data-integration/data-pipelines/prepare-dbs/sql-server">}})
-- [AWS Aurora and PostgreSQL]({{<relref "/integrate/redis-data-integration/data-pipelines/prepare-dbs/postgresql">}})
+- [AWS Aurora PostgreSQL]({{<relref "/integrate/redis-data-integration/data-pipelines/prepare-dbs/aws-aur-pgsql">}})
+- [AWS RDS PostgreSQL]({{<relref "/integrate/redis-data-integration/data-pipelines/prepare-dbs/postgresql">}})
 
 See the [RDI architecture overview]({{< relref "/integrate/redis-data-integration/architecture#overview" >}}) for more information about CDC.
 
 ## Set up connectivity
 
-To ensure that you can connect your Redis Cloud database to the source database hosted on an AWS EC2 instance, you need to set up an endpoint service through AWS PrivateLink. To do this:
+To ensure that you can connect your Redis Cloud database to the source database, you need to set up an endpoint service through AWS PrivateLink. 
 
-1. [Create a network load balancer](#create-network-load-balancer) that will route incoming HTTP requests to your database.
-1. [Create an endpoint service](#create-endpoint-service) through AWS PrivateLink.
+Choose the steps for your database setup:
+- [Database hosted on an AWS EC2 instance](#database-hosted-on-an-aws-ec2-instance)
+- [Database hosted on AWS RDS or AWS Aurora](#database-hosted-on-aws-rds-or-aws-aurora)
 
-### Create network load balancer
+### Database hosted on an AWS EC2 instance
+
+The following diagram shows the network setup for a database hosted on an AWS EC2 instance.
+
+{{<image filename="images/rc/rdi/rdi-setup-diagram-ec2.png" alt="The network setup for a database hosted on an AWS EC2 instance." width=75% >}}
+
+To do this:
+
+1. [Create a network load balancer](#create-network-load-balancer-ec2) that will route incoming HTTP requests to your database.
+1. [Create an endpoint service](#create-endpoint-service-ec2) through AWS PrivateLink.
+
+#### Create network load balancer {#create-network-load-balancer-ec2}
 
 In the [AWS Management Console](https://console.aws.amazon.com/), use the **Services** menu to locate and select **Compute** > **EC2**. [Create a network load balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/create-network-load-balancer.html#configure-load-balancer) with the following settings:
 
@@ -67,7 +80,7 @@ In the [AWS Management Console](https://console.aws.amazon.com/), use the **Serv
         1. In **Register targets**, select the EC2 instance that runs your source database, enter the port, and select **Include as pending below**. Then, select **Create target group** to create your target group. Return **Listeners and routing** in the Network Load Balancer setup.
     1. Set the following **Listener** properties:
         - **Protocol**: Select **TCP**.
-        - **Port**: Enter **80**.
+        - **Port**: Enter your source database's port.
         - **Default action**: Select the target group you created in the previous step.
 1. Review the network load balancer settings, and then select **Create load balancer** to continue.
 1. After the network load balancer is active, select **Security**, and then select the security group ID to open the Security group settings.
@@ -76,11 +89,76 @@ In the [AWS Management Console](https://console.aws.amazon.com/), use the **Serv
     - **Source**: Select **Anywhere - IPv4**.
     Select **Save rules** to save your changes.
 
-### Create endpoint service
+#### Create endpoint service {#create-endpoint-service-ec2}
 
 In the [AWS Management Console](https://console.aws.amazon.com/), use the **Services** menu to locate and select **Networking & Content Delivery** > **VPC**. There, select **PrivateLink and Lattice** > **Endpoint services**. [Create an endpoint service](https://docs.aws.amazon.com/vpc/latest/privatelink/create-endpoint-service.html) with the following settings:
 
-1. In **Available load balancers**, select the [network load balancer](#create-network-load-balancer) you created.
+1. In **Available load balancers**, select the [network load balancer](#create-network-load-balancer-ec2) you created.
+1. In **Additional settings**, choose the following settings:
+    - **Require acceptance for endpoint**: Select **Acceptance required**.
+    - **Supported IP address types**: Select **IPv4**.
+1. Select **Create** to create the endpoint service.
+
+After you create the endpoint service, you need to add Redis Cloud as an Allowed Principal on your [endpoint service VPC permissions](https://docs.aws.amazon.com/vpc/latest/privatelink/configure-endpoint-service.html#add-remove-permissions). 
+
+1. In the Redis Cloud Console, copy the Amazon Resource Name (ARN) provided in the **Setup connectivity** section.
+1. Return to the endpoint service list on the [Amazon VPC console](https://console.aws.amazon.com/vpc/). Select the endpoint service you just created.
+1. Navigate to **Allow principals** tab.
+1. Add the Redis Cloud ARN you copied and choose **Allow principals**.
+1. Save the service name for later. 
+
+For more details on AWS PrivateLink, see [Share your services through AWS PrivateLink](https://docs.aws.amazon.com/vpc/latest/privatelink/privatelink-share-your-services.html).
+
+### Database hosted on AWS RDS or AWS Aurora
+
+The following diagram shows the network setup for a database hosted on AWS RDS or AWS Aurora.
+
+{{<image filename="images/rc/rdi/rdi-setup-diagram-aurora.png" alt="The network setup for a database hosted on AWS RDS or AWS Aurora." width=75% >}}
+
+To do this:
+
+1. [Create an RDS Proxy](#create-rds-proxy) that will route requests to your database.
+1. [Create a network load balancer](#create-network-load-balancer-rds) that will route incoming HTTP requests to the RDS proxy.
+1. [Create an endpoint service](#create-endpoint-service-rds) through AWS PrivateLink.
+
+#### Create RDS proxy {#create-rds-proxy}
+
+In the [AWS Management Console](https://console.aws.amazon.com/), use the **Services** menu to locate and select **Database** > **Aurora and RDS**. [Create an RDS proxy](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-proxy-creating.html) that can access your database.
+
+<--! TODO: HOW TO GET THE STATIC IP -->
+
+#### Create network load balancer {#create-network-load-balancer-rds}
+
+In the [AWS Management Console](https://console.aws.amazon.com/), use the **Services** menu to locate and select **Compute** > **EC2**. [Create a network load balancer](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/create-network-load-balancer.html#configure-load-balancer) with the following settings:
+
+1. In **Basic configuration**: 
+    - **Scheme**: Select **Internal**.
+    - **Load balancer IP address type**: Select **IPv4**.
+1. In **Network mapping**, select the VPC and availability zone associated with your source database.
+1. In **Security groups**, select the security group associated with your source database.
+1. In **Listeners and routing**: 
+    1. Select **Create target group** to [create a target group](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-target-group.html) with the following settings:
+        1. In **Specify group details**:
+            - **Target type**: Select **IP Addresses**.
+            - **Protocol : Port**: Select **TCP**, and then enter the port number where your database is exposed.
+            - The **IP address type** and **VPC** should be selected already and match the VPC you selected earlier.
+        1. In **Register targets**, enter the static IP of your RDS proxy, enter the port, and select **Include as pending below**. Then, select **Create target group** to create your target group. Return **Listeners and routing** in the Network Load Balancer setup.
+    1. Set the following **Listener** properties:
+        - **Protocol**: Select **TCP**.
+        - **Port**: Enter your source database's port.
+        - **Default action**: Select the target group you created in the previous step.
+1. Review the network load balancer settings, and then select **Create load balancer** to continue.
+1. After the network load balancer is active, select **Security**, and then select the security group ID to open the Security group settings.
+1. Select **Edit inbound rules**, then **Add rule** to add a rule with the following settings:
+    - **Type**: Select **HTTP**.
+    - **Source**: Select **Anywhere - IPv4**.
+    Select **Save rules** to save your changes.
+
+#### Create endpoint service {#create-endpoint-service-rds}
+
+In the [AWS Management Console](https://console.aws.amazon.com/), use the **Services** menu to locate and select **Networking & Content Delivery** > **VPC**. There, select **PrivateLink and Lattice** > **Endpoint services**. [Create an endpoint service](https://docs.aws.amazon.com/vpc/latest/privatelink/create-endpoint-service.html) with the following settings:
+
+1. In **Available load balancers**, select the [network load balancer](#create-network-load-balancer-rds) you created.
 1. In **Additional settings**, choose the following settings:
     - **Require acceptance for endpoint**: Select **Acceptance required**.
     - **Supported IP address types**: Select **IPv4**.
@@ -159,7 +237,6 @@ If your source database has TLS or mTLS enabled, we recommend that you enter the
 
 After you store this secret, you can view and copy the [Amazon Resource Name (ARN)](https://docs.aws.amazon.com/secretsmanager/latest/userguide/reference_iam-permissions.html#iam-resources) of your secret on the secret details page. 
 
-
 ## Next steps
 
 After you have set up your source database and prepared connectivity and credentials, select **Define source database** to [define your source connection and data pipeline]({{<relref "/operate/rc/databases/rdi/define">}}).

content/operate/rc/databases/rdi/view-edit.md

@@ -1,19 +1,21 @@
 ---
-Title: View data pipeline
+Title: View and edit data pipeline
 alwaysopen: false
 categories:
 - docs
 - operate
 - rc
-description: Observe and stop your data pipeline.
+description: Observe and change your data pipeline.
 hideListLinks: true
 weight: 3
 ---
 
-Use the **Data pipeline** tab in your database to view your data pipeline.
+Use the **Data pipeline** tab in your database to view and edit your data pipeline.
 
 The **Data pipeline** tab gives an overview of your data pipeline and lets you view your data stream metrics. 
 
+
+<--! TODO: REPLACE SCREENSHOT -->
 {{<image filename="images/rc/rdi/rdi-status-metrics-tables.png" alt="The select source database type list." width=80% >}}
 
 The **Status** table shows statistics for the whole data pipeline: 
@@ -41,7 +43,6 @@ The **Data stream metrics** table shows the following metrics for each data stre
 | **Filtered** | Number of records from the source table that were filtered from being inserted into the target database. |
 | **Rejected** | Number of records from the source table that could not be parsed or inserted into the target database. |
 
-<!-- DOUBLE CHECK THIS BEFORE PHASE 2
 ## Edit data pipeline
 
 To change the data you want to ingest from the data pipeline:
@@ -50,14 +51,6 @@ To change the data you want to ingest from the data pipeline:
 
     {{<image filename="images/rc/rdi/rdi-edit-button.png" alt="The edit pipeline button." width=100px >}}
 
-1. For the **Configure a new pipeline** option, select the Redis data type to write keys to the target. You can choose **Hash** or **JSON**. 
-
-    {{<image filename="images/rc/rdi/rdi-configure-new-pipeline.png" alt="The Pipeline definition screen. Configure a new pipeline is selected." width=75% >}}
-    
-    Select **Continue**.
-    
-    {{<image filename="images/rc/rdi/rdi-continue-button.png" alt="The continue button." width=150px >}}
-
 1. Select the schema and tables you want to migrate to the target database from the **Source data selection** list. 
 
     {{<image filename="images/rc/rdi/rdi-select-source-data.png" alt="The select source data section. " width=75% >}}
@@ -84,14 +77,26 @@ To change the data you want to ingest from the data pipeline:
 
      {{<image filename="images/rc/rdi/rdi-continue-button.png" alt="The continue button." width=150px >}}
 
+1. In the **Pipeline definition** section, select the Redis data type to write keys to the target. You can choose **Hash** or **JSON** if the target database supports JSON. 
+
+    {{<image filename="images/rc/rdi/rdi-configure-new-pipeline.png" alt="The Pipeline definition screen. Configure a new pipeline is selected." width=75% >}}
+    
+    Select **Continue**.
+    
+    {{<image filename="images/rc/rdi/rdi-continue-button.png" alt="The continue button." width=150px >}}
+
 1. Review the tables you selected in the **Summary** and select how you want to update the data pipeline:
 
+    {{<image filename="images/rc/rdi/rdi-update-preferences.png" alt="The Select update preferences section." width=25% >}}
+
     - **Apply to new data changes only**: The data pipeline will only synchronize new updates to the schema and tables selected. The data pipeline will not ingest any data from new schemas or tables that are selected.
     - **Reset pipeline (re-process all data)**: The data pipeline will re-ingest all of the selected data.
     - **Flush cached data and reset pipeline**: The data pipeline will flush the target Redis database, and then re-ingest all of the selected data from the source database.
 
 1. Select **Apply changes**.
 
+    {{<image filename="images/rc/rdi/rdi-apply-changes.png" alt="The apply changes button." width=150px >}}
+
 At this point, the data pipeline will apply the changes. If you selected **Reset pipeline** or **Flush cached data and reset pipeline**, the data pipeline will ingest data from the source database to the target database. After this initial sync is complete, the data pipeline enters the *change streaming* phase, where changes are captured as they happen.
 
 If you selected **Apply to new data changes only**, the data pipeline will enter the *change streaming* phase without ingesting data.
@@ -108,7 +113,7 @@ To reset the data pipeline and restart the ingest process:
 
 1. Select **Reset data pipeline**.
 
-At this point, the data pipeline will re-ingest data from the source database to your target Redis database. -->
+At this point, the data pipeline will re-ingest data from the source database to your target Redis database.
 
 ## Stop and restart data pipeline