Skip to content

Commit d67ac20

Browse files
committed
Merge branch 'includes2' of https://github.com/MashaMSFT/azure-docs-pr into includes2
2 parents df4cd16 + 892a103 commit d67ac20

File tree

135 files changed

+170
-17
lines changed

Some content is hidden

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

135 files changed

+170
-17
lines changed

articles/azure-sql/accelerated-database-recovery.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ms.reviewer: carlrab
1313
ms.date: 03/24/2020
1414
---
1515
# Accelerated Database Recovery in Azure SQL
16+
[!INCLUDE[appliesto-asf](includes/appliesto-asf.md)]
1617

1718
**Accelerated Database Recovery (ADR)** is a SQL database engine feature that greatly improves database availability, especially in the presence of long running transactions, by redesigning the SQL database engine recovery process. ADR is currently available for Azure SQL Database, Azure SQL Managed Instance, SQL Server on Azure VMs, and databases in Azure Synapse (currently in preview). The primary benefits of ADR are:
1819

articles/azure-sql/azure-hybrid-benefit.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ms.reviewer: sashan, moslake, carlrab
1313
ms.date: 11/13/2019
1414
---
1515
# Azure Hybrid Benefit - Azure SQL Database & SQL Managed Instance
16+
[!INCLUDE[appliesto-asf](includes/appliesto-asf.md)]
1617

1718
In the provisioned compute tier of the vCore-based purchasing model, you can exchange your existing licenses for discounted rates on Azure SQL Database and Azure SQL Managed Instance by using [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/). This Azure benefit allows you to save up to 30 percent or even higher on SQL Database & SQL Managed Instance by using your on-premises SQL Server licenses with Software Assurance. The [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/) page has a calculator to help determine savings.
1819

articles/azure-sql/azure-sql-iaas-vs-paas-what-is-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ms.reviewer:
1515
ms.date: 05/27/2020
1616
---
1717
# What is Azure SQL?
18+
[!INCLUDE[appliesto-asf](includes/appliesto-asf.md)]
1819

1920
Azure SQL is a family of managed, secure, and intelligent SQL Server database products.
2021

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ ms.author: sashan
1212
ms.reviewer: mathoma, carlrab
1313
ms.date: 02/13/2019
1414
---
15-
# Tutorial: Configure active geo-replication & failover in portal (Azure SQL Database)
15+
# Tutorial: Configure active geo-replication & fail over in portal (Azure SQL Database)
16+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
1617

1718

1819
This article shows you how to configure [active geo-replication for Azure SQL Database](active-geo-replication-overview.md#active-geo-replication-terminology-and-capabilities) using the [Azure portal](https://portal.azure.com) and to initiate failover.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ms.date: 04/28/2020
1414
---
1515

1616
# Creating and using active geo-replication - Azure SQL Database
17+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
1718

1819
Active geo-replication is an Azure SQL Database feature that allows you to create readable secondary databases of individual databases on a server in the same or different data center (region).
1920

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ms.reviewer: mathoma, carlrab
1313
ms.date: 12/18/2018
1414
---
1515
# Configure and manage Azure SQL Database security for geo-restore or failover
16+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
1617

1718
This article describes the authentication requirements to configure and control [active geo-replication](active-geo-replication-overview.md) and [auto-failover groups](auto-failover-group-overview.md). It also provides the steps required to set up user access to the secondary database. Finally, it also describes how to enable access to the recovered database after using [geo-restore](recovery-using-backups.md#geo-restore). For more information on recovery options, see [Business Continuity Overview](business-continuity-high-availability-disaster-recover-hadr-overview.md).
1819

articles/azure-sql/database/advanced-data-security.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ms.date: 04/23/2020
1616
# Advanced data security
1717
[!INCLUDE[appliesto-sqldb-sqlmi-asa](../includes/appliesto-sqldb-sqlmi-asa.md)]
1818

19+
1920
Advanced data security (ADS) is a unified package for advanced SQL security capabilities. ADS is available for for Azure SQL Database, Azure SQL Managed Instance, and Azure Synapse. It includes functionality for discovering and classifying sensitive data, surfacing and mitigating potential database vulnerabilities, and detecting anomalous activities that could indicate a threat to your database. It provides a single go-to location for enabling and managing these capabilities.
2021

2122
## Overview

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ms.date: 05/04/2020
1515
# Create alerts for Azure SQL Database and Azure Synapse using Azure portal
1616
[!INCLUDE[appliesto-sqldb-asa](../includes/appliesto-sqldb-asa.md)]
1717

18+
1819
## Overview
1920

2021
This article shows you how to set up alerts for databases in Azure SQL Database and Azure Synapse (formerly Azure SQL Data Warehouse) using the Azure portal. Alerts can send you an email or call a web hook when some metric (for example database size or CPU usage) reaches the threshold. This article also provides best practices for setting alert periods.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Always Encrypted - Azure Key Vault
3-
description: This article shows you how to secure sensitive data in a SQL database with data encryption using the Always Encrypted Wizard in SQL Server Management Studio.
2+
title: "Configure Always Encrypted using Azure Key Vault"
3+
description: This tutorial shows you how to secure sensitive data in a Azure SQL Database with data encryption using the Always Encrypted Wizard in SQL Server Management Studio.
44
keywords: data encryption, encryption key, cloud encryption
55
services: sql-database
66
ms.service: sql-database
@@ -13,9 +13,10 @@ ms.author: vanto
1313
ms.reviewer:
1414
ms.date: 04/23/2020
1515
---
16-
# Always Encrypted: Protect sensitive data and store encryption keys in Azure Key Vault
16+
# Configure Always Encrypted using Azure Key Vault
17+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
1718

18-
This article shows you how to secure sensitive data in Azure SQL Database with data encryption using the [Always Encrypted Wizard](https://msdn.microsoft.com/library/mt459280.aspx) in [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/hh213248.aspx). It also includes instructions that will show you how to store each encryption key in Azure Key Vault.
19+
This article shows you how to secure sensitive data in Azure SQL Database with data encryption using the [Always Encrypted Wizard](/sql/relational-databases/security/encryption/always-encrypted-wizard) in [SQL Server Management Studio (SSMS)](/sql/ssms/sql-server-management-studio-ssms). It also includes instructions that will show you how to store each encryption key in Azure Key Vault.
1920

2021
Always Encrypted is a data encryption technology that helps protect sensitive data at rest on the server, during movement between client and server, and while the data is in use. Always Encrypted ensures that sensitive data never appears as plaintext inside the database system. After you configure data encryption, only client applications or app servers that have access to the keys can access plaintext data. For detailed information, see [Always Encrypted (Database Engine)](https://msdn.microsoft.com/library/mt163865.aspx).
2122

@@ -31,17 +32,16 @@ Follow the steps in this article and learn how to set up Always Encrypted for Az
3132

3233
## Prerequisites
3334

34-
For this tutorial, you'll need:
3535

3636
- An Azure account and subscription. If you don't have one, sign up for a [free trial](https://azure.microsoft.com/pricing/free-trial/).
3737
- [SQL Server Management Studio](https://msdn.microsoft.com/library/mt238290.aspx) version 13.0.700.242 or later.
3838
- [.NET Framework 4.6](https://msdn.microsoft.com/library/w0x726c2.aspx) or later (on the client computer).
3939
- [Visual Studio](https://www.visualstudio.com/downloads/download-visual-studio-vs.aspx).
4040
- [Azure PowerShell](/powershell/azure/overview) or [Azure CLI](/cli/azure/install-azure-cli)
4141

42-
## Enable your client application to access the SQL Database service
42+
## Enable your client application to access SQL Database
4343

44-
You must enable your client application to access the SQL Database service by setting up an Azure Active Directory (AAD) application and copying the *Application ID* and *key* that you will need to authenticate your application.
44+
You must enable your client application to access SQL Database by setting up an Azure Active Directory (AAD) application and copying the *Application ID* and *key* that you will need to authenticate your application.
4545

4646
To get the *Application ID* and *key*, follow the steps in [create an Azure Active Directory application and service principal that can access resources](../../active-directory/develop/howto-create-service-principal-portal.md).
4747

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Always Encrypted - Windows certificate store
2+
title: Configure Always Encrypted using 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.
44
keywords: encrypt data, sql encryption, database encryption, sensitive data, Always Encrypted
55
services: sql-database
@@ -13,9 +13,10 @@ ms.author: vanto
1313
ms.reviwer:
1414
ms.date: 04/23/2020
1515
---
16-
# Always Encrypted: Protect sensitive data and store encryption keys in the Windows certificate store
16+
# Configure Always Encrypted using Windows certificate store
17+
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
1718

18-
This article shows you how to secure sensitive data in Azure SQL Database with database encryption by using the [Always Encrypted Wizard](https://msdn.microsoft.com/library/mt459280.aspx) in [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/hh213248.aspx). It also shows you how to store your encryption keys in the Windows certificate store.
19+
This tutorial shows you how to secure sensitive data in Azure SQL Database with database encryption by using the [Always Encrypted Wizard](/sql/relational-databases/security/encryption/always-encrypted-wizard) in [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/hh213248.aspx). It also shows you how to store your encryption keys in the Windows certificate store.
1920

2021
Always Encrypted is a data encryption technology that helps protect sensitive data at rest on the server, during movement between client and server, and while the data is in use, ensuring that sensitive data never appears as plaintext inside the database system. After you encrypt data, only client applications or app servers that have access to the keys can access plaintext data. For detailed information, see [Always Encrypted (Database Engine)](https://msdn.microsoft.com/library/mt163865.aspx).
2122

0 commit comments

Comments
 (0)