Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-fixespr01

Author: davidsmatlak

articles/azure-government/documentation-government-services-devtools.md

@@ -26,9 +26,7 @@ For more information, see [DevTest Labs public documentation](../lab-services/de
 
 ### Variations
 The following DevTest Labs features are not currently available in Azure Government:
-* [Azure Resource Manager templates to create multi-VM environments and PaaS resources within a Lab](../lab-services/devtest-lab-create-environment-from-arm.md).
-* Connect to an external GitHub repository to add Azure Resource Manager Templates, however [adding artifact repositories to leverage custom artifacts](../lab-services/devtest-lab-add-artifact-repo.md) is available.
-* Auto shutdown feature for Azure compute VMs, however, setting auto shutdown for [Labs](https://azure.microsoft.com/updates/azure-devtest-labs-auto-shutdown-notification/) and [Lab Virtual Machines](https://azure.microsoft.com/updates/azure-devtest-labs-set-auto-shutdown-for-a-single-lab-vm/) is available.  
+* Auto shutdown feature for Azure compute VMs; however, setting auto shutdown for [Labs](https://azure.microsoft.com/updates/azure-devtest-labs-auto-shutdown-notification/) and [Lab Virtual Machines](https://azure.microsoft.com/updates/azure-devtest-labs-set-auto-shutdown-for-a-single-lab-vm/) is available.  
 
 
 ## Next steps

articles/azure-government/documentation-government-services-monitoringandmanagement.md

@@ -81,12 +81,6 @@ For more information, see [Site Recovery commercial documentation](../site-recov
 The following Site Recovery features are not currently available in Azure Government:
 * Email notification
 
-| Site Recovery | Classic | Resource Manager |
-| --- | --- | --- |
-| VMware/Physical  | GA | GA |
-| Hyper-V | GA | GA |
-| Site to Site | GA | GA |
-
 The following URLs for Site Recovery are different in Azure Government:
 
 | Azure Public | Azure Government | Notes |
@@ -101,95 +95,6 @@ Azure Monitor is generally available in Azure Government.
 
 For more information, see [Monitor commercial documentation](https://docs.microsoft.com/azure/monitoring-and-diagnostics/monitoring-overview).
 
-### Variations
-The following sections detail differences and workarounds for features of Azure Monitor in Azure Government:
-
-#### Action Groups
-Action Groups are generally available in Azure Government with no differences from commercial Azure.   
-
-#### Activity Log Alerts
-Activity Log Alerts are generally available in Azure Government with no differences from commercial Azure.
-
-#### Alerts Experience
-The unified alerts UI experience is available for metric and log alerts in Azure Government.
-
-#### Autoscale
-Autoscale is generally available in Azure Government.
-
-If you are using PowerShell/ARM/REST calls to specify settings, set the "Location" of the Autoscale to "USGov Virginia" or "USGov Iowa". The resource targeted by Autoscale can exist in any region. An example of the setting is below:
-
-```powershell
-$rule1 = New-AzAutoscaleRule -MetricName "Requests" -MetricResourceId "/subscriptions/S1/resourceGroups/RG1/providers/Microsoft.Web/sites/WebSite1" -Operator GreaterThan -MetricStatistic Average -Threshold 10 -TimeGrain 00:01:00 -ScaleActionCooldown 00:05:00 -ScaleActionDirection Increase -ScaleActionScaleType ChangeCount -ScaleActionValue "1"
-$rule2 = New-AzAutoscaleRule -MetricName "Requests" -MetricResourceId "/subscriptions/S1/resourceGroups/RG1/providers/Microsoft.Web/sites/WebSite1" -Operator GreaterThan -MetricStatistic Average -Threshold 10 -TimeGrain 00:01:00 -ScaleActionCooldown 00:10:00 -ScaleActionDirection Increase -ScaleActionScaleType ChangeCount -ScaleActionValue "2"
-$profile1 = New-AzAutoscaleProfile -DefaultCapacity 2 -MaximumCapacity 10 -MinimumCapacity 2 -Rules $rule1, $rule2 -Name "MyProfile"
-$webhook_scale = New-AzAutoscaleWebhook -ServiceUri https://example.com?mytoken=mytokenvalue
-$notification1= New-AzAutoscaleNotification -CustomEmails [email protected] -SendEmailToSubscriptionAdministrator -SendEmailToSubscriptionCoAdministrators -Webhooks $webhook_scale
-Add-AzAutoscaleSetting -Location "USGov Virginia" -Name "MyScaleVMSSSetting" -ResourceGroup sdubeys-usgv -TargetResourceId /subscriptions/s1/resourceGroups/rg1/providers/Microsoft.Web/serverFarms/ServerFarm1 -AutoscaleProfiles $profile1 -Notifications $notification1
-```
-
-If you are interested in implementing autoscale on your resources, use PowerShell/ARM/Rest calls to specify the settings.
-
-For more information on using PowerShell, see [public documentation](https://docs.microsoft.com/azure/monitoring-and-diagnostics/insights-powershell-samples#create-and-manage-autoscale-settings).
-
-#### Metrics
-Metrics are generally available in Azure Government. However, multi-dimensional metrics are supported only via the REST API. The ability to [show multi-dimensional metrics](../azure-monitor/platform/metrics-charts.md) is in preview in the Azure Government portal.
-
-#### Metric Alerts
-The first generation of metrics alerts is generally available in both Azure Government and commercial Azure. The first generation is called *Alerts (Classic)*. The second generation of metric alerts (also called the [unified alerts experience](../azure-monitor/platform/alerts-overview.md)) is now also available, but with a reduced set of resource providers [compared to the public cloud](../azure-monitor/platform/alerts-metric-near-real-time.md). More will be added over time. 
-
-The resources currently supported in the second generation alerts experience are:
-- Microsoft.ApiManagement/service
-- Microsoft.Cache/redis
-- Microsoft.Compute/virtualMachines
-- Microsoft.DBforMySQL/servers
-- Microsoft.DBforPostgreSQL/servers
-- Microsoft.DBforMariaDB/servers
-- Microsoft.Devices/IotHubs
-- Microsoft.EventGrid/domains
-- Microsoft.EventGrid/topics
-- Microsoft.EventHub/clusters
-- Microsoft.EventHub/namespaces
-- Microsoft.Insights/components
-- Microsoft.Network/dnsZones
-- Microsoft.Network/loadBalancers
-- Microsoft.Network/natGateways
-- Microsoft.Network/privateEndpoints
-- Microsoft.Network/privateLinkServices
-- Microsoft.Network/trafficManagerProfiles
-- Microsoft.OperationalInsights/workspaces
-- Microsoft.PowerBIDedicated/capacities
-- Microsoft.Relay/namespaces
-- Microsoft.ServiceBus/namespaces
-- Microsoft.Sql/managedInstances
-- Microsoft.Sql/servers/databases
-- Microsoft.Sql/servers/elasticPools
-- Microsoft.Storage/storageAccounts
-- Microsoft.Storage/storageAccounts/blobServices
-- Microsoft.Storage/storageAccounts/fileServices
-- Microsoft.Storage/storageAccounts/queueServices
-- Microsoft.Storage/storageAccounts/tableServices
-- Microsoft.Web/hostingEnvironments/multiRolePools
-- Microsoft.Web/hostingEnvironments/workerPools
-- Microsoft.Web/serverfarms
-- Microsoft.Web/sites
-- Microsoft.Web/sites/slots
-
-> [!NOTE]
-> Creating multi-resource metric alert rules on Virtual Machines is **currently not supported**. This article will be updated as soon as this functionality becomes available.
-
-You can still use [classic alerts](../azure-monitor/platform/alerts-classic.overview.md) for resources not yet available in the second generation of alerts. 
-
-When using PowerShell/ARM/Rest calls to create metric alerts, you will need to set the "Location" of the metric alert to "USGov Virginia" or "USGov Iowa". An example of the setting is below:
-
-```powershell
-$actionEmail = New-AzAlertRuleEmail -CustomEmail [email protected]
-$actionWebhook = New-AzAlertRuleWebhook -ServiceUri https://example.com?token=mytoken
-Add-AzMetricAlertRule -Name vmcpu_gt_1 -Location "USGov Virginia" -ResourceGroup myrg1 -TargetResourceId /subscriptions/s1/resourceGroups/myrg1/providers/Microsoft.ClassicCompute/virtualMachines/my_vm1 -MetricName "Percentage CPU" -Operator GreaterThan -Threshold 1 -WindowSize 00:05:00 -TimeAggregationOperator Average -Actions $actionEmail, $actionWebhook -Description "alert on CPU > 1%"
-```
-
-For more information on using PowerShell, see [public documentation](../azure-monitor/platform/powershell-quickstart-samples.md).
-
-
 ## Application Insights
 
 This section describes the supplemental configuration that is required to use Application Insights in Azure Government. To learn more about Azure Monitor and Application Insights checkout the [full documentation](https://docs.microsoft.com/azure/azure-monitor/overview).

articles/azure-government/documentation-government-services-securityandidentity.md

@@ -149,7 +149,6 @@ All features covered in the above list are available in the US Government cloud
 The following Azure Active Directory Premium P1 features are currently not available in Azure Government:
 
 - Azure Active Directory Domain Services
-- Cloud App Security
 - B2B Collaboration is available in Azure US Government tenants created after June, 2019. Over time, more tenants will get access to this functionality. See [How can I tell if B2B collaboration is available in my Azure US Government tenant?](../active-directory/b2b/current-limitations.md#how-can-i-tell-if-b2b-collaboration-is-available-in-my-azure-us-government-tenant)
 
 The following features have known limitations in Azure Government:
@@ -183,4 +182,4 @@ For information about EMS suite capabilities in Azure Government, see the [Enter
 
 ## Next steps
 
-For supplemental information and updates, subscribe to the [Microsoft Azure Government Blog.](https://devblogs.microsoft.com/azuregov)
+For supplemental information and updates, subscribe to the [Microsoft Azure Government Blog.](https://devblogs.microsoft.com/azuregov)

articles/azure-government/documentation-government-services-webandmobile.md

@@ -60,19 +60,10 @@ those apps created in the public cloud:
 Some App Service features available in the public cloud are not yet available 
 in Azure Government:
 
-- Diagnose and solve problems
 - Deployment
     - Deployment Options: Only Local Git Repository and External Repository are available.
-    - Deployment Center
-- Settings
-    - Application Insights
 - Development Tools
-    - Performance test
     - Resource explorer
-    - PHP Debugging
-- Support & Troubleshooting
-    - App Service Advisor
-- App Service Certificates
 
 
 ### Considerations

articles/azure-monitor/insights/container-insights-hybrid-setup.md

@@ -223,7 +223,7 @@ To first identify the full resource ID of your Log Analytics workspace required
        az login
        az account set --subscription "Subscription Name"
        # execute deployment command to add container insights solution to the specified Log Analytics workspace
-       az group deployment create --resource-group <resource group of log analytics workspace> --template-file ./containerSolution.json --parameters @./containerSolutionParams.json
+       az deployment group create --resource-group <resource group of log analytics workspace> --name <deployment name> --template-file  ./containerSolution.json --parameters @./containerSolutionParams.json
        ```
 
        The configuration change can take a few minutes to complete. When it's completed, a message is displayed that's similar to the following and includes the result:

articles/azure-resource-manager/templates/quickstart-create-templates-use-visual-studio-code.md

@@ -136,7 +136,8 @@ There are many methods for deploying templates. Azure Cloud Shell is used in thi
     read location &&
     resourceGroupName="${projectName}rg" &&
     az group create --name $resourceGroupName --location "$location" &&
-    az deployment group create --resource-group $resourceGroupName --template-file "$HOME/azuredeploy.json"
+    az deployment group create --resource-group $resourceGroupName --template-file "$HOME/azuredeploy.json" &&
+    echo "Press [ENTER] to continue ..."
     ```
 
     # [PowerShell](#tab/PowerShell)
@@ -148,6 +149,7 @@ There are many methods for deploying templates. Azure Cloud Shell is used in thi
 
     New-AzResourceGroup -Name $resourceGroupName -Location "$location"
     New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateFile "$HOME/azuredeploy.json"
+    Write-Host "Press [ENTER] to continue ..."
     ```
 
     ---
@@ -177,7 +179,8 @@ There are many methods for deploying templates. Azure Cloud Shell is used in thi
     read resourceGroupName &&
     echo "Enter the Storage Account name:" &&
     read storageAccountName &&
-    az storage account show --resource-group $resourceGroupName --name $storageAccountName
+    az storage account show --resource-group $resourceGroupName --name $storageAccountName &&
+    echo "Press [ENTER] to continue ..."
     ```
 
     # [PowerShell](#tab/PowerShell)
@@ -186,6 +189,7 @@ There are many methods for deploying templates. Azure Cloud Shell is used in thi
     $resourceGroupName = Read-Host -Prompt "Enter the Resource Group name"
     $storageAccountName = Read-Host -Prompt "Enter the Storage Account name"
     Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName
+    Write-Host "Press [ENTER] to continue ..."
     ```
 
     ---

articles/azure-resource-manager/templates/template-tutorial-create-multiple-instances.md

@@ -119,7 +119,8 @@ To list all three storage accounts, omit the --name parameter:
 echo "Enter a project name that is used to generate resource group name:" &&
 read projectName &&
 resourceGroupName="${projectName}rg" &&
-az storage account list --resource-group $resourceGroupName
+az storage account list --resource-group $resourceGroupName &&
+echo "Press [ENTER] to continue ..."
 ```
 
 # [PowerShell](#tab/azure-powershell)
@@ -128,6 +129,7 @@ az storage account list --resource-group $resourceGroupName
 $projectName = Read-Host -Prompt "Enter a project name that is used to generate resource group name"
 $resourceGroupName = "${projectName}rg"
 Get-AzStorageAccount -ResourceGroupName $resourceGroupName
+Write-Host "Press [ENTER] to continue ..."
 ```
 
 ---
@@ -140,7 +142,7 @@ When the Azure resources are no longer needed, clean up the resources you deploy
 
 1. From the Azure portal, select **Resource group** from the left menu.
 2. Enter the resource group name in the **Filter by name** field.
-3. Select the resource group name.  You shall see a total of six resources in the resource group.
+3. Select the resource group name.  You shall see a total of three resources in the resource group.
 4. Select **Delete resource group** from the top menu.
 
 ## Next steps

articles/azure-resource-manager/templates/template-tutorial-create-templates-with-dependent-resources.md

@@ -132,6 +132,7 @@ By specifying the dependencies, Resource Manager efficiently deploys the solutio
         -adminPassword $adminPassword `
         -dnsLabelPrefix $dnsLabelPrefix `
         -TemplateFile "$HOME/azuredeploy.json"
+
     Write-Host "Press [ENTER] to continue ..."
     ```
 
@@ -143,6 +144,7 @@ By specifying the dependencies, Resource Manager efficiently deploys the solutio
     $vmName = "SimpleWinVM"
 
     Get-AzVM -Name $vmName -ResourceGroupName $resourceGroupName
+    
     Write-Host "Press [ENTER] to continue ..."
     ```
 

articles/azure-resource-manager/templates/template-tutorial-use-conditions.md

@@ -154,6 +154,8 @@ New-AzResourceGroupDeployment `
     -storageAccountName $storageAccountName `
     -newOrExisting $newOrExisting `
     -TemplateFile "$HOME/azuredeploy.json"
+
+Write-Host "Press [ENTER] to continue ..."
 ```
 
 > [!NOTE]
@@ -166,8 +168,12 @@ Try making another deployment with **newOrExisting** set to "existing" and speci
 When the Azure resources are no longer needed, clean up the resources you deployed by deleting the resource group. To delete the resource group, select **Try it** to open the Cloud Shell. To paste the PowerShell script, right-click the shell pane, and then select **Paste**.
 
 ```azurepowershell-interactive
-$resourceGroupName = Read-Host -Prompt "Enter the same resource group name you used in the last procedure"
+$projectName = Read-Host -Prompt "Enter the same project name you used in the last procedure"
+$resourceGroupName = "${projectName}rg"
+
 Remove-AzResourceGroup -Name $resourceGroupName
+
+Write-Host "Press [ENTER] to continue ..."
 ```
 
 ## Next steps

articles/azure-resource-manager/templates/template-tutorial-use-key-vault.md

@@ -166,6 +166,8 @@ New-AzResourceGroupDeployment `
     -ResourceGroupName $resourceGroupName `
     -TemplateFile "$HOME/azuredeploy.json" `
     -TemplateParameterFile "$HOME/azuredeploy.parameters.json"
+
+Write-Host "Press [ENTER] to continue ..."
 ```
 
 When you deploy the template, use the same resource group that you used in the key vault. This approach makes it easier for you to clean up the resources, because you need to delete only one resource group instead of two.
@@ -189,6 +191,8 @@ $projectName = Read-Host -Prompt "Enter the same project name that is used for c
 $resourceGroupName = "${projectName}rg"
 
 Remove-AzResourceGroup -Name $resourceGroupName
+
+Write-Host "Press [ENTER] to continue ..."
 ```
 
 ## Next steps