Skip to content

Commit 29b2ece

Browse files
authored
Merge pull request #115299 from MashaMSFT/move13
Move13
2 parents 9321033 + 7ccfa55 commit 29b2ece

File tree

173 files changed

+698
-573
lines changed

Some content is hidden

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

173 files changed

+698
-573
lines changed

.openpublishing.redirection.json

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53121,6 +53121,131 @@
5312153121
"source_path": "articles/sql-database/troubleshoot-connectivity-issues-microsoft-azure-sql-database.md",
5312253122
"redirect_url": "/azure/azure-sql/database/troubleshoot-common-errors-issues",
5312353123
"redirect_document_id": true
53124+
},
53125+
{
53126+
"source_path": "articles/sql-database/replication-with-sql-database-managed-instance.md",
53127+
"redirect_url": "/azure/azure-sql/managed-instance/tutorial-replication-between-two-instances-configure",
53128+
"redirect_document_id": true
53129+
},
53130+
{
53131+
"source_path": "articles/sql-database/sql-database-howto-managed-instance.md",
53132+
"redirect_url": "/azure/azure-sql/managed-instance/how-to-content-reference-guide",
53133+
"redirect_document_id": true
53134+
},
53135+
{
53136+
"source_path": "articles/sql-database/sql-database-instance-pools-how-to.md",
53137+
"redirect_url": "/azure/azure-sql/managed-instance/instance-pools-configure",
53138+
"redirect_document_id": true
53139+
},
53140+
{
53141+
"source_path": "articles/sql-database/sql-database-instance-pools.md",
53142+
"redirect_url": "/azure/azure-sql/managed-instance/instance-pools-overview",
53143+
"redirect_document_id": true
53144+
},
53145+
{
53146+
"source_path": "articles/sql-database/sql-database-managed-instance-aad-security-tutorial.md",
53147+
"redirect_url": "/azure/azure-sql/managed-instance/tutorial-configure-aad-security",
53148+
"redirect_document_id": true
53149+
},
53150+
{
53151+
"source_path": "articles/sql-database/sql-database-managed-instance-auditing.md",
53152+
"redirect_url": "/azure/azure-sql/managed-instance/auditing-configure",
53153+
"redirect_document_id": true
53154+
},
53155+
{
53156+
"source_path": "articles/sql-database/sql-database-managed-instance-configure-p2s.md",
53157+
"redirect_url": "/azure/azure-sql/managed-instance/point-to-site-p2s-configure",
53158+
"redirect_document_id": true
53159+
},
53160+
{
53161+
"source_path": "articles/sql-database/sql-database-managed-instance-configure-replication-tutorial.md",
53162+
"redirect_url": "/azure/azure-sql/managed-instance/tutorial-configure-replication-two-instances-and-sql-server",
53163+
"redirect_document_id": true
53164+
},
53165+
{
53166+
"source_path": "articles/sql-database/sql-database-managed-instance-configure-vm.md",
53167+
"redirect_url": "/azure/azure-sql/managed-instance/connect-vm-instance-configure",
53168+
"redirect_document_id": true
53169+
},
53170+
{
53171+
"source_path": "articles/sql-database/sql-database-managed-instance-connect-app.md",
53172+
"redirect_url": "/azure/azure-sql/managed-instance/connect-application-instance",
53173+
"redirect_document_id": true
53174+
},
53175+
{
53176+
"source_path": "articles/sql-database/sql-database-managed-instance-configure-vnet-subnet.md",
53177+
"redirect_url": "/azure/azure-sql/managed-instance/vnet-existing-add-subnet",
53178+
"redirect_document_id": true
53179+
},
53180+
{
53181+
"source_path": "articles/sql-database/sql-database-managed-instance-connection-type.md",
53182+
"redirect_url": "/azure/azure-sql/managed-instance/connection-types-overview",
53183+
"redirect_document_id": true
53184+
},
53185+
{
53186+
"source_path": "articles/sql-database/sql-database-managed-instance-connectivity-architecture.md",
53187+
"redirect_url": "/azure/azure-sql/managed-instance/connectivity-architecture-overview",
53188+
"redirect_document_id": true
53189+
},
53190+
{
53191+
"source_path": "articles/sql-database/sql-database-managed-instance-create-manage.md",
53192+
"redirect_url": "/azure/azure-sql/managed-instance/api-references-create-manage-instance",
53193+
"redirect_document_id": true
53194+
},
53195+
{
53196+
"source_path": "articles/sql-database/sql-database-managed-instance-create-vnet-subnet.md",
53197+
"redirect_url": "/azure/azure-sql/managed-instance/virtual-network-subnet-create-arm-template",
53198+
"redirect_document_id": true
53199+
},
53200+
{
53201+
"source_path": "articles/sql-database/sql-database-managed-instance-custom-dns.md",
53202+
"redirect_url": "/azure/azure-sql/managed-instance/custom-dns-configure",
53203+
"redirect_document_id": true
53204+
},
53205+
{
53206+
"source_path": "articles/sql-database/sql-database-managed-instance-determine-size-vnet-subnet.md",
53207+
"redirect_url": "/azure/azure-sql/managed-instance/vnet-subnet-determine-size",
53208+
"redirect_document_id": true
53209+
},
53210+
{
53211+
"source_path": "articles/sql-database/sql-database-managed-instance-delete-virtual-cluster.md",
53212+
"redirect_url": "/azure/azure-sql/managed-instance/virtual-cluster-delete",
53213+
"redirect_document_id": true
53214+
},
53215+
{
53216+
"source_path": "articles/sql-database/sql-database-managed-instance-failover-group-tutorial.md",
53217+
"redirect_url": "/azure/azure-sql/managed-instance/tutorial-add-instance-failover-group",
53218+
"redirect_document_id": true
53219+
},
53220+
{
53221+
"source_path": "articles/sql-database/sql-database-managed-instance.md",
53222+
"redirect_url": "/azure/azure-sql/managed-instance/sql-managed-instance-paas-overview",
53223+
"redirect_document_id": true
53224+
},
53225+
{
53226+
"source_path": "articles/sql-database/scripts/sql-database-add-managed-instance-to-failover-group-powershell.md",
53227+
"redirect_url": "/azure/azure-sql/managed-instance/scripts/add-to-failover-group-powershell",
53228+
"redirect_document_id": true
53229+
},
53230+
{
53231+
"source_path": "articles/sql-database/scripts/sql-database-create-configure-managed-instance-powershell.md",
53232+
"redirect_url": "/azure/azure-sql/managed-instance/scripts/create-configure-managed-instance-powershell",
53233+
"redirect_document_id": true
53234+
},
53235+
{
53236+
"source_path": "articles/sql-database/scripts/sql-managed-instance-create-powershell-azure-resource-manager-template.md",
53237+
"redirect_url": "/azure/azure-sql/managed-instance/scripts/create-powershell-azure-resource-manager-template",
53238+
"redirect_document_id": true
53239+
},
53240+
{
53241+
"source_path": "articles/sql-database/scripts/sql-managed-instance-restore-geo-backup.md",
53242+
"redirect_url": "/azure/azure-sql/managed-instance/scripts/restore-geo-backup",
53243+
"redirect_document_id": true
53244+
},
53245+
{
53246+
"source_path": "articles/sql-database/scripts/transparent-data-encryption-byok-sql-managed-instance-powershell.md",
53247+
"redirect_url": "/azure/azure-sql/managed-instance/scripts/transparent-data-encryption-byok-powershell",
53248+
"redirect_document_id": true
5312453249
}
5312553250
]
5312653251
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.date: 03/27/2020
1515
---
1616
# Configure and manage Azure Active Directory authentication with SQL
1717

18-
This article shows you how to create and populate Azure AD, and then use Azure AD with [Azure SQL Database](technical-overview.md), [Azure SQL Managed Instance](../../sql-database/sql-database-managed-instance.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview, see [Azure Active Directory Authentication](aad-authentication-overview.md).
18+
This article shows you how to create and populate Azure AD, and then use Azure AD with [Azure SQL Database](technical-overview.md), [Azure SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md). For an overview, see [Azure Active Directory Authentication](aad-authentication-overview.md).
1919

2020
## Azure AD authentication methods
2121

@@ -107,7 +107,7 @@ To grant your SQL Managed Instance Azure AD read permission using the Azure port
107107

108108
The process of changing the administrator may take several minutes. Then the new administrator appears in the Active Directory admin box.
109109

110-
After provisioning an Azure AD admin for your SQL Managed Instance, you can begin to create Azure AD server principals (logins) with the <a href="/sql/t-sql/statements/create-login-transact-sql?view=azuresqldb-mi-current">CREATE LOGIN</a> syntax. For more information, see [SQL Managed Instance overview](../../sql-database/sql-database-managed-instance.md#azure-active-directory-integration).
110+
After provisioning an Azure AD admin for your SQL Managed Instance, you can begin to create Azure AD server principals (logins) with the <a href="/sql/t-sql/statements/create-login-transact-sql?view=azuresqldb-mi-current">CREATE LOGIN</a> syntax. For more information, see [SQL Managed Instance overview](../managed-instance/sql-managed-instance-paas-overview.md#azure-active-directory-integration).
111111

112112
> [!TIP]
113113
> To later remove an Admin, at the top of the Active Directory admin page, select **Remove admin**, and then select **Save**.
@@ -351,7 +351,7 @@ You can meet these requirements by:
351351

352352
## Create contained users mapped to Azure AD identities
353353

354-
Since SQL Managed Instance supports Azure AD server principals (logins), using contained database users is not required. Azure AD server principals (logins) enable you to create logins from Azure AD users, groups, or applications. This means that you can authenticate with your SQL Managed Instance using the Azure AD server login rather than a contained database user. For more information, see [SQL Managed Instance Overview](../../sql-database/sql-database-managed-instance.md#azure-active-directory-integration). For syntax on creating Azure AD server principals (logins), see <a href="/sql/t-sql/statements/create-login-transact-sql?view=azuresqldb-mi-current">CREATE LOGIN</a>.
354+
Since SQL Managed Instance supports Azure AD server principals (logins), using contained database users is not required. Azure AD server principals (logins) enable you to create logins from Azure AD users, groups, or applications. This means that you can authenticate with your SQL Managed Instance using the Azure AD server login rather than a contained database user. For more information, see [SQL Managed Instance Overview](../managed-instance/sql-managed-instance-paas-overview.md#azure-active-directory-integration). For syntax on creating Azure AD server principals (logins), see <a href="/sql/t-sql/statements/create-login-transact-sql?view=azuresqldb-mi-current">CREATE LOGIN</a>.
355355

356356
However, using Azure Active Directory authentication with SQL Database and Azure Synapse requires using contained database users based on an Azure AD identity. A contained database user does not have a login in the master database, and maps to an identity in Azure AD that is associated with the database. The Azure AD identity can be either an individual user account or a group. For more information about contained database users, see [Contained Database Users- Making Your Database Portable](https://msdn.microsoft.com/library/ff929188.aspx).
357357

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.date: 04/23/2020
1414
---
1515
# Use Azure Active Directory Authentication for authentication with Azure SQL
1616

17-
Azure Active Directory authentication is a mechanism of connecting to [Azure SQL Database](technical-overview.md), [Azure SQL Managed Instance](../../sql-database/sql-database-managed-instance.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md) by using identities in Azure Active Directory (Azure AD).
17+
Azure Active Directory authentication is a mechanism of connecting to [Azure SQL Database](technical-overview.md), [Azure SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md), and [Azure Synapse Analytics (formerly Azure SQL Data Warehouse)](../../synapse-analytics/sql-data-warehouse/sql-data-warehouse-overview-what-is.md) by using identities in Azure Active Directory (Azure AD).
1818

1919
> [!NOTE]
2020
> This article applies to Azure SQL Database, SQL Managed Instance, and Azure Synapse. For simplicity, Azure SQL is used when referring to all three.
@@ -110,8 +110,8 @@ To create a contained database user in Azure SQL Database, SQL Managed Instance,
110110

111111
### SQL Managed Instance
112112

113-
- Azure AD server principals (logins) and users are supported for [SQL Managed Instance](../../sql-database/sql-database-managed-instance.md).
114-
- Setting Azure AD server principals (logins) mapped to an Azure AD group as database owner is not supported in [SQL Managed Instances](../../sql-database/sql-database-managed-instance.md).
113+
- Azure AD server principals (logins) and users are supported for [SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md).
114+
- Setting Azure AD server principals (logins) mapped to an Azure AD group as database owner is not supported in [SQL Managed Instances](../managed-instance/sql-managed-instance-paas-overview.md).
115115
- An extension of this is that when a group is added as part of the `dbcreator` server role, users from this group can connect to the SQL Managed Instance and create new databases, but will not be able to access the database. This is because the new database owner is SA, and not the Azure AD user. This issue does not manifest if the individual user is added to the `dbcreator` server role.
116116
- SQL Agent management and jobs execution are supported for Azure AD server principals (logins).
117117
- Database backup and restore operations can be executed by Azure AD server principals (logins).
@@ -154,7 +154,7 @@ The following authentication methods are supported for Azure AD server principal
154154
## Next steps
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).
157-
- 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)
157+
- For a tutorial of using Azure AD server principals (logins) with SQL Managed Instances, see [Azure AD server principals (logins) with SQL Managed Instances](../managed-instance/tutorial-configure-aad-security.md)
158158
- 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).

articles/azure-sql/database/auto-failover-group-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,6 @@ For detailed steps configuring a failover group, see the following tutorials:
678678

679679
- [Add a single database to a failover group](tutorial-add-single-database-failover-group.md)
680680
- [Add an elastic pool to a failover group](tutorial-add-elastic-pool-failover-group.md)
681-
- [Add a managed instance to a failover group](../../sql-database/sql-database-managed-instance-failover-group-tutorial.md)
681+
- [Add a managed instance to a failover group](../managed-instance/tutorial-add-instance-failover-group.md)
682682

683683
For an overview of Azure SQL Database high availability options, see [geo-replication](active-geo-replication-overview.md) and [auto-failover groups](auto-failover-group-overview.md).

0 commit comments

Comments
 (0)