Skip to content

Commit 82bf9e0

Browse files
author
Mike Ray (Microsoft)
committed
Merge branch '20230209-manage-license-type' of https://github.com/MikeRayMSFT/sql-docs-pr into 20230210-update-overview-arc-sql
2 parents c32cf95 + 5998e4b commit 82bf9e0

7 files changed

Lines changed: 179 additions & 164 deletions

File tree

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41310,6 +41310,11 @@
4131041310
"redirect_url": "/sql/dma/dma-consolidatereports",
4131141311
"redirect_document_id": false
4131241312
},
41313+
{
41314+
"source_path": "docs/sql-server/azure-arc/billing.md",
41315+
"redirect_url": "/sql/sql-server/azure-arc/manage-license-type",
41316+
"redirect_document_id": false
41317+
},
4131341318
{
4131441319
"source_path": "docs/sql-server/azure-arc/connect-at-scale.md",
4131541320
"redirect_url": "/sql/sql-server/azure-arc/connect-at-scale-script",

docs/database-engine/install-windows/install-sql-server-from-the-installation-wizard-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ This isn't applicable to [!INCLUDE[sql-server-2019](../../includes/sssql19-md.md
453453
1. On the **Edition** page, select the edition you want to install.
454454

455455
* **Specify a free edition** allows you to select Evaluation, Developer, or Web edition.
456-
* **Use pay-as-you-go billing through Microsoft Azure** is an alternative to using the traditional license agreement. [!INCLUDE[sql-server-2022](../../includes/sssql22-md.md)] introduces this option in setup and allows you to activate your instance for use in production without supplying a product key. This option requires an active Azure subscription. For more information, see [Billing through Microsoft Azure](../../sql-server/azure-arc/billing.md). With this option you can specify Standard or Enterprise edition.
456+
* **Use pay-as-you-go billing through Microsoft Azure** is an alternative to using the traditional license agreement. [!INCLUDE[sql-server-2022](../../includes/sssql22-md.md)] introduces this option in setup and allows you to activate your instance for use in production without supplying a product key. This option requires an active Azure subscription. For more information, see [Manage SQL Server license type](../../sql-server/azure-arc/manage-license-type.md). With this option you can specify Standard or Enterprise edition.
457457
* **Enter the product key** allows you to provide a product key for a specific edition of SQL Server. You may also specify if you have a license with Software Assurance or SQL Software Subscription, and if you have a SQL Server license only.
458458

459459
To continue, select **Next**.

docs/sql-server/azure-arc/connect-already-enabled.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To install the Azure extension for SQL Server, use the following steps:
3535
1. Search for the connected server with the SQL Server instance that you want to connect to Azure.
3636
1. Under **Extensions**, select **+ Add**.
3737
1. Select `Azure extension for SQL Server` and select **Next**.
38-
1. Specify the SQL Server edition and license type you are using on this machine. Please note that some Arc-enabled SQL Server features are only available for SQL Servers with Software Assurance (Paid) or with Azure pay-as-you-go. [Learn more:](billing.md).
38+
1. Specify the SQL Server edition and license type you are using on this machine. Please note that some Arc-enabled SQL Server features are only available for SQL Servers with Software Assurance (Paid) or with Azure pay-as-you-go. For more information, review [Manage SQL Server license type](manage-license-type.md).
3939
1. Specify the SQL Server instance(s) you want to exclude from registering (if you have multiple instances to skip, separate them by spaces) and select **Review + Create**.
4040
:::image type="content" source="media/join/license-type-in-extension.png" alt-text="Screenshot for license type and exclude instances.":::
4141
1. Select **Create**.

docs/sql-server/azure-arc/connect-at-scale-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To do this,
5151
1. Navigate to the **SQL Server - Azure Arc** view in the Azure portal.
5252
1. Select the **Automatic Arc-enabled SQL Server registration** button at the top of the list.
5353
1. Select a subscription and optionally a resource group.
54-
1. Select License type. Please note that some Arc-enabled SQL Server features are only available for SQL Servers with Software Assurance (Paid) or with Azure pay-as-you-go. [Learn more:](billing.md).
54+
1. Select License type. Please note that some Arc-enabled SQL Server features are only available for SQL Servers with Software Assurance (Paid) or with Azure pay-as-you-go. For more information, review [Manage SQL Server license type](manage-license-type.md).
5555
1. Select **Enable**.
5656

5757
These steps create a new Azure Policy assignment of the *Configure Arc-enabled machines running SQL Server to have SQL Server extension installed* policy definition to the selected subscription and, optionally, a specific resource group scope. A new system assigned managed identity is created and granted the required permissions to onboard Arc-enabled SQL Servers. This new managed identity is used by the policy remediation to install the Azure extension for SQL Server.

docs/sql-server/azure-arc/connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If the server that runs your SQL Server instance isn't yet connected to Azure, y
4444

4545
:::image type="content" source="media/join/server-details-sql-server-azure-arc.png" alt-text="Screenshot of server details for Azure Arc.":::
4646

47-
1. Select the SQL Server edition and license type you are using on this machine. Please note that some Arc-enabled SQL Server features are only available for SQL Servers with Software Assurance (Paid) or with Azure pay-as-you-go. [Learn more:](billing.md).
47+
1. Select the SQL Server edition and license type you are using on this machine. Please note that some Arc-enabled SQL Server features are only available for SQL Servers with Software Assurance (Paid) or with Azure pay-as-you-go. For more information, review [Manage SQL Server license type](manage-license-type.md).
4848

4949
1. Specify the SQL Server instance(s) you want to exclude from registering (if you have multiple instances installed on the server). Separate each excluded instance by a space.
5050

0 commit comments

Comments
 (0)