Skip to content

Commit ea42b93

Browse files
authored
Merge pull request #115269 from MashaMSFT/move12
Move12
2 parents 247d406 + a5e2c56 commit ea42b93

File tree

153 files changed

+5142
-140
lines changed

Some content is hidden

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

153 files changed

+5142
-140
lines changed

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

Lines changed: 1 addition & 1 deletion
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](../../sql-database/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](../../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).
1919

2020
## Azure AD authentication methods
2121

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

Lines changed: 1 addition & 1 deletion
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](../../sql-database/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](../../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).
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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The following steps create a new secondary database in a geo-replication partner
3535

3636
To add a secondary database, you must be the subscription owner or co-owner.
3737

38-
The secondary database has the same name as the primary database and has, by default, the same service tier and compute size. The secondary database can be a single database or a pooled database. For more information, see [DTU-based purchasing model](dtu-service-tiers.md) and [vCore-based purchasing model](../../sql-database/sql-database-service-tiers-vcore.md).
38+
The secondary database has the same name as the primary database and has, by default, the same service tier and compute size. The secondary database can be a single database or a pooled database. For more information, see [DTU-based purchasing model](dtu-service-tiers.md) and [vCore-based purchasing model](service-tiers-vcore.md).
3939
After the secondary is created and seeded, data begins replicating from the primary database to the new secondary database.
4040

4141
> [!NOTE]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Transaction log rate throttling on the primary due to lower compute size on a se
122122
> [!NOTE]
123123
> Transaction log rate on the primary may be throttled for reasons unrelated to lower compute size on a secondary. This kind of throttling may occur even if the secondary has the same or higher compute size than the primary. For details, including wait types for different kinds of log rate throttling, see [Transaction log rate governance](resource-limits-logical-server.md#transaction-log-rate-governance).
124124
125-
For more information on the SQL Database compute sizes, see [What are SQL Database Service Tiers](../../sql-database/sql-database-purchase-models.md).
125+
For more information on the SQL Database compute sizes, see [What are SQL Database Service Tiers](purchasing-models.md).
126126

127127
## Cross-subscription geo-replication
128128

@@ -288,5 +288,5 @@ As discussed previously, active geo-replication can also be managed programmatic
288288
- SQL Database also supports auto-failover groups. For more information, see using [auto-failover groups](auto-failover-group-overview.md).
289289
- For a business continuity overview and scenarios, see [Business continuity overview](business-continuity-high-availability-disaster-recover-hadr-overview.md)
290290
- To learn about Azure SQL Database automated backups, see [SQL Database automated backups](automated-backups-overview.md).
291-
- To learn about using automated backups for recovery, see [Restore a database from the service-initiated backups](../../sql-database/sql-database-recovery-using-backups.md).
291+
- To learn about using automated backups for recovery, see [Restore a database from the service-initiated backups](recovery-using-backups.md).
292292
- To learn about authentication requirements for a new primary server and database, see [SQL Database security after disaster recovery](geo-replication-security-configure.md).

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Advanced data security (ADS) is a unified package for advanced SQL security capa
2222
Advanced data security (ADS) provides a set of advanced SQL security capabilities, including data discovery & classification, vulnerability assessment, and Advanced Threat Protection.
2323

2424
- [Data Discovery & Classification](data-discovery-and-classification-overview.md) provides capabilities built into Azure SQL Database, Azure SQL Managed Instance, and Azure Synapse for discovering, classifying, labeling & reporting the sensitive data in your databases. It can be used to provide visibility into your database classification state, and to track the access to sensitive data within the database and beyond its borders.
25-
- [Vulnerability Assessment](../../sql-database/sql-vulnerability-assessment.md) is an easy to configure service that can discover, track, and help you remediate potential database vulnerabilities. It provides visibility into your security state, and includes actionable steps to resolve security issues, and enhance your database fortifications.
26-
- [Advanced Threat Protection](../../sql-database/sql-database-threat-detection-overview.md) detects anomalous activities indicating unusual and potentially harmful attempts to access or exploit your database. It continuously monitors your database for suspicious activities, and provides immediate security alerts on potential vulnerabilities, SQL injection attacks, and anomalous database access patterns. Advanced Threat Protection alerts provide details of the suspicious activity and recommend action on how to investigate and mitigate the threat.
25+
- [Vulnerability Assessment](sql-vulnerability-assessment.md) is an easy to configure service that can discover, track, and help you remediate potential database vulnerabilities. It provides visibility into your security state, and includes actionable steps to resolve security issues, and enhance your database fortifications.
26+
- [Advanced Threat Protection](threat-detection-overview.md) detects anomalous activities indicating unusual and potentially harmful attempts to access or exploit your database. It continuously monitors your database for suspicious activities, and provides immediate security alerts on potential vulnerabilities, SQL injection attacks, and anomalous database access patterns. Advanced Threat Protection alerts provide details of the suspicious activity and recommend action on how to investigate and mitigate the threat.
2727

2828
Enable SQL ADS once to enable all of these included features. With one click, you can enable ADS for all databases on your [server](logical-servers.md) in Azure (which hosts SQL Database or Azure Synapse Analytics) or in you instance in Azure SQL Managed Instance. Enabling or managing ADS settings requires belonging to the [SQL security manager](https://docs.microsoft.com/azure/role-based-access-control/built-in-roles#sql-security-manager) role, SQL database admin role or SQL server admin role.
2929

@@ -70,6 +70,6 @@ Advanced data security settings for your server or managed instance can also be
7070
## Next steps
7171

7272
- Learn more about [Data Discovery & Classification](data-discovery-and-classification-overview.md)
73-
- Learn more about [vulnerability Assessment](../../sql-database/sql-vulnerability-assessment.md)
74-
- Learn more about [Advanced Threat Protection](../../sql-database/sql-database-threat-detection.md)
73+
- Learn more about [vulnerability Assessment](sql-vulnerability-assessment.md)
74+
- Learn more about [Advanced Threat Protection](threat-detection.md)
7575
- Learn more about [Azure Security Center](https://docs.microsoft.com/azure/security-center/security-center-intro)
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
title: Azure Resource Manager templates
3+
titleSuffix: Azure SQL Database & SQL Managed Instance
4+
description: Use Azure Resource Manager templates to create and configure Azure SQL Database and Azure SQL Managed Instance.
5+
services: sql-database
6+
ms.service: sql-database
7+
ms.subservice: service
8+
ms.custom: overview-samples sqldbrb=2
9+
ms.devlang:
10+
ms.topic: sample
11+
author: jovanpop-msft
12+
ms.author: jovanpop
13+
ms.reviewer: sstein
14+
ms.date: 02/04/2019
15+
---
16+
17+
# Azure Resource Manager templates for Azure SQL Database
18+
19+
Azure Resource Manager templates enable you to define your infrastructure as code and deploy your solutions to Azure cloud for your Azure SQL Database and Azure SQL Managed Instance.
20+
21+
## [Azure SQL Database](#tab/single-database)
22+
23+
The following table includes links to Azure Resource Manager templates for Azure SQL Database.
24+
25+
| | |
26+
|---|---|
27+
| [SQL Database](https://github.com/Azure/azure-quickstart-templates/tree/master/201-sql-database-transparent-encryption-create) | This Azure Resource Manager template creates a single database in Azure SQL Database and configures server-level IP firewall rules. |
28+
| [Server](https://github.com/Azure/azure-quickstart-templates/tree/master/101-sql-logical-server) | This Azure Resource Manager template creates a server for Azure SQL Database. |
29+
| [Elastic pool](https://github.com/Azure/azure-quickstart-templates/tree/master/101-sql-elastic-pool-create) | This template allows you to deploy an elastic pool and to assign databases to it. |
30+
| [Failover groups](https://github.com/Azure/azure-quickstart-templates/tree/master/101-sql-with-failover-group) | This template creates two servers, a single database, and a failover group in Azure SQL Database.|
31+
| [Threat Detection](https://github.com/Azure/azure-quickstart-templates/tree/master/201-sql-threat-detection-db-policy-multiple-databases) | This template allows you to deploy a server and a set of databases with Threat Detection enabled, with an email address for alerts for each database. Threat Detection is part of the SQL Advanced Threat Protection (ATP) offering and provides a layer of security that responds to potential threats over servers and databases.|
32+
| [Auditing to Azure Blob Storage](https://github.com/Azure/azure-quickstart-templates/tree/master/201-sql-auditing-server-policy-to-blob-storage) | This template allows you to deploy a server with auditing enabled to write audit logs to a blob storage. Auditing for Azure SQL Database tracks database events and writes them to an audit log that can be placed in your Azure storage account, OMS workspace, or Event Hubs.|
33+
| [Auditing to Azure Event Hub](https://github.com/Azure/azure-quickstart-templates/tree/master/201-sql-auditing-server-policy-to-eventhub) | This template allows you to deploy a server with auditing enabled to write audit logs to an existing Event Hub. In order to send audit events to Event Hub, set auditing settings with `Enabled` `State` and set `IsAzureMonitorTargetEnabled` as `true`. Also, configure Diagnostic Settings with `SQLSecurityAuditEvents` log category on the `master` database (for serve level auditing). Auditing tracks database events and writes them to an audit log that can be placed in your Azure storage account, OMS workspace, or Event Hubs.|
34+
| [Azure Web App with SQL Database](https://github.com/Azure/azure-quickstart-templates/tree/master/201-web-app-sql-database) | This sample creates a free Azure Web App and a database in Azure SQL Database at the "Basic" service level.|
35+
| [Azure Web App and Redis Cache with SQL Database](https://github.com/Azure/azure-quickstart-templates/tree/master/201-web-app-redis-cache-sql-database) | This template creates a Web App, Redis Cache, and SQL Database in the same resource group, and creates two connection strings in the Web App for the SQL Database and Redis Cache.|
36+
| [Import data from blob storage using ADF V2](https://github.com/Azure/azure-quickstart-templates/tree/master/101-data-factory-v2-blob-to-sql-copy) | This Azure Resource Manager template creates Azure Data Factory V2 that copies data from Azure Blob Storage to SQL Database.|
37+
| [HDInsight cluster with a SQL Database](https://github.com/Azure/azure-quickstart-templates/tree/master/101-hdinsight-linux-with-sql-database) | This template allows you to create a HDInsight cluster, a logical SQL server, a database, and two tables. This template is used by the [Use Sqoop with Hadoop in HDInsight article](https://docs.microsoft.com/azure/hdinsight/hadoop/hdinsight-use-sqoop) |
38+
| [Azure Logic App that runs a SQL Stored Procedure on a schedule](https://github.com/Azure/azure-quickstart-templates/tree/master/101-logic-app-sql-proc) | This template allows you to create a Logic App that will run a SQL stored procedure on schedule. Any arguments for the procedure can be put into the body section of the template.|
39+
40+
## [Azure SQL Managed Instance](#tab/managed-instance)
41+
42+
The following table includes links to Azure Resource Manager templates for Azure SQL Managed Instance.
43+
44+
| | |
45+
|---|---|
46+
| [SQL Managed Instance in a new VNet](https://github.com/Azure/azure-quickstart-templates/tree/master/101-sqlmi-new-vnet) | This Azure Resource Manager template creates a new configured Azure VNet and SQL Managed Instance in the VNet. |
47+
| [Network environment for SQL Managed Instance](https://github.com/Azure/azure-quickstart-templates/tree/master/101-sql-managed-instance-azure-environment) | This deployment will create a configured Azure Virtual Network with two subnets - one that will be dedicated to your SQL Managed Instances, and another one where you can place other resources (for example VMs, App Service environments, etc.). This template will create a properly configured networking environment where you can deploy SQL Managed Instances. |
48+
| [SQL Managed Instance with P2S connection](https://github.com/Azure/azure-quickstart-templates/tree/master/201-sqlmi-new-vnet-w-point-to-site-vpn) | This deployment will create an Azure Virtual Network with two subnets `ManagedInstance` and `GatewaySubnet`. SQL Managed Instance will be deployed in ManagedInstance subnet. Virtual network gateway will be created in `GatewaySubnet` subnet and configured for Point-to-Site VPN connection. |
49+
| [SQL Managed Instance with Virtual machine](https://github.com/Azure/azure-quickstart-templates/tree/master/201-sqlmi-new-vnet-w-jumpbox) | This deployment will create an Azure Virtual Network with two subnets `ManagedInstance` and `Management`. SQL Managed Instance will be deployed in `ManagedInstance` subnet. Virtual machine with the latest version of SQL Server Management Studio (SSMS) will be deployed in `Management` subnet. |
50+
51+
---

azure-sql/database/audit-log-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For example, for database `Database1` on `Server1` the following is a possible v
2525

2626
Server1/Database1/SqlDbAuditing_ServerAudit_NoRetention/2019-02-03/12_23_30_794_0.xel
2727

28-
[Read-only Replicas](../../sql-database/sql-database-read-scale-out.md) Audit logs are stored in the same container. The directory hierarchy within the container is of the form `<ServerName>/<DatabaseName>/<AuditName>/<Date>/RO/`. The Blob filename shares the same format. The Audit Logs of Read-only Replicas are stored in the same container.
28+
[Read-only Replicas](read-scale-out.md) Audit logs are stored in the same container. The directory hierarchy within the container is of the form `<ServerName>/<DatabaseName>/<AuditName>/<Date>/RO/`. The Blob filename shares the same format. The Audit Logs of Read-only Replicas are stored in the same container.
2929

3030

3131
### Event Hub

azure-sql/database/auto-failover-group-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ When performing OLTP operations, use `<fog-name>.zone_id.database.windows.net` a
254254
If you have a logically isolated read-only workload that is tolerant to certain staleness of data, you can use the secondary database in the application. To connect directly to the geo-replicated secondary, use `server.secondary.zone_id.database.windows.net` as the server URL and the connection is made directly to the geo-replicated secondary.
255255

256256
> [!NOTE]
257-
> In certain service tiers, SQL Database supports the use of [read-only replicas](../../sql-database/sql-database-read-scale-out.md) to load balance read-only query workloads using the capacity of one read-only replica and using the `ApplicationIntent=ReadOnly` parameter in the connection string. When you have configured a geo-replicated secondary, you can use this capability to connect to either a read-only replica in the primary location or in the geo-replicated location.
257+
> In certain service tiers, SQL Database supports the use of [read-only replicas](read-scale-out.md) to load balance read-only query workloads using the capacity of one read-only replica and using the `ApplicationIntent=ReadOnly` parameter in the connection string. When you have configured a geo-replicated secondary, you can use this capability to connect to either a read-only replica in the primary location or in the geo-replicated location.
258258
>
259259
> - To connect to a read-only replica in the primary location, use `<fog-name>.zone_id.database.windows.net`.
260260
> - To connect to a read-only replica in the secondary location, use `<fog-name>.secondary.zone_id.database.windows.net`.
@@ -371,7 +371,7 @@ Due to the high latency of wide area networks, continuous copy uses an asynchron
371371
372372
## Failover groups and point-in-time restore
373373

374-
For information about using point-in-time restore with failover groups, see [Point in Time Recovery (PITR)](../../sql-database/sql-database-recovery-using-backups.md#point-in-time-restore).
374+
For information about using point-in-time restore with failover groups, see [Point in Time Recovery (PITR)](recovery-using-backups.md#point-in-time-restore).
375375

376376
## Limitations of failover groups
377377

@@ -471,5 +471,5 @@ As discussed previously, auto-failover groups and active geo-replication can als
471471
- [Use PowerShell to add an Azure SQL Database to a failover group](scripts/add-database-to-failover-group-powershell.md)
472472
- For a business continuity overview and scenarios, see [Business continuity overview](business-continuity-high-availability-disaster-recover-hadr-overview.md)
473473
- To learn about Azure SQL Database automated backups, see [SQL Database automated backups](automated-backups-overview.md).
474-
- To learn about using automated backups for recovery, see [Restore a database from the service-initiated backups](../../sql-database/sql-database-recovery-using-backups.md).
474+
- To learn about using automated backups for recovery, see [Restore a database from the service-initiated backups](recovery-using-backups.md).
475475
- To learn about authentication requirements for a new primary server and database, see [SQL Database security after disaster recovery](geo-replication-security-configure.md).

0 commit comments

Comments
 (0)