Merge pull request #299204 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: v-alje

articles/container-apps/environment.md

@@ -5,7 +5,7 @@ services: container-apps
 author: craigshoemaker
 ms.service: azure-container-apps
 ms.topic:  conceptual
-ms.date: 04/10/2025
+ms.date: 04/28/2025
 ms.author: cshoe
 ms.custom: build-2023
 ---
@@ -49,7 +49,7 @@ Use more than one environment when you want two or more applications to:
 
 | Type | Description | Plan | Billing considerations |
 |--|--|--|--|
-| Workload profile | Run serverless apps with support for scale-to-zero and pay only for resources your apps use with the consumption profile. You can also run apps with customized hardware and increased cost predictability using dedicated workload profiles. | Consumption and Dedicated | You can choose to run apps under either or both plans using separate workload profiles. The Dedicated plan has a fixed cost for the entire environment regardless of how many workload profiles you're using. |
+| Workload profile | Run serverless apps with support for scale-to-zero and pay only for resources your apps use with the consumption profile. You can also run apps with customized hardware and increased cost predictability using dedicated workload profiles. | Consumption and Dedicated | You can choose to run apps under either or both plans using separate workload profiles. The Dedicated plan has a fixed plan management cost for the entire environment regardless of how many workload profiles you're using. The Dedicated plan also has a variable cost based on the number of workload profile instances and the resources allocated to each instance. For more information see [Billing](billing.md#dedicated-plan). |
 | Consumption only | Run serverless apps with support for scale-to-zero and pay only for resources your apps use. | Consumption only | Billed only for individual container apps and their resource usage. There's no cost associated with the Container Apps environment. |
 
 ## Logs

articles/container-apps/opentelemetry-agents.md

@@ -4,7 +4,7 @@ description: Learn to record and query data collected using OpenTelemetry in Azu
 services: container-apps
 author: craigshoemaker
 ms.service: azure-container-apps
-ms.date: 02/07/2025
+ms.date: 04/28/2025
 ms.author: cshoe
 ms.topic: how-to
 ---
@@ -27,7 +27,7 @@ Each endpoint type (Azure Monitor Application Insights, DataDog, and OTLP) has s
 
 ## Prerequisites
 
-Enabling the managed OpenTelemetry agent to your environment doesn't automatically mean the agent collects data. Agents only send data based on your configuration settings and instrumenting your code correctly.
+Enabling the managed OpenTelemetry agent for your environment doesn't automatically mean the agent collects data. Agents only send data based on your configuration settings and instrumenting your code correctly.
 
 ### Configure source code
 
@@ -161,13 +161,17 @@ resource "azapi_update_resource" "app_insights_open_telemetry_integration" {
 
 ## Datadog
 
-The Datadog agent configuration requires a value for `site` and `key` from your Datadog instance. Gather these values from your Datadog instance according to this table:
+You do not need to run the Datadog agent in your container app if you've enabled the managed OpenTelemetry agent for your environment.
 
-| Datadog agent property | Container Apps configuration property |
+The OpenTelemetry agent configuration requires a value for `site` and `key` from your Datadog instance. Gather these values from your Datadog instance according to this table:
+
+| Datadog instance property | OpenTelemetry agent configuration property |
 |---|---|
 | `DD_SITE` | `site` |
 | `DD_API_KEY` | `key` |
 
+If you created your Datadog instance in the Azure portal, see [API keys](/azure/partner-solutions/datadog/manage#api-keys) for more information.
+
 Once you have these configuration details, you can configure the agent via your container app's ARM or Bicep template or with Azure CLI commands.
 
 Avoid specifying the value of a secret, such as your Datadog API key, directly in a production environment. Instead, use a reference to a secret stored in Azure Key Vault.
@@ -305,7 +309,7 @@ Before you run this command, replace the `<PLACEHOLDERS>` with your values.
 az containerapp env telemetry data-dog set \
   --resource-group <RESOURCE_GROUP_NAME> \
   --name <ENVIRONMENT_NAME> \
-  --site  "<DATADOG_SUBDOMAIN>.datadoghq.com" \
+  --site "<DATADOG_SUBDOMAIN>.datadoghq.com" \
   --key <DATADOG_KEY> \
   --enable-open-telemetry-traces true \
   --enable-open-telemetry-metrics true

articles/container-apps/waf-app-gateway.md

@@ -2,11 +2,11 @@
 title: Protect Azure Container Apps with Application Gateway and Web Application Firewall (WAF)
 description: Learn how to protect Azure Container Apps with Application Gateway Web Application Firewall (WAF)
 services: container-apps
-author: cachai2
+author: craigshoemaker
 ms.service: azure-container-apps
 ms.topic:  how-to
-ms.date: 03/26/2025
-ms.author: cachai
+ms.date: 04/28/2025
+ms.author: cshoe
 ---
 
 # Protect Azure Container Apps with Web Application Firewall on Application Gateway
@@ -177,7 +177,7 @@ Perform the following steps:
     | Public IP address | Select **Add new**. Enter **my-frontend** for the name of your frontend and select **OK** |
 
    > [!NOTE]
-   > For the Application Gateway v2 SKU, there must be a **Public** frontend IP. You can have both a public and a private frontend IP configuration, but a private-only frontend IP configuration with no public IP is currently not supported in the v2 SKU. To learn more, [read here](../virtual-network/ip-services/configure-public-ip-application-gateway.md).
+   > For the Application Gateway v2 SKU, there must be a public frontend IP. For more information, see [Public and private IP address support](/azure/application-gateway/configuration-frontend-ip#public-and-private-ip-address-support) and [Manage a public IP address with an Azure Application Gateway](../virtual-network/ip-services/configure-public-ip-application-gateway.md).
 
 1. Select **Next: Backends**.