Skip to content

Commit 92a634c

Browse files
authored
Merge pull request #115235 from MashaMSFT/move11
Move11
2 parents db4add3 + b27190d commit 92a634c

File tree

209 files changed

+714
-589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+714
-589
lines changed

.openpublishing.redirection.json

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52856,6 +52856,131 @@
5285652856
"source_path": "articles/sql-database/sql-database-temporal-tables-retention-policy.md",
5285752857
"redirect_url": "/azure/azure-sql/database/temporal-tables-retention-policy",
5285852858
"redirect_document_id": true
52859+
},
52860+
{
52861+
"source_path": "articles/sql-database/sql-database-conditional-access.md",
52862+
"redirect_url": "/azure/azure-sql/database/conditional-access-confugre",
52863+
"redirect_document_id": true
52864+
},
52865+
{
52866+
"source_path": "articles/sql-database/sql-database-cli-samples.md",
52867+
"redirect_url": "/azure/azure-sql/database/az-cli-script-samples-content-guide",
52868+
"redirect_document_id": true
52869+
},
52870+
{
52871+
"source_path": "articles/sql-database/sql-database-configure-failover-group.md",
52872+
"redirect_url": "/azure/azure-sql/database/auto-failover-group-configure",
52873+
"redirect_document_id": true
52874+
},
52875+
{
52876+
"source_path": "articles/sql-database/sql-database-connect-excel.md",
52877+
"redirect_url": "/azure/azure-sql/database/connect-excel",
52878+
"redirect_document_id": true
52879+
},
52880+
{
52881+
"source_path": "articles/sql-database/sql-database-connect-query-dotnet-core.md",
52882+
"redirect_url": "/azure/azure-sql/database/connect-query-dotnet-core",
52883+
"redirect_document_id": true
52884+
},
52885+
{
52886+
"source_path": "articles/sql-database/sql-database-connect-query-dotnet-visual-studio.md",
52887+
"redirect_url": "/azure/azure-sql/database/connect-query-dotnet-visual-studio",
52888+
"redirect_document_id": true
52889+
},
52890+
{
52891+
"source_path": "articles/sql-database/sql-database-connect-query-go.md",
52892+
"redirect_url": "/azure/azure-sql/database/connect-query-go",
52893+
"redirect_document_id": true
52894+
},
52895+
{
52896+
"source_path": "articles/sql-database/sql-database-connect-query-java.md",
52897+
"redirect_url": "/azure/azure-sql/database/connect-query-java",
52898+
"redirect_document_id": true
52899+
},
52900+
{
52901+
"source_path": "articles/sql-database/sql-database-connect-query-nodejs.md",
52902+
"redirect_url": "/azure/azure-sql/database/connect-query-nodejs",
52903+
"redirect_document_id": true
52904+
},
52905+
{
52906+
"source_path": "articles/sql-database/sql-database-connect-query-php.md",
52907+
"redirect_url": "/azure/azure-sql/database/connect-query-php",
52908+
"redirect_document_id": true
52909+
},
52910+
{
52911+
"source_path": "articles/sql-database/sql-database-connect-query-ruby.md",
52912+
"redirect_url": "/azure/azure-sql/database/connect-query-ruby",
52913+
"redirect_document_id": true
52914+
},
52915+
{
52916+
"source_path": "articles/sql-database/sql-database-connect-query-python.md",
52917+
"redirect_url": "/azure/azure-sql/database/connect-query-python",
52918+
"redirect_document_id": true
52919+
},
52920+
{
52921+
"source_path": "articles/sql-database/sql-database-connect-query-vscode.md",
52922+
"redirect_url": "/azure/azure-sql/database/connect-query-vscode",
52923+
"redirect_document_id": true
52924+
},
52925+
{
52926+
"source_path": "articles/sql-database/sql-database-connect-query.md",
52927+
"redirect_url": "/azure/azure-sql/database/connect-query-content-reference-guide",
52928+
"redirect_document_id": true
52929+
},
52930+
{
52931+
"source_path": "articles/sql-database/sql-database-connectivity-issues.md",
52932+
"redirect_url": "/azure/azure-sql/database/troubleshoot-common-connectivity-issues",
52933+
"redirect_document_id": true
52934+
},
52935+
{
52936+
"source_path": "articles/sql-database/sql-database-data-discovery-and-classification.md",
52937+
"redirect_url": "/azure/azure-sql/database/data-discovery-and-classification-overview",
52938+
"redirect_document_id": true
52939+
},
52940+
{
52941+
"source_path": "articles/sql-database/sql-database-design-first-database-csharp.md",
52942+
"redirect_url": "/azure/azure-sql/database/tutorial-design-first-database-csharp",
52943+
"redirect_document_id": true
52944+
},
52945+
{
52946+
"source_path": "articles/sql-database/sql-database-design-first-database.md",
52947+
"redirect_url": "/azure/azure-sql/database/tutorial-design-first-database",
52948+
"redirect_document_id": true
52949+
},
52950+
{
52951+
"source_path": "articles/sql-database/sql-database-develop-cplusplus-simple.md",
52952+
"redirect_url": "/azure/azure-sql/database/develop-cplusplus-simple",
52953+
"redirect_document_id": true
52954+
},
52955+
{
52956+
"source_path": "articles/sql-database/sql-database-glossary-terms.md",
52957+
"redirect_url": "/azure/azure-sql/database/glossary-terms",
52958+
"redirect_document_id": true
52959+
},
52960+
{
52961+
"source_path": "articles/sql-database/sql-database-high-availability.md",
52962+
"redirect_url": "/azure/azure-sql/database/high-availability-sla",
52963+
"redirect_document_id": true
52964+
},
52965+
{
52966+
"source_path": "articles/sql-database/sql-database-import.md",
52967+
"redirect_url": "/azure/azure-sql/database/database-import",
52968+
"redirect_document_id": true
52969+
},
52970+
{
52971+
"source_path": "articles/sql-database/sql-database-job-automation-overview.md",
52972+
"redirect_url": "/azure/azure-sql/database/job-automation-overview",
52973+
"redirect_document_id": true
52974+
},
52975+
{
52976+
"source_path": "articles/sql-database/sql-database-manage-logins.md",
52977+
"redirect_url": "/azure/azure-sql/database/logins-create-manage",
52978+
"redirect_document_id": true
52979+
},
52980+
{
52981+
"source_path": "articles/sql-database/sql-database-managed-instance-transactional-replication.md",
52982+
"redirect_url": "/azure/azure-sql/database/transactional-replication-overview",
52983+
"redirect_document_id": true
5285952984
}
5286052985
]
5286152986
}

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Administrators can assign a Conditional Access policy to the following cloud app
3333
- [Office 365 (preview)](#office-365-preview)
3434
- Azure Analysis Services
3535
- Azure DevOps
36-
- [Azure SQL Database and Data Warehouse](../../sql-database/sql-database-conditional-access.md)
36+
- [Azure SQL Database and Data Warehouse](../../azure-sql/database/conditional-access-confugre.md)
3737
- Dynamics CRM Online
3838
- Microsoft Application Insights Analytics
3939
- [Microsoft Azure Information Protection](/azure/information-protection/faqs#i-see-azure-information-protection-is-listed-as-an-available-cloud-app-for-conditional-accesshow-does-this-work)

articles/availability-zones/az-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ There is no additional cost for virtual machines deployed in an Availability Zon
161161
- [Load balance VMs across zones using a Standard Load Balancer with a zone-redundant frontend](../load-balancer/load-balancer-standard-public-zone-redundant-cli.md)
162162
- [Load balance VMs within a zone using a Standard Load Balancer with a zonal frontend](../load-balancer/load-balancer-standard-public-zonal-cli.md)
163163
- [Zone-redundant storage](../storage/common/storage-redundancy-zrs.md)
164-
- [SQL Database](../sql-database/sql-database-high-availability.md#zone-redundant-configuration)
164+
- [SQL Database](../azure-sql/database/high-availability-sla.md#zone-redundant-configuration)
165165
- [Event Hubs geo-disaster recovery](../event-hubs/event-hubs-geo-dr.md#availability-zones)
166166
- [Service Bus geo-disaster recovery](../service-bus-messaging/service-bus-geo-dr.md#availability-zones)
167167
- [Create a zone-redundant virtual network gateway](../vpn-gateway/create-zone-redundant-vnet-gateway.md)

articles/azure-sql/database/aad-authentication-configure.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ For more information, see [Integrating your on-premises identities with Azure Ac
5555
5656
## Azure AD admin with a server in SQL Database
5757

58-
Each [server](logical-servers.md) in Azure (which hosts SQL Database or Azure Synapse) starts with a single server administrator account that is the administrator of the entire server. Create a second administrator account as an Azure AD account. This principal is created as a contained database user in the master database of the server. Administrator accounts are members of the **db_owner** role in every user database, and enter each user database as the **dbo** user. For more information about administrator accounts, see [Managing Databases and Logins](../../sql-database/sql-database-manage-logins.md).
58+
Each [server](logical-servers.md) in Azure (which hosts SQL Database or Azure Synapse) starts with a single server administrator account that is the administrator of the entire server. Create a second administrator account as an Azure AD account. This principal is created as a contained database user in the master database of the server. Administrator accounts are members of the **db_owner** role in every user database, and enter each user database as the **dbo** user. For more information about administrator accounts, see [Managing Databases and Logins](logins-create-manage.md).
5959

6060
When using Azure Active Directory with geo-replication, the Azure Active Directory administrator must be configured for both the primary and the secondary servers. If a server does not have an Azure Active Directory administrator, then Azure Active Directory logins and users receive a `Cannot connect` to server error.
6161

@@ -404,7 +404,7 @@ For more information about creating contained database users based on Azure Acti
404404
> If you receive a **Connection Timeout Expired**, you may need to set the `TransparentNetworkIPResolution`
405405
parameter of the connection string to false. For more information, see [Connection timeout issue with .NET Framework 4.6.1 - TransparentNetworkIPResolution](https://blogs.msdn.microsoft.com/dataaccesstechnologies/20../../connection-timeout-issue-with-net-framework-4-6-1-transparentnetworkipresolution/).
406406

407-
When you create a database user, that user receives the **CONNECT** permission and can connect to that database as a member of the **PUBLIC** role. Initially the only permissions available to the user are any permissions granted to the **PUBLIC** role, or any permissions granted to any Azure AD groups that they are a member of. Once you provision an Azure AD-based contained database user, you can grant the user additional permissions, the same way as you grant permission to any other type of user. Typically grant permissions to database roles, and add users to roles. For more information, see [Database Engine Permission Basics](https://social.technet.microsoft.com/wiki/contents/articles/4433.database-engine-permission-basics.aspx). For more information about special SQL Database roles, see [Managing Databases and Logins in Azure SQL Database](../../sql-database/sql-database-manage-logins.md).
407+
When you create a database user, that user receives the **CONNECT** permission and can connect to that database as a member of the **PUBLIC** role. Initially the only permissions available to the user are any permissions granted to the **PUBLIC** role, or any permissions granted to any Azure AD groups that they are a member of. Once you provision an Azure AD-based contained database user, you can grant the user additional permissions, the same way as you grant permission to any other type of user. Typically grant permissions to database roles, and add users to roles. For more information, see [Database Engine Permission Basics](https://social.technet.microsoft.com/wiki/contents/articles/4433.database-engine-permission-basics.aspx). For more information about special SQL Database roles, see [Managing Databases and Logins in Azure SQL Database](logins-create-manage.md).
408408
A federated domain user account that is imported into a managed domain as an external user, must use the managed domain identity.
409409

410410
> [!NOTE]
@@ -530,7 +530,7 @@ Guidance on troubleshooting issues with Azure AD Authentication can be found in
530530

531531
## Next steps
532532

533-
- For an overview of logins, users, database roles, and permissions in SQL Database, see [Logins, users, database roles, and user accounts](../../sql-database/sql-database-manage-logins.md).
533+
- For an overview of logins, users, database roles, and permissions in SQL Database, see [Logins, users, database roles, and user accounts](logins-create-manage.md).
534534
- For more information about database principals, see [Principals](https://msdn.microsoft.com/library/ms181127.aspx).
535535
- For more information about database roles, see [Database roles](https://msdn.microsoft.com/library/ms189121.aspx).
536536
- For more information about firewall rules in SQL Database, see [SQL Database firewall rules](firewall-configure.md).

articles/azure-sql/database/aad-authentication-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The following authentication methods are supported for Azure AD server principal
155155

156156
- To learn how to create and populate Azure AD, and then configure Azure AD with Azure SQL Database, SQL Managed Instance or Azure Synapse, see [Configure and manage Azure Active Directory authentication with SQL Database, SQL Managed Instance, or Azure Synapse](aad-authentication-configure.md).
157157
- For a tutorial of using Azure AD server principals (logins) with SQL Managed Instances, see [Azure AD server principals (logins) with SQL Managed Instances](../../sql-database/sql-database-managed-instance-aad-security-tutorial.md)
158-
- For an overview of logins, users, database roles, and permissions in SQL Database, see [Logins, users, database roles, and permissions](../../sql-database/sql-database-manage-logins.md).
158+
- For an overview of logins, users, database roles, and permissions in SQL Database, see [Logins, users, database roles, and permissions](logins-create-manage.md).
159159
- For more information about database principals, see [Principals](https://msdn.microsoft.com/library/ms181127.aspx).
160160
- For more information about database roles, see [Database roles](https://msdn.microsoft.com/library/ms189121.aspx).
161161
- For syntax on creating Azure AD server principals (logins) for SQL Managed Instances, see [CREATE LOGIN](/sql/t-sql/statements/create-login-transact-sql?view=azuresqldb-mi-current).

articles/azure-sql/database/active-geo-replication-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ To achieve real business continuity, adding database redundancy between datacent
7676
> [!NOTE]
7777
> The log replay is delayed on the secondary database if there are schema updates on the Primary. The latter requires a schema lock on the secondary database.
7878
> [!IMPORTANT]
79-
> You can use geo-replication to create a secondary database in the same region as the primary. You can use this secondary to load-balance a read-only workloads in the same region. However, a secondary database in the same region does not provide additional fault resilience and therefore is not a suitable failover target for disaster recovery. It will also not guarantee availability zone isolation. Use Business critical or Premium service tier with [zone redundant configuration](../../sql-database/sql-database-high-availability.md#zone-redundant-configuration) to achieve availability zone isolation.
79+
> You can use geo-replication to create a secondary database in the same region as the primary. You can use this secondary to load-balance a read-only workloads in the same region. However, a secondary database in the same region does not provide additional fault resilience and therefore is not a suitable failover target for disaster recovery. It will also not guarantee availability zone isolation. Use Business critical or Premium service tier with [zone redundant configuration](high-availability-sla.md#zone-redundant-configuration) to achieve availability zone isolation.
8080
>
8181
8282
- **Planned failover**
@@ -113,7 +113,7 @@ To ensure that your application can immediately access the new primary after fai
113113

114114
Both primary and secondary databases are required to have the same service tier. It is also strongly recommended that the secondary database is created with the same compute size (DTUs or vCores) as the primary. If the primary database is experiencing a heavy write workload, a secondary with lower compute size may not be able to keep up with it. That will cause redo lag on the secondary, and potential unavailability of the secondary. To mitigate these risks, active geo-replication will throttle the primary's transaction log rate if necessary to allow its secondaries to catch up.
115115

116-
Another consequence of an imbalanced secondary configuration is that after failover, application performance may suffer due to insufficient compute capacity of the new primary. In that case, it will be necessary to scale up database service objective to the necessary level, which may take significant time and compute resources, and will require a [high availability](../../sql-database/sql-database-high-availability.md) failover at the end of the scale up process.
116+
Another consequence of an imbalanced secondary configuration is that after failover, application performance may suffer due to insufficient compute capacity of the new primary. In that case, it will be necessary to scale up database service objective to the necessary level, which may take significant time and compute resources, and will require a [high availability](high-availability-sla.md) failover at the end of the scale up process.
117117

118118
If you decide to create the secondary with lower compute size, the log IO percentage chart in Azure portal provides a good way to estimate the minimal compute size of the secondary that is required to sustain the replication load. For example, if your primary database is P6 (1000 DTU) and its log write percent is 50%, the secondary needs to be at least P4 (500 DTU). To retrieve historical log IO data, use the [sys.resource_stats](/sql/relational-databases/system-catalog-views/sys-resource-stats-azure-sql-database) view. To retrieve recent log write data with higher granularity that better reflects short-term spikes in log rate, use [sys.dm_db_resource_stats](/sql/relational-databases/system-dynamic-management-views/sys-dm-db-resource-stats-azure-sql-database) view.
119119

@@ -198,7 +198,7 @@ After the initial setup, the users, logins, and firewall rules created can be re
198198

199199
## Keeping credentials and firewall rules in sync
200200

201-
We recommend using [database-level IP firewall rules](firewall-configure.md) for geo-replicated databases so these rules can be replicated with the database to ensure all secondary databases have the same IP firewall rules as the primary. This approach eliminates the need for customers to manually configure and maintain firewall rules on servers hosting both the primary and secondary databases. Similarly, using [contained database users](../../sql-database/sql-database-manage-logins.md) for data access ensures both primary and secondary databases always have the same user credentials so during a failover, there is no disruptions due to mismatches with logins and passwords. With the addition of [Azure Active Directory](../../active-directory/fundamentals/active-directory-whatis.md), customers can manage user access to both primary and secondary databases and eliminating the need for managing credentials in databases altogether.
201+
We recommend using [database-level IP firewall rules](firewall-configure.md) for geo-replicated databases so these rules can be replicated with the database to ensure all secondary databases have the same IP firewall rules as the primary. This approach eliminates the need for customers to manually configure and maintain firewall rules on servers hosting both the primary and secondary databases. Similarly, using [contained database users](logins-create-manage.md) for data access ensures both primary and secondary databases always have the same user credentials so during a failover, there is no disruptions due to mismatches with logins and passwords. With the addition of [Azure Active Directory](../../active-directory/fundamentals/active-directory-whatis.md), customers can manage user access to both primary and secondary databases and eliminating the need for managing credentials in databases altogether.
202202

203203
## Upgrading or downgrading primary database
204204

0 commit comments

Comments
 (0)