Skip to content

Commit 8a050db

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ez-er-ps
2 parents bc2908e + 5ac609d commit 8a050db

File tree

646 files changed

+2666
-2620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

646 files changed

+2666
-2620
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4024,6 +4024,26 @@
40244024
"source_path_from_root": "/articles/managed-grafana/how-to-transition-domain.md",
40254025
"redirect_url": "/azure/managed-grafana/overview",
40264026
"redirect_document_id": false
4027+
},
4028+
{
4029+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-portal.md",
4030+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4031+
"redirect_document_id": false
4032+
},
4033+
{
4034+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-powershell.md",
4035+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4036+
"redirect_document_id": false
4037+
},
4038+
{
4039+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
4040+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4041+
"redirect_document_id": false
4042+
},
4043+
{
4044+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-powershell.md",
4045+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4046+
"redirect_document_id": false
40274047
}
40284048
]
40294049
}

articles/azure-functions/functions-create-first-java-gradle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Use the following command to clone the sample project:
3636

3737
```bash
3838
git clone https://github.com/Azure-Samples/azure-functions-samples-java.git
39-
cd azure-functions-samples-java/
39+
cd azure-functions-samples-java/triggers-bindings
4040
```
4141

4242
Open `build.gradle` and change the `appName` in the following section to a unique name to avoid domain name conflict when deploying to Azure.

articles/azure-functions/functions-create-first-quarkus.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ The resource group is not necessary for this part of the instructions, but it's
7272
1. Invoke Quarkus dev mode:
7373

7474
```bash
75-
cd functions-azure
7675
mvn -DskipTests -DresourceGroup=<yourResourceGroupName> quarkus:dev
7776
```
7877

articles/communication-services/how-tos/calling-sdk/breakoutrooms.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ms.custom: template-how-to
1515

1616
This article describes how to implement Microsoft Teams breakout rooms with Azure Communication Services. This capability enables Azure Communication Services users in Teams meetings to participate in breakout rooms. Teams administrators control the availability of breakout rooms in Teams meeting with Teams meeting policy. You can find additional information about breakout rooms in [Teams documentation](https://support.microsoft.com/office/use-breakout-rooms-in-microsoft-teams-meetings-7de1f48a-da07-466c-a5ab-4ebace28e461).
1717

18-
[!INCLUDE [Public Preview Disclaimer](../../includes/public-preview-include-document.md)]
19-
2018
## Prerequisites
2119

2220
- An Azure account with an active subscription. See [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).

articles/communication-services/how-tos/calling-sdk/includes/breakoutrooms/breakoutrooms-web.md

Lines changed: 58 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ const breakoutRoomsFeature = mainMeetingCall.feature(Features.BreakoutRooms);
2525

2626
### Subscribe to breakoutRoom events
2727

28-
The `BreakoutRooms` API enables you to subscribe to `BreakoutRooms` events. A `breakoutRoomsUpdated` event comes from a `BreakoutRoomsCallFeature` instance and contains information about the created, updated, and assigned breakout rooms.
29-
30-
To receive breakout room details, subscribe to the `breakoutRoomsUpdated` event.
28+
The `BreakoutRooms` API allows you to subscribe to `BreakoutRooms` events. A `breakoutRoomsUpdated` event comes from a `BreakoutRoomsCallFeature` instance and contains information about the created, updated, and assigned breakout rooms.
3129

30+
To receive breakout room details, subscribe to the `breakoutRoomsUpdated` event.
3231
```js
3332
breakoutRoomsFeature.on('breakoutRoomsUpdated', breakoutRoomsUpdatedListener);
3433
```
@@ -96,9 +95,7 @@ Event `breakoutRoomsUpdated` provides an instance of one of the following classe
9695
data: Call | TeamsCall;
9796
}
9897
```
99-
100-
The following code shows the useful information received in the breakout room events:
101-
98+
The following code shows you valuable information received in the breakout room events:
10299
```js
103100
const breakoutRoomsUpdatedListener = (event) => {
104101
switch(event.type) {
@@ -118,13 +115,13 @@ The following code shows the useful information received in the breakout room ev
118115
break;
119116
case "breakoutRoomsSettings":
120117
const breakoutRoomSettings = event.data;
121-
console.log(`Breakout room ends at: ${breakoutRoomSettings.roomEndTime}`);
118+
console.log(`Breakout room ends at: ${breakoutRoomSettings.roomEndTime}`);
122119
console.log(`Disable the user to return to main meeting from breakout room call : ${breakoutRoomSettings.disableReturnToMainMeeting}`);
123120
break;
124121
case "join":
125122
const breakoutRoomCall = event.data;
126123
console.log(`You have joined breakout room with call ID: ${breakoutRoomCall.id}`);
127-
break;
124+
break;
128125
}
129126
}
130127
breakoutRoomsFeature.on('breakoutRoomsUpdated', breakoutRoomsUpdatedListener);
@@ -166,19 +163,59 @@ if(breakoutRoom.state == 'open' && !breakoutRoom.autoMoveParticipantToBreakoutRo
166163
const breakoutRoomCall = await breakoutRoom.join();
167164
}
168165
```
166+
When the user is in a breakout room and the organizer assigns a new breakout room to the user, the user gets `breakoutRoomsUpdated` event with the type `assignedBreakoutRooms`. This event contains the latest breakout room details. The user has to `hangUp()` previous breakout room call. If `autoMoveParticipantToBreakoutRoom` is set to `true`, the user is automatically moved, otherwise the user has to call the `join` method explicitly on the new breakout room.
167+
168+
```js
169+
//Breakout room which is assigned initially.
170+
const breakoutRoom = breakoutRoomsFeature.assignedBreakoutRoom;
171+
if(breakoutRoom.state == 'open' && !breakoutRoom.autoMoveParticipantToBreakoutRoom) {
172+
const breakoutRoomCall = await breakoutRoom.join();
173+
}
174+
175+
// `breakoutRoomsUpdated` event which contains the details of the new breakout room
176+
let assignedRoom = undefined;
177+
const breakoutRoomsUpdatedListener = (event) => {
178+
switch(event.type) {
179+
case "assignedBreakoutRooms":
180+
const assignedRoom = event.data;
181+
break;
182+
}
183+
}
184+
185+
if(assignedRoom.threadId != breakoutRoom.threadId && breakoutRooms != null)
186+
{
187+
await breakoutRoom.hangUp();
188+
}
189+
if(assignedRoom.state == 'open' && !assignedRoom.autoMoveParticipantToBreakoutRoom) {
190+
const breakoutRoomCall = await assignedRoom.join();
191+
}
192+
```
193+
Microsoft 365 user with role organizer, co-organizer, or breakout room manager get the list of breakout rooms created by the breakout room manager or organizer of the main meeting. In this case, the behavior is slightly different. This user has to explicitly call `join()` method to join the breakout room. The user is kept on hold in the main meeting initially and eventually removed from the main meeting. The user has to initialize the breakoutRooms Feature for the `breakoutRoomCall` inorder to receive updates on the breakout room.
194+
195+
If the user wants to join any of the breakout rooms , then the user explicitly calls the `join` method.
196+
197+
```js
198+
const breakoutRoom = breakoutRoomsFeature.breakoutRooms[0];
199+
if(breakoutRoom.state == 'open') {
200+
const breakoutRoomCall = await breakoutRoom.join();
201+
}
202+
```
203+
To exit a breakout room, users should execute the `hangUp()` function on the breakout room call. The user would be calling `ReturnToMainMeeting` to resume the main meeting call.
204+
205+
```js
206+
breakoutRoomCall.hangUp();
207+
const mainMeetingCall = breakoutRoomCall.returnToMainMeeting();
208+
```
169209

170210
### Leave breakout room
171211

172-
When the breakout room state is `closed`, then the user is automatically moved to the main meeting. User is informed about the end of breakout room by receiving event `breakoutRoomsUpdated` with class `AssignedBreakoutRoomsEvent` and property `type` equal to `assignedBreakoutRooms` that indicates that `assignedBreakoutRoom` has property `state` set to `closed`.
212+
When the breakout room state is `closed`, user is informed about the end of breakout room by receiving event `breakoutRoomsUpdated` with class `AssignedBreakoutRoomsEvent` and property `type` equal to `assignedBreakoutRooms` that indicates that `assignedBreakoutRoom` has property `state` set to `closed`. User leaves the breakout room automatically and can return to the main meeting by calling `returnToMainMeeting()` as shown above.
173213

174-
If the user wants to leave the breakout room even before the room is closed and the breakout room settings `breakoutRoomsFeature.breakoutRoomsSettings` have property `disableReturnToMainMeeting` set to `false` then user can join the main meeting call with the following code:
214+
If the user wants to leave the breakout room even before the room is closed and the breakout room settings `breakoutRoomsFeature.breakoutRoomsSettings` have property `disableReturnToMainMeeting` set to `false` then user can return to the main meeting call with the following code:
175215

176216
```js
177-
const breakoutRoomsSettings = breakoutRoomsFeature.breakoutRoomsSettings;
178-
if(breakoutRoomCall != null && !breakoutRoomsSettings.disableReturnToMainMeeting){
179-
breakoutRoomCall.hangUp();
180-
mainMeetingCall.resume();
181-
}
217+
breakoutRoomCall.hangUp();
218+
const mainMeetingCall = breakoutRoomCall.returnToMainMeeting();
182219
```
183220

184221
### Get participants of the breakout room
@@ -208,7 +245,7 @@ Breakout rooms have the following properties:
208245
const displayName : string = breakoutRoom.displayName;
209246
const threadId : string = breakoutRoom.threadId;
210247
const state : BreakoutRoomState = breakoutRoom.state;
211-
const autoMoveParticipantToBreakoutRoom : boolean = breakoutRoom.autoMoveParticipantToBreakoutRoom;
248+
const autoMoveParticipantToBreakoutRoom : boolean = breakoutRoom.autoMoveParticipantToBreakoutRoom;
212249
const call : Call | TeamsCall = breakoutRoom.call;
213250
const invitees : Invitee[] = breakoutRoom.invitees;
214251
```
@@ -247,5 +284,8 @@ const roomEndTime : TimestampInfo = breakoutRoomsSettings.roomEndTime;
247284
|412 | 46256| ExpectedError | Unable to join Breakout Room as the room is closed. | Ensure that the `state` of `assignedBreakoutRoom` is `open` and call `breakoutRoomsFeature.assignedBreakoutRoom.join()` method explicitly.|
248285
|412 | 46257| UnexpectedServerError | Unable to resume main meeting. | Follow the instructions defined in the section `Leave breakout room` for manual leaving of breakout room. If the issue persists, gather browser console logs and contact Azure Communication Services support. |
249286
|412| 46258 | UnexpectedClientError | Unable to read breakout room details. | Gather browser console logs and contact Azure Communication Services support. |
250-
|500 | 46259| UnexpectedServerError | Couldn't hang up the Breakout room call. | Follow the instructions defined in the section `Leave breakout room` for manual leaving of breakout room. |
251-
|412| 46260 | UnexpectedClientError | Can't join Breakout Room as it isn't yet assigned. | Ensure that the `breakoutRoomsFeature.assignedBreakoutRoom` is having the details of the assigned breakout room. Ensure that the `state` of `assignedBreakoutRoom` is `open` and call `breakoutRoomsFeature.assignedBreakoutRoom.join()` method explicitly. |
287+
|500 | 46259| UnexpectedServerError | Could not hang up the Breakout room call. | Follow the instructions defined in the section `Leave breakout room` for manual leaving of breakout room. |
288+
|412| 46260 | UnexpectedClientError | Cannot join Breakout Room as it is not yet assigned. | Ensure that the `breakoutRoomsFeature.assignedBreakoutRoom` is having the details of the assigned breakout room. Ensure that the `state` of `assignedBreakoutRoom` is `open` and call `breakoutRoomsFeature.assignedBreakoutRoom.join()` method explicitly. |
289+
|412| 46261 | UnexpectedClientError | Unable to join the main meeting. | Please try again by calling the `breakoutRoomsFeature.assignedBreakoutRoom.returnToMainMeeting()` method. If the issue persists, gather browser console logs and contact Azure Communication Services support.|
290+
|412| 46262 | ExpectedError | Already in the main meeting. | Please call this method only when the participant is in breakout room and removed from the main meeting.|
291+
|412| 46263 | UnexpectedClientError | Existing breakout room call hangup failed. | Try to call hangup() method again to hangup the call. Call join() method to join the breakout room again. |

articles/container-apps/aspire-dashboard.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,24 @@ Refer to the following items if you have issues enabling your dashboard:
9696

9797
- You might receive an authentication error when accessing the dashboard that reads, "Could not authenticate user with requested resource."
9898

99-
To solve this problem, make sure you grant the *Microsoft.App/managedEnvironments/write*, *Contributor*, or *Owner* roles on your Container Apps environment.
99+
This issue occurs because security group permissions do not propagate to the Container App Environment. To solve this problem, make sure you explicitly give yourself a *Contributor* or *Owner* role on your Container Apps environment. This can be done through the following steps:
100+
101+
- **Navigate to the Resource:**
102+
- Open the Azure Portal and search for your container app environment.
103+
- **Access the Access Control (IAM) Blade:**
104+
- Click on _Access Control (IAM)_ for the container app environment.
105+
- **Verify Existing Role Assignments:**
106+
- Check if you (or your account) are assigned any roles. Note that permissions do not currently propagate through security groups.
107+
- If you are not, follow the remaining steps to assign the role.
108+
- **Explicit Role Assignment:**
109+
- Click _Add > Add role assignment_.
110+
- Choose Role: Either _Contributor_ or _Owner_, as appropriate for your required access level.
111+
- Assign the role explicitly to your user account (e.g., [email protected]).
112+
- **Save and Confirm:**
113+
- Save the changes. Ensure the role is visible under the Role Assignments section.
114+
- **Verify Dashboard Access:**
115+
- Test by attempting to access the Aspire dashboard. If you continue to get the error, please reach out to our team.
116+
100117

101118
## Related content
102119

articles/governance/policy/samples/australia-ism.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Regulatory Compliance details for Australian Government ISM PROTECTED
33
description: Details of the Australian Government ISM PROTECTED Regulatory Compliance built-in initiative. Each control is mapped to one or more Azure Policy definitions that assist with assessment.
4-
ms.date: 11/04/2024
4+
ms.date: 12/06/2024
55
ms.topic: sample
66
ms.custom: generated
77
---
@@ -462,5 +462,5 @@ Additional articles about Azure Policy:
462462
- [Regulatory Compliance](../concepts/regulatory-compliance.md) overview.
463463
- See the [initiative definition structure](../concepts/initiative-definition-structure.md).
464464
- Review other examples at [Azure Policy samples](./index.md).
465-
- Review [Understanding policy effects](../concepts/effects.md).
465+
- Review [Understanding policy effects](../concepts/effect-basics.md).
466466
- Learn how to [remediate non-compliant resources](../how-to/remediate-resources.md).

articles/governance/policy/samples/azure-security-benchmark.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Regulatory Compliance details for Microsoft cloud security benchmark
33
description: Details of the Microsoft cloud security benchmark Regulatory Compliance built-in initiative. Each control is mapped to one or more Azure Policy definitions that assist with assessment.
4-
ms.date: 11/04/2024
4+
ms.date: 12/06/2024
55
ms.topic: sample
66
ms.custom: generated
77
---
@@ -727,5 +727,5 @@ Additional articles about Azure Policy:
727727
- [Regulatory Compliance](../concepts/regulatory-compliance.md) overview.
728728
- See the [initiative definition structure](../concepts/initiative-definition-structure.md).
729729
- Review other examples at [Azure Policy samples](./index.md).
730-
- Review [Understanding policy effects](../concepts/effects.md).
730+
- Review [Understanding policy effects](../concepts/effect-basics.md).
731731
- Learn how to [remediate non-compliant resources](../how-to/remediate-resources.md).

articles/governance/policy/samples/built-in-initiatives.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: List of built-in policy initiatives
33
description: List built-in policy initiatives for Azure Policy. Categories include Regulatory Compliance, Azure Machine Configuration, and more.
4-
ms.date: 11/04/2024
4+
ms.date: 12/06/2024
55
ms.topic: sample
66
ms.custom: generated
77
---
@@ -88,5 +88,5 @@ The name on each built-in links to the initiative definition source on the
8888
## Next steps
8989

9090
- See the built-ins on the [Azure Policy GitHub repo](https://github.com/Azure/azure-policy).
91-
- Review the [Azure Policy definition structure](../concepts/definition-structure.md).
92-
- Review [Understanding policy effects](../concepts/effects.md).
91+
- Review the [Azure Policy definition structure](../concepts/definition-structure-basics.md).
92+
- Review [Understanding policy effects](../concepts/effect-basics.md).

articles/governance/policy/samples/built-in-policies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: List of built-in policy definitions
33
description: List built-in policy definitions for Azure Policy. Categories include Tags, Regulatory Compliance, Key Vault, Kubernetes, Azure Machine Configuration, and more.
4-
ms.date: 11/04/2024
4+
ms.date: 12/06/2024
55
ms.topic: sample
66
ms.custom: generated
77
---
@@ -369,5 +369,5 @@ The name of each built-in links to the policy definition in the Azure portal. Us
369369
## Next steps
370370

371371
- See the built-ins on the [Azure Policy GitHub repo](https://github.com/Azure/azure-policy).
372-
- Review the [Azure Policy definition structure](../concepts/definition-structure.md).
373-
- Review [Understanding policy effects](../concepts/effects.md).
372+
- Review the [Azure Policy definition structure](../concepts/definition-structure-basics.md).
373+
- Review [Understanding policy effects](../concepts/effect-basics.md).

0 commit comments

Comments
 (0)