Merge pull request #186908 from mmccrory/fixpolicy

updated policy and template

Author: LJSpiller

articles/automanage/arm-deploy.md

@@ -11,15 +11,15 @@ ms.date: 12/10/2021
 
 
 ## Overview
-Follow the steps below to onboard a machine to Automanage Best Practices using an ARM template.
+Follow the steps to onboard a machine to Automanage Best Practices using an ARM template.
 
 ## Prerequisites
-* You must have necessary [RBAC permissions](./automanage-virtual-machines.md#required-rbac-permissions)
+* You must have necessary [Role-based access control permissions](./automanage-virtual-machines.md#required-rbac-permissions)
 * You must be in a supported region and supported VM image highlighted in these [prerequisites](./automanage-virtual-machines.md#prerequisites)
 
 
 ## ARM template overview
-The following ARM template will onboard your specified machine onto Azure Automanage Best Practices. Details on the ARM template and steps on how to deploy are located in the ARM template deployment section [below](#arm-template-deployment).
+The following ARM template will onboard your specified machine onto Azure Automanage Best Practices. Details on the ARM template and steps on how to deploy are located in the ARM template deployment [section](#arm-template-deployment).
 ```json
 {
     "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -38,27 +38,27 @@ The following ARM template will onboard your specified machine onto Azure Automa
             "apiVersion": "2021-04-30-preview",
             "name": "[concat(parameters('machineName'), '/Microsoft.Automanage/default')]",
             "properties": {
-                "configurationProfile": "[parameters('configurationProfile')]",
+                "configurationProfile": "[parameters('configurationProfile')]"
             }
         }
     ]
 }
 ```
 
 ## ARM template deployment
-The ARM template above will create a configuration profile assignment for your specified machine. 
+This ARM template will create a configuration profile assignment for your specified machine. 
 
 The `configurationProfile` value can be one of the following values:
 * "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction"
 * "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesDevTest"
 
 Follow these steps to deploy the ARM template:
-1. Save the ARM template above as `azuredeploy.json`
-1. Run the ARM template deployment with `az deployment group create --resource-group myResourceGroup --template-file azuredeploy.json`
-1. Provide the values for machineName, automanageAccountName, and configurationProfileAssignment when prompted
-1. You are done!
+1. Save this ARM template as `azuredeploy.json`
+1. Run this ARM template deployment with `az deployment group create --resource-group myResourceGroup --template-file azuredeploy.json`
+1. Provide the values for machineName, and configurationProfileAssignment when prompted
+1. You're ready to deploy
 
-As with any ARM template, it is possible to factor out the parameters into a separate `azuredeploy.parameters.json` file and use that as an argument when deploying.
+As with any ARM template, it's possible to factor out the parameters into a separate `azuredeploy.parameters.json` file and use that as an argument when deploying.
 
 ## Next steps
 Learn more about Automanage for [Linux](./automanage-linux.md) and [Windows](./automanage-windows-server.md)

articles/automanage/virtual-machines-policy-enable.md

@@ -26,7 +26,7 @@ If you don't have an Azure subscription, [create an account](https://azure.micro
 > The following Azure RBAC permission is needed to enable Automanage: **Owner** role or **Contributor** along with **User Access Administrator** roles.
 
 ## Direct link to Policy
-The Automanage policy definition can be found in the Azure portal by the name of [Configure virtual machines to be onboarded to Azure Automanage](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F270610db-8c04-438a-a739-e8e6745b22d3). If you click on this link, skip directly to step 8 in [Locate and assign the policy](#locate-and-assign-the-policy) below.
+The Automanage policy definition can be found in the Azure portal by the name of [Configure virtual machines to be onboarded to Azure Automanage](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2Ff889cab7-da27-4c41-a3b0-de1f6f87c550). If you click on this link, skip directly to step 8 in [Locate and assign the policy](#locate-and-assign-the-policy) below.
 
 ## Sign in to Azure
 
@@ -38,21 +38,21 @@ Sign in to the [Azure portal](https://portal.azure.com/).
 1. Navigate to **Policy** in the Azure portal
 1. Go to the **Definitions** pane
 1. Click the **Categories** dropdown to see the available options
-1. Select the **Enable Automanage – Azure virtual machine best practices** option
-1. Now the list will update to show a built-in policy with a name that starts with *Enable Automanage…*
-1. Click on the *Enable Automanage - Azure virtual machine best practices* built-in policy name
+1. Select the **Automanage** option
+1. Now the list will update to show a built-in policy with a name that starts with *Configure virtual machines to be onboarded to Azure Automanage*
+1. Click on the *Configure virtual machines to be onboarded to Azure Automanage* built-in policy name
 1. After clicking on the policy, you can now see the **Definition** tab
 
     > [!NOTE]
-    > The Azure Policy definition is used to set Automanage parameters like the configuration profile or the account. It also sets filters that ensure the policy applies only to the correct VMs.
+    > The Azure Policy definition is used to set Automanage parameters like the configuration profile. It also sets filters that ensure the policy applies only to the correct VMs.
 
 1. Click the **Assign** button to create an Assignment
 1. Under the **Basics** tab, fill out **Scope** by setting the *Subscription* and *Resource Group*
 
     > [!NOTE]
     > The Scope lets you define which VMs this policy applies to. You can set application at the subscription level or resource group level. If you set a resource group, all VMs that are currently in that resource group or any future VMs we add to it will have Automanage automatically enabled.
 
-1. Click on the **Parameters** tab and set the **Automanage Account** and the desired **Configuration Profile**
+1. Click on the **Parameters** tab and set the **Configuration Profile** and the desired **Effect**
 1. Under the **Review + create** tab, review the settings
 1. Apply the Assignment by clicking **Create**
 1. View your assignments in the **Assignments** tab next to **Definition**