Merge pull request #108149 from mumian/0317-sql

0317 sql

Author: megvanhuygen

articles/sql-database/sql-database-single-database-get-started-template.md

@@ -4,7 +4,7 @@ description: Create a single database in Azure SQL Database using the Azure Reso
 services: sql-database
 ms.service: sql-database
 ms.subservice: single-database
-ms.custom:
+ms.custom: subject-armqs
 ms.devlang:
 ms.topic: quickstart
 author: mumian
@@ -15,17 +15,39 @@ ms.date: 06/28/2019
 
 # Quickstart: Create a single database in Azure SQL Database using the Azure Resource Manager template
 
-Creating a [single database](sql-database-single-database.md) is the quickest and simplest deployment option for creating a database in Azure SQL Database. This quickstart shows you how to create a single database using the Azure Resource Manager template. For more information, see [Azure Resource Manager documentation](/azure/azure-resource-manager/).
+Creating a [single database](sql-database-single-database.md) is the quickest and simplest deployment option for creating a database in Azure SQL Database. This quickstart shows you how to create a single database using the Azure Resource Manager template.
+
+[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
 
 If you don't have an Azure subscription, [create a free account](https://azure.microsoft.com/free/).
 
+## Prerequisites
+
+None
+
 ## Create a single database
 
 A single database has a defined set of compute, memory, IO, and storage resources using one of two [purchasing models](sql-database-purchase-models.md). When you create a single database, you also define a [SQL Database server](sql-database-servers.md) to manage it and place it within [Azure resource group](../azure-resource-manager/management/overview.md) in a specified region.
 
-The following JSON file is the template that is used in this article. The template is stored in [GitHub](https://raw.githubusercontent.com/Azure/azure-docs-json-samples/master/SQLServerAndDatabase/azuredeploy.json). More Azure SQL database template samples can be found in [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/?resourceType=Microsoft.Sql&pageNumber=1&sort=Popular).
+### Review the template
+
+The template used in this quickstart is from [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/101-sql-logical-server/).
+
+:::code language="json" source="~/quickstart-templates/101-sql-logical-server/azuredeploy.json" range="1-163" highlight="63-132":::
+
+These resources are defined in the template:
+
+- [**Microsoft.Sql/servers**](/azure/templates/microsoft.sql/servers)
+- [**Microsoft.Sql/servers/firewallRules**](/azure/templates/microsoft.sql/servers/firewallrules)
+- [**Microsoft.Sql/servers/securityAlertPolicies**](/azure/templates/microsoft.sql/servers/securityalertpolicies)
+- [**Microsoft.Sql/servers/vulnerabilityAssessments**](/azure/templates/microsoft.sql/servers/vulnerabilityassessments)
+- [**Microsoft.Sql/servers/connectionPolicies**](/azure/templates/microsoft.sql/servers/connectionpolicies)
+- [**Microsoft.Storage/storageAccounts**](/azure/templates/microsoft.storage/storageaccounts)
+- [**Microsoft.Storage/storageAccounts/providers/roleAssignments**](/azure/templates/microsoft.authorization/roleassignments)
+
+More Azure SQL database template samples can be found in [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/?resourceType=Microsoft.Sql&pageNumber=1&sort=Popular).
 
-[!code-json[create-azure-sql-database-server-and-database](~/resourcemanager-templates/SQLServerAndDatabase/azuredeploy.json)]
+### Deploy the template
 
 Select **Try it** from the following PowerShell code block to open Azure Cloud Shell.
 
@@ -40,7 +62,7 @@ $adminPassword = Read-Host -Prompt "Enter the SQl server administrator password"
 $resourceGroupName = "${projectName}rg"
 
 New-AzResourceGroup -Name $resourceGroupName -Location $location
-New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateFile "D:\GitHub\azure-docs-json-samples\SQLServerAndDatabase\azuredeploy.json" -projectName $projectName -adminUser $adminUser -adminPassword $adminPassword
+New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateUri "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/101-sql-logical-server/azuredeploy.json" -administratorLogin $adminUser -administratorLoginPassword $adminPassword
 
 Read-Host -Prompt "Press [ENTER] to continue ..."
 ```
@@ -59,15 +81,15 @@ az group create --location $location --name $resourceGroupName
 
 az group deployment create -g $resourceGroupName --template-uri "D:\GitHub\azure-docs-json-samples\SQLServerAndDatabase\azuredeploy.json" `
     --parameters 'projectName=' + $projectName \
-                 'adminUser=' + $adminUser \
-                 'adminPassword=' + $adminPassword
+                 'administratorLogin=' + $adminUser \
+                 'administratorLoginPassword=' + $adminPassword
 
 Read-Host -Prompt "Press [ENTER] to continue ..."
 ```
 
 * * *
 
-## Query the database
+## Validate the deployment
 
 To query the database, see [Query the database](./sql-database-single-database-get-started.md#query-the-database).
 
@@ -102,3 +124,4 @@ az group delete --name $resourceGroupName
   - [Connect and query using Azure Data Studio](https://docs.microsoft.com/sql/azure-data-studio/quickstart-sql-database?toc=/azure/sql-database/toc.json)
 - To create a single database using Azure CLI, see [Azure CLI samples](sql-database-cli-samples.md).
 - To create a single database using Azure PowerShell, see [Azure PowerShell samples](sql-database-powershell-samples.md).
+- To learn how to create Resource Manager templates, see [Create your first template](../azure-resource-manager/templates/template-tutorial-create-first-template.md).

articles/sql-database/toc.yml

@@ -18,8 +18,8 @@
   - name: Price and performance options
     items:
     - name: Purchasing models
-      items: 
-      - name: Overview 
+      items:
+      - name: Overview
         href: sql-database-purchase-models.md
       - name: vCore model
         items:
@@ -39,7 +39,7 @@
       items:
       - name: Overview
         href: sql-database-service-tiers-general-purpose-business-critical.md
-        displayName: provisioned compute tier  
+        displayName: provisioned compute tier
       - name: General purpose / Standard
         href: sql-database-service-tier-general-purpose.md
       - name: Business critical / Premium
@@ -70,7 +70,7 @@
   - name: How-to guide
     href: sql-database-howto.md
 
-  - name: Security   
+  - name: Security
     items:
     - name: Security overview
       href: sql-database-security-overview.md
@@ -96,7 +96,7 @@
       items:
       - name: Transparent Data Encryption (TDE)
         items:
-        - name: TDE with Azure SQL  
+        - name: TDE with Azure SQL
           href: transparent-data-encryption-azure-sql.md
         - name: TDE with Bring Your Own Key
           href: transparent-data-encryption-byok-azure-sql.md
@@ -114,7 +114,7 @@
           href: sql-database-always-encrypted.md
         - name: Use the Azure key vault
           href: sql-database-always-encrypted-azure-key-vault.md
-  
+
     - name: Auditing
       items:
       - name: Get started with SQL Database auditing
@@ -141,7 +141,7 @@
       - name: IP-based firewall
         href: sql-database-firewall-configure.md
       - name: vNet firewall rules
-        items: 
+        items:
         - name: vNet endpoints
           href: sql-database-vnet-service-endpoint-rule-overview.md
         - name: vNet endpoints - PowerShell
@@ -155,7 +155,7 @@
         href: sql-database-managed-instance-public-endpoint-securely.md
       - name: Managed instance auditing
         href: sql-database-managed-instance-auditing.md
-    - name: Security baseline	
+    - name: Security baseline
       href: security-baseline.md
 
   - name: Connect and query
@@ -229,13 +229,13 @@
           href: sql-database-long-term-retention.md
 
       - name: Failover groups and geo-replication
-        items: 
+        items:
         - name: Active geo-replication
           href: sql-database-active-geo-replication.md
         - name: Auto-failover groups
           href: sql-database-auto-failover-group.md
         - name: Configure security for replicas
-          href: sql-database-geo-replication-security-config.md  
+          href: sql-database-geo-replication-security-config.md
         - name: Outage recovery guidance
           href: sql-database-disaster-recovery.md
         - name: Recovery drills
@@ -301,7 +301,7 @@
     - name: Read Scale-Out
       href: sql-database-read-scale-out.md
     - name: Database sharding
-      items: 
+      items:
       - name: Database sharding
         href: sql-database-elastic-scale-introduction.md
       - name: Glossary
@@ -336,9 +336,9 @@
         href: sql-database-in-memory-oltp-migration.md
     - name: Transactional replication
       href: sql-database-managed-instance-transactional-replication.md
-    - name: Temporal tables 
+    - name: Temporal tables
       href: sql-database-temporal-tables.md
-    - name: Job automation 
+    - name: Job automation
       href: sql-database-job-automation-overview.md
 
   - name: How to
@@ -384,7 +384,7 @@
         href: /azure/search/search-howto-connecting-azure-sql-database-to-azure-search-using-indexers?toc=/azure/sql-database/toc.json
       - name: Configure temporal retention policy
         href: sql-database-temporal-tables-retention-policy.md
-      - name: Authenticate app 
+      - name: Authenticate app
         href: sql-database-client-id-keys.md
       - name: Batching for perf
         href: sql-database-use-batching-to-improve-performance.md
@@ -405,7 +405,7 @@
       - name: Java
         items:
         - name: Use Spring Data JDBC
-          href: /java/azure/spring-framework/configure-spring-data-jdbc-with-azure-sql-server 
+          href: /java/azure/spring-framework/configure-spring-data-jdbc-with-azure-sql-server
         - name: Use Spring Data JPA
           href: /java/azure/spring-framework/configure-spring-data-jpa-with-azure-sql-server
     - name: Design data applications
@@ -415,7 +415,7 @@
       - name: Design for elastic pools
         href: sql-database-disaster-recovery-strategies-for-applications-with-elastic-pool.md
       - name: Design for app upgrades
-        href: sql-database-manage-application-rolling-upgrade.md  
+        href: sql-database-manage-application-rolling-upgrade.md
       - name: Multi-tenant SaaS
         items:
         - name: SaaS design patterns
@@ -498,11 +498,11 @@
   - name: Quickstarts
     items:
     - name: Create
-      items: 
+      items:
       - name: Using Azure portal
         href: sql-database-single-database-get-started.md
-      - name: Using template
-        displayName: Azure Resource Manager template, ARM
+      - name: Using ARM template
+        displayName: Resource Manager
         href: sql-database-single-database-get-started-template.md
     - name: Configure
       items:
@@ -516,7 +516,7 @@
     - name: Add to a failover group
       href: sql-database-single-database-failover-group-tutorial.md
     - name: Implement a geo-distributed database
-      href: sql-database-implement-geo-distributed-database.md 
+      href: sql-database-implement-geo-distributed-database.md
     - name: Configure active geo-replication
       href: sql-database-active-geo-replication-portal.md
     - name: Set up Azure SQL Data Sync
@@ -534,9 +534,9 @@
     items:
 
       - name: Single database resources
-        items:    
+        items:
         - name: vCore resource limits
-          href: sql-database-vcore-resource-limits-single-databases.md  
+          href: sql-database-vcore-resource-limits-single-databases.md
         - name: DTU resource limits
           href: sql-database-dtu-resource-limits-single-databases.md
         - name: Scale resources
@@ -545,23 +545,22 @@
       - name: Elastic pool resources
         items:
         - name: vCore resource limits
-          href: sql-database-vcore-resource-limits-elastic-pools.md  
+          href: sql-database-vcore-resource-limits-elastic-pools.md
         - name: DTU resource limits
-          href: sql-database-dtu-resource-limits-elastic-pools.md  
+          href: sql-database-dtu-resource-limits-elastic-pools.md
         - name: Scale resources
           href: sql-database-elastic-pool-scale.md
         - name: Manage pool resources
           href: sql-database-elastic-pool-manage.md
 
       - name: Database server resources
         items:
-        - name: Database resource limits 
+        - name: Database resource limits
           href: sql-database-resource-limits-database-server.md
         - name: Connectivity architecture
-          href: sql-database-connectivity-architecture.md 
-        - name: Connectivity settings	
+          href: sql-database-connectivity-architecture.md
+        - name: Connectivity settings
           href: sql-database-connectivity-settings.md
-
       - name: Data sync
         items:
         - name: Data Sync Agent
@@ -575,7 +574,7 @@
         - name: Troubleshoot Data Sync
           href: sql-database-troubleshoot-data-sync.md
       - name: T-SQL differences
-        href: sql-database-transact-sql-information.md 
+        href: sql-database-transact-sql-information.md
       - name: Features
         items:
         - name: SQL Data Sync
@@ -627,7 +626,7 @@
 
 
   - name: How to
-    items: 
+    items:
     - name: Overview
       href: sql-database-howto-single-database.md
     - name: Migrate to a single/pooled database
@@ -649,7 +648,7 @@
     - name: Configure security for geo-replicas
       href: sql-database-geo-replication-security-config.md
     - name: Try in-memory features
-      href: sql-database-in-memory-sample.md  
+      href: sql-database-in-memory-sample.md
     - name: Enable automatic tuning
       href: sql-database-automatic-tuning-enable.md
     - name: Enable e-mail notifications for automatic tuning
@@ -689,7 +688,7 @@
       - name: Use Dapper framework
         href: sql-database-elastic-scale-working-with-dapper.md
     - name: Query distributed data
-      items:  
+      items:
       - name: Query vertically partitioned data
         href: sql-database-elastic-query-getting-started-vertical.md
       - name: Report across scaled-out data tier
@@ -720,7 +719,7 @@
   href:  sql-database-managed-instance-index.yml
   items:
   - name: Overview
-    items: 
+    items:
     - name: Managed instance
       href: sql-database-managed-instance.md
     - name: Instance pools
@@ -730,7 +729,7 @@
   - name: Quickstarts
     items:
     - name: Create
-      items: 
+      items:
       - name: Using Azure portal
         href: sql-database-managed-instance-get-started.md
       - name: Using PowerShell
@@ -740,7 +739,7 @@
     - name: Configure
       items:
       - name: Service-aided subnet configuration
-        href: sql-database-managed-instance-enabling-service-aided-subnet-configuration.md      
+        href: sql-database-managed-instance-enabling-service-aided-subnet-configuration.md
       - name: Public endpoint
         href: sql-database-managed-instance-public-endpoint-configure.md
       - name: Client VM connection
@@ -767,7 +766,7 @@
         - name: MI pub to MI sub
           href: replication-with-sql-database-managed-instance.md
         - name: MI pub, MI dist, SQL sub
-          href: sql-database-managed-instance-configure-replication-tutorial.md 
+          href: sql-database-managed-instance-configure-replication-tutorial.md
 
   - name: Concepts
     items:
@@ -776,9 +775,9 @@
     - name: Resource limits
       href: sql-database-managed-instance-resource-limits.md
     - name: Connectivity architecture
-      href: sql-database-managed-instance-connectivity-architecture.md 
+      href: sql-database-managed-instance-connectivity-architecture.md
     - name: T-SQL differences
-      href: sql-database-managed-instance-transact-sql-information.md 
+      href: sql-database-managed-instance-transact-sql-information.md
     - name: Features
       items:
       - name: Linked servers
@@ -793,7 +792,7 @@
     - name: Overview
       href: sql-database-howto-managed-instance.md
     - name: Migrate to Managed instance
-      href: sql-database-managed-instance-migrate.md  
+      href: sql-database-managed-instance-migrate.md
     - name: Customize time zone
       href: sql-database-managed-instance-timezone.md
     - name: Configure connection types
@@ -802,7 +801,7 @@
       href: sql-database-managed-instance-migrate-tde-certificate.md
     - name: Restore to a point in time
       href: sql-database-managed-instance-point-in-time-restore.md
-    - name: Determine size of managed instance subnet 
+    - name: Determine size of managed instance subnet
       href: sql-database-managed-instance-determine-size-vnet-subnet.md
     - name: Create new VNet and subnet for managed instance
       href: sql-database-managed-instance-create-vnet-subnet.md
@@ -891,7 +890,7 @@
     - name: Connectivity issues
       href: troubleshoot-connectivity-issues-microsoft-azure-sql-database.md
     - name: Problem resolution
-      items: 
+      items:
       - name: Import/Export service hangs
         href: azure-sql-database-hangs-importing-exporting.md
   - name: Videos