Skip to content

Commit 4ff46bb

Browse files
MashaMSFTMashaMSFT
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/sql-docs-pr into 2022_atpdep
2 parents bc666cb + 1c403af commit 4ff46bb

1,975 files changed

Lines changed: 15418 additions & 17268 deletions

File tree

Some content is hidden

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

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
---
2-
title: ActiveDirectoryInteractive connects to SQL
2+
title: ActiveDirectoryInteractive connects to SQL
33
description: "C# Code example, with explanations, for connecting to Azure SQL Database by using SqlAuthenticationMethod.ActiveDirectoryInteractive mode."
4-
services: sql-database
4+
services:
5+
- "sql-database"
56
ms.service: sql-database
67
ms.subservice: security
7-
ms.custom: active directory, has-adal-ref, sqldbrb=1
8-
ms.devlang:
8+
ms.custom:
9+
- "active directory"
10+
- "has-adal-ref"
11+
- "sqldbrb=1"
912
ms.topic: conceptual
1013
author: GithubMirek
1114
ms.author: MirekS
12-
ms.reviewer: kendralittle, vanto, mathoma
15+
ms.reviewer: wiassaf, vanto, mathoma
1316
ms.date: 04/06/2022
1417
---
1518
# Connect to Azure SQL Database with Azure AD Multi-Factor Authentication
@@ -136,4 +139,4 @@ Microsoft SQL Azure (RTM) - 12.0.2000.8
136139

137140
- [Azure Active Directory server principals](authentication-azure-ad-logins.md)
138141
- [Azure AD-only authentication with Azure SQL](authentication-azure-ad-only-authentication.md)
139-
- [Using multi-factor Azure Active Directory authentication](authentication-mfa-ssms-overview.md)
142+
- [Using multi-factor Azure Active Directory authentication](authentication-mfa-ssms-overview.md)

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
---
22
title: "Tutorial: Geo-replication & failover in portal"
33
description: Learn how to configure geo-replication for an SQL database using the Azure portal or Azure CLI, and initiate failover.
4-
services: sql-database
4+
services:
5+
- "sql-database"
56
ms.service: sql-database
67
ms.subservice: high-availability
7-
ms.custom: sqldbrb=1, devx-track-azurecli
8+
ms.custom:
9+
- "sqldbrb=1"
10+
- "devx-track-azurecli"
811
ms.topic: tutorial
912
author: rajeshsetlem
1013
ms.author: rsetlem
11-
ms.reviewer: kendralittle, mathoma
14+
ms.reviewer: wiassaf, mathoma
1215
ms.date: 08/20/2021
1316
---
1417
# Tutorial: Configure active geo-replication and failover (Azure SQL Database)
@@ -170,4 +173,4 @@ Confirm that you want to perform the operation.
170173

171174
* To learn more about active geo-replication, see [active geo-replication](active-geo-replication-overview.md).
172175
* To learn about auto-failover groups, see [Auto-failover groups](auto-failover-group-sql-db.md)
173-
* For a business continuity overview and scenarios, see [Business continuity overview](business-continuity-high-availability-disaster-recover-hadr-overview.md).
176+
* For a business continuity overview and scenarios, see [Business continuity overview](business-continuity-high-availability-disaster-recover-hadr-overview.md).

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ title: Active geo-replication
33
description: Use active geo-replication to create readable secondary databases of individual databases in Azure SQL Database in the same or different regions.
44
ms.service: sql-database
55
ms.subservice: high-availability
6-
ms.custom: sqldbrb=1
6+
ms.custom:
7+
- "sqldbrb=1"
78
ms.topic: conceptual
89
author: rajeshsetlem
910
ms.author: rsetlem
10-
ms.reviewer: kendralittle, mathoma
11+
ms.reviewer: wiassaf, mathoma
1112
ms.date: 4/14/2022
1213
---
1314

@@ -18,13 +19,6 @@ Active geo-replication is a feature that lets you to create a continuously synch
1819

1920
Active geo-replication is designed as a business continuity solution that lets you perform quick disaster recovery of individual databases in case of a regional disaster or a large scale outage. Once geo-replication is set up, you can initiate a geo-failover to a geo-secondary in a different Azure region. The geo-failover is initiated programmatically by the application or manually by the user.
2021

21-
> [!NOTE]
22-
> Active geo-replication for Azure SQL Hyperscale is [now in public preview](service-tier-hyperscale-replicas.md#geo-replica-in-preview). Current limitations include:
23-
> - Primary can have only one geo-secondary replica.
24-
> - Restore or database copy from geo-secondary is not supported.
25-
> - Can't use geo-secondary as a source for geo-replication to another database.
26-
> - Audit records are not logged on Geo-secondaries when connecting with ApplicationIntent=Readonly.
27-
2822

2923
> [!NOTE]
3024
> Active geo-replication is not supported by Azure SQL Managed Instance. For geographic failover of instances of SQL Managed Instance, use [Auto-failover groups](auto-failover-group-sql-db.md).

‎azure-sql/database/active-geo-replication-security-configure.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
---
22
title: Configure security for disaster recovery
33
description: Learn the security considerations for configuring and managing security after a database restore or a failover to a secondary server.
4-
services: sql-database
4+
services:
5+
- "sql-database"
56
ms.service: sql-database
67
ms.subservice: high-availability
7-
ms.custom: sqldbrb=1
8-
ms.devlang:
8+
ms.custom:
9+
- "sqldbrb=1"
910
ms.topic: how-to
1011
author: rajeshsetlem
1112
ms.author: rsetlem
12-
ms.reviewer: kendralittle, mathoma, vanto
13+
ms.reviewer: wiassaf, mathoma, vanto
1314
ms.date: 12/18/2018
1415
---
1516
# Configure and manage Azure SQL Database security for geo-restore or failover
@@ -103,4 +104,4 @@ SID = 0x1234 /*replace 0x1234 with the desired login SID*/
103104
* For more information on contained database users, see [Contained Database Users - Making Your Database Portable](/sql/relational-databases/security/contained-database-users-making-your-database-portable).
104105
* To learn about active geo-replication, see [Active geo-replication](active-geo-replication-overview.md).
105106
* To learn about auto-failover groups, see [Auto-failover groups](auto-failover-group-sql-db.md).
106-
* For information about using geo-restore, see [geo-restore](recovery-using-backups.md#geo-restore)
107+
* For information about using geo-restore, see [geo-restore](recovery-using-backups.md#geo-restore)

‎azure-sql/database/adonet-v12-develop-direct-route-ports.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
---
22
title: Ports beyond 1433
33
description: Client connections from ADO.NET to Azure SQL Database can bypass the proxy and interact directly with the database using ports other than 1433.
4-
services: sql-database
4+
services:
5+
- "sql-database"
56
ms.service: sql-database
67
ms.subservice: development
7-
ms.custom: "sqldbrb=1, devx-track-dotnet"
8-
ms.devlang:
8+
ms.custom:
9+
- "sqldbrb=1, devx-track-dotnet"
910
ms.topic: reference
1011
author: VanMSFT
1112
ms.author: vanto
12-
ms.reviewer: kendralittle, mathoma
13+
ms.reviewer: wiassaf, mathoma
1314
ms.date: 06/11/2020
1415
---
1516
# Ports beyond 1433 for ADO.NET 4.5

‎azure-sql/database/advance-notifications.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
---
22
title: Advance notifications (Preview) for planned maintenance events
33
description: Get notification before planned maintenance for Azure SQL Database.
4-
services: sql-database
4+
services:
5+
- "sql-database"
56
ms.service: sql-db-mi
67
ms.subservice: service-overview
7-
ms.custom:
8-
ms.devlang:
98
ms.topic: how-to
109
author: scott-kim-sql
1110
ms.author: scottkim
12-
ms.reviewer: kendralittle, mathoma, wiassaf, urosmil
11+
ms.reviewer: wiassaf, mathoma, urosmil
1312
ms.date: 04/04/2022
14-
monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
13+
monikerRange: "= azuresql || = azuresql-db || = azuresql-mi"
1514
---
1615
# Advance notifications for planned maintenance events (Preview)
1716
[!INCLUDE[appliesto-sqldb-sqlmi](../includes/appliesto-sqldb-sqlmi.md)]

‎azure-sql/database/alerts-insights-configure-portal.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
---
22
title: Setup alerts and notifications in the Azure portal
33
description: Use the Azure portal to create alerts, which can trigger notifications or automation when the conditions you specify are met.
4-
services: sql-database
4+
services:
5+
- "sql-database"
56
ms.service: sql-database
67
ms.subservice: performance
7-
ms.custom: sqldbrb=1
8-
ms.devlang:
8+
ms.custom:
9+
- "sqldbrb=1"
910
ms.topic: how-to
1011
author: sravanisaluru
1112
ms.author: srsaluru
1213
ms.date: "03/23/2022"
13-
ms.reviewer: kendralittle, mathoma, wiassaf
14+
ms.reviewer: wiassaf, mathoma
1415
---
1516
# Create alerts for Azure SQL Database and Azure Synapse Analytics using the Azure portal
1617
[!INCLUDE[appliesto-sqldb-asa](../includes/appliesto-sqldb-asa.md)]
@@ -67,4 +68,4 @@ Within 10 minutes, the alert is active and triggers as previously described.
6768

6869
## Next steps
6970

70-
* Learn more about [configuring webhooks in alerts](/azure/azure-monitor/alerts/alerts-webhooks).
71+
* Learn more about [configuring webhooks in alerts](/azure/azure-monitor/alerts/alerts-webhooks).

‎azure-sql/database/always-encrypted-azure-key-vault-configure.md‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
---
22
title: "Configure Always Encrypted by using Azure Key Vault"
3-
description: This tutorial shows you how to secure sensitive data in a database in Azure SQL Database with data encryption by using the Always Encrypted wizard in SQL Server Management Studio.
4-
keywords: data encryption, encryption key, cloud encryption
5-
services: sql-database
3+
description: This tutorial shows you how to secure sensitive data in a database in Azure SQL Database with data encryption by using the Always Encrypted wizard in SQL Server Management Studio.
4+
keywords:
5+
- "data encryption"
6+
- "encryption key"
7+
- "cloud encryption"
8+
services:
9+
- "sql-database"
610
ms.service: sql-database
711
ms.subservice: security
8-
ms.custom: sqldbrb=1, devx-track-azurecli, devx-track-azurepowershell
12+
ms.custom:
13+
- "sqldbrb=1"
14+
- "devx-track-azurecli"
15+
- "devx-track-azurepowershell"
916
ms.topic: how-to
1017
author: VanMSFT
1118
ms.author: vanto
12-
ms.reviewer: kendralittle, mathoma
19+
ms.reviewer: wiassaf, mathoma
1320
ms.date: 11/02/2020
1421
---
1522
# Configure Always Encrypted by using Azure Key Vault

‎azure-sql/database/always-encrypted-certificate-store-configure.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
---
22
title: Configure Always Encrypted by using the Windows certificate store
33
description: This article shows you how to secure sensitive data in Azure SQL Database with database encryption by using the Always Encrypted wizard in SQL Server Management Studio (SSMS). It also shows you how to store your encryption keys in the Windows certificate store.
4-
keywords: encrypt data, sql encryption, database encryption, sensitive data, Always Encrypted
5-
services: sql-database
4+
keywords:
5+
- "encrypt data"
6+
- "sql encryption"
7+
- "database encryption"
8+
- "sensitive data"
9+
- "Always Encrypted"
10+
services:
11+
- "sql-database"
612
ms.service: sql-database
713
ms.subservice: security
8-
ms.custom: sqldbrb=1
9-
ms.devlang:
14+
ms.custom:
15+
- "sqldbrb=1"
1016
ms.topic: how-to
1117
author: VanMSFT
1218
ms.author: vanto
13-
ms.reviwer:
1419
ms.date: 04/23/2020
1520
---
1621

@@ -542,4 +547,4 @@ After you create a database that uses Always Encrypted, you may want to do the f
542547
* [Transparent Data Encryption](/sql/relational-databases/security/encryption/transparent-data-encryption)
543548
* [SQL Server Encryption](/sql/relational-databases/security/encryption/sql-server-encryption)
544549
* [Always Encrypted Wizard](/sql/relational-databases/security/encryption/always-encrypted-wizard)
545-
* [Always Encrypted Blog](/archive/blogs/sqlsecurity/always-encrypted-key-metadata)
550+
* [Always Encrypted Blog](/archive/blogs/sqlsecurity/always-encrypted-key-metadata)

‎azure-sql/database/always-encrypted-enclaves-configure-attestation.md‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
---
22
title: "Configure attestation for Always Encrypted using Azure Attestation"
3-
description: "Configure Azure Attestation for Always Encrypted with secure enclaves in Azure SQL Database."
4-
keywords: encrypt data, sql encryption, database encryption, sensitive data, Always Encrypted, secure enclaves, SGX, attestation
5-
services: sql-database
3+
description: Configure Azure Attestation for Always Encrypted with secure enclaves in Azure SQL Database.
4+
keywords:
5+
- "encrypt data"
6+
- "sql encryption"
7+
- "database encryption"
8+
- "sensitive data"
9+
- "Always Encrypted"
10+
- "secure enclaves"
11+
- "SGX"
12+
- "attestation"
13+
services:
14+
- "sql-database"
615
ms.service: sql-database
716
ms.subservice: security
8-
ms.devlang:
917
ms.topic: how-to
1018
author: jaszymas
1119
ms.author: jaszymas
12-
ms.reviwer: vanto
13-
ms.date: 07/14/2021
14-
ms.custom: devx-track-azurepowershell
20+
ms.reviewer: vanto
21+
ms.date: 07/14/2021
22+
ms.custom:
23+
- "devx-track-azurepowershell"
1524
---
1625

1726
# Configure attestation for Always Encrypted using Azure Attestation

0 commit comments

Comments
 (0)