Skip to content

Commit a18cbef

Browse files
authored
Merge pull request #274681 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)
2 parents 1c718c6 + 6b2cf90 commit a18cbef

File tree

11 files changed

+24
-14
lines changed

11 files changed

+24
-14
lines changed

articles/azure-monitor/alerts/action-groups.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Global requests from clients can be processed by action group services in any re
2323
- You can add up to five action groups to an alert rule.
2424
- Action groups are executed concurrently, in no specific order.
2525
- Multiple alert rules can use the same action group.
26+
- Action Groups are defined by the unique set of actions and the users to be notified. For example, if you want to notify User1, User2 and User3 by email for two different alert rules, you only need to create one action group which you can apply to both alert rules.
2627

2728
## Create an action group in the Azure portal
2829
1. Go to the [Azure portal](https://portal.azure.com/).

articles/azure-signalr/signalr-concept-internals.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ A self-hosted ASP.NET Core SignalR application server listens to and connects cl
2828
With SignalR Service, the application server no longer accepts persistent client connections, instead:
2929

3030
1. A `negotiate` endpoint is exposed by Azure SignalR Service SDK for each hub.
31-
1. The endpoint responds to client negotiation requests and redirect clients to SignalR Service.
31+
1. The endpoint responds to client negotiation requests and redirects clients to SignalR Service.
3232
1. The clients connect to SignalR Service.
3333

3434
For more information, see [Client connections](#client-connections).
3535

3636
Once the application server is started:
3737

3838
- For ASP.NET Core SignalR: Azure SignalR Service SDK opens five WebSocket connections per hub to SignalR Service.
39-
- For ASP.NET SignalR: Azure SignalR Service SDK opens five WebSocket connections per hub to SignalR Service, and one per application WebSocket connection.
39+
- For ASP.NET SignalR: Azure SignalR Service SDK opens five WebSocket connections per hub to SignalR Service and one per application WebSocket connection.
4040

4141

42-
The initial number of connections defaults to 5 and is configurable using the `InitialHubServerConnectionCount` option in the SignalR Service SDK. For more information, see [configuration](https://github.com/Azure/azure-signalr/blob/dev/docs/run-asp-net-core.md#maxhubserverconnectioncount).
42+
The initial number of connections defaults to 5 and is configurable using the `InitialHubServerConnectionCount` option in the SignalR Service SDK. For more information, see [configuration](signalr-howto-use.md#configure-options).
4343

4444
While the application server is connected to the SignalR service, the Azure SignalR service may send load-balancing messages to the server. Then, the SDK starts new server connections to the service for better performance. Messages to and from clients are multiplexed into these connections.
4545

articles/azure-signalr/signalr-howto-scale-multi-instances.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dotnet user-secrets set Azure:SignalR:ConnectionString:backup:secondary <Connect
3131

3232
### Add multiple endpoints from code
3333

34-
A `ServicEndpoint` class describes the properties of an Azure SignalR Service endpoint.
34+
A `ServiceEndpoint` class describes the properties of an Azure SignalR Service endpoint.
3535
You can configure multiple instance endpoints when using Azure SignalR Service SDK through:
3636
```cs
3737
services.AddSignalR()
@@ -274,4 +274,4 @@ When no `primary` endpoint is available, the client's `/negotiate` picks from th
274274
You can use multiple endpoints in high availability and disaster recovery scenarios.
275275

276276
> [!div class="nextstepaction"]
277-
> [Setup SignalR Service for disaster recovery and high availability](./signalr-concept-disaster-recovery.md)
277+
> [Setup SignalR Service for disaster recovery and high availability](./signalr-concept-disaster-recovery.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.date: 01/04/2024
1414
> The Dynamics 365 connector is officially deprecated and is no longer available. Instead, use the
1515
> [Microsoft Dataverse connector](/connectors/commondataserviceforapps/) to access Microsoft Dataverse
1616
> used for Microsoft Dynamics 365 Sales, Microsoft Dynamics 365 Customer Service, Microsoft Dynamics 365
17-
> Field Service, Microsoft Dynamics 365 Marketing, and Microsoft Dynamics 365 Project Service Automation.
17+
> Field Service, Microsoft Dynamics 365 Customer Insights - Journeys, and Microsoft Dynamics 365 Project Service Automation.
1818
>
1919
> The Dataverse connector replaces the Microsoft Dataverse (Legacy) connector, previously named as the
2020
> Common Data Service 2.0 connector, which replaced the Dynamics 365 connector.

articles/container-apps/scale-app.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ az containerapp create \
214214
--image <CONTAINER_IMAGE_LOCATION>
215215
--min-replicas 0 \
216216
--max-replicas 5 \
217+
--transport tcp \
218+
--ingress <external/internal> \
219+
--target-port <CONTAINER_TARGET_PORT> \
217220
--scale-rule-name azure-tcp-rule \
218221
--scale-rule-type tcp \
219222
--scale-rule-tcp-concurrency 100

articles/container-registry/container-registry-artifact-streaming.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Start artifact streaming, by following these general steps:
9595
9696
```azurecli-interactive
9797
az configure --defaults acr="mystreamingtest"
98-
az acr import -source docker.io/jupyter/all-spark-notebook:latest -t jupyter/all-spark-notebook:latest
98+
az acr import --source docker.io/jupyter/all-spark-notebook:latest -t jupyter/all-spark-notebook:latest
9999
```
100100
101101
3. Create an artifact streaming from the Image

articles/cosmos-db/try-free.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following table lists the limits for the [Try Azure Cosmos DB](https://aka.m
4242
² After expiration, the information stored in your account is deleted. You can upgrade your account prior to expiration and migrate the information stored.
4343

4444
> [!NOTE]
45-
> Try Azure Cosmos DB supports global distribution in only the **East US**, **North Europe**, **Southeast Asia**, and **North Central US** regions. Azure support tickets can't be created for Try Azure Cosmos DB accounts. However, support is provided for subscribers with existing support plans.
45+
> Try Azure Cosmos DB supports global distribution in only the **East US**, **North Europe**, **Southeast Asia**, and **North Central US** regions. Azure support tickets can't be created for Try Azure Cosmos DB accounts. However, support is provided for subscribers with existing support plans. If the account exceeds the maximum resource limits, it's automatically deleted.
4646
4747
### [MongoDB](#tab/mongodb)
4848

@@ -75,7 +75,7 @@ The following table lists the limits for the [Try Azure Cosmos DB](https://aka.m
7575
| Maximum storage size (GiB) | 128 |
7676

7777
¹ A new trial can be requested after expiration.
78-
² After expiration, the information stored in your account is deleted. You can upgrade your account prior to expiration and migrate the information stored.
78+
² After expiration, the information stored in your account is deleted. You can upgrade your account prior to expiration and migrate the information stored. If the account exceeds the maximum resource limits, it's automatically deleted.
7979

8080
---
8181

articles/event-grid/includes/limits.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,14 @@ The following limits apply to MQTT in Azure Event Grid namespace resource.
4444
| Inbound MQTT bandwidth per Event Grid namespace | 1 MB per second per TU |
4545
| Inbound MQTT publishing requests per session | 100 messages per second |
4646
| Inbound MQTT bandwidth per session | 1 MB per second |
47+
| Inbound in-flight MQTT messages* | 100 messages |
48+
| Inbound in-flight MQTT bandwidth* | 64 KB |
4749
| Outbound MQTT publishing requests per Event Grid namespace | 1,000 messages per second per TU |
4850
| Outbound MQTT bandwidth per Event Grid namespace | 1 MB per second per TU |
4951
| Outbound MQTT publishing requests per session| 100 messages per second |
5052
| Outbound MQTT bandwidth per session | 1 MB per second |
53+
| Outbound in-flight MQTT messages* | 100 messages |
54+
| Outbound in-flight MQTT bandwidth* | 64 KB |
5155
| Max message size | 512 KB |
5256
| Segments per topic/ topic filter | 8 |
5357
| Topic size | 256 B |
@@ -72,6 +76,8 @@ The following limits apply to MQTT in Azure Event Grid namespace resource.
7276
| Topic templates | 10 per topic space |
7377
| Permission bindings | 100 |
7478

79+
\* For MQTTv5, learn more about [flow control support](../mqtt-support.md#flow-control).
80+
7581
## Events limits in Event Grid namespace
7682

7783
The following limits apply to events in Azure Event Grid namespace resource.

articles/expressroute/expressroute-howto-coexist-resource-manager.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ The steps to configure both scenarios are covered in this article. This article
3434
* ExpressRoute-VPN Gateway coexist configurations are **not supported on the Basic SKU**.
3535
* If you want to use transit routing between ExpressRoute and VPN, **the ASN of Azure VPN Gateway must be set to 65515, and Azure Route Server should be used.** Azure VPN Gateway supports the BGP routing protocol. For ExpressRoute and Azure VPN to work together, you must keep the Autonomous System Number of your Azure VPN gateway at its default value, 65515. If you previously selected an ASN other than 65515 and you change the setting to 65515, you must reset the VPN gateway for the setting to take effect.
3636
* **The gateway subnet must be /27 or a shorter prefix**, such as /26, /25, or you receive an error message when you add the ExpressRoute virtual network gateway.
37-
* **Coexistence in a dual-stack virtual network is not supported.** If you're using ExpressRoute IPv6 support and a dual-stack ExpressRoute gateway, coexistence with VPN Gateway isn't possible.
3837

3938
## Configuration designs
4039

articles/operator-insights/operator-insights-faq.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ sections:
4444
- UK South
4545
- North Europe
4646
- West Europe
47-
- Australia East
47+
- Australia East
48+
- UAE North
4849
4950
We'll be enabling other regions. If your region isn't in the list, contact your local Microsoft representative.

0 commit comments

Comments
 (0)