Merge branch 'main' into sqlsvr-aad-p1

Author: rwestMSFT

.openpublishing.publish.config.json

@@ -72,12 +72,6 @@
       "branch": "master",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "azure",
-      "url": "https://github.com/MicrosoftDocs/azure-docs-pr",
-      "branch": "main",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "azure_cli_scripts",
       "url": "https://github.com/Azure-Samples/azure-cli-samples",

.openpublishing.redirection.azure-sql.json

@@ -455,6 +455,26 @@
       "redirect_url": "/azure/azure-sql/virtual-machines/windows/ways-to-connect-to-sql",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/azure-sql/managed-instance/managed-instance-link-use-ssms-to-replicate-database.md",
+      "redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-configure-how-to-ssms",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/azure-sql/managed-instance/managed-instance-link-use-ssms-to-failover-database.md",
+      "redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-configure-how-to-ssms",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/azure-sql/managed-instance/managed-instance-link-use-scripts-to-failover-database.md",
+      "redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-configure-how-to-scripts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/azure-sql/managed-instance/managed-instance-link-use-scripts-to-replicate-database.md",
+      "redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-configure-how-to-scripts",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/azure-sql/database/service-tier-hyperscale-named-replicas-faq.yml",
       "redirect_url": "/azure/azure-sql/database/service-tier-hyperscale-frequently-asked-questions-faq#read-scale-out-questions",
@@ -631,8 +651,8 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/azure-sql/database/change-data-capture-overview.md",
-      "redirect_url": "/sql/relational-databases/track-changes/about-change-data-capture-sql-server",
+      "source_path_from_root": "/azure-sql/managed-instance/virtual-cluster-delete.md",
+      "redirect_url": "/azure/azure-sql/managed-instance/virtual-cluster-architecture",
       "redirect_document_id": false
     }
   ]

.openpublishing.redirection.json

@@ -41805,11 +41805,6 @@
       "redirect_url": "/sql/sql-server/versioning-system-monikers-ui-sql-server",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/docs/relational-databases/track-changes/known-issues-and-limitations.md",
-      "redirect_url": "/sql/relational-databases/track-changes/about-change-data-capture-sql-server",
-      "redirect_document_id": false
-    },
     {
       "source_path": "docs/relational-databases/track-changes/known-issues-resolutions-with-cdc-for-oracle-attunity.md",
       "redirect_url": "/sql/integration-services/change-data-capture/known-issues-resolutions-with-cdc-for-oracle-attunity",
@@ -41850,6 +41845,11 @@
       "redirect_url": "/sql/relational-databases/polybase/polybase-guide",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/relational-databases/track-changes/known-issues-and-limitations.md",
+      "redirect_url": "/sql/relational-databases/track-changes/known-issues-and-errors-change-data-capture",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/advanced-analytics/tutorials/walkthrough-prepare-the-data.md",
       "redirect_url": "/sql/advanced-analytics/tutorials/demo-data-nyctaxi-in-sql",
@@ -59574,6 +59574,11 @@
       "source_path": "docs/ssdt/release-notes-ssdt.md",
       "redirect_url": "/sql/ssdt/previous-releases-of-sql-server-data-tools-ssdt-and-ssdt-bi",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/ssms/f1-help/connect-to-server-database-engine.md",
+      "redirect_url": "/sql/ssms/f1-help/connect-to-server-login-page-database-engine",
+      "redirect_document_id": false
     }
  ]
 }

azure-sql/azure-hybrid-benefit.md

@@ -120,8 +120,10 @@ SQL Database and SQL Managed Instance customers have the following rights associ
 
 |License footprint|What does Azure Hybrid Benefit for SQL Server get you?|
 |---|---|
-|SQL Server Enterprise Edition core customers with SA|<li>Can pay base rate on Hyperscale, General Purpose, or Business Critical SKU</li><br><li>One core on-premises = Four vCores in Hyperscale SKU</li><br><li>One core on-premises = Four vCores in General Purpose SKU</li><br><li>One core on-premises = One vCore in Business Critical SKU</li>|
-|SQL Server Standard Edition core customers with SA|<li>Can pay base rate on Hyperscale, General Purpose, or Business Critical SKU</li><br><li>One core on-premises = One vCore in Hyperscale SKU</li><br><li>One core on-premises = One vCore in General Purpose SKU</li><br><li>Four cores on-premises = One vCore in Business Critical SKU</li>|
+|SQL Server Enterprise Edition core customers with SA|<li>Can pay base rate on Hyperscale, General Purpose, or Business Critical SKU</li><br><li>One core on-premises = Four vCores in Hyperscale SKU<sup>1</sup></li><br><li>One core on-premises = Four vCores in General Purpose SKU</li><br><li>One core on-premises = One vCore in Business Critical SKU</li>|
+|SQL Server Standard Edition core customers with SA|<li>Can pay base rate on Hyperscale, General Purpose, or Business Critical SKU</li><br><li>One core on-premises = One vCore in Hyperscale SKU<sup>1</sup></li><br><li>One core on-premises = One vCore in General Purpose SKU</li><br><li>Four cores on-premises = One vCore in Business Critical SKU</li>|
+
+<sup>1</sup> Simplified pricing for SQL Database Hyperscale coming soon. Review the [Hyperscale pricing blog](https://aka.ms/hsignite2023) for details.
 
 ## Next steps
 

azure-sql/database/active-geo-replication-configure-portal.md

@@ -8,9 +8,7 @@ ms.date: 06/29/2023
 ms.service: sql-database
 ms.subservice: high-availability
 ms.topic: tutorial
-ms.custom:
-  - sqldbrb=1
-  - devx-track-azurecli
+ms.custom: sqldbrb=1, devx-track-azurecli, ignite-2023, devx-track-azurepowershell
 ---
 # Tutorial: Configure active geo-replication and failover (Azure SQL Database)
 
@@ -33,6 +31,8 @@ To add a secondary database, you must be the subscription owner or co-owner.
 The secondary database has the same name as the primary database and has, by default, the same service tier and compute size. The secondary database can be a single database or a pooled database. For more information, see [DTU-based purchasing model](service-tiers-dtu.md) and [vCore-based purchasing model](service-tiers-vcore.md).
 After the secondary is created and seeded, data begins replicating from the primary database to the new secondary database.
 
+If your secondary replica is used _only_ for disaster recovery (DR) and doesn't have any read or write workloads, you can save on licensing costs by designating the database for standby when you configure a new active geo-replication relationship. Review [license-free standby replica](standby-replica-how-to-configure.md) to learn more. 
+
 > [!NOTE]
 > If the partner database already exists, (for example, as a result of terminating a previous geo-replication relationship) the command fails.
 
@@ -42,27 +42,27 @@ After the secondary is created and seeded, data begins replicating from the prim
 
 2. On the SQL Database page, select your database, scroll to **Data management**, select **Replicas**, and then select **Create replica**.
 
-    :::image type="content" source="./media/active-geo-replication-configure-portal/azure-cli-create-geo-replica.png" alt-text="Configure geo-replication":::
+    :::image type="content" source="media/active-geo-replication-configure-portal/azure-cli-create-geo-replica.png" alt-text="Screenshot that shows the Configure geo-replication option.":::
 
 3. Select or create the server for the secondary database, and configure the **Compute + storage** options if necessary. You can select any region for your secondary server, but we recommend the [paired region](/azure/availability-zones/cross-region-replication-azure).
 
-    :::image type="content" source="./media/active-geo-replication-configure-portal/azure-portal-create-and-configure-replica.png" alt-text="{alt-text}":::
+    :::image type="content" source="media/active-geo-replication-configure-portal/azure-portal-create-and-configure-replica.png" alt-text="Screenshot that shows the Create and configure replica screen." lightbox="media/active-geo-replication-configure-portal/azure-portal-create-and-configure-replica.png":::
 
     Optionally, you can add a secondary database to an elastic pool. To create the secondary database in a pool, select **Yes** next to **Want to use SQL elastic pool?** and select a pool on the target server. A pool must already exist on the target server. This workflow doesn't create a pool.
 
 4. Click **Review + create**, review the information, and then click **Create**.
 
 5. The secondary database is created and the deployment process begins.
 
-    :::image type="content" source="./media/active-geo-replication-configure-portal/azure-portal-geo-replica-deployment.png" alt-text="Screenshot that shows the deployment status of the secondary database.":::
+    :::image type="content" source="media/active-geo-replication-configure-portal/azure-portal-geo-replica-deployment.png" alt-text="Screenshot that shows the deployment status of the secondary database." lightbox="media/active-geo-replication-configure-portal/azure-portal-geo-replica-deployment.png":::
 
 6. When the deployment is complete, the secondary database displays its status.
 
-    :::image type="content" source="./media/active-geo-replication-configure-portal/azure-portal-sql-database-secondary-status.png" alt-text="Screenshot that shows the secondary database status after deployment.":::
+    :::image type="content" source="media/active-geo-replication-configure-portal/azure-portal-sql-database-secondary-status.png" alt-text="Screenshot that shows the secondary database status after deployment." lightbox="media/active-geo-replication-configure-portal/azure-portal-sql-database-secondary-status.png":::
 
 7. Return to the primary database page, and then select **Replicas**. Your secondary database is listed under **Geo replicas**.
 
-    :::image type="content" source="./media/active-geo-replication-configure-portal/azure-sql-db-geo-replica-list.png" alt-text="Screenshot that shows the SQL database primary and geo replicas.":::
+    :::image type="content" source="media/active-geo-replication-configure-portal/azure-sql-db-geo-replica-list.png" alt-text="Screenshot that shows the SQL database primary and geo replicas.":::
 
 # [Azure CLI](#tab/azure-cli)
 
@@ -152,7 +152,7 @@ The secondary database can be switched to become the primary.
 2. Scroll to **Data management**, and then select **Replicas**.
 3. In the **Geo replicas** list, select the database you want to become the new primary, select the ellipsis, and then select **Forced failover**.
 
-    :::image type="content" source="./media/active-geo-replication-configure-portal/azure-portal-select-forced-failover.png" alt-text="Screenshot that shows selecting forced failover from the drop-down.":::
+    :::image type="content" source="media/active-geo-replication-configure-portal/azure-portal-select-forced-failover.png" alt-text="Screenshot that shows selecting forced failover from the drop-down." lightbox="media/active-geo-replication-configure-portal/azure-portal-select-forced-failover.png":::
 4. Select **Yes** to begin the failover.
 
 # [Azure CLI](#tab/azure-cli)
@@ -226,8 +226,82 @@ Remove-AzSqlDatabaseSecondary @parameters
 
 ---
 
+## Cross-subscription geo-replication
+
+Use Transact-SQL (T-SQL) create a geo-secondary in a subscription different from the subscription of the primary (whether under the same tenant of Microsoft Entra ID ([formerly Azure Active Directory](/azure/active-directory/fundamentals/new-name)) or not), follow the steps in this section.
+
+1. Add the IP address of the client machine executing the T-SQL commands in this example, to the server firewalls of **both** the primary and secondary servers. You can confirm that IP address by executing the following query while connected to the primary server from the same client machine.
+  
+   ```sql
+   select client_net_address from sys.dm_exec_connections where session_id = @@SPID;
+   ``` 
+
+   For more information, see [Configure firewall](firewall-configure.md).
+
+2. In the `master` database on the **primary** server, create a SQL authentication login dedicated to active geo-replication setup. Adjust login name and password as needed.
+
+   ```sql
+   create login geodrsetup with password = 'ComplexPassword01';
+   ```
+
+3. In the same database, create a user for the login, and add it to the `dbmanager` role:
+
+   ```sql
+   create user geodrsetup for login geodrsetup;
+   alter role dbmanager add member geodrsetup;
+   ```
+
+4. Take note of the SID value of the new login. Obtain the SID value using the following query.
+
+   ```sql
+   select sid from sys.sql_logins where name = 'geodrsetup';
+   ```
+
+5. Connect to the **primary** database (not the `master` database), and create a user for the same login.
+
+   ```sql
+   create user geodrsetup for login geodrsetup;
+   ```
+
+6. In the same database, add the user to the `db_owner` role.
+
+   ```sql
+   alter role db_owner add member geodrsetup;
+   ```
+
+7. In the `master` database on the **secondary** server, create the same login as on the primary server, using the same name, password, and SID. Replace the hexadecimal SID value in the sample command below with the one obtained in Step 4.
+
+   ```sql
+   create login geodrsetup with password = 'ComplexPassword01', sid=0x010600000000006400000000000000001C98F52B95D9C84BBBA8578FACE37C3E;
+   ```
+
+8. In the same database, create a user for the login, and add it to the `dbmanager` role.
+
+   ```sql
+   create user geodrsetup for login geodrsetup;
+   alter role dbmanager add member geodrsetup;
+   ```
+
+9. Connect to the `master` database on the **primary** server using the new `geodrsetup` login, and initiate geo-secondary creation on the secondary server. Adjust database name and secondary server name as needed. Once the command is executed, you can monitor geo-secondary creation by querying the [sys.dm_geo_replication_link_status](/sql/relational-databases/system-dynamic-management-views/sys-dm-geo-replication-link-status-azure-sql-database) view in the **primary** database, and the [sys.dm_operation_status](/sql/relational-databases/system-dynamic-management-views/sys-dm-operation-status-azure-sql-database) view in the `master` database on the **primary** server. The time needed to create a geo-secondary depends on the primary database size.
+
+   ```sql
+   alter database [dbrep] add secondary on server [servername];
+   ```
+
+10. After the geo-secondary is successfully created, the users, logins, and firewall rules created by this procedure can be removed.
+
+> [!NOTE]
+> Cross-subscription geo-replication operations including setup and geo-failover are only supported using REST API & T-SQL commands.
+> 
+> Adding a geo-secondary using T-SQL is not supported when connecting to the primary server over a [private endpoint](private-endpoint-overview.md). If a private endpoint is configured but public network access is allowed, adding a geo-secondary is supported when connected to the primary server from a public IP address. Once a geo-secondary is added, [public network access can be denied](connectivity-settings.md#deny-public-network-access).
+> 
+> Creating a geo-secondary on a logical server in a different Microsoft Entra tenant is not supported when [Microsoft Entra-only authentication](authentication-azure-ad-only-authentication.md) is enabled on either primary or secondary logical server.
+
+
+
 ## Next steps
 
 * To learn more about active geo-replication, see [active geo-replication](active-geo-replication-overview.md).
 * To learn about auto-failover groups, see [Auto-failover groups](auto-failover-group-sql-db.md)
 * For a business continuity overview and scenarios, see [Business continuity overview](business-continuity-high-availability-disaster-recover-hadr-overview.md).
+* Save on licensing costs by designating your secondary DR replica for [standby](standby-replica-how-to-configure.md).