Merge pull request #297908 from hhunter-ms/hh-418788

[Dapr/ACA] Updates to arguments and overview

Author: v-shils

articles/container-apps/TOC.yml

@@ -315,7 +315,7 @@
           href: microservices-dapr.md
         - name: Deploy using ARM or Bicep
           href: microservices-dapr-azure-resource-manager.md
-        - name: Enable Dapr on an existing container app
+        - name: Configure Dapr on an existing container app
           href: enable-dapr.md
         - name: Deploy using the Dapr extension for Azure Functions
           href: dapr-functions-extension.md

articles/container-apps/azure-resource-manager-api-spec.md

@@ -5,7 +5,7 @@ services: container-apps
 author: craigshoemaker
 ms.service: azure-container-apps
 ms.topic: reference
-ms.date: 01/23/2025
+ms.date: 04/09/2025
 ms.author: cshoe
 ms.custom: build-2023
 ---
@@ -148,7 +148,7 @@ A resource's `properties.configuration` object includes the following properties
 | `secrets` | Defines secret values in your container app. | object |
 | `ingress` | Object that defines public accessibility configuration of a container app. | object |
 | `registries` | Configuration object that references credentials for private container registries. Entries defined with `secretref` reference the secrets configuration object. | object |
-| `dapr` | Configuration object that defines the Dapr settings for the container app. | object  |
+| `dapr` | Configuration object that defines the [Dapr settings for the container app](./enable-dapr.md). | object  |
 
 Changes made to the `configuration` section are [application-scope changes](revisions.md#application-scope-changes), which doesn't trigger a new revision.
 
@@ -253,7 +253,15 @@ The following example ARM template snippet deploys a container app.
         "httpReadBufferSize": 30,
         "httpMaxRequestSize": 10,
         "logLevel": "debug",
-        "enableApiLogging": true
+        "enableApiLogging": true,
+        "appHealth": {
+          "enabled": true,
+          "path": "/health",
+          "probeIntervalSeconds": 3,
+          "probeTimeoutMilliseconds": 1000,
+          "threshold": 3,
+        },
+        "maxConcurrency": 10
       },
       "maxInactiveRevisions": 10,
       "service": {
@@ -448,6 +456,13 @@ properties:
       httpMaxRequestSize: 10
       logLevel: debug
       enableApiLogging: true
+      appHealth: 
+        - enabled: true
+        - path: "/health"
+        - probeIntervalSeconds: 3
+        - probeTimeoutMilliseconds: 1000
+        - threshold: 3
+      maxConcurrency: 10
     maxInactiveRevisions: 10
     service:
       type: redis

articles/container-apps/dapr-overview.md

@@ -6,7 +6,7 @@ author: hhunter-ms
 ms.service: azure-container-apps
 ms.custom: build-2023
 ms.topic: conceptual
-ms.date: 01/08/2025
+ms.date: 04/09/2025
 ---
 
 # Microservice APIs powered by Dapr
@@ -27,6 +27,8 @@ Configure microservices APIs for your container apps environment with a [Dapr-en
 
 ## Versioning
 
+Instead of following a fixed release schedule, Dapr in Azure Container Apps releases new features and functionality based on the prioritization and stability of the Dapr binaries. [Learn more about Dapr releases in Azure Container Apps.](./faq.yml#how-often-are-dapr-versions-released-for-azure-container-apps-)
+
 Dapr versions in Azure Container Apps include:
 - A semantic versioning prefix, such as `1.13.6`, which denotes compatibility with the corresponding OSS Dapr runtime version APIs and related tools like SDKs, CLI, etc.
 - A `-msft.<number>` suffix, which denotes incorporating Azure-specific customizations for enhanced security and production readiness.

articles/container-apps/enable-dapr.md

@@ -1,17 +1,19 @@
 ---
-title: Enable Dapr on an existing container app
-description: Enable Dapr on your existing Azure Container App service.
+title: Configure Dapr on an existing container app
+description: Configure Dapr on your existing Azure Container App service.
 ms.author: hannahhunter
 author: hhunter-ms
 ms.service: azure-container-apps
 ms.custom: build-2023, devx-track-bicep
 ms.topic: conceptual
-ms.date: 11/25/2024
+ms.date: 04/08/2025
 ---
 
-# Enable Dapr on an existing container app
+# Configure Dapr on an existing container app
 
-You can configure Dapr using various [arguments and annotations][dapr-args] based on the runtime context. Azure Container Apps provides three channels through which you can enable Dapr:
+You can configure Dapr using various [arguments and annotations][dapr-args] based on the runtime context. Dapr configurations available in Azure Container Apps are considered *application-scope* changes. When you run a container app in multiple-revision mode, changes to these settings don't create a new revision. Instead, all existing revisions are restarted to ensure they're configured with the most up-to-date values.
+
+Azure Container Apps provides three channels through which you can enable and configure Dapr:
 
 - [The Azure CLI](#using-the-cli)
 - [Infrastructure as Code (IaC) templates,](#using-bicep-or-arm) like Bicep or Azure Resource Manager (ARM) templates
@@ -23,12 +25,19 @@ The following table outlines the currently supported list of Dapr sidecar config
 | ------------------------- | ------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
 | `--enable-dapr`           | `dapr.enabled`            | Enables Dapr on the container app.                                                                                           |
 | `--dapr-app-port`         | `dapr.appPort`            | The port your application is listening on which is used by Dapr for communicating to your application                   |
-| `--dapr-app-protocol`     | `dapr.appProtocol`        | Tells Dapr which protocol your application is using. Valid options are `http` or `grpc`. Default is `http`.                  |
+| `--dapr-app-protocol`     | `dapr.appProtocol`        | Tells Dapr which protocol your application is using. Valid options are `http` or `grpc`. Default setting is `http`.                  |
 | `--dapr-app-id`           | `dapr.appId`              | A unique Dapr identifier for your container app used for service discovery, state encapsulation, and the pub/sub consumer ID. |
-| `--dapr-max-request-size` | `dapr.httpMaxRequestSize` | Set the max size of request body http and grpc servers to handle uploading of large files. Default is 4 MB.                    |
-| `--dapr-read-buffer-size` | `dapr.httpReadBufferSize` | Set the max size of http header read buffer in to handle when sending multi-KB headers. The default 4 KB.                    |
+| `--dapr-max-request-size` | `dapr.httpMaxRequestSize` | Set the max size of request body http and grpc servers to handle uploading of large files. Default setting is `4 MB`.                    |
+| `--dapr-read-buffer-size` | `dapr.httpReadBufferSize` | Set the max size of http header read buffer in to handle when sending multi-KB headers. Default setting is `4 KB`.                    |
 | `--dapr-api-logging`      | `dapr.enableApiLogging`   | Enables viewing the API calls from your application to the Dapr sidecar.                                                     |
-| `--dapr-log-level`        | `dapr.logLevel`           | Set the log level for the Dapr sidecar. Allowed values: debug, error, info, warn. Default is `info`.                         |
+| `--dapr-log-level`        | `dapr.logLevel`           | Set the log level for the Dapr sidecar. Allowed values: debug, error, info, warn. Default setting is `info`.                         |
+| `--dapr-app-health-enabled` | `dapr.appHealth.enabled`| Optional configuration to enable app health checks for your container app using Boolean format. Default setting is `false`.                                |
+| `--dapr-app-health-path`    | `dapr.appHealth.path`| Set the path that Dapr invokes for health probes when the app channel is HTTP. This value is ignored if the app channel is using gRPC. Default setting is `/healthz`.                               |
+| `--dapr-app-health-probe-interval` | `dapr.appHealth.probeIntervalSeconds`| Number of seconds between each health probe. Default setting is `3`.                             |
+| `--dapr-app-health-probe-timeout` | `dapr.appHealth.probeTimeoutMilliseconds`| Timeout in milliseconds for health probe requests. This value must be smaller than the `probeIntervalSeconds` value. Default setting is `500`.              |
+| `--dapr-app-health-threshold` | `dapr.appHealth.threshold`| Max number of consecutive failures before the app is considered unhealthy. Default setting is `3`.                             |
+| `--dapr-max-concurrency`  | `dapr.maxConcurrency`     | Limit the concurrency of your application. A valid value is any number larger than `0`. `-1` means no limit on concurrency.                         |
+
 
 ## Using the CLI
 
@@ -52,7 +61,19 @@ When using an IaC template, specify the following arguments in the `properties.c
    appId: 'nodeapp'
    appProtocol: 'http'
    appPort: 3000
- }
+   httpReadBufferSize: 30
+   httpMaxRequestSize: 10
+   logLevel: 'debug'
+   enableApiLogging: true
+   appHealth: {
+     enabled: true
+     path: '/health'
+     probeIntervalSeconds: 3
+     probeTimeoutMilliseconds: 1000
+     threshold: 3
+   },
+   maxConcurrency: 10
+  }
 ```
 
 # [ARM](#tab/arm1)
@@ -62,13 +83,24 @@ When using an IaC template, specify the following arguments in the `properties.c
     "enabled": true,
     "appId": "nodeapp",
     "appProtocol": "http",
-    "appPort": 3000
+    "appPort": 3000,
+    "httpReadBufferSize": 30,
+    "httpMaxRequestSize": 10,
+    "logLevel": "debug",
+    "enableApiLogging": true,
+    "appHealth": {
+      "enabled": true,
+      "path": "/health",
+      "probeIntervalSeconds": 3,
+      "probeTimeoutMilliseconds": 1000,
+      "threshold": 3,
+    },
+    "maxConcurrency": 10
   }
 ```
 
 ---
 
-The above Dapr configuration values are considered application-scope changes. When you run a container app in multiple-revision mode, changes to these settings don't create a new revision. Instead, all existing revisions are restarted to ensure they're configured with the most up-to-date values.
 
 ## Using the Azure portal