Skip to content

Commit 9cc0d53

Browse files
committed
Merge branch 'main' into release-preview-site-manager
2 parents ddffc6d + c9c5db3 commit 9cc0d53

File tree

158 files changed

+1759
-2522
lines changed

Some content is hidden

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

158 files changed

+1759
-2522
lines changed

.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3851,7 +3851,7 @@
38513851
},
38523852
{
38533853
"source_path_from_root": "/articles/aks/cluster-configuration.md",
3854-
"redirect_url": "/azure/aks/concepts-clusters-workloads.md",
3854+
"redirect_url": "/azure/aks/concepts-clusters-workloads",
38553855
"redirect_document_id": false
38563856
},
38573857
{

articles/ai-studio/concepts/rbac-ai-studio.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ In this article, you learn how to manage access (authorization) to an Azure AI h
2424
2525
## Azure AI hub resource vs Azure AI project
2626

27-
In the Azure AI Studio, there are two levels of access: the Azure AI hub resource and the Azure AI project. The resource is home to the infrastructure (including virtual network setup, customer-managed keys, managed identities, and policies) as well as where you configure your Azure AI services. Azure AI hub resource access can allow you to modify the infrastructure, create new Azure AI hub resources, and create projects. Azure AI projects are a subset of the Azure AI hub resource that act as workspaces that allow you to build and deploy AI systems. Within a project you can develop flows, deploy models, and manage project assets. Project access lets you develop AI end-to-end while taking advantage of the infrastructure setup on the Azure AI hub resource.
27+
In the Azure AI Studio, there are two levels of access: the Azure AI hub and the Azure AI project. The AI hub is home to the infrastructure (including virtual network setup, customer-managed keys, managed identities, and policies) as well as where you configure your Azure AI services. Azure AI hub access can allow you to modify the infrastructure, create new Azure AI hub resources, and create projects. Azure AI projects are a subset of the Azure AI hub resource that act as workspaces that allow you to build and deploy AI systems. Within a project you can develop flows, deploy models, and manage project assets. Project access lets you develop AI end-to-end while taking advantage of the infrastructure setup on the Azure AI hub resource.
2828

2929
:::image type="content" source="../media/concepts/azureai-hub-project-relationship.png" alt-text="Diagram of the relationship between AI Studio resources." lightbox="../media/concepts/azureai-hub-project-relationship.png":::
3030

@@ -114,7 +114,6 @@ The Azure AI hub resource has dependencies on other Azure services. The followin
114114
| `Microsoft.Insights/Components/Write` | Write to an application insights component configuration. |
115115
| `Microsoft.OperationalInsights/workspaces/write` | Create a new workspace or links to an existing workspace by providing the customer ID from the existing workspace. |
116116

117-
118117
## Sample enterprise RBAC setup
119118
The following is an example of how to set up role-based access control for your Azure AI Studio for an enterprise.
120119

@@ -151,6 +150,18 @@ If the built-in roles are insufficient, you can create custom roles. Custom role
151150
> [!NOTE]
152151
> You must be an owner of the resource at that level to create custom roles within that resource.
153152
153+
## Scenario: Use a customer-managed key
154+
155+
When using a customer-managed key (CMK), an Azure Key Vault is used to store the key. The user or service principal used to create the workspace must have owner or contributor access to the key vault.
156+
157+
If your Azure AI hub is configured with a **user-assigned managed identity**, the identity must be granted the following roles. These roles allow the managed identity to create the Azure Storage, Azure Cosmos DB, and Azure Search resources used when using a customer-managed key:
158+
159+
- `Microsoft.Storage/storageAccounts/write`
160+
- `Microsoft.Search/searchServices/write`
161+
- `Microsoft.DocumentDB/databaseAccounts/write`
162+
163+
Within the key vault, the user or service principal must have create, get, delete, and purge access to the key through a key vault access policy. For more information, see [Azure Key Vault security](/azure/key-vault/general/security-features#controlling-access-to-key-vault-data).
164+
154165
## Next steps
155166

156167
- [How to create an Azure AI hub resource](../how-to/create-azure-ai-resource.md)

articles/aks/custom-node-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ The settings below can be used to tune the operation of the virtual memory (VM)
239239

240240
## Next steps
241241

242-
- Learn [how to configure your AKS cluster](cluster-configuration.md).
242+
- Learn [how to configure your AKS cluster](./concepts-clusters-workloads.md).
243243
- Learn how [upgrade the node images](node-image-upgrade.md) in your cluster.
244244
- See [Upgrade an Azure Kubernetes Service (AKS) cluster](upgrade-cluster.md) to learn how to upgrade your cluster to the latest version of Kubernetes.
245245
- See the list of [Frequently asked questions about AKS](faq.md) to find answers to some common AKS questions.

articles/azure-arc/servers/private-link-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Use Azure Private Link to securely connect servers to Azure Arc
2+
title: Use Azure Private Link to connect servers to Azure Arc using a private endpoint
33
description: Learn how to use Azure Private Link to securely connect networks to Azure Arc.
44
ms.topic: conceptual
55
ms.custom:

articles/azure-monitor/agents/agents-overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The tables below provide a comparison of Azure Monitor Agent with the legacy the
116116
| | IIS logs |||
117117
| **Data sent to** | | | |
118118
| | Azure Monitor Logs |||
119-
| **Services and features supported** | | | | |
119+
| **Services and features supported** | | | |
120120
| | Microsoft Sentinel | ✓ ([View scope](./azure-monitor-agent-migration.md#migrate-additional-services-and-features)) ||
121121
| | VM Insights |||
122122
| | Microsoft Defender for Cloud - Only uses MDE agent | | |
@@ -140,7 +140,7 @@ The tables below provide a comparison of Azure Monitor Agent with the legacy the
140140
| | File based logs || |
141141
| **Data sent to** | | | |
142142
| | Azure Monitor Logs |||
143-
| **Services and features supported** | | | | | |
143+
| **Services and features supported** | | | |
144144
| | Microsoft Sentinel | ✓ ([View scope](./azure-monitor-agent-migration.md#migrate-additional-services-and-features)) ||
145145
| | VM Insights |||
146146
| | Microsoft Defender for Cloud - Only use MDE agent | | |
@@ -156,7 +156,7 @@ View [supported operating systems for Azure Arc Connected Machine agent](../../a
156156
### Windows
157157

158158
| Operating system | Azure Monitor agent | Legacy agent|
159-
|:---|:---:|:---:|:---:|
159+
|:---|:---:|:---:
160160
| Windows Server 2022 |||
161161
| Windows Server 2022 Core || |
162162
| Windows Server 2019 |||
@@ -181,7 +181,7 @@ View [supported operating systems for Azure Arc Connected Machine agent](../../a
181181
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](~/articles/virtual-machines/workloads/centos/centos-end-of-life.md).
182182
183183
| Operating system | Azure Monitor agent <sup>1</sup> | Legacy Agent <sup>1</sup> |
184-
|:---|:---:|:---:|:---:|
184+
|:---|:---:|:---:|
185185
| AlmaLinux 9 | ✓<sup>2</sup> ||
186186
| AlmaLinux 8 | ✓<sup>2</sup> ||
187187
| Amazon Linux 2017.09 | ||
@@ -215,8 +215,8 @@ View [supported operating systems for Azure Arc Connected Machine agent](../../a
215215
| Ubuntu 22.04 LTS |||
216216
| Ubuntu 20.04 LTS | ✓<sup>2</sup> ||
217217
| Ubuntu 18.04 LTS | ✓<sup>2</sup> ||
218-
| Ubuntu 16.04 LTS ||||
219-
| Ubuntu 14.04 LTS | |||
218+
| Ubuntu 16.04 LTS |||
219+
| Ubuntu 14.04 LTS | ||
220220

221221
<sup>1</sup> Requires Python (2 or 3) to be installed on the machine.<br>
222222
<sup>2</sup> Also supported on Arm64-based machines.<br>

articles/azure-netapp-files/understand-guidelines-active-directory-domain-service-site.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Ensure that you meet the following requirements about the DNS configurations:
7272
* Ensure that DNS servers have network connectivity to the Azure NetApp Files delegated subnet hosting the Azure NetApp Files volumes.
7373
* Ensure that network ports UDP 53 and TCP 53 are not blocked by firewalls or NSGs.
7474
* Ensure that [the SRV records registered by the AD DS Net Logon service](https://social.technet.microsoft.com/wiki/contents/articles/7608.srv-records-registered-by-net-logon.aspx) have been created on the DNS servers.
75-
* Ensure that the PTR records for the AD DS domain controllers used by Azure NetApp Files have been created on the DNS servers.
75+
* Ensure the PTR records for the AD DS domain controllers used by Azure NetApp Files have been created on the DNS servers in the same domain as your Azure NetApp Files configuration.
7676
* Azure NetApp Files doesn’t automatically delete pointer records (PTR) associated with DNS entries when a volume is deleted. PTR records are used for reverse DNS lookups, which map IP addresses to hostnames. They are typically managed by the DNS server's administrator.
7777
When you create a volume in Azure NetApp Files, you can associate it with a DNS name. However, the management of DNS records, including PTR records, is outside the scope of Azure NetApp Files. Azure NetApp Files provides the option to associate a volume with a DNS name for easier access, but it doesn't manage the DNS records associated with that name.
7878
If you delete a volume in Azure NetApp Files, the associated DNS records (such as the A records for forwarding DNS lookups) need to be managed and deleted from the DNS server or the DNS service you are using.

articles/cloud-shell/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,6 @@ Programming languages
196196
[27]: https://kubernetes.io/docs/reference/kubectl/
197197
[28]: https://pnp.github.io/office365-cli/
198198
[29]: https://puppet.com/docs/bolt/latest/bolt.html
199-
[30]: https://www.ansible.com/microsoft-azure
199+
[30]: /azure/developer/ansible/overview
200200
[31]: https://www.terraform.io/docs/providers/azurerm/
201201
[32]: persisting-shell-storage.md

articles/communication-services/quickstarts/chat/includes/meeting-interop-javascript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Create an **index.html** file in the root directory of your project. We use this
6464
## Add the Teams UI controls
6565

6666
Replace the code in index.html with the following snippet.
67-
The text boxes at the top of the page will be used to enter the Teams meeting context and meeting thread ID. The 'Join Teams Meeting' button is used to join the specified meeting.
67+
The text box at the top of the page will be used to enter the Teams meeting context. The 'Join Teams Meeting' button is used to join the specified meeting.
6868
A chat pop-up appears at the bottom of the page. It can be used to send messages on the meeting thread, and it displays in real time any messages sent on the thread while the Communication Services user is a member.
6969

7070
```html
@@ -349,7 +349,7 @@ Open your browser and navigate to `http://localhost:8080/`. You should see app l
349349

350350
:::image type="content" source="../join-teams-meeting-chat-quickstart.png" alt-text="Screenshot of the completed JavaScript Application.":::
351351

352-
Insert the Teams meeting link and thread ID into the text boxes. Press *Join Teams Meeting* to join the Teams meeting. After the Communication Services user has been admitted into the meeting, you can chat from within your Communication Services application. Navigate to the box at the bottom of the page to start chatting. For simplicity, the application only shows the last two messages in the chat.
352+
Insert the Teams meeting link into the text box. Press *Join Teams Meeting* to join the Teams meeting. After the Communication Services user has been admitted into the meeting, you can chat from within your Communication Services application. Navigate to the box at the bottom of the page to start chatting. For simplicity, the application only shows the last two messages in the chat.
353353

354354
> [!NOTE]
355355
> Certain features are currently not supported for interoperability scenarios with Teams. Learn more about the supported features, please see [Teams meeting capabilities for Teams external users](../../../concepts/interop/guest/capabilities.md)

articles/communication-services/tutorials/file-sharing-tutorial-interop-chat.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ To be able to start the Composite for meeting chat, we need to pass `TeamsMeetin
7474
{ "meetingLink": "<TEAMS_MEETING_LINK>" }
7575
```
7676

77-
Note that meeting link should look something like `https://teams.microsoft.com/l/meetup-join/19%3ameeting_XXXXXXXXXXX%40thread.v2/XXXXXXXXXXX`
78-
79-
And this is all you need! And there's no other setup needed to enable the Azure Communication Services end user to receive file attachments from the Teams user.
77+
This is all you need - and there's no other setup needed to enable the Azure Communication Services end user to receive file attachments from the Teams user!
8078

8179
## Permissions
8280

articles/communication-services/tutorials/inline-image-tutorial-interop-chat.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ ms.subservice: chat
1313

1414
# Enable inline image using UI Library in Teams Interoperability Chat
1515

16-
[!INCLUDE [Public Preview Notice](../includes/public-preview-include.md)]
17-
1816
In a Teams Interoperability Chat ("Interop Chat"), we can enable Azure Communication Service end users to receive inline images sent by Teams users. Currently, the Azure Communication Service end user is able to only receive inline images from the Teams user. Refer to [UI Library Use Cases](../concepts/ui-library/ui-library-use-cases.md) to learn more.
1917

2018
>[!IMPORTANT]
@@ -33,7 +31,7 @@ Access the code for this tutorial on [GitHub](https://github.com/Azure-Samples/c
3331
- [Visual Studio Code](https://code.visualstudio.com/) on one of the [supported platforms](https://code.visualstudio.com/docs/supporting/requirements#_platforms).
3432
- [Node.js](https://nodejs.org/), Active LTS and Maintenance LTS versions. Use the `node --version` command to check your version.
3533
- An active Communication Services resource and connection string. [Create a Communication Services resource](../quickstarts/create-communication-resource.md).
36-
- Using the UI library version [1.7.0-beta.1](https://www.npmjs.com/package/@azure/communication-react/v/1.7.0-beta.1) or the latest.
34+
- Using the UI library version [1.15.0](https://www.npmjs.com/package/@azure/communication-react/v/1.15.0) or the latest.
3735
- Have a Teams meeting created and the meeting link ready.
3836
- Be familiar with how [ChatWithChat Composite](https://azure.github.io/communication-ui-library/?path=/docs/composites-call-with-chat-basicexample--basic-example) works.
3937

@@ -75,10 +73,7 @@ To be able to start the Composite for meeting chat, we need to pass `TeamsMeetin
7573
{ "meetingLink": "<TEAMS_MEETING_LINK>" }
7674
```
7775

78-
Note that meeting link should look something like `https://teams.microsoft.com/l/meetup-join/19%3ameeting_XXXXXXXXXXX%40thread.v2/XXXXXXXXXXX`.
79-
80-
81-
And this is all you need! And there's no other setup needed to enable inline image specifically.
76+
This is all you need - and there's no other setup needed to enable inline image specifically.
8277

8378

8479
## Run the code

0 commit comments

Comments
 (0)