Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into gwerror

Author: MekaylaMoore

articles/application-gateway/application-gateway-diagnostics.md

@@ -6,7 +6,7 @@ services: application-gateway
 author: greg-lindsay
 ms.service: azure-application-gateway
 ms.topic: concept-article
-ms.date: 06/17/2024
+ms.date: 05/07/2025
 ms.author: greglin 
 ---
 
@@ -81,7 +81,7 @@ Activity logging is automatically enabled for every Resource Manager resource. Y
    For Application Gateway, three logs are available:
 
    * Access log
-   * Performance log
+   * Performance log (available only for the v1 SKU)
    * Firewall log
 
 1. To start collecting data, select **Turn on diagnostics**.

articles/connectors/connectors-native-webhook.md

@@ -5,7 +5,7 @@ services: logic-apps
 ms.suite: integration
 ms.reviewer: estfan, azla
 ms.topic: how-to
-ms.date: 02/09/2024
+ms.date: 05/07/2025
 ---
 
 # Subscribe and wait for events to run workflows using HTTP webhooks in Azure Logic Apps
@@ -227,6 +227,39 @@ Here is more information about the outputs from an HTTP Webhook trigger or actio
 | 404 | Not Found |
 | 500 | Internal server error. Unknown error occurred. |
 
+## Generate callback URL with secondary access key
+
+A logic app workflow has two access keys: primary and secondary. By default, Azure Logic Apps uses the primary key to generate the callback URL for the HTTP webhook trigger.
+
+To use the secondary key instead for callback URL generation, follow these steps:
+
+1. From the workflow designer, switch to code view.
+
+1. In the **`HttpWebhook`** trigger definition. find the **`accessKeyType`** parameter.
+
+1. Specify the word **`Secondary`** as the parameter value.
+
+1. Remember to save your changes.
+
+The following example shows the webhook trigger definition with the **`accessKeyType`** parameter set to **`Secondary`**:
+
+
+```json
+{
+  "type": "HttpWebhook",
+  "inputs": {
+    "subscribe": {
+      "method": "POST",
+      "uri": "<subscription-URL>",
+      "body": "@listCallbackUrl()"
+    },
+    "accessKeyType": "Secondary"
+  },
+  "runAfter": {}
+}
+
+```
+
 ## Next steps
 
 * [Secure access and data - Access for inbound calls to request-based triggers](../logic-apps/logic-apps-securing-a-logic-app.md#secure-inbound-requests)

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
 

articles/cost-management-billing/manage/filter-view-subscriptions.md

@@ -6,7 +6,7 @@ ms.reviewer: presharm
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 03/03/2025
+ms.date: 05/01/2025
 ms.author: presharm
 ---
 

articles/cost-management-billing/reservations/index.yml

@@ -10,7 +10,7 @@ metadata:
   ms.topic: landing-page
   author: pri-mittal
   ms.author: primittal
-  ms.date: 12/06/2024
+  ms.date: 05/02/2025
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
 

articles/cost-management-billing/troubleshoot-billing/cannot-create-vm.md

@@ -2,7 +2,7 @@
 title: Error when creating a VM as an Azure Enterprise user
 description: Provides several solutions to an issue in which you can't create a VM as an Enterprise Agreement (EA) user in portal.
 ms.topic: troubleshooting
-ms.date: 04/15/2024
+ms.date: 05/01/2025
 ms.author: banders
 author: bandersmsft
 ms.reviewer: jarrettr

articles/cost-management-billing/understand/pay-bill.md

@@ -3,11 +3,11 @@ title: Pay your Microsoft Customer Agreement or Microsoft Online Subscription Pr
 description: Learn how to pay your bill in the Azure portal. You must be a billing profile owner, contributor, or invoice manager to pay in the portal.
 keywords: billing, past due, balance, pay now,
 author: lindseyshep
-ms.reviewer: lishepar
+ms.reviewer: lishepar, jobailey
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 10/08/2024
+ms.date: 04/30/2025
 ms.author: lishepar
 ---
 
@@ -43,15 +43,15 @@ Here's a table that summarizes payment methods for agreement types:
 
 ## Reserve Bank of India
 
-As of October 2021, automatic payments in India might block some credit card transactions, especially transactions that exceed 5,000 INR. Because of this situation, you might need to make payments for your Microsoft Online Subscription Program (MOSP) account manually in the Azure portal. This directive doesn't affect the total amount you're charged for your Azure usage.
+In October 2021, automatic payments in India might block some credit card transactions, especially transactions that exceed 5,000 INR. Because of this situation, you might need to make payments for your Microsoft Online Subscription Program (MOSP) account manually in the Azure portal. This directive doesn't affect the total amount you're charged for your Azure usage.
 
-As of June 2022, the Reserve Bank of India increased the limit of e-mandates on cards for recurring payments from 5,000 to 15,000 INR. Learn more about this directive on the [Reserve Bank of India website](https://www.rbi.org.in/Scripts/NotificationUser.aspx?Id=11668&Mode=0).
+In June 2022, the Reserve Bank of India increased the limit of e-mandates on cards for recurring payments from 5,000 to 15,000 INR. Learn more about this directive on the [Reserve Bank of India website](https://www.rbi.org.in/Scripts/NotificationUser.aspx?Id=11668&Mode=0).
 
-As of September 2022, Microsoft and other online merchants no longer store credit card information. To comply with this regulation, Microsoft removed all stored card details from Azure. To avoid service interruption, you need to add and verify your payment method to make a payment in the Azure portal for all invoices. Learn more about this directive on the [Reserve Bank of India website](https://rbidocs.rbi.org.in/rdocs/notification/PDFs/DPSSC09B09841EF3746A0A7DC4783AC90C8F3.PDF).
+In September 2022, Microsoft and other online merchants no longer store credit card information. To comply with this regulation, Microsoft removed all stored card details from Azure. To avoid service interruption, you need to add and verify your payment method to make a payment in the Azure portal for all invoices. Learn more about this directive on the [Reserve Bank of India website](https://rbidocs.rbi.org.in/rdocs/notification/PDFs/DPSSC09B09841EF3746A0A7DC4783AC90C8F3.PDF).
 
 ### UPI and NetBanking payment options
 
-Azure supports two alternate payment options for customers in India:
+Azure supports two alternate payment options for customers in India for MOSA accounts:
 
 - Unified Payments Interface (UPI) is a real-time payment method.
 - NetBanking gives customers access to banking services through an online platform.