Skip to content

Commit eef2d6a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-classic-admins-deprecation-update
2 parents 512ab19 + 095c247 commit eef2d6a

28 files changed

+408
-163
lines changed

articles/azure-arc/resource-bridge/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ Arc resource bridge supports the following Azure regions:
107107
* South Central US
108108
* Canada Central
109109
* Australia East
110+
* Australia SouthEast
111+
110112
* West Europe
111113
* North Europe
112114
* UK South

articles/connectors/connectors-create-api-servicebus.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: logic-apps
55
ms.suite: integration
66
ms.reviewer: estfan, azla
77
ms.topic: how-to
8-
ms.date: 04/11/2024
8+
ms.date: 08/26/2024
99
ms.custom: engagement-fy23
1010
---
1111

@@ -32,8 +32,8 @@ The Service Bus connector has different versions, based on [logic app workflow t
3232

3333
| Logic app | Environment | Connector version |
3434
|-----------|-------------|-------------------|
35-
| **Consumption** | Multitenant Azure Logic Apps | Managed connector, which appears in the connector gallery under **Runtime** > **Shared**. For more information, review the following documentation: <br><br>- [Service Bus managed connector reference](/connectors/servicebus/) <br>- [Managed connectors in Azure Logic Apps](managed.md) |
36-
| **Standard** | Single-tenant Azure Logic Apps and App Service Environment v3 (Windows plans only) | Managed connector (Azure-hosted), which appears in the connector gallery under **Runtime** > **Shared**, and built-in connector, which appears in the connector gallery under **Runtime** > **In App** and is [service provider based](../logic-apps/custom-connector-overview.md#service-provider-interface-implementation). The built-in version usually provides better performance, capabilities, pricing, and so on. <br><br>**Note**: Service Bus built-in connector triggers follow the [*polling trigger*](introduction.md#triggers) pattern, which means that the trigger continually checks for messages in the queue or topic subscription. <br><br>For more information, review the following documentation: <br><br>- [Service Bus managed connector reference](/connectors/servicebus/) <br>- [Service Bus built-in connector operations](/azure/logic-apps/connectors/built-in/reference/servicebus) <br>- [Built-in connectors in Azure Logic Apps](built-in.md) |
35+
| **Consumption** | Multitenant Azure Logic Apps | Managed connector, which appears in the connector gallery under **Runtime** > **Shared**. <br><br>**Note**: Service Bus managed connector triggers follow the [*long polling trigger* pattern](#service-bus-managed-triggers), which means that the trigger periodically checks for messages in the queue or topic subscription. For more information, review the following documentation: <br><br>- [Service Bus managed connector reference](/connectors/servicebus/) <br>- [Managed connectors in Azure Logic Apps](managed.md) |
36+
| **Standard** | Single-tenant Azure Logic Apps and App Service Environment v3 (Windows plans only) | Managed connector (Azure-hosted), which appears in the connector gallery under **Runtime** > **Shared**, and built-in connector, which appears in the connector gallery under **Runtime** > **In App** and is [service provider based](../logic-apps/custom-connector-overview.md#service-provider-interface-implementation). <br><br>The Service Bus managed connector triggers follow the [*long polling trigger* pattern](#service-bus-managed-triggers), which means that the trigger periodically checks for messages in the queue or topic subscription. <br><br>The Service Bus built-in connector triggers follow the [*push trigger* pattern](introduction.md#triggers) and usually provides better performance, capabilities, pricing, and so on. <br><br>For more information, review the following documentation: <br><br>- [Service Bus managed connector reference](/connectors/servicebus/) <br>- [Service Bus built-in connector operations](/azure/logic-apps/connectors/built-in/reference/servicebus) <br>- [Built-in connectors in Azure Logic Apps](built-in.md) |
3737

3838
## Prerequisites
3939

@@ -108,6 +108,7 @@ In Standard workflows that use the Service Bus built-in operations, you can incr
108108

109109
To increase the timeout for sending a message, [add the **ServiceProviders.ServiceBus.MessageSenderOperationTimeout** app setting](../logic-apps/edit-app-settings-host-settings.md).
110110

111+
<a name="service-bus-managed-triggers"></a>
111112
### Service Bus managed connector triggers
112113

113114
* For the Service Bus managed connector, all triggers are *long-polling*. This trigger type processes all the messages and then waits 30 seconds for more messages to appear in the queue or topic subscription. If no messages appear in 30 seconds, the trigger run is skipped. Otherwise, the trigger continues reading messages until the queue or topic subscription is empty. The next trigger poll is based on the recurrence interval specified in the trigger's properties.
@@ -139,7 +140,7 @@ To increase the timeout for sending a message, [add the **ServiceProviders.Servi
139140
140141
### Service Bus built-in connector triggers
141142

142-
Currently, configuration settings for the Service Bus built-in trigger are shared between the [Azure Functions host extension](../azure-functions/functions-bindings-service-bus.md#hostjson-settings), which is defined in your logic app's [**host.json** file](../logic-apps/edit-app-settings-host-settings.md), and the trigger settings defined in your logic app's workflow, which you can set up either through the designer or code view. This section covers both settings locations.
143+
For the Service Bus built-in connector, all triggers follow the [*push trigger* pattern](introduction.md#triggers). Currently, configuration settings for the Service Bus built-in trigger are shared between the [Azure Functions host extension](../azure-functions/functions-bindings-service-bus.md#hostjson-settings), which is defined in your logic app's [**host.json** file](../logic-apps/edit-app-settings-host-settings.md), and the trigger settings defined in your logic app's workflow, which you can set up either through the designer or code view. This section covers both settings locations.
143144

144145
* In Standard workflows, some triggers, such as the **When messages are available in a queue** trigger, can return one or more messages. When these triggers fire, they return between one and the number of messages. For this type of trigger and where the **Maximum message count** parameter isn't supported, you can still control the number of messages received by using the **maxMessageBatchSize** property in the **host.json** file. To find this file, see [Edit host and app settings for Standard logic apps](../logic-apps/edit-app-settings-host-settings.md).
145146

@@ -334,7 +335,7 @@ The steps to add and use a Service Bus trigger differ based on whether you want
334335

335336
#### Built-in connector trigger
336337

337-
The built-in Service Bus connector is a stateless connector, by default. To run this connector's operations in stateful mode, see [Enable stateful mode for stateless built-in connectors](enable-stateful-affinity-built-in-connectors.md).
338+
By default, the Service Bus built-in connector is a stateless connector. To run this connector's operations in stateful mode, see [Enable stateful mode for stateless built-in connectors](enable-stateful-affinity-built-in-connectors.md). Also, Service Bus built-in triggers follow the [*push trigger* pattern](introduction.md#triggers).
338339

339340
1. In the [Azure portal](https://portal.azure.com), and open your Standard logic app resource with blank workflow in the designer.
340341

@@ -363,11 +364,6 @@ The built-in Service Bus connector is a stateless connector, by default. To run
363364

364365
![Screenshot showing Standard workflow, Service Bus built-in trigger, and example trigger information.](./media/connectors-create-api-azure-service-bus/service-bus-trigger-built-in-standard.png)
365366

366-
> [!NOTE]
367-
>
368-
> This Service Bus trigger follows the *polling trigger* pattern, which means that the trigger continually checks for messages
369-
> in the queue or topic subscription. For more general information about polling triggers, review [Triggers](introduction.md#triggers).
370-
371367
1. Add any actions that your workflow needs.
372368

373369
For example, you can add an action that sends email when a new message arrives. When your trigger checks your queue and finds a new message, your workflow runs your selected actions for the found message.
@@ -378,6 +374,8 @@ The built-in Service Bus connector is a stateless connector, by default. To run
378374

379375
#### Managed connector trigger
380376

377+
Service Bus managed triggers follow the [*long polling trigger* pattern](#service-bus-managed-triggers).
378+
381379
1. In the [Azure portal](https://portal.azure.com), and open your Standard logic app resource and blank workflow in the designer.
382380

383381
1. In the designer, [follow these general steps to add the Azure Service Bus managed trigger that you want](../logic-apps/create-workflow-with-trigger-or-action.md?tabs=standard#add-trigger).
@@ -606,4 +604,4 @@ As long as this error happens only occasionally, the error is expected. When the
606604

607605
* [Managed connectors for Azure Logic Apps](/connectors/connector-reference/connector-reference-logicapps-connectors)
608606
* [Built-in connectors for Azure Logic Apps](built-in.md)
609-
* [What are connectors in Azure Logic Apps](introduction.md)
607+
* [What are connectors in Azure Logic Apps](introduction.md)

articles/cost-management-billing/manage/subscription-disabled.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ If you're the Account Administrator or subscription Owner and you canceled a pay
5050

5151
For other subscription types (for example, Enterprise Subscription), [contact support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade) to have your subscription reactivated.
5252

53+
## Reactivation process time
54+
55+
It can take up to 24 hours for your subscription to get reactivated after you pay your balance.
56+
5357
## After reactivation
5458

5559
After your subscription is reactivated, there might be a delay in creating or managing resources. If the delay exceeds 30 minutes, contact [Azure Billing Support](https://go.microsoft.com/fwlink/?linkid=2083458) for assistance. Most Azure resources automatically resume and don't require any action. However, we recommend that you check your Azure service resources and restart them if, if necessary.

0 commit comments

Comments
 (0)