Skip to content

Commit 7c59536

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into migvn
2 parents ed9a3f4 + 1eae7cb commit 7c59536

File tree

222 files changed

+897
-805
lines changed

Some content is hidden

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

222 files changed

+897
-805
lines changed

articles/aks/cost-analysis.md

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ author: nickomang
55
ms.author: nickoman
66
ms.service: azure-kubernetes-service
77
ms.subservice: aks-monitoring
8-
ms.custom: ignite-2023, devx-track-azurecli, build-2024
8+
ms.custom: ignite-2023, devx-track-azurecli
99
ms.topic: how-to
10-
ms.date: 05/06/2024
10+
ms.date: 06/17/2024
1111

1212
#CustomerIntent: As a cluster operator, I want to obtain cost management information, perform cost attribution, and improve my cluster footprint
1313
---
@@ -50,21 +50,8 @@ The AKS cost analysis addon is built on top of [OpenCost](https://www.opencost.i
5050

5151
* AKS Automatic is not supported at this time.
5252

53-
* If using the Azure CLI, you must have version `2.44.0` or later installed, and the `aks-preview` Azure CLI extension version `0.5.155` or later installed.
53+
* If using the Azure CLI, you must have version `2.61.0` or later installed.
5454

55-
### Install or update the `aks-preview` Azure CLI extension
56-
57-
Install the `aks-preview` Azure CLI extension using the [`az extension add`][az-extension-add] command.
58-
59-
```azurecli-interactive
60-
az extension add --name aks-preview
61-
```
62-
63-
If you need to update the extension version, you can do this using the [`az extension update`][az-extension-update] command.
64-
65-
```azurecli-interactive
66-
az extension update --name aks-preview
67-
```
6855

6956
## Enable cost analysis on your AKS cluster
7057

@@ -83,13 +70,7 @@ You can enable the cost analysis with the `--enable-cost-analysis` flag during o
8370
The following example creates a new AKS cluster in the `Standard` tier with cost analysis enabled:
8471

8572
```azurecli-interactive
86-
az aks create \
87-
--resource-group <resource-group> \
88-
--name <cluster-name> \
89-
--location <location> \
90-
--tier standard \
91-
--enable-cost-analysis \
92-
--generate-ssh-keys
73+
az aks create --resource-group <resource-group> --name <cluster-name> --location <location> --enable-managed-identity --generate-ssh-keys --tier standard --enable-cost-analysis
9374
```
9475

9576
The following example updates an existing AKS cluster in the `Standard` tier to enable cost analysis:
@@ -99,7 +80,9 @@ az aks update --resource-group <resource-group> --name <cluster-name> --enable-c
9980
```
10081

10182
> [!WARNING]
102-
> The AKS cost analysis addon Memory usage is dependent on the number of containers deployed. Memory consumption can be roughly approximated by 200MB + 0.5MB per Container. The current memory limit is set to 4GB which will support approximately 7000 containers per cluster but could be more or less depending on various factors. These estimates are subject to change.
83+
> The AKS cost analysis add-on Memory usage is dependent on the number of containers deployed. Memory consumption can be roughly approximated by 200 MB + 0.5 MB per container. The current memory limit is set to 4 GB which will support approximately 7000 containers per cluster. These estimates could be more or less depending on various factors and are subject to change.
84+
>
85+
> If you are experiencing issues such as the add-on pod getting `OOMKilled` or stuck in a `Pending` state, refer to the [AKS cost analysis add-on issues](/troubleshoot/azure/azure-kubernetes/aks-cost-analysis-add-on-issues) troubleshooting guide.
10386
10487
## Disable cost analysis
10588

@@ -110,7 +93,7 @@ az aks update --name myAKSCluster --resource-group myResourceGroup --disable-cos
11093
```
11194

11295
> [!NOTE]
113-
> If you intend to downgrade your cluster from the `Standard` or `Premium` tiers to the `Free` tier while cost analysis is enabled, you must first explicitly disable cost analysis as shown here.
96+
> If you intend to downgrade your cluster from the `Standard` or `Premium` tiers to the `Free` tier while cost analysis is enabled, you must first explicitly disable cost analysis.
11497
11598
## View the cost data
11699

@@ -138,4 +121,4 @@ See the following guide to troubleshoot [AKS cost analysis add-on issues](/troub
138121

139122
## Learn more
140123

141-
Visibility is one element of cost management. Refer to [Optimize Costs in Azure Kubernetes Service (AKS)](./best-practices-cost.md) for other best practices on how to gain control over your kubernetes cost.
124+
Visibility is one element of cost management. Refer to [Optimize Costs in Azure Kubernetes Service (AKS)](./best-practices-cost.md) for other best practices on how to gain control over your kubernetes cost.

articles/batch/managed-identity-pools.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure managed identities in Batch pools
33
description: Learn how to enable user-assigned managed identities on Batch pools and how to use managed identities within the nodes.
44
ms.topic: conceptual
5-
ms.date: 02/29/2024
5+
ms.date: 06/18/2024
66
ms.devlang: csharp
77
ms.custom:
88
---
@@ -16,9 +16,11 @@ resources in Azure.
1616
This topic explains how to enable user-assigned managed identities on Batch pools and how to use managed identities within the nodes.
1717

1818
> [!IMPORTANT]
19-
> Pools must be configured using [Virtual Machine Configuration](nodes-and-pools.md#virtual-machine-configuration) in order to use managed identities.
20-
>
21-
> Creating pools with managed identities can be done by using the [Batch .NET management library](/dotnet/api/overview/azure/batch#management-library), but is not currently supported with the [Batch .NET client library](/dotnet/api/overview/azure/batch#client-library).
19+
> Creating pools with managed identities can only be performed with the
20+
> [Batch Management Plane APIs or SDKs](batch-apis-tools.md#batch-management-apis) using Entra authentication.
21+
> It is not possible to create pools with managed identities using the
22+
> [Batch Service APIs or SDKs](batch-apis-tools.md#batch-service-apis). For more information, see the overview
23+
> documentation for [Batch APIs and tools](batch-apis-tools.md).
2224
2325
## Create a user-assigned managed identity
2426

@@ -31,7 +33,7 @@ First, [create your user-assigned managed identity](../active-directory/managed-
3133
3234
## Create a Batch pool with user-assigned managed identities
3335

34-
After you've created one or more user-assigned managed identities, you can create a Batch pool with that identity or those identities. You can:
36+
After you create one or more user-assigned managed identities, you can create a Batch pool with that identity or those identities. You can:
3537

3638
- [Use the Azure portal to create the Batch pool](#create-batch-pool-in-azure-portal)
3739
- [Use the Batch .NET management library to create the Batch pool](#create-batch-pool-with-net)

articles/communication-services/concepts/analytics/logs/voice-and-video-logs.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ For each endpoint within a call, a distinct call diagnostic log is created for o
123123
| `RecvFreezeDurationPerMinuteInMs` | The average freeze duration in milliseconds per minute for incoming video/screensharing stream. Freezes are typically due to bad network condition and can degrade the stream quality. <br><br> The stream quality is considered poor when this value is greater than 6,000 ms for video stream, or greater than 25,000 ms for screensharing stream.
124124

125125
### Call client operations log schema
126-
[!INCLUDE [Public Preview Disclaimer](../../../includes/public-preview-include-document.md)]
127-
128126

129127
The **call client operations** log provides client-side information about the calling endpoints and participants involved in a call. These logs are currently in preview and show client events that occurred in a call and what actions a customer may have taken during a call.
130128

@@ -149,7 +147,6 @@ This log provides detailed information on actions taken during a call and can be
149147

150148

151149
### Call client media stats time series log schema
152-
[!INCLUDE [Public Preview Disclaimer](../../../includes/public-preview-include-document.md)]
153150

154151
The **call client media statistics time series** log provides
155152
client-side information about the media streams between individual

articles/communication-services/concepts/voice-video-calling/call-diagnostics.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ ms.subservice: calling
1616

1717

1818
# Call Diagnostics
19-
20-
[!INCLUDE [Public Preview Disclaimer](../../includes/public-preview-include-document.md)]
19+
Azure Communication Services offers call quality analytics and visualizations so you can investigate call metrics, events, and understand detected quality issues in your Communication Services calling solution.
2120

2221
Understanding your call quality and reliability is foundational to
2322
delivering a great customer calling experience. There are various
@@ -315,4 +314,4 @@ quality](https://learn.microsoft.com/azure/communication-services/concepts/voice
315314
- name: End of Call Survey
316315
href: concepts/voice-video-calling/end-of-call-survey-concept.md
317316
displayName: diagnostics, Survey, feedback, quality, reliability, users, end, call, quick
318-
-->
317+
-->

articles/communication-services/quickstarts/chat/includes/chat-swift.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ From the command line, go inside the root directory of the `ChatQuickstart` iOS
4545
Open the Podfile, and add the following dependencies to the `ChatQuickstart` target:
4646

4747
```
48-
pod 'AzureCommunicationChat', '~> 1.3.4'
48+
pod 'AzureCommunicationChat', '~> 1.3.5'
4949
```
5050

5151
Install the dependencies with the following command: `pod install`. Note that this also creates an Xcode workspace.

articles/communication-services/quickstarts/ui-library/includes/get-started-call/android.md

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -350,15 +350,24 @@ The Communication Services Call SDK accepts a full Microsoft Teams meeting link.
350350

351351
[!INCLUDE [Public Preview Notice](../../../../includes/public-preview-include.md)]
352352

353-
To set up a Azure Communication Services Rooms call, initialize a `CallCompositeRoomLocator`, supply it to the `CallCompositeRemoteOptions` object and set `CallCompositeParticipantRole` to the `CallCompositeLocalOptions` by `setRoleHint()`.
354-
`CallComposite` will use role hint before connecting to the call. Once call is connected, actual up-to-date participant role is retrieved from Azure Communication Services.
355-
353+
To set up a Azure Communication Services Rooms call, initialize a `CallCompositeRoomLocator` with a room ID.
354+
While on the setup screen, `CallComposite` will enable camera and microphone to all participants with any room role. Actual up-to-date participant role and capabilities are retrieved from Azure Communication Services once call is connected.
356355

357356
For more information about Rooms, how to create and manage one see [Rooms Quickstart](../../../rooms/get-started-rooms.md)
358357

359358
#### [Kotlin](#tab/kotlin)
360359

361360
```kotlin
361+
// Optionally, if user is a Consumer role, disable camera and microphone buttons on the setup screen:
362+
val setupScreenOptions = CallCompositeSetupScreenOptions()
363+
.setCameraButtonEnabled(false)
364+
.setMicrophoneButtonEnabled(false)
365+
366+
367+
val callComposite = CallCompositeBuilder()
368+
.setupScreenOptions(setupScreenOptions)
369+
.build()
370+
362371
val locator = CallCompositeRoomLocator("<ROOM_ID>")
363372

364373
val remoteOptions = CallCompositeRemoteOptions(
@@ -367,26 +376,28 @@ val remoteOptions = CallCompositeRemoteOptions(
367376
"DISPLAY_NAME",
368377
)
369378

370-
val localOptions = CallCompositeLocalOptions().setRoleHint(participantRole)
371-
372-
val callComposite = CallCompositeBuilder().build()
373-
callComposite.launch(context, remoteOptions, localOptions)
379+
callComposite.launch(context, remoteOptions)
374380
```
375381

376382
#### [Java](#tab/java)
377383

378384
```java
385+
// Optionally, if user is a Consumer role, disable camera and microphone buttons on the setup screen:
386+
CallCompositeSetupScreenOptions setupScreenOptions = new CallCompositeSetupScreenOptions()
387+
.setCameraButtonEnabled(false)
388+
.setMicrophoneButtonEnabled(false);
389+
390+
CallComposite callComposite = new CallCompositeBuilder()
391+
.setupScreenOptions(setupScreenOptions)
392+
.build();
393+
379394
CallCompositeJoinLocator locator = new CallCompositeRoomLocator("<ROOM_ID>");
380395

381396
CallCompositeRemoteOptions remoteOptions = new CallCompositeRemoteOptions(
382397
locator,
383398
communicationTokenCredential,
384399
"DISPLAY_NAME");
385-
386-
CallCompositeLocalOptions localOptions = new CallCompositeLocalOptions().setRoleHint(participantRole);
387-
388-
CallComposite callComposite = new CallCompositeBuilder().build();
389-
callComposite.launch(context, remoteOptions, localOptions);
400+
callComposite.launch(context, remoteOptions);
390401
```
391402

392403
---

articles/communication-services/quickstarts/ui-library/includes/get-started-call/ios.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,23 +215,21 @@ The Communication Services Call SDK accepts a full Microsoft Teams meeting link.
215215
216216
[!INCLUDE [Public Preview Notice](../../../../includes/public-preview-include.md)]
217217
218-
To set up a Azure Communication Services Rooms call, inside the `startCallComposite` function, initialize a `RemoteOptions` instance for the `.roomCall` locator. Replace `<ROOM_ID>` with the Room ID for your call. Initialize a `LocalOptions` instance with `roleHint`.
219-
220-
Replace `<DISPLAY_NAME>` with your name.
221-
222-
`CallComposite` will use role hint before connecting to the call. Once call is connected, actual up-to-date participant role is retrieved from Azure Communication Services.
223-
218+
To set up a Azure Communication Services Rooms call, initialize a `CallCompositeRoomLocator` with a room ID.
219+
While on the setup screen, `CallComposite` will enable camera and microphone to all participants with any room role. Actual up-to-date participant role and capabilities are retrieved from Azure Communication Services once call is connected.
224220
225221
For more information about Rooms, how to create and manage one see [Rooms Quickstart](../../../rooms/get-started-rooms.md)
226222
227223
```swift
228224
let remoteOptions = RemoteOptions(for: .roomCall(roomId: "<ROOM_ID>"),
229225
credential: communicationTokenCredential,
230226
displayName: "<DISPLAY_NAME>")
231-
let localOptions = LocalOptions(roleHint: participantRole)
232227
233-
let callComposite = CallComposite()
234-
callComposite.launch(remoteOptions: remoteOptions, localOptions: localOptions)
228+
// Optionally, if user is a Consumer role, disable camera and microphone buttons on the setup screen:
229+
let setupScreenOptions = SetupScreenOptions(cameraButtonEnabled: false, microphoneButtonEnabled: false)
230+
let callCompositeOptions = CallCompositeOptions(setupScreenOptions: setupScreenOptions)
231+
232+
let callComposite = CallComposite(withOptions: callCompositeOptions)
235233
```
236234
237235
### Launch the composite

articles/cost-management-billing/costs/migrate-cost-management-api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ Some property names have changed in the new Cost Details dataset available throu
150150
| ResourceGuid | meterId | Exact string values differ. |
151151
| ResourceLocation | resourceLocation | |
152152
| ResourceLocationId | None | |
153+
| ResourceName | None | |
153154
| ResourceRate | effectivePrice | |
154155
| ServiceAdministratorId | N/A | |
155156
| ServiceInfo1 | serviceInfo1 | |

articles/external-attack-surface-management/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
href: using-and-managing-discovery.md
2020
- name: Modifying inventory assets
2121
href: modifying-inventory-assets.md
22+
- name: Policy engine automation
23+
href: policy-engine.md
2224
- name: Understand billable assets
2325
href: understanding-billable-assets.md
2426
- name: Leveraging data connections
379 KB
Loading

0 commit comments

Comments
 (0)