Merge pull request #287486 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent.md

@@ -5,7 +5,7 @@ author: snehasudhirG
 services: automation
 ms.subservice: change-inventory-management
 ms.topic: how-to
-ms.date: 09/09/2024
+ms.date: 09/27/2024
 ms.author: sudhirsneha
 ms.custom:
 ms.service: azure-automation
@@ -22,6 +22,11 @@ Using the Azure portal, you can migrate from Change Tracking & Inventory with LA
 - Migrate single/multiple VMs from the Virtual Machines page.
 - Migrate multiples VMs on LA version solution within a particular Automation Account.
 
+> [!NOTE]
+> File Integrity Monitoring (FIM) using [Microsoft Defender for Endpoint (MDE)](https://learn.microsoft.com/azure/defender-for-cloud/file-integrity-monitoring-enable-defender-endpoint) is now currently available. Follow the guidance to migrate from:
+> - [FIM with Change Tracking and Inventory using AMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-ama).
+> - [FIM with Change Tracking and Inventory using MMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-mma).
+
 ## Onboarding to Change tracking and inventory using Azure Monitoring Agent
 
 ### [Using Azure portal - Azure single VM](#tab/ct-single-vm)

articles/automation/change-tracking/overview-monitoring-agent.md

@@ -3,7 +3,7 @@ title: Azure Automation Change Tracking and Inventory overview using Azure Monit
 description: This article describes the Change Tracking and Inventory feature using Azure monitoring agent, which helps you identify software and Microsoft service changes in your environment.
 services: automation
 ms.subservice: change-inventory-management
-ms.date: 09/09/2024
+ms.date: 09/27/2024
 ms.topic: overview
 ms.service: azure-automation
 ---
@@ -19,7 +19,10 @@ ms.service: azure-automation
 This article explains on the latest version of change tracking support using Azure Monitoring Agent as a singular agent for data collection. 
 
 > [!NOTE]
-> The [Current GA version](/azure/defender-for-cloud/file-integrity-monitoring-enable-log-analytics) of File Integrity Monitoring based on Log Analytics agent, will be deprecated in August 2024, and a **new version will be provided over MDE soon**.  The **[FIM Public Preview](/azure/defender-for-cloud/file-integrity-monitoring-enable-ama) based on Azure Monitor Agent (AMA), will be deprecated when the alternative is provided over MDE**. Hence, the FIM with AMA Public Preview version is not planned for GA. Read the announcement [here](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/microsoft-defender-for-cloud-strategy-and-plan-towards-log/ba-p/3883341).
+> File Integrity Monitoring (FIM) using [Microsoft Defender for Endpoint (MDE)](https://learn.microsoft.com/azure/defender-for-cloud/file-integrity-monitoring-enable-defender-endpoint) is now currently available. Follow the guidance to migrate from:
+> - [FIM with Change Tracking and Inventory using AMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-ama).
+> - [FIM with Change Tracking and Inventory using MMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-mma).
+
 
 ## Key benefits
 

articles/cdn/cdn-add-to-web-app.md

@@ -13,6 +13,8 @@ ms.custom: mvc
 
 # Tutorial: Add Azure Content Delivery Network to an Azure App Service web app
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
 This tutorial shows how to add [Azure Content Delivery Network](cdn-overview.md) to a [web app in Azure App Service](../app-service/overview.md). Web apps are services for hosting web applications, REST APIs, and mobile back ends.
 
 Here's the home page of the sample static HTML site that you work with:

articles/cdn/cdn-app-dev-net.md

@@ -14,6 +14,9 @@ ms.custom: has-adal-ref, devx-track-csharp, devx-track-dotnet
 
 # Get started with the Azure CDN Library for .NET
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
+
 > [!div class="op_single_selector"]
 > - [Node.js](cdn-app-dev-node.md)
 > - [.NET](cdn-app-dev-net.md)

articles/cdn/cdn-app-dev-node.md

@@ -14,6 +14,9 @@ ms.custom: devx-track-js
 
 # Get started with Azure CDN development
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
+
 > [!div class="op_single_selector"]
 > - [Node.js](cdn-app-dev-node.md)
 > - [.NET](cdn-app-dev-net.md)

articles/cdn/cdn-azure-diagnostic-logs.md

@@ -14,6 +14,8 @@ ms.custom: devx-track-azurepowershell
 
 # Diagnostic logs - Azure Content Delivery Network
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
 With Azure diagnostic logs, you can view core analytics and save them into one or more destinations including:
 
 - Azure Storage account

articles/cdn/cdn-billing.md

@@ -12,6 +12,8 @@ ms.author: duau
 
 # Understanding Azure Content Delivery Network billing
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
 This FAQ describes the billing structure for content hosted by Azure Content Delivery Network.
 
 ## What is a billing region?

articles/cdn/cdn-caching-policy.md

@@ -13,6 +13,8 @@ ms.author: juliako
 
 # Manage Azure CDN caching policy in Azure Media Services
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
 Azure Media Services provides HTTP based Adaptive Streaming and progressive download. HTTP based streaming is highly scalable with benefits of caching in proxy and CDN layers and client-side caching. Streaming endpoints provides general streaming capabilities and also configuration for HTTP cache headers. Streaming endpoints sets HTTP Cache-Control: max-age and Expires headers. You can get more information for HTTP cache headers from [W3.org](https://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html).
 
 ## Default Caching headers

articles/cdn/cdn-caching-rules-tutorial.md

@@ -14,6 +14,8 @@ ms.custom: mvc
 
 # Tutorial: Set Azure Content Delivery Network caching rules
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
 > [!NOTE]
 > Caching rules are available only for **Azure CDN Standard from Edgio** profiles. For **Azure CDN from Microsoft** profiles, you must use the [Standard rules engine](cdn-standard-rules-engine-reference.md) For **Azure CDN Premium from Edgio** profiles, you must use the [Edgio Premium rules engine](./cdn-verizon-premium-rules-engine.md) in the **Manage** portal for similar functionality.
 

articles/cdn/cdn-caching-rules.md

@@ -12,6 +12,8 @@ ms.author: duau
 
 # Control Azure Content Delivery Network caching behavior with caching rules
 
+[!INCLUDE [Azure CDN from Microsoft (classic) retirement notice](../../includes/cdn-classic-retirement.md)]
+
 This article describes how you can use content delivery network caching rules to set or modify default cache expiration behavior. These caching rules can either be global or with custom conditions, such as a URL path and file extension.
 
 > [!NOTE]