Merge pull request #303071 from curib/master

Update planned maintenance doc + resolve merge conflicts

Author: v-ccolin

articles/container-apps/aspire-dashboard.md

@@ -55,6 +55,9 @@ You can enable the Aspire Dashboard on any existing container app using the foll
 
 You can also find the Aspire Dashboard settings by browsing to your Container Apps environment and selecting *Monitoring* > *Logging options*.
 
+>[!NOTE]
+> Custom domains aren't supported for accessing the Aspire Dashboard. You must use the default domain name provided by Azure Container Apps, such as: `https://<DOTNET_COMPONENT_NAME>.ext.<CLUSTER_NAME>.<REGION>.azurecontainerapps.io`
+
 ::: zone-end
 
 ::: zone pivot="azurecli"
@@ -70,6 +73,9 @@ az containerapp env dotnet-component create \
 
 The `create` command returns the dashboard URL that you can open in a browser.
 
+>[!NOTE]
+> Custom domains aren't supported for accessing the Aspire Dashboard. You must use the default domain name provided by Azure Container Apps, such as: `https://<DOTNET_COMPONENT_NAME>.ext.<CLUSTER_NAME>.<REGION>.azurecontainerapps.io`
+
 ::: zone-end
 
 ::: zone pivot="azd"
@@ -85,6 +91,9 @@ azd up
 
 The `up` command returns the dashboard URL that you can open in a browser.
 
+>[!NOTE]
+> Custom domains aren't supported for accessing the Aspire Dashboard. You must use the default domain name provided by Azure Container Apps, such as: `https://<DOTNET_COMPONENT_NAME>.ext.<CLUSTER_NAME>.<REGION>.azurecontainerapps.io`
+
 ::: zone-end
 
 ## Troubleshooting
@@ -115,6 +124,7 @@ Refer to the following items if you have issues enabling your dashboard:
   - **Verify Dashboard Access:**
     - Test by attempting to access the Aspire dashboard. If you continue to get the error, please reach out to our team.
 
+- Custom domains aren't supported for accessing the Aspire Dashboard. You must use the default domain name provided by Azure Container Apps, such as: `https://<DOTNET_COMPONENT_NAMNE>.ext.<CLUSTER_NAME>.<REGION>.azurecontainerapps.io`
 
 ## Related content
 

articles/container-apps/media/planned-maintenance/azure-container-apps-planned-maintenance-search.png

@@ -119,6 +119,10 @@ Use the following steps to review the maintenance history in the Azure portal.
 
 1. Select **Diagnose and solve problems**.
 
+1. Search for the **Scheduled Maintenance Events** detector. 
+
+:::image type="content" source="media/planned-maintenance/azure-container-apps-planned-maintenance-search.png" alt-text="Screenshot of an Azure Container Apps diagnostics scheduled maintenance search." lightbox="media/planned-maintenance/azure-container-apps-planned-maintenance-search.png":::
+
 In the *Diagnose and solve problems* window, you can view the configured maintenance window and upgrade events that occurred in the last month. As you hover your mouse over the bars in the chart, you can see the start time for each upgrade event.
 
 :::image type="content" source="media/planned-maintenance/azure-container-apps-planned-maintenance-upgrade-events.png" alt-text="Screenshot of an Azure Container Apps planned maintenance event history graph." lightbox="media/planned-maintenance/azure-container-apps-planned-maintenance-upgrade-events.png":::