Skip to content

Commit ee4218e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into bfdnote
2 parents e96d60e + 70c9414 commit ee4218e

18 files changed

+34
-41
lines changed

articles/azure-sql/database/active-directory-interactive-connect-azure-sql-db.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ For the C# program to successfully run, you need to assign proper values to stat
120120
| Initial_DatabaseName | "myDatabase" | **SQL servers** > **SQL databases** |
121121
| ClientApplicationID | "a94f9c62-97fe-4d19-b06d-111111111111" | **Azure Active Directory** > **App registrations** > **Search by name** > **Application ID** |
122122
| RedirectUri | new Uri("https://mywebserver.com/") | **Azure Active Directory** > **App registrations** > **Search by name** > *[Your-App-registration]* > **Settings** > **RedirectURIs**<br /><br />For this article, any valid value is fine for RedirectUri, because it isn't used here. |
123-
| &nbsp; | &nbsp; | &nbsp; |
124123

125124
## Verify with SQL Server Management Studio
126125

articles/azure-sql/database/manage-data-after-migrating-to-database.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Azure AD supports [Azure AD Multi-Factor Authentication](authentication-mfa-ssms
111111
|Are logged in to Windows using your Azure AD credentials from a federated domain|Use [Azure AD integrated authentication](authentication-aad-configure.md).|
112112
|Are logged in to Windows using credentials from a domain not federated with Azure|Use [Azure AD integrated authentication](authentication-aad-configure.md).|
113113
|Have middle-tier services which need to connect to SQL Database or Azure Synapse Analytics|Use [Azure AD integrated authentication](authentication-aad-configure.md).|
114-
|||
114+
115115

116116
### How do I limit or control connectivity access to my database
117117

articles/azure-sql/database/migrate-dtu-to-vcore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ The following table provides guidance for specific migration scenarios:
178178
|General purpose|Premium|Upgrade|Must migrate secondary first|
179179
|Business critical|General purpose|Downgrade|Must migrate primary first|
180180
|General purpose|Business critical|Upgrade|Must migrate secondary first|
181-
||||
181+
182182

183183
## Migrate failover groups
184184

articles/azure-sql/database/powershell-script-content-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The following table includes links to sample Azure PowerShell scripts for Azure
5151
| [Sync data between databases](scripts/sql-data-sync-sync-data-between-sql-databases.md?toc=%2fpowershell%2fmodule%2ftoc.json) | This PowerShell script configures Data Sync to sync between multiple databases in Azure SQL Database. |
5252
| [Sync data between SQL Database and SQL Server on-premises](scripts/sql-data-sync-sync-data-between-azure-onprem.md?toc=%2fpowershell%2fmodule%2ftoc.json) | This PowerShell script configures Data Sync to sync between a database in Azure SQL Database and a SQL Server on-premises database. |
5353
| [Update the SQL Data Sync sync schema](scripts/update-sync-schema-in-sync-group.md?toc=%2fpowershell%2fmodule%2ftoc.json) | This PowerShell script adds or removes items from the Data Sync sync schema. |
54-
|||
54+
5555

5656
Learn more about the [Single-database Azure PowerShell API](single-database-manage.md#powershell).
5757

@@ -69,7 +69,7 @@ The following table includes links to sample Azure PowerShell scripts for Azure
6969
| [Manage transparent data encryption in a managed instance using your own key from Azure Key Vault](../managed-instance/scripts/transparent-data-encryption-byok-powershell.md?toc=%2fpowershell%2fmodule%2ftoc.json)| This PowerShell script configures transparent data encryption in a Bring Your Own Key scenario for Azure SQL Managed Instance, using a key from Azure Key Vault.|
7070
|**Configure a failover group**||
7171
| [Configure a failover group for a managed instance](../managed-instance/scripts/add-to-failover-group-powershell.md?toc=%2fpowershell%2fmodule%2ftoc.json) | This PowerShell script creates two managed instances, adds them to a failover group, and then tests failover from the primary managed instance to the secondary managed instance. |
72-
|||
72+
7373

7474
Learn more about [PowerShell cmdlets for Azure SQL Managed Instance](../managed-instance/api-references-create-manage-instance.md#powershell-create-and-configure-managed-instances).
7575

articles/azure-sql/database/purchasing-models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The following table and chart compares and contrasts the vCore-based and the DTU
3434
|---|---|---|
3535
|DTU-based|This model is based on a bundled measure of compute, storage, and I/O resources. Compute sizes are expressed in DTUs for single databases and in elastic database transaction units (eDTUs) for elastic pools. For more information about DTUs and eDTUs, see [What are DTUs and eDTUs?](purchasing-models.md#dtu-purchasing-model).|Customers who want simple, preconfigured resource options|
3636
|vCore-based|This model allows you to independently choose compute and storage resources. The vCore-based purchasing model also allows you to use [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/) for SQL Server to save costs.|Customers who value flexibility, control, and transparency|
37-
||||
37+
3838

3939
:::image type="content" source="./media/purchasing-models/pricing-model.png" alt-text="Pricing model comparison" lightbox="./media/purchasing-models/pricing-model.png":::
4040

articles/azure-sql/database/replication-to-sql-database.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ There are different [types of replication](/sql/relational-databases/replication
5454
| [**Peer-to-peer**](/sql/relational-databases/replication/transactional/peer-to-peer-transactional-replication) | No | No|
5555
| [**Bidirectional**](/sql/relational-databases/replication/transactional/bidirectional-transactional-replication) | No | Yes|
5656
| [**Updatable subscriptions**](/sql/relational-databases/replication/transactional/updatable-subscriptions-for-transactional-replication) | No | No|
57-
| &nbsp; | &nbsp; | &nbsp; |
5857

5958

6059
## Remarks

articles/azure-sql/database/resource-limits-dtu-elastic-pools.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For the same number of DTUs, resources provided to an elastic pool may exceed th
5858
| Min DTU per database choices | 0, 5 | 0, 5 | 0, 5 | 0, 5 | 0, 5 | 0, 5 | 0, 5 | 0, 5 |
5959
| Max DTU per database choices | 5 | 5 | 5 | 5 | 5 | 5 | 5 | 5 |
6060
| Max storage per database (GB) | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 |
61-
||||||||
61+
6262

6363
<sup>1</sup> See [Resource management in dense elastic pools](elastic-pool-resource-management.md) for additional considerations.
6464

@@ -77,7 +77,7 @@ For the same number of DTUs, resources provided to an elastic pool may exceed th
7777
| Min DTU per database choices | 0, 10, 20, 50 | 0, 10, 20, 50, 100 | 0, 10, 20, 50, 100, 200 | 0, 10, 20, 50, 100, 200, 300 | 0, 10, 20, 50, 100, 200, 300, 400 | 0, 10, 20, 50, 100, 200, 300, 400, 800 |
7878
| Max DTU per database choices | 10, 20, 50 | 10, 20, 50, 100 | 10, 20, 50, 100, 200 | 10, 20, 50, 100, 200, 300 | 10, 20, 50, 100, 200, 300, 400 | 10, 20, 50, 100, 200, 300, 400, 800 |
7979
| Max storage per database (GB) | 1024 | 1024 | 1024 | 1024 | 1024 | 1024 |
80-
||||||||
80+
8181

8282
<sup>1</sup> See [SQL Database pricing options](https://azure.microsoft.com/pricing/details/sql-database/elastic/) for details on additional cost incurred due to any extra storage provisioned.
8383

@@ -98,7 +98,7 @@ For the same number of DTUs, resources provided to an elastic pool may exceed th
9898
| Min DTU per database choices | 0, 10, 20, 50, 100, 200, 300, 400, 800, 1200 | 0, 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600 | 0, 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600, 2000 | 0, 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600, 2000, 2500 | 0, 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600, 2000, 2500, 3000 |
9999
| Max DTU per database choices | 10, 20, 50, 100, 200, 300, 400, 800, 1200 | 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600 | 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600, 2000 | 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600, 2000, 2500 | 10, 20, 50, 100, 200, 300, 400, 800, 1200, 1600, 2000, 2500, 3000 |
100100
| Max storage per database (GB) | 1024 | 1536 | 1792 | 2304 | 2816 |
101-
|||||||
101+
102102

103103
<sup>1</sup> See [SQL Database pricing options](https://azure.microsoft.com/pricing/details/sql-database/elastic/) for details on additional cost incurred due to any extra storage provisioned.
104104

@@ -119,7 +119,7 @@ For the same number of DTUs, resources provided to an elastic pool may exceed th
119119
| Min eDTUs per database | 0, 25, 50, 75, 125 | 0, 25, 50, 75, 125, 250 | 0, 25, 50, 75, 125, 250, 500 | 0, 25, 50, 75, 125, 250, 500, 1000 | 0, 25, 50, 75, 125, 250, 500, 1000|
120120
| Max eDTUs per database | 25, 50, 75, 125 | 25, 50, 75, 125, 250 | 25, 50, 75, 125, 250, 500 | 25, 50, 75, 125, 250, 500, 1000 | 25, 50, 75, 125, 250, 500, 1000|
121121
| Max storage per database (GB) | 1024 | 1024 | 1024 | 1024 | 1536 |
122-
|||||||
122+
123123

124124
<sup>1</sup> See [SQL Database pricing options](https://azure.microsoft.com/pricing/details/sql-database/elastic/) for details on additional cost incurred due to any extra storage provisioned.
125125

@@ -140,7 +140,7 @@ For the same number of DTUs, resources provided to an elastic pool may exceed th
140140
| Min DTU per database choices | 0, 25, 50, 75, 125, 250, 500, 1000, 1750 | 0, 25, 50, 75, 125, 250, 500, 1000, 1750 | 0, 25, 50, 75, 125, 250, 500, 1000, 1750 | 0, 25, 50, 75, 125, 250, 500, 1000, 1750 | 0, 25, 50, 75, 125, 250, 500, 1000, 1750, 4000 |
141141
| Max DTU per database choices | 25, 50, 75, 125, 250, 500, 1000, 1750 | 25, 50, 75, 125, 250, 500, 1000, 1750 | 25, 50, 75, 125, 250, 500, 1000, 1750 | 25, 50, 75, 125, 250, 500, 1000, 1750 | 25, 50, 75, 125, 250, 500, 1000, 1750, 4000 |
142142
| Max storage per database (GB) | 2048 | 2560 | 3072 | 3584 | 4096 |
143-
|||||||
143+
144144

145145
<sup>1</sup> See [SQL Database pricing options](https://azure.microsoft.com/pricing/details/sql-database/elastic/) for details on additional cost incurred due to any extra storage provisioned.
146146

@@ -169,7 +169,7 @@ The following table describes per database properties for pooled databases.
169169
| Max DTUs per database |The maximum number of DTUs that any database in the pool may use, if available based on utilization by other databases in the pool. Max DTUs per database is not a resource guarantee for a database. If the workload in each database does not need all available pool resources to perform adequately, consider setting max DTUs per database to prevent a single database from monopolizing pool resources. Some degree of over-committing is expected since the pool generally assumes hot and cold usage patterns for databases, where all databases are not simultaneously peaking. |
170170
| Min DTUs per database |The minimum number of DTUs reserved for any database in the pool. Consider setting a min DTUs per database when you want to guarantee resource availability for each database regardless of resource consumption by other databases in the pool. The min DTUs per database may be set to 0, and is also the default value. This property is set to anywhere between 0 and the average DTUs utilization per database.|
171171
| Max storage per database |The maximum database size set by the user for a database in a pool. Pooled databases share allocated pool storage, so the size a database can reach is limited to the smaller of remaining pool storage and maximum database size. Maximum database size refers to the maximum size of the data files and does not include the space used by the log file. |
172-
|||
172+
173173

174174
> [!IMPORTANT]
175175
> Because resources in an elastic pool are finite, setting min DTUs per database to a value greater than 0 implicitly limits resource utilization by each database. If, at a point in time, most databases in a pool are idle, resources reserved to satisfy the min DTUs guarantee are not available to databases active at that point in time.
@@ -197,7 +197,7 @@ The following table lists tempdb sizes for single databases in Azure SQL Databas
197197
|Standard Elastic Pools (1200 eDTU)|32|10|320|
198198
|Standard Elastic Pools (1600-3000 eDTU)|32|12|384|
199199
|Premium Elastic Pools (all DTU configurations)|13.9|12|166.7|
200-
||||
200+
201201

202202
## Next steps
203203

articles/azure-sql/database/resource-limits-vcore-elastic-pools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ The following table describes per database properties for pooled databases.
564564
| Max vCores per database |The maximum number of vCores that any database in the pool may use, if available based on utilization by other databases in the pool. Max vCores per database is not a resource guarantee for a database. If the workload in each database does not need all available pool resources to perform adequately, consider setting max vCores per database to prevent a single database from monopolizing pool resources. Some degree of over-committing is expected since the pool generally assumes hot and cold usage patterns for databases, where all databases are not simultaneously peaking. |
565565
| Min vCores per database |The minimum number of vCores reserved for any database in the pool. Consider setting a min vCores per database when you want to guarantee resource availability for each database regardless of resource consumption by other databases in the pool. The min vCores per database may be set to 0, and is also the default value. This property is set to anywhere between 0 and the average vCores utilization per database.|
566566
| Max storage per database |The maximum database size set by the user for a database in a pool. Pooled databases share allocated pool storage, so the size a database can reach is limited to the smaller of remaining pool storage and maximum database size. Maximum database size refers to the maximum size of the data files and does not include the space used by the log file. |
567-
|||
567+
568568

569569
> [!IMPORTANT]
570570
> Because resources in an elastic pool are finite, setting min vCores per database to a value greater than 0 implicitly limits resource utilization by each database. If, at a point in time, most databases in a pool are idle, resources reserved to satisfy the min vCores guarantee are not available to databases active at that point in time.

articles/azure-sql/database/saas-dbpertenant-get-started-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ The Wingtip application uses [*Azure Traffic Manager*](../../traffic-manager/tr
128128
| .*&lt;user&gt;* | *af1* in the example. |
129129
| .trafficmanager.net/ | Traffic Manager, base URL. |
130130
| fabrikamjazzclub | Identifies the tenant named Fabrikam Jazz Club. |
131-
| &nbsp; | &nbsp; |
131+
132132

133133
- The tenant name is parsed from the URL by the events app.
134134
- The tenant name is used to create a key.

articles/azure-sql/database/saas-tenancy-app-design-patterns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ The following table summarizes the differences between the main tenancy models.
185185
| Performance monitoring and management | Per-tenant only | Aggregate + per-tenant | Aggregate; although is per-tenant only for singles. |
186186
| Development complexity | Low | Low | Medium; due to sharding. |
187187
| Operational complexity | Low-High. Individually simple, complex at scale. | Low-Medium. Patterns address complexity at scale. | Low-High. Individual tenant management is complex. |
188-
| &nbsp; ||||
188+
189189

190190
## Next steps
191191

0 commit comments

Comments
 (0)