Merge pull request #176484 from mmccrory/ignite21updates

changes to support new API and custom profiles

Author: Court72

.openpublishing.redirection.json

@@ -5,6 +5,11 @@
       "redirect_url": "/azure/storage/blobs/quickstart-blobs-c-plus-plus",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/automanage/virtual-machines-custom-preferences.md",
+      "redirect_url": "/azure/automanage/automanage-upgrade",
+      "redirect_document_id": false
+    },
     {
       "source_path": "active-directory/authentication/concept-mfa-plan.md",
       "redirect_url": "active-directory/authentication/howto-mfa-getstarted",

articles/automanage/TOC.yml

@@ -19,17 +19,17 @@
         href: automanage-hotpatch.md
   - name: Automanage for Azure Arc-enabled servers
     href: automanage-arc.md
-  - name: Automanage account
-    href: automanage-account.md
 - name: How to
   expanded: true
   items:
-  - name: Create custom preferences
-    href: virtual-machines-custom-preferences.md
+  - name: Create custom profile
+    href: virtual-machines-custom-profile.md
   - name: Enable on VMs through Azure Policy
     href: virtual-machines-policy-enable.md
   - name: Enable on VMs through an ARM template
     href: arm-deploy.md
+  - name: Upgrade machines to latest Automanage Version
+    href: automanage-upgrade.md
   - name: Troubleshoot onboarding errors
     href: common-errors.md
   - name: Repair a broken Automanage account

articles/automanage/arm-deploy.md

@@ -12,11 +12,11 @@ ms.date: 04/09/2021
 
 
 ## Overview
-Follow the steps below to onboard a machine to Automanage Best Practices. The ARM template below will create a `configurationProfileAssignment` object, which is the Azure resource that represents a machine that has been onboarded to Automanage.
+Follow the steps below to onboard a machine to Automanage Best Practices using an ARM template.
 
 ## Prerequisites
-* You must have created an existing Automanage Account and assigned it the correct permissions. See [this document](./automanage-account.md) for more information on the Automanage Account and how to create one and assign permissions.
-* If you have an existing Automanage Account with permissions assigned, you must also have the **Contributor** role on the resource group containing the machines you want to onboard to Automanage.
+* You must have necessary [RBAC 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
@@ -29,33 +29,29 @@ The following ARM template will onboard your specified machine onto Azure Automa
         "machineName": {
             "type": "String"
         },
-        "automanageAccountName": {
-            "type": "String"
-        },
-        "configurationProfileAssignment": {
+        "configurationProfile": {
             "type": "String"
         }
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines/providers/configurationProfileAssignments",
-            "apiVersion": "2020-06-30-preview",
-            "name": "[concat(parameters('machineName'), '/Microsoft.Automanage/', 'default')]",
+            "apiVersion": "2021-04-30-preview",
+            "name": "[concat(parameters('machineName'), '/Microsoft.Automanage/default')]",
             "properties": {
-                "configurationProfile": "[parameters('configurationProfileAssignment')]",
-                "accountId": "[concat(resourceGroup().id, '/providers/Microsoft.Automanage/accounts/', parameters('automanageAccountName'))]"
+                "configurationProfile": "[parameters('configurationProfile')]",
             }
         }
     ]
 }
 ```
 
 ## ARM template deployment
-The ARM template above will create a configuration profile assignment for your specified machine, using a specified Automanage Account. If you haven't created an Automanage Account, learn more at [this doc](./automanage-account.md).
+The ARM template above will create a configuration profile assignment for your specified machine. 
 
-The `configurationProfileAssignment` value can be one of the following values:
-* "Production"
-* "DevTest"
+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`

articles/automanage/automanage-arc.md

@@ -1,6 +1,6 @@
 ---
 title: Azure Automanage for Azure Arc-enabled servers
-description: Learn about the Azure Automanage for Azure Arc-enabled servers
+description: Learn about Azure Automanage for Azure Arc-enabled servers
 ms.service: virtual-machines
 ms.subservice: automanage
 ms.collection: linux
@@ -14,7 +14,7 @@ ms.date: 06/24/2021
 
 These Azure services are automatically onboarded for you when you use Automanage Machine Best Practices on an Azure Arc-enabled server VM. They are essential to our best practices white paper, which you can find in our [Cloud Adoption Framework](/azure/cloud-adoption-framework/manage/azure-server-management).
 
-For all of these services, we will auto-onboard, auto-configure, monitor for drift, and remediate if drift is detected. To learn more about this process, see [Azure Automanage for virtual machines](automanage-virtual-machines.md).
+For all of these services, we will auto-onboard, auto-configure, monitor for drift, and remediate if drift is detected. To learn more, go to [Azure Automanage for virtual machines](automanage-virtual-machines.md).
 
 ## Supported operating systems
 
@@ -30,18 +30,17 @@ Automanage supports the following operating systems for Azure Arc-enabled server
 
 ## Participating services
 
-|Service    |Description    |Environments supported<sup>1</sup>    |Preferences supported<sup>1</sup>    |
-|-----------|---------------|----------------------|-------------------------|
-|[Machines Insights Monitoring](../azure-monitor/vm/vminsights-overview.md)    |Azure Monitor for machines monitors the performance and health of your virtual machines, including their running processes and dependencies on other resources. Learn [more](../azure-monitor/vm/vminsights-overview.md).    |Production    |No    |
-|[Azure Security Center](../security-center/security-center-introduction.md)    |Azure Security Center is a unified infrastructure security management system that strengthens the security posture of your data centers, and provides advanced threat protection across your hybrid workloads in the cloud. Learn [more](../security-center/security-center-introduction.md).  Automanage will configure the subscription where your VM resides to the free-tier offering of Azure Security Center. If your subscription is already onboarded to Azure Security Center, then Automanage will not reconfigure it.    |Production, Dev/Test    |No    |
-|[Update Management](../automation/update-management/overview.md)    |You can use Update Management in Azure Automation to manage operating system updates for your machines. You can quickly assess the status of available updates on all agent machines and manage the process of installing required updates for servers. Learn [more](../automation/update-management/overview.md).    |Production, Dev/Test    |No    |
-|[Change Tracking & Inventory](../automation/change-tracking/overview.md) |Change Tracking and Inventory combines change tracking and inventory functions to allow you to track virtual machine and server infrastructure changes. The service supports change tracking across services, daemons software, registry, and files in your environment to help you diagnose unwanted changes and raise alerts. Inventory support allows you to query in-guest resources for visibility into installed applications and other configuration items.  Learn [more](../automation/change-tracking/overview.md).    |Production, Dev/Test    |No    |
-|[Azure Guest Configuration](../governance/policy/concepts/guest-configuration.md)  | Guest Configuration policy is used to monitor the configuration and report on the compliance of the machine. The Automanage service will install the Azure Linux baseline using the Guest Configuration extension. For Linux machines, the guest configuration service will install the baseline in audit-only mode. You will be able to see where your VM is out of compliance with the baseline, but noncompliance won't be automatically remediated. Learn [more](../governance/policy/concepts/guest-configuration.md).    |Production, Dev/Test    |No    |
-|[Azure Automation Account](../automation/automation-create-standalone-account.md)    |Azure Automation supports management throughout the lifecycle of your infrastructure and applications. Learn [more](../automation/automation-intro.md).    |Production, Dev/Test    |No    |
-|[Log Analytics Workspace](../azure-monitor/logs/log-analytics-overview.md) |Azure Monitor stores log data in a Log Analytics workspace, which is an Azure resource and a container where data is collected, aggregated, and serves as an administrative boundary. Learn [more](../azure-monitor/logs/design-logs-deployment.md).    |Production, Dev/Test    |No    |
+|Service    |Description    |Configuration Profile<sup>1</sup>    |
+|-----------|---------------|----------------------|
+|[Machines Insights Monitoring](../azure-monitor/vm/vminsights-overview.md)    |Azure Monitor for machines monitors the performance and health of your virtual machines, including their running processes and dependencies on other resources.    |Production    |
+|[Update Management](../automation/update-management/overview.md)    |You can use Update Management in Azure Automation to manage operating system updates for your machines. You can quickly assess the status of available updates on all agent machines and manage the process of installing required updates for servers.    |Production, Dev/Test    |
+|[Change Tracking & Inventory](../automation/change-tracking/overview.md) |Change Tracking and Inventory combines change tracking and inventory functions to allow you to track virtual machine and server infrastructure changes. The service supports change tracking across services, daemons software, registry, and files in your environment to help you diagnose unwanted changes and raise alerts. Inventory support allows you to query in-guest resources for visibility into installed applications and other configuration items.    |Production, Dev/Test    |
+|[Azure Guest Configuration](../governance/policy/concepts/guest-configuration.md)  | Guest Configuration policy is used to monitor the configuration and report on the compliance of the machine. The Automanage service will install the Azure Linux baseline using the Guest Configuration extension. For Linux machines, the guest configuration service will install the baseline in audit-only mode. You will be able to see where your VM is out of compliance with the baseline, but noncompliance won't be automatically remediated.    |Production, Dev/Test    |
+|[Azure Automation Account](../automation/automation-create-standalone-account.md)    |Azure Automation supports management throughout the lifecycle of your infrastructure and applications.    |Production, Dev/Test    |
+|[Log Analytics Workspace](../azure-monitor/logs/log-analytics-overview.md) |Azure Monitor stores log data in a Log Analytics workspace, which is an Azure resource and a container where data is collected, aggregated, and serves as an administrative boundary.    |Production, Dev/Test    |
 
 
-<sup>1</sup> The environment selection is available when you are enabling Automanage. Learn [more](automanage-virtual-machines.md#environment-configuration). You can also adjust the default settings of the environment and set your own preferences within the best practices constraints.
+<sup>1</sup> The [configuration profile](automanage-virtual-machines.md#configuration-profile) selection is available when you are enabling Automanage. You can also create your own custom profile with the set of Azure services and settings that you need.
 
 
 ## Next steps