Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ergrupdate

duongau · duongau · commit 80780e057440 · 2022-05-16T14:32:43.000-07:00
diff --git a/articles/azure-resource-manager/bicep/toc.yml b/articles/azure-resource-manager/bicep/toc.yml
@@ -93,6 +93,8 @@
       href: ../../postgresql/quickstart-create-postgresql-server-database-using-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
     - name: Database Migration Service
       href: ../../dms/create-dms-bicep.md?toc=/azure/azure-resource-manager/bicep/toc.json
+    - name: SQL Database
+      href: /azure-sql/database/single-database-create-bicep-quickstart.md?toc=/azure/azure-resource-manager/bicep/toc.json
   - name: DevOps
     items:
     - name: App Configuration
diff --git a/articles/cognitive-services/Custom-Vision-Service/copy-move-projects.md b/articles/cognitive-services/Custom-Vision-Service/copy-move-projects.md
@@ -15,8 +15,6 @@ ms.author: pafarley
 
 After you've created and trained a Custom Vision project, you may want to copy your project to another resource. If your app or business depends on the use of a Custom Vision project, we recommend you copy your model to another Custom Vision account in another region. Then if a regional outage occurs, you can access your project in the region where it was copied.
 
-As a part of Azure, Custom Vision Service has components that are maintained across multiple regions. Service zones and regions are used by all of our services to provide continued service to our customers. For more information on zones and regions, see [Azure regions](../../availability-zones/az-overview.md). If you need additional information or have any issues, please [contact support](/answers/topics/azure-custom-vision.html).
-
 The **[ExportProject](https://southcentralus.dev.cognitive.microsoft.com/docs/services/Custom_Vision_Training_3.3/operations/5eb0bcc6548b571998fddeb3)** and **[ImportProject](https://southcentralus.dev.cognitive.microsoft.com/docs/services/Custom_Vision_Training_3.3/operations/5eb0bcc7548b571998fddee3)** APIs enable this scenario by allowing you to copy projects from one Custom Vision account into others. This guide shows you how to use these REST APIs with cURL. You can also use an HTTP request service like Postman to issue the requests.
 
 > [!TIP]
diff --git a/articles/cognitive-services/Custom-Vision-Service/overview.md b/articles/cognitive-services/Custom-Vision-Service/overview.md
@@ -52,10 +52,19 @@ The Custom Vision portal can be used by the following web browsers:
 
 ![Custom Vision website in a Chrome browser window](media/browser-home.png)
 
+## Backup and disaster recovery
+
+As a part of Azure, Custom Vision Service has components that are maintained across multiple regions. Service zones and regions are used by all of our services to provide continued service to our customers. For more information on zones and regions, see [Azure regions](../../availability-zones/az-overview.md). If you need additional information or have any issues, please [contact support](/answers/topics/azure-custom-vision.html).
+
+
 ## Data privacy and security
 
 As with all of the Cognitive Services, developers using the Custom Vision service should be aware of Microsoft's policies on customer data. See the [Cognitive Services page](https://www.microsoft.com/trustcenter/cloudservices/cognitiveservices) on the Microsoft Trust Center to learn more.
 
+## Data residency
+
+Custom Vision primarily doesn't replicate data out of the specified region, except for one region, `NorthCentralUS`, where there is no local Azure Support.
+
 ## Next steps
 
 Follow the [Build a classifier](getting-started-build-a-classifier.md) quickstart to get started using Custom Vision on the web portal, or complete an [SDK quickstart](quickstarts/image-classification.md) to implement the basic scenarios in code.
diff --git a/articles/cosmos-db/continuous-backup-restore-introduction.md b/articles/cosmos-db/continuous-backup-restore-introduction.md
@@ -101,6 +101,9 @@ For example, if you have 1 TB of data in two regions then:
 
 * Restore cost is calculated as (1000 * 0.15) = $150 per restore
 
+> [!TIP]
+> For more information about measuring the current data usage of your Azure Cosmos DB account, see [Explore Azure Monitor Cosmos DB insights](/azure/azure-monitor/insights/cosmosdb-insights-overview#view-utilization-and-performance-metrics-for-azure-cosmos-db).
+
 ## Customer-managed keys
 
 See [How do customer-managed keys affect continuous backups?](./how-to-setup-cmk.md#how-do-customer-managed-keys-affect-continuous-backups) to learn:
diff --git a/articles/cosmos-db/graph/create-graph-dotnet.md b/articles/cosmos-db/graph/create-graph-dotnet.md
@@ -22,7 +22,7 @@ ms.custom: devx-track-dotnet, mode-api
 > * [PHP](create-graph-php.md)
 >  
 
-Azure Cosmos DB is Microsoft's globally distributed multi-model database service. You can quickly create and query document, key/value, and graph databases, all of which benefit from the global distribution and horizontal scale capabilities at the core of Azure Cosmos DB. 
+Azure Cosmos DB is Microsoft's globally distributed multi-model database service. You can quickly create and query document, key/value, and graph databases. All of which benefit from the global distribution and horizontal scale capabilities at the core of Azure Cosmos DB. 
 
 This quickstart demonstrates how to create an Azure Cosmos DB [Gremlin API](graph-introduction.md) account, database, and graph (container) using the Azure portal. You then build and run a console app built using the open-source driver [Gremlin.Net](https://tinkerpop.apache.org/docs/3.2.7/reference/#gremlin-DotNet).  
 
@@ -56,16 +56,15 @@ Now let's clone a Gremlin API app from GitHub, set the connection string, and ru
     cd "C:\git-samples"
     ```
 
-3. Run the following command to clone the sample repository. This command creates a copy of the sample app on your computer.
+3. Run the following command to clone the sample repository. The ``git clone`` command creates a copy of the sample app on your computer.
 
     ```bash
     git clone https://github.com/Azure-Samples/azure-cosmos-db-graph-gremlindotnet-getting-started.git
     ```
 
 4. Then open Visual Studio and open the solution file.
 
-5. Restore the NuGet packages in the project. This should include the Gremlin.Net driver, and the Newtonsoft.Json package.
-
+5. Restore the NuGet packages in the project. The restore operation should include the Gremlin.Net driver, and the Newtonsoft.Json package.
 
 6. You can also install the Gremlin.Net@v3.4.6 driver manually using the NuGet package manager, or the [NuGet command-line utility](/nuget/install-nuget-client-tools): 
 
@@ -110,16 +109,27 @@ Now go back to the Azure portal to get your connection string information and co
 
     :::image type="content" source="./media/create-graph-dotnet/endpoint.png" alt-text="Copy the endpoint":::
 
-   To run this sample, copy the **Gremlin Endpoint** value, delete the port number at the end, that is the URI becomes `https://<your cosmos db account name>.gremlin.cosmosdb.azure.com`. The endpoint value should look like `testgraphacct.gremlin.cosmosdb.azure.com`
+   For this sample, record the *Host* value of the **Gremlin Endpoint**. For example, if the URI is ``https://graphtest.gremlin.cosmosdb.azure.com``, the *Host* value would be ``graphtest.gremlin.cosmosdb.azure.com``.
 
-1. Next, navigate to the **Keys** tab and copy the **PRIMARY KEY** value from the Azure portal. 
+1. Next, navigate to the **Keys** tab and record the *PRIMARY KEY* value from the Azure portal. 
 
-1. After you've copied the URI and PRIMARY KEY of your account, save them to a new environment variable on the local machine running the application. To set the environment variable, open a command prompt window, and run the following command. Make sure to replace <Your_Azure_Cosmos_account_URI> and <Your_Azure_Cosmos_account_PRIMARY_KEY> values.
+1. After you've copied the URI and PRIMARY KEY of your account, save them to a new environment variable on the local machine running the application. To set the environment variable, open a command prompt window, and run the following command. Make sure to replace ``<cosmos-account-name>`` and ``<cosmos-account-primary-key>`` values.
 
-   ```console
-   setx Host "<your Azure Cosmos account name>.gremlin.cosmosdb.azure.com"
-   setx PrimaryKey "<Your_Azure_Cosmos_account_PRIMARY_KEY>"
-   ```
+    ### [Windows](#tab/windows)
+    
+    ```powershell
+    setx Host "<cosmos-account-name>.gremlin.cosmosdb.azure.com"
+    setx PrimaryKey "<cosmos-account-primary-key>"
+    ```
+    
+    ### [Linux / macOS](#tab/linux+macos)
+    
+    ```bash
+    export Host=<cosmos-account-name>.gremlin.cosmosdb.azure.com
+    export PrimaryKey=<cosmos-account-primary-key>
+    ```
+    
+    ---
 
 1. Open the *Program.cs* file and update the "database and "container" variables with the database and container (which is also the graph name) names created above.
 
diff --git a/articles/devtest-labs/TOC.yml b/articles/devtest-labs/TOC.yml
@@ -259,6 +259,8 @@
       href: create-alerts.md
   - name: Move to new region
     href: how-to-move-labs.md
+  - name: Move schedules to another region
+    href: how-to-move-schedule-to-new-region.md
 - name: Reference
   items:
   - name: CLI
diff --git a/articles/devtest-labs/how-to-move-labs.md b/articles/devtest-labs/how-to-move-labs.md
@@ -265,3 +265,4 @@ In this article, you moved a DevTest lab from one region to another and cleaned
 
 - [Move resources to a new resource group or subscription](../azure-resource-manager/management/move-resource-group-and-subscription.md)
 - [Move Azure VMs to another region](../site-recovery/azure-to-azure-tutorial-migrate.md)
+- [Move Microsoft.DevtestLab/schedules to another region](./how-to-move-schedule-to-new-region.md)
diff --git a/articles/devtest-labs/how-to-move-schedule-to-new-region.md b/articles/devtest-labs/how-to-move-schedule-to-new-region.md
@@ -0,0 +1,87 @@
+---
+title: How to move a schedule to another region
+description: This article explains how to move schedules to another Azure region.
+ms.topic: how-to
+ms.author: rosemalcolm
+author: RoseHJM
+ms.date: 05/09/2022
+---
+# Move schedules to another region
+
+In this article, you'll learn how to move schedules by using an Azure Resource Manager (ARM) template. 
+
+DevTest Labs supports two types of schedules.
+
+- Schedules apply only to compute virtual machines (VMs): schedules are stored as microsoft.devtestlab/schedules resources, and often referred to as top level schedules, or simply schedules. 
+
+- Lab schedules apply only to DevTest Labs (DTL) VMs: lab schedules. They are stored as microsoft.devtestlab/labs/schedules resources. This type of schedule is not covered in this article.
+
+In this article, you'll learn how to:
+> [!div class="checklist"]
+> >
+> - Export an ARM template that contains your schedules. 
+> - Modify the template by adding or updating the target region and other parameters.
+> - Delete the resources in the source region.
+
+## Prerequisites
+
+- Ensure that the services and features that your account uses are supported in the target region.
+- For preview features, ensure that your subscription is allowlisted for the target region.
+- Ensure a Compute VM exists in the target region.
+
+## Move an existing schedule
+There are two ways to move a schedule:
+
+ - Manually recreate the schedules on the moved VMs. This process can be time consuming and error prone. This approach is most useful when you have a few schedules and VMs.
+ - Export and redeploy the schedules by using ARM templates.
+
+Use the following steps to export and redeploy your schedule in another Azure region by using an ARM template:
+
+1. Sign in to the [Azure portal](https://portal.azure.com).
+
+2. Go to the source resource group that held your VMs.
+
+3. On the **Resource Group Overview** page, under **Resources**, select **Show hidden types**.
+
+4. Select all resources with the type **microsoft.devtestlab/schedules**.
+ 
+5. Select **Export template**.
+
+    :::image type="content" source="./media/how-to-move-schedule-to-new-region/move-compute-schedule.png" alt-text="Screenshot that shows the hidden resources in a resource group, with schedules selected.":::
+
+6. On the **Export resource group template** page, select **Deploy**.
+
+7. On the **Custom deployment** page, select **Edit template**.
+ 
+8. In the template code, change all instances of `"location": "<old location>"` to `"location": "<new location>"` and then select **Save**.
+
+9. On the **Custom deployment** page, enter values that match the target VM:
+
+   |Name|Value|
+   |----|----|
+   |**Subscription**|Select an Azure subscription.|
+   |**Resource group**|Select the resource group name. |
+   |**Region**|Select a location for the lab schedule. For example, **Central US**. |
+   |**Schedule Name**|Must be a globally unique name. |
+   |**VirtualMachine_xxx_externalId**|Must be the target VM. |
+ 
+    :::image type="content" source="./media/how-to-move-schedule-to-new-region/move-schedule-custom-deployment.png" alt-text="Screenshot that shows the custom deployment page, with new location values for the relevant settings.":::
+
+    >[!IMPORTANT]
+    >Each schedule must have a globally unique name; you will need to change the schedule name for the new location.
+
+10. Select **Review and create** to create the deployment.
+
+11. When the deployment is complete, verify that the new schedule is configured correctly on the new VM.
+
+## Discard or clean up
+
+Now you can choose to clean up the original schedules if they're no longer used. Go to the original schedule resource group (where you exported templates from in step 5 above) and delete the schedule resource.
+
+## Next steps
+
+In this article, you moved a schedule from one region to another and cleaned up the source resources. To learn more about moving resources between regions and disaster recovery in Azure, refer to:
+
+- [Move a DevTest Labs to another region](./how-to-move-labs.md).
+- [Move resources to a new resource group or subscription](../azure-resource-manager/management/move-resource-group-and-subscription.md).
+- [Move Azure VMs to another region](../site-recovery/azure-to-azure-tutorial-migrate.md).
diff --git a/articles/devtest-labs/media/how-to-move-schedule-to-new-region/move-compute-schedule.png b/articles/devtest-labs/media/how-to-move-schedule-to-new-region/move-compute-schedule.png
diff --git a/articles/devtest-labs/media/how-to-move-schedule-to-new-region/move-schedule-custom-deployment.png b/articles/devtest-labs/media/how-to-move-schedule-to-new-region/move-schedule-custom-deployment.png
diff --git a/articles/virtual-machines/linux/tutorial-automate-vm-deployment.md b/articles/virtual-machines/linux/tutorial-automate-vm-deployment.md
@@ -5,7 +5,7 @@ author: cynthn
 ms.service: virtual-machines
 ms.collection: linux
 ms.topic: tutorial
-ms.date: 09/12/2019
+ms.date: 05/13/2022
 ms.author: cynthn
 ms.custom: mvc, devx-track-js, devx-track-azurecli
 
@@ -152,7 +152,7 @@ az keyvault certificate create \
 
 
 ### Prepare certificate for use with VM
-To use the certificate during the VM create process, obtain the ID of your certificate with [az keyvault secret list-versions](/cli/azure/keyvault/secret#az-keyvault-secret-list-versions). The VM needs the certificate in a certain format to inject it on boot, so convert the certificate with [az vm secret format](/cli/azure/vm). The following example assigns the output of these commands to variables for ease of use in the next steps:
+To use the certificate during the VM create process, obtain the ID of your certificate with [az keyvault secret list-versions](/cli/azure/keyvault/secret#az-keyvault-secret-list-versions). The VM needs the certificate in a certain format to inject it on boot, so convert the certificate with [az vm secret format](/cli/azure/vm/secret#az-vm-secret-format). The following example assigns the output of these commands to variables for ease of use in the next steps:
 
 ```azurecli-interactive
 secret=$(az keyvault secret list-versions \

Original file line number	Diff line number	Diff line change
`@@ -265,3 +265,4 @@ In this article, you moved a DevTest lab from one region to another and cleaned`
`265`	`265`
`266`	`266`	`- [Move resources to a new resource group or subscription](../azure-resource-manager/management/move-resource-group-and-subscription.md)`
`267`	`267`	`- [Move Azure VMs to another region](../site-recovery/azure-to-azure-tutorial-migrate.md)`
	`268`	`+- [Move Microsoft.DevtestLab/schedules to another region](./how-to-move-schedule-to-new-region.md)`