Merge branch 'MicrosoftDocs:main' into java-suggestions-reza

Author: m-reza-rahman

articles/cdn/edgio-retirement-faq.md

@@ -83,7 +83,12 @@ Certificates from internal CAs or self-signed certificates aren't allowed.
 
 ### Can I retain my existing *.azureedge.net domain when I move to Azure Front Door?
 
-You can temporarily retain your *.azureedge.net domain by following the instructions provided in [Migrate to Azure Front Door while retaining *.azureedge.net domain](migrate-cdn-to-front-door-retain-edge-domain.md). However, this is only a short-term solution due to the urgent retirement of Azure CDN from Edgio. Relying on domains like *.azureedge.net and *.azurefd.net isn't recommended as it poses availability risks. To ensure greater flexibility and avoid a single point of failure, it's advisable to adopt a custom domain as soon as possible.
+You can temporarily retain your *.azureedge.net domain by following the instructions provided in [Migrate to Azure Front Door while retaining *.azureedge.net domain](migrate-cdn-to-front-door-retain-edge-domain.md). 
+
+> [!IMPORTANT]
+> - Relying on domains like `*.azureedge.net` and `*.azurefd.net` isn't recommended as it poses availability risks. To ensure greater flexibility and avoid a single point of failure, adopt a custom domain.
+> - For customers who migrated to Akamai while retaining `*.azureedge.net` and `*.vo.msecnd.net` domains, these domains will be supported till March 31, 2025.
+> - For customers who migrated to Front Door Standard/Premium while retaining `*.azureedge.net`, these domains will be supported till September 30, 2027.
 
 ### What are some key things I should do to verify my workloads are working properly on AFD?
 

articles/cdn/migrate-cdn-to-front-door-retain-edge-domain.md

@@ -13,7 +13,9 @@ ms.author: duau
 # Migrate to Azure Front Door while retaining *.azureedge.net domain
 
 > [!IMPORTANT]
-> This is a temporary measure due to the sudden and imminent retirement of Azure CDN from Edgio. Relying on domains like `*.azureedge.net` and `*.azurefd.net` isn't recommended as it poses availability risks. To ensure greater flexibility and avoid a single point of failure, adopt a custom domain as soon as possible.
+> - Relying on domains like `*.azureedge.net` and `*.azurefd.net` isn't recommended as it poses availability risks. To ensure greater flexibility and avoid a single point of failure, adopt a custom domain.
+> - For customers who migrated to Akamai while retaining `*.azureedge.net` and `*.vo.msecnd.net` domains, these domains will be supported till March 31, 2025.
+> - For customers who migrated to Front Door Standard/Premium while retaining `*.azureedge.net`, these domains will be supported till September 30, 2027.
 
 This article provides you with instructions for migrating to Azure Front Door from Azure CDN from Edgio while retaining the `*.azureedge.net` domain.
 
@@ -29,10 +31,10 @@ This article provides you with instructions for migrating to Azure Front Door fr
 
     > [!NOTE]
     > - The following steps assume you're using an Azure Blob Storage account as your origin. If you're using a different origin, adjust the steps accordingly.
-    > - If you are already using custom domains on Edgio, follow the steps in [Migrate Azure CDN from Edgio to Azure Front Door](../frontdoor/migrate-cdn-to-front-door.md).
+    > - If you're already using custom domains on Edgio, follow the steps in [Migrate Azure CDN from Edgio to Azure Front Door](../frontdoor/migrate-cdn-to-front-door.md).
 
     > [!IMPORTANT]
-    > If you plan to migrate to Azure Front Door, set the Feature Flag **DoNotForceMigrateEdgioCDNProfiles** before January 7, 2025 using [Set up preview feature](../azure-resource-manager/management/preview-features.md). This will prevent Microsoft from auto-migrating your profiles to Azure Front Door. Auto-migration is on a *best effort* basis and may cause issues with billing, features, availability, and performance. Note you will have until January 14, 2025 to complete your migration to another CDN, but again Microsoft cannot guarantee your services will be available on the Edgio platform before this date.
+    > If you plan to migrate to Azure Front Door, set the Feature Flag **DoNotForceMigrateEdgioCDNProfiles** before January 7, 2025 using [Set up preview feature](../azure-resource-manager/management/preview-features.md). This will prevent Microsoft from auto-migrating your profiles to Azure Front Door. Auto-migration is on a *best effort* basis and may cause issues with billing, features, availability, and performance. You'll have until January 14, 2025 to complete your migration to another CDN, but again Microsoft cannot guarantee your services will be available on the Edgio platform before this date.
 
 ## Gather information
 
@@ -126,11 +128,11 @@ This article provides you with instructions for migrating to Azure Front Door fr
     - Azure CDN from Edgio endpoint hostname (for example, `contoso.azureedge.net`)
 
 1. The Azure support team makes the necessary DNS changes within 24-48 hours of filing the ticket. Traffic will now start being served by the Azure Front Door service.
-1. If you face any issues and need to rollback the DNS changes, you can reopen the support ticket and request for rollback.
+1. If you face any issues and need to roll back the DNS changes, you can reopen the support ticket and request for rollback.
 
     > [!NOTE]
-    > - Most of the traffic will immediately switch to Azure Front Door. You may see a small portion of the traffic still served by Edgio. The DNS changes takes time to propagate and some DNS servers have high TTL for DNS record expiry. Wait for 24-48 hours for all the traffic to switch.
-    > - After the changes, under AFD Domains blade, the 'Certificate state' field may show the value as 'issuing' and the 'DNS state' field may show the value as 'Certificate needed'. This is just a portal bug that will be fixed by January 31st. The bug doesn't impact your certificates or traffic in any manner as the Certificate and DNS State for *.azureedge.net domains are completely managed by AFD.
+    > - Most of the traffic will immediately switch to Azure Front Door. You may see a small portion of the traffic still served by Edgio. The DNS changes take time to propagate and some DNS servers have high TTL for DNS record expiry. Wait for 24-48 hours for all the traffic to switch.
+    > - After the changes, under AFD Domains blade, the 'Certificate state' field may show the value as 'issuing' and the 'DNS state' field may show the value as 'Certificate needed'. This is just a portal bug that will be fixed by January 31. The bug doesn't impact your certificates or traffic in any manner as the Certificate and DNS State for *.azureedge.net domains are completely managed by AFD.
    
 
 ## Next step

articles/healthcare-apis/fhir/media/azure-ad-b2c-setup/b2c-api-permission-2-sml.png

@@ -15,7 +15,7 @@ In this guide, you learn how to set up Azure Monitor alerts and use them with Az
 Both Azure Monitor and Grafana provide alerting functions.
 
 > [!NOTE]
-> Grafana alerts are only available for instances in the Standard plan.
+> Grafana alerts aren't available in the Essential (preview) plan.
 
 Grafana provides an alerting function for a number of [supported data sources](https://grafana.com/docs/grafana/latest/alerting/fundamentals/data-source-alerting/#data-sources-and-grafana-alerting). Alert rules are processed in your Azure Managed Grafana workspace and they share the same compute resources and query throttling limits with dashboard rendering. For more information about these limits, refer to [performance considerations and limitations](https://grafana.com/docs/grafana/latest/alerting/set-up/performance-limitations/#performance-considerations-and-limitations).
 

articles/healthcare-apis/fhir/media/azure-ad-b2c-setup/b2c-app-list-sml.png

@@ -54,6 +54,9 @@ Some Azure Managed Grafana features aren't available in Azure Government and Mic
 
 The following quotas apply to the Essential (preview) and Standard plans.
 
+> [!NOTE]
+> Grafana Enterprise is an option within the Standard plan, not a separate plan within Azure. The information listed below for the Standard plan also applies to Standard instances with Grafana Enterprise enabled.
+
 [!INCLUDE [Azure Managed Grafana limits](../../includes/azure-managed-grafana-limits.md)]
 
 Each data source also has its own limits that can be reflected in Azure Managed Grafana dashboards, alerts and reports. We recommend that you research these limits in the documentation of each data source provider. For instance: