Merge pull request #264262 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: Taojunshen

articles/container-instances/container-instances-log-analytics.md

@@ -195,6 +195,19 @@ ContainerInstanceLog_CL
 |_ResourceId|string|A unique identifier for the resource that the record is associated with|
 |_SubscriptionId|string|A unique identifier for the subscription that the record is associated with|
 
+## Using Diagnostic Settings
+
+Diagnostic Settings for container groups is a preview feature and it can be enabled through preview features options in Azure portal. Once this feature is enabled for a subscription, Diagnostic Settings can be applied to a container group. Applying Diagnostic Settings will cause a container group to restart.
+
+For example, here is how we can use New-AzDiagnosticSetting command to apply a Diagnostic Settings object to a container group.
+
+```azurepowershell
+$log = @()
+$log += New-AzDiagnosticSettingLogSettingsObject -Enabled $true -Category ContainerInstanceLog -RetentionPolicyDay 7 -RetentionPolicyEnabled $true
+ 
+New-AzDiagnosticSetting -Name test-setting -ResourceId <container-group-resource-id> -WorkspaceId <log-analytics-workspace-id> -Log $log
+```
+
 ## Next steps
 
 ### Azure Monitor logs

articles/container-instances/tutorial-docker-compose.md

@@ -15,6 +15,9 @@ In this tutorial, you use [Docker Compose](https://docs.docker.com/compose/) to
 
 Run containers in Azure Container Instances on-demand when you develop cloud-native apps with Docker and you want to switch seamlessly from local development to cloud deployment. This capability is enabled by [integration between Docker and Azure](https://docs.docker.com/engine/context/aci-integration/). You can use native Docker commands to run either [a single container instance](quickstart-docker-cli.md) or multi-container group in Azure.
 
+> [!IMPORTANT]
+> Docker Compose's integration for ACI has been retired in November 2023. See also: [Retirement Date Pending](https://github.com/docker/compose-cli?tab=readme-ov-file#warning-retirement-date-pending).  
+
 > [!IMPORTANT]
 > Not all features of Azure Container Instances are supported. Provide feedback about the Docker-Azure integration by creating an issue in the [Docker ACI Integration](https://github.com/docker/aci-integration-beta) GitHub repository.
 

includes/azure-websites-limits.md

@@ -26,7 +26,7 @@ ms.author: msangapu
 | Custom domain [SSL support](../articles/app-service/configure-ssl-certificate.md) |Not supported, wildcard certificate for \*.azurewebsites.net available by default|Not supported, wildcard certificate for \*.azurewebsites.net available by default|Unlimited SNI SSL connections |Unlimited SNI SSL and 1 IP SSL connections included |Unlimited SNI SSL and 1 IP SSL connections included | Unlimited SNI SSL and 1 IP SSL connections included|
 | [Hybrid connections](../articles/app-service/app-service-hybrid-connections.md) | | | 5 per plan | 25 per plan | 220 per app | 220 per app |
 | [Virtual Network Integration](../articles/app-service/overview-vnet-integration.md) | | | X  |  X |  X  |  X  |
-| [Private Endpoints](../articles/app-service/networking/private-endpoint.md) | | |  X | X  |  100 per app  |    |
+| [Private Endpoints](../articles/app-service/networking/private-endpoint.md) | | | 100 per app | 100 per app | 100 per app |    |
 | Integrated load balancer | |X |X |X |X |X<sup>9</sup> |
 | [Access restrictions](../articles/app-service/networking-features.md#access-restrictions) | 512 rules per app | 512 rules per app | 512 rules per app | 512 rules per app | 512 rules per app | 512 rules per app |
 | [Always On](../articles/app-service/configure-common.md) | | |X |X |X |X |