Merge branch 'MicrosoftDocs:main' into Concepts-Network-Fabric-OptionA-OptionB

Author: jmmason70

.openpublishing.redirection.json

@@ -5244,6 +5244,11 @@
       "redirect_url": "/azure/virtual-wan/virtual-wan-about",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/openvpn-azure-ad-client.md",
+      "redirect_url": "/azure/virtual-wan/point-to-site-entra-vpn-client-windows",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/high-availability-vpn-client.md",
       "redirect_url": "/azure/virtual-wan/global-hub-profile",

articles/active-directory-b2c/media/configure-security-analytics-sentinel/full-details.png

@@ -10,7 +10,10 @@ ms.date: 12/10/2021
 # Onboard a machine to Automanage with an Azure Resource Manager (ARM) template
 
 > [!CAUTION]
-> On 31 August 2024, both Automation Update Management and the Log Analytics agent it uses will be retired. Migrate to Azure Update Manager before that. Refer to guidance on migrating to Azure Update Manager [here](/azure/update-manager/guidance-migration-automation-update-management-azure-update-manager?WT.mc_id=Portal-Microsoft_Azure_Automation). [Migrate Now](https://portal.azure.com/).
+> On September 30, 2027, the Azure Automanage Best Practices service will be retired. As a result, attempting to create a new configuration profile or onboarding a new subscription to the service will result in an error. Learn more [here](https://aka.ms/automanagemigration/) about how to migrate to Azure Policy before that date. 
+
+> [!CAUTION]
+> Starting February 1st 2025, Azure Automanage will begin rolling out changes to halt support and enforcement for all services dependent on the deprecated Microsoft Monitoring Agent (MMA). To continue using Change Tracking and Management, VM Insights, Update Management, and Azure Automation, [migrate to the new Azure Monitor Agent (AMA)][01].
 
 ## Overview
 Follow the steps to onboard a machine to Automanage Best Practices using an ARM template.
@@ -65,3 +68,7 @@ As with any ARM template, it's possible to factor out the parameters into a sepa
 
 ## Next steps
 Learn more about Automanage for [Linux](./automanage-linux.md) and [Windows](./automanage-windows-server.md)
+
+<!-- Link reference definitions -->
+[01]: https://aka.ms/mma-to-ama
+

articles/active-directory-b2c/media/configure-security-analytics-sentinel/rule-crud.png

@@ -9,7 +9,10 @@ ms.date: 12/10/2021
 # Automanage Accounts
 
 > [!CAUTION]
-> On 31 August 2024, both Automation Update Management and the Log Analytics agent it uses will be retired. Migrate to Azure Update Manager before that. Refer to guidance on migrating to Azure Update Manager [here](/azure/update-manager/guidance-migration-automation-update-management-azure-update-manager?WT.mc_id=Portal-Microsoft_Azure_Automation). [Migrate Now](https://portal.azure.com/).
+> On September 30, 2027, the Azure Automanage Best Practices service will be retired. As a result, attempting to create a new configuration profile or onboarding a new subscription to the service will result in an error. Learn more [here](https://aka.ms/automanagemigration/) about how to migrate to Azure Policy before that date. 
+
+> [!CAUTION]
+> Starting February 1st 2025, Azure Automanage will begin rolling out changes to halt support and enforcement for all services dependent on the deprecated Microsoft Monitoring Agent (MMA). To continue using Change Tracking and Management, VM Insights, Update Management, and Azure Automation, [migrate to the new Azure Monitor Agent (AMA)](https://aka.ms/mma-to-ama/).
 
 The Automanage account is the identity that is used by the Automanage service to perform its automated operations.
 

articles/active-directory-b2c/media/partner-akamai-secure-hybrid-access/akamai-b2c-saml-configuration.png

@@ -10,7 +10,10 @@ ms.date: 05/12/2022
 # Azure Automanage for Machines Best Practices - Azure Arc-enabled servers
 
 > [!CAUTION]
-> On 31 August 2024, both Automation Update Management and the Log Analytics agent it uses will be retired. Migrate to Azure Update Manager before that. Refer to guidance on migrating to Azure Update Manager [here](/azure/update-manager/guidance-migration-automation-update-management-azure-update-manager?WT.mc_id=Portal-Microsoft_Azure_Automation). [Migrate Now](https://portal.azure.com/).
+> On September 30, 2027, the Azure Automanage Best Practices service will be retired. As a result, attempting to create a new configuration profile or onboarding a new subscription to the service will result in an error. Learn more [here](https://aka.ms/automanagemigration/) about how to migrate to Azure Policy before that date. 
+
+> [!CAUTION]
+> Starting February 1st 2025, Azure Automanage will begin rolling out changes to halt support and enforcement for all services dependent on the deprecated Microsoft Monitoring Agent (MMA). To continue using Change Tracking and Management, VM Insights, Update Management, and Azure Automation, [migrate to the new Azure Monitor Agent (AMA)](https://aka.ms/mma-to-ama/).
 
 > [!CAUTION]
 > This article references CentOS, a Linux distribution that is End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](/azure/virtual-machines/workloads/centos/centos-end-of-life).
@@ -35,7 +38,7 @@ Automanage supports the following operating systems for Azure Arc-enabled server
 | --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------- |
 | [Machines Insights Monitoring](/azure/azure-monitor/vm/vminsights-overview)        | 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              |
-| [Microsoft Antimalware](../security/fundamentals/antimalware.md)                  | Microsoft Antimalware for Azure is a free real-time protection that helps identify and remove viruses, spyware, and other malicious software. It generates alerts when known malicious or unwanted software tries to install itself or run on your Azure systems. **Note:** Microsoft Antimalware requires that there be no other antimalware software installed, or it may fail to work. This is also only supported for Windows Server 2016 and above.           | Production, Dev/Test              |
+| [Microsoft Antimalware](../security/fundamentals/antimalware.md)                  | Microsoft Antimalware for Azure is a free real-time protection that helps identify and remove viruses, spyware, and other malicious software. It generates alerts when known malicious or unwanted software tries to install itself or run on your Azure systems. **Note:** Microsoft Antimalware requires that there be no other anti-malware software installed, or it may fail to work. This is also only supported for Windows Server 2016 and above.           | 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              |
 | [Machine Configuration](../governance/machine-configuration/overview.md)          | Machine Configuration policy is used to monitor the configuration and report on the compliance of the machine. The Automanage service will install the Azure security baseline using the Guest Configuration extension. For Arc machines, the machine 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              |