Merge branch 'main' into release-dallas

Author: v-alje

azure-sql/migration-guides/managed-instance/sql-server-to-managed-instance-overview.md

@@ -22,6 +22,7 @@ You can migrate SQL Server databases running on-premises or on:
 - SQL Server on Azure Virtual Machines.  
 - Amazon Web Services (AWS) Elastic Compute Cloud (EC2). 
 - Compute Engine in Google Cloud Platform (GCP).  
+- Amazon RDS
 - Cloud SQL for SQL Server in GCP. 
 
 For other migration guides, see [Database Migration](/data-migration). 
@@ -107,19 +108,19 @@ The following table compares the recommended migration options:
 
 |Migration option  |When to use  |Considerations  |
 |---------|---------|---------|
-|[Azure SQL migration extension for Azure Data Studio](/azure/dms/migration-using-azure-data-studio) | - Migrate single databases or multiple databases at scale.<br/>- Can run in both online (minimal downtime) and offline (acceptable downtime) modes.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- AWS EC2<br/>- GCP Compute SQL Server VM |  - Easy to setup and get started.<br/>- Requires setup of self-hosted integration runtime to access on-premises SQL Server and backups.<br/>- Includes both assessment and migration capabilities. |
-|[Azure Database Migration Service](/azure/dms/tutorial-sql-server-to-managed-instance) | - Migrate single databases or multiple databases at scale.<br/>- Can run in both online (minimal downtime) and offline modes.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- AWS EC2<br/>- GCP Compute SQL Server VM |  - Migrations at scale can be automated via [PowerShell](/azure/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-offline).<br/>- Time to complete migration depends on database size and is affected by backup and restore time.<br/>- Sufficient downtime might be required. |
-|[Native backup and restore](../../managed-instance/restore-sample-database-quickstart.md) | - Migrate individual line-of-business application databases.<br/>- Quick and easy migration without a separate migration service or tool.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- AWS EC2<br/>- GCP Compute SQL Server VM | - Database backup uses multiple threads to optimize data transfer to Azure Blob Storage, but partner bandwidth and database size can affect transfer rate.<br/>- Downtime should accommodate the time required to perform a full backup and restore (which is a size of data operation).| 
-|[Log Replay Service](../../managed-instance/log-replay-service-migrate.md) | - Migrate individual line-of-business application databases.<br/>- More control is needed for database migrations.<br/><br/>Supported sources:<br/>- SQL Server (2008 to 2019) on-premises or Azure VM<br/>- AWS EC2<br/>- GCP Compute SQL Server VM | - The migration entails making full database backups on SQL Server and copying backup files to Azure Blob Storage. Log Replay Service is used to restore backup files from Azure Blob Storage to SQL Managed Instance.<br/>- Databases being restored during the migration process will be in a restoring mode and can't be used for read or write workloads until the process is complete.| 
-|[Link feature for Azure SQL Managed Instance](../../managed-instance/managed-instance-link-feature-overview.md) | - Migrate individual line-of-business application databases.<br/>- More control is needed for database migrations.<br/>- Minimum downtime migration is needed.<br/><br/>Supported sources:<br/>- SQL Server (2016 to 2019) on-premises or Azure VM<br/>- AWS EC2<br/>- GCP Compute SQL Server VM | - The migration entails establishing a network connection between SQL Server and SQL Managed Instance, and opening communication ports.<br/>- Uses [Always On availability group](/sql/database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server) technology to replicate database near real-time, making an exact replica of the SQL Server database on SQL Managed Instance.<br/>- The database can be used for read-only access on SQL Managed Instance while migration is in progress.<br/>- Provides the best performance during migration with minimum downtime. | 
+|[Azure SQL migration extension for Azure Data Studio](/azure/dms/migration-using-azure-data-studio) | - Migrate single databases or multiple databases at scale.<br/>- Can run in both online (minimal downtime) and offline (acceptable downtime) modes.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- Amazon EC2<br/>- GCP Compute SQL Server VM |  - Easy to setup and get started.<br/>- Requires setup of self-hosted integration runtime to access on-premises SQL Server and backups.<br/>- Includes both assessment and migration capabilities. |
+|[Azure Database Migration Service](/azure/dms/tutorial-sql-server-to-managed-instance) | - Migrate single databases or multiple databases at scale.<br/>- Can run in both online (minimal downtime) and offline modes.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- Amazon EC2<br/>- GCP Compute SQL Server VM |  - Migrations at scale can be automated via [PowerShell](/azure/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-offline).<br/>- Time to complete migration depends on database size and is affected by backup and restore time.<br/>- Sufficient downtime might be required. |
+|[Native backup and restore](../../managed-instance/restore-sample-database-quickstart.md) | - Migrate individual line-of-business application databases.<br/>- Quick and easy migration without a separate migration service or tool.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- Amazon EC2<br/>- GCP Compute SQL Server VM | - Database backup uses multiple threads to optimize data transfer to Azure Blob Storage, but partner bandwidth and database size can affect transfer rate.<br/>- Downtime should accommodate the time required to perform a full backup and restore (which is a size of data operation).| 
+|[Log Replay Service](../../managed-instance/log-replay-service-migrate.md) | - Migrate individual line-of-business application databases.<br/>- More control is needed for database migrations.<br/><br/>Supported sources:<br/>- SQL Server (2008 to 2019) on-premises or Azure VM<br/>- Amazon EC2<br/>- GCP Compute SQL Server VM | - The migration entails making full database backups on SQL Server and copying backup files to Azure Blob Storage. Log Replay Service is used to restore backup files from Azure Blob Storage to SQL Managed Instance.<br/>- Databases being restored during the migration process will be in a restoring mode and can't be used for read or write workloads until the process is complete.| 
+|[Link feature for Azure SQL Managed Instance](../../managed-instance/managed-instance-link-feature-overview.md) | - Migrate individual line-of-business application databases.<br/>- More control is needed for database migrations.<br/>- Minimum downtime migration is needed.<br/><br/>Supported sources:<br/>- SQL Server (2016 to 2019) on-premises or Azure VM<br/>- Amazon EC2<br/>- GCP Compute SQL Server VM | - The migration entails establishing a network connection between SQL Server and SQL Managed Instance, and opening communication ports.<br/>- Uses [Always On availability group](/sql/database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server) technology to replicate database near real-time, making an exact replica of the SQL Server database on SQL Managed Instance.<br/>- The database can be used for read-only access on SQL Managed Instance while migration is in progress.<br/>- Provides the best performance during migration with minimum downtime. | 
 
 The following table compares the alternative migration options: 
 
 |Method or technology |When to use |Considerations  |
 |---------|---------|---------|
-|[Transactional replication](../../managed-instance/replication-transactional-overview.md) | - Migrate by continuously publishing changes from source database tables to target SQL Managed Instance database tables.<br/>- Do full or partial database migrations of selected tables (subset of a database).<br/><br/>Supported sources:<br/>- SQL Server (2012 to 2019) with some limitations<br/>- AWS EC2<br/>- GCP Compute SQL Server VM |<br/>- Setup is relatively complex compared to other migration options.<br/>- Provides a continuous replication option to migrate data (without taking the databases offline).<br/>- Transactional replication has limitations to consider when you're setting up the publisher on the source SQL Server instance. See [Limitations on publishing objects](/sql/relational-databases/replication/publish/publish-data-and-database-objects#limitations-on-publishing-objects) to learn more.<br/>- Capability to [monitor replication activity](/sql/relational-databases/replication/monitor/monitoring-replication) is available.    |
-|[Bulk copy](/sql/relational-databases/import-export/import-and-export-bulk-data-by-using-the-bcp-utility-sql-server)| - Do full or partial data migrations.<br/>- Can accommodate downtime.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- AWS EC2<br/>- AWS RDS<br/>- GCP Compute SQL Server VM   | - Requires downtime for exporting data from the source and importing into the target.<br/>- The file formats and data types used in the export or import need to be consistent with table schemas. |
-|[Import Export Wizard/BACPAC](../../database/database-import.md)| - Migrate individual line-of-business application databases.<br/>- Suited for smaller databases.<br/>Doesn't require a separate migration service or tool.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- AWS EC2<br/>- AWS RDS<br/>- GCP Compute SQL Server VM  |<br/>- Requires downtime because data needs to be exported at the source and imported at the destination.<br/>- The file formats and data types used in the export or import need to be consistent with table schemas to avoid truncation or data-type mismatch errors.<br/>- Time taken to export a database with a large number of objects can be significantly higher. |
+|[Transactional replication](../../managed-instance/replication-transactional-overview.md) | - Migrate by continuously publishing changes from source database tables to target SQL Managed Instance database tables.<br/>- Do full or partial database migrations of selected tables (subset of a database).<br/><br/>Supported sources:<br/>- SQL Server (2012 to 2019) with some limitations<br/>- Amazon EC2<br/>- GCP Compute SQL Server VM |<br/>- Setup is relatively complex compared to other migration options.<br/>- Provides a continuous replication option to migrate data (without taking the databases offline).<br/>- Transactional replication has limitations to consider when you're setting up the publisher on the source SQL Server instance. See [Limitations on publishing objects](/sql/relational-databases/replication/publish/publish-data-and-database-objects#limitations-on-publishing-objects) to learn more.<br/>- Capability to [monitor replication activity](/sql/relational-databases/replication/monitor/monitoring-replication) is available.    |
+|[Bulk copy](/sql/relational-databases/import-export/import-and-export-bulk-data-by-using-the-bcp-utility-sql-server)| - Do full or partial data migrations.<br/>- Can accommodate downtime.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- Amazon EC2<br/>- Amazon RDS<br/>- GCP Compute SQL Server VM   | - Requires downtime for exporting data from the source and importing into the target.<br/>- The file formats and data types used in the export or import need to be consistent with table schemas. |
+|[Import Export Wizard/BACPAC](../../database/database-import.md)| - Migrate individual line-of-business application databases.<br/>- Suited for smaller databases.<br/>Doesn't require a separate migration service or tool.<br/><br/>Supported sources:<br/>- SQL Server (2005 to 2019) on-premises or Azure VM<br/>- Amazon EC2<br/>- Amazon RDS<br/>- GCP Compute SQL Server VM  |<br/>- Requires downtime because data needs to be exported at the source and imported at the destination.<br/>- The file formats and data types used in the export or import need to be consistent with table schemas to avoid truncation or data-type mismatch errors.<br/>- Time taken to export a database with a large number of objects can be significantly higher. |
 |[Azure Data Factory](/azure/data-factory/connector-azure-sql-managed-instance)| - Migrate and/or transform data from source SQL Server databases.<br/>- Merging data from multiple sources of data to Azure SQL Managed Instance is typically for business intelligence (BI) workloads.<br/>- Requires creating data movement pipelines in Data Factory to move data from source to destination.<br/>- [Cost](https://azure.microsoft.com/pricing/details/data-factory/data-pipeline/) is an important consideration and is based on factors like pipeline triggers, activity runs, and duration of data movement. |
 
 ## Feature interoperability 

azure-sql/virtual-machines/windows/media/ways-to-connect-to-sql/sql-vm-portal-connectivity-change.png

@@ -96,7 +96,7 @@ You can change the connectivity settings for your SQL Server virtual machine in
 
 2. Select your SQL Server VM.
 
-3. Under **Settings**, select **Security**.
+3. Under **Settings**, select **Security Configuration**.
 
 4. Change the **SQL connectivity level** to your required setting. You can optionally use this area to change the SQL Server port or the SQL authentication settings.
 
@@ -145,4 +145,4 @@ The following table lists the requirements to connect to SQL Server on Azure VM.
 
 To see provisioning instructions along with these connectivity steps, see [Provisioning a SQL Server virtual machine on Azure](create-sql-vm-portal.md).
 
-For other topics related to running SQL Server on Azure VMs, see [SQL Server on Azure virtual machines](sql-server-on-azure-vm-iaas-what-is-overview.md).
+For other topics related to running SQL Server on Azure VMs, see [SQL Server on Azure virtual machines](sql-server-on-azure-vm-iaas-what-is-overview.md).

azure-sql/virtual-machines/windows/ways-to-connect-to-sql.md

@@ -131,7 +131,7 @@ You can download the report for offline viewing by selecting download combined r
 
 :::image type="content" source="media/database-migration-assessment-for-oracle-extension/dmafo-downlaod-report.png" alt-text="download assessment report":::
 
-You can also cancel an ongoing assessment and move assessments to another directory.
+You can also cancel an ongoing assessment, delete an assessment and move assessments to another directory.
 
 ## Change Assessment Directory
 
@@ -143,18 +143,6 @@ You can also cancel an ongoing assessment and move assessments to another direct
 
 ## Troubleshoot
 
-### Delete assessment
-
-1. Go to the assessment directory. The assessment directory path is shown in the  Oracle Assessment:Assessment Path settings under the manage extension.
-    Default Assessment Path
-    - Windows -  C:\Users\\<username\>\\.dmaoracle
-    - Linux  - ~/home/\<username\>/.dmaoracle/
-    - Mac  - /Users/\<username\>/.dmaoracle/
-
-2. For each Oracle server, there will be separate folder inside .dmaoracle
-3. Traverse through the folder and identify the folder matching the assessment name.
-4. Delete the particular folder.
-
 ### Logging
 
 The extension has the errors, warning and other diagnostic logging written in the default log directory. 

docs/azure-data-studio/extensions/database-migration-assessment-for-oracle-extension.md

@@ -21,7 +21,7 @@ monikerRange: ">=sql-server-2016"
 
   This topic describes how to switch the HADR cluster context of an instance of [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] by using [!INCLUDE[tsql](../../../includes/tsql-md.md)] in [!INCLUDE[ssSQL11SP1](../../../includes/sssql11sp1-md.md)] and later versions. The *HADR cluster context* determines which Windows Server Failover Clustering (WSFC) cluster manages the metadata for availability replicas hosted by the server instance.  
 
- Switch the HADR cluster context only during a cross-cluster migration of [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] to an instance of [!INCLUDE[ssSQL11SP1](../../../includes/sssql11sp1-md.md)] on a new WSFC cluster. Cross-cluster migration of [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] supports OS upgrade to [!INCLUDE[win8](../../../includes/win8-md.md)] or [!INCLUDE[win8srv](../../../includes/win8srv-md.md)] with minimal downtime of availability groups. For more information, see [Cross-Cluster Migration of Always On Availability Groups for OS Upgrade](/previous-versions/sql/sql-server-2012/jj873730(v=msdn.10)).  
+ Switch the HADR cluster context only during a cross-cluster migration of [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] to an instance of [!INCLUDE[ssSQL11SP1](../../../includes/sssql11sp1-md.md)] on a new WSFC cluster. Cross-cluster migration of [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] supports OS upgrade to [!INCLUDE[win8](../../../includes/win8-md.md)] or [!INCLUDE[winserver2012](../../../includes/winserver2012-md.md)] with minimal downtime of availability groups. For more information, see [Cross-Cluster Migration of Always On Availability Groups for OS Upgrade](/previous-versions/sql/sql-server-2012/jj873730(v=msdn.10)).  
 
 > [!CAUTION]  
 >  Switch the HADR cluster context only during cross-cluster migration of [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] deployments.