Skip to content

Commit 41dd079

Browse files
authored
Merge pull request #5052 from MicrosoftDocs/main
5/19/2025 PM Publish
2 parents c907e77 + 693ed12 commit 41dd079

File tree

67 files changed

+602
-623
lines changed

Some content is hidden

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

67 files changed

+602
-623
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ _repo.*/
1111

1212
.openpublishing.buildcore.ps1
1313

14+
*sec.endpointdlp
15+
1416
# CoPilot instructions and prompts
1517
.github/copilot-instructions.md
16-
.github/prompts/*.md
18+
.github/prompts/*.md

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"branch_mapping": {}
118118
},
119119
{
120-
"path_to_root": "foundry-samples",
120+
"path_to_root": "foundry-samples-main",
121121
"url": "https://github.com/azure-ai-foundry/foundry-samples",
122122
"branch": "main",
123123
"branch_mapping": {}

articles/ai-foundry/concepts/ai-resources.md

Lines changed: 27 additions & 83 deletions
Large diffs are not rendered by default.

articles/ai-foundry/concepts/encryption-keys-portal.md

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,58 +18,56 @@ zone_pivot_groups: project-type
1818

1919
Customer-managed keys (CMKs) in [Azure AI Foundry portal](https://ai.azure.com/) provide enhanced control over the encryption of your data. By using CMKs, you can manage your own encryption keys to add an extra layer of protection and meet compliance requirements more effectively.
2020

21-
## About encryption in Azure AI Foundry portal
21+
## About encryption in Azure AI Foundry
2222

23-
Azure AI Foundry is a service in the Microsoft Azure cloud, and it also relies on other Azure services. By default, these services use Microsoft-managed encryption keys to encrypt data in transit and at rest.
23+
Azure AI Foundry is a service in the Microsoft Azure cloud. By default, services use Microsoft-managed encryption keys to encrypt data in transit and at rest.
2424

2525
::: zone pivot="hub-project"
2626

2727
Hub and [!INCLUDE [hub](../includes/hub-project-name.md)] resources are implementations of the Azure Machine Learning workspace and encrypt data in transit and at rest. For details, see [Data encryption with Azure Machine Learning](../../machine-learning/concept-data-encryption.md).
2828

29-
Azure AI services data is encrypted and decrypted using [FIPS 140-2](https://en.wikipedia.org/wiki/FIPS_140-2) compliant [256-bit AES](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard) encryption. Encryption and decryption are transparent, meaning encryption and access are managed for you. Your data is secure by default and you don't need to modify your code or applications to take advantage of encryption.
30-
3129
::: zone-end
3230

3331
::: zone pivot="fdp-project"
3432

35-
## Service-side storage of encrypted data when using customer-managed keys
33+
Data is encrypted and decrypted using [FIPS 140-2](https://en.wikipedia.org/wiki/FIPS_140-2) compliant [256-bit AES](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard) encryption. Encryption and decryption are transparent, meaning encryption and access are managed for you. Your data is secure by default and you don't need to modify your code or applications to take advantage of encryption.
34+
35+
::: zone-end
3636

37-
Customer-managed key encryption can be enabled during project creation through the Azure portal or Bicep template. The encrypted data is stored service-side on Microsoft-managed resources. Metadata is stored in multitenant resources using document-level CMK encryption. Due to its dedicated resource model, its Azure cost is charged in your subscription.
37+
## Storage of encrypted data when using customer-managed keys
38+
39+
Customer-managed key encryption can be enabled during resource creation through the Azure portal or template options. The encrypted data is stored service-side on Microsoft-managed resources using your encryption key.
3840

3941
> [!NOTE]
40-
> When you use server-side encryption, Azure charges will continue to accrue during the soft delete retention period.
42+
> Due to the dedicated hosting model for certain services when using customer-managed key encrypted data, additional charges may apply.
4143
42-
::: zone-end
44+
> [!NOTE]
45+
> When you use server-side encryption, Azure charges will continue to accrue during the soft delete retention period.
4346
4447
::: zone pivot="hub-project"
4548

46-
## Data storage in your subscription when using customer-managed keys
49+
## Service-side storage of encrypted data when using customer-managed keys with AI hub
4750

48-
Hub resources store metadata in your Azure subscription when using customer-managed keys. Data is stored in a Microsoft-managed resource group that includes an Azure Storage account, Azure Cosmos DB resource and Azure AI Search.
51+
Two architecture options are available when using customer-managed keys:
4952

50-
> [!IMPORTANT]
51-
> When using a customer-managed key, the costs for your subscription will be higher because encrypted data is stored in your subscription. To estimate the cost, use the [Azure pricing calculator](https://azure.microsoft.com/pricing/calculator/).
53+
* **Encrypted data is stored in Microsoft subscription (recommended)**
5254

53-
The encryption key you provide when creating a hub is used to encrypt data that is stored on Microsoft-managed resources. All projects using the same hub store data on the resources in a managed resource group identified by the name `azureml-rg-hubworkspacename_GUID`. Projects use Microsoft Entra ID authentication when interacting with these resources. If your hub has a private link endpoint, network access to the managed resources is restricted. The managed resource group is deleted, when the hub is deleted.
55+
Data is stored service-side on Microsoft-managed resources instead of in managed resources in your subscription. Metadata is stored in multitenant resources using document-level CMK encryption. An Azure AI Search instance is hosted on the Microsoft-side per customer, and for each hub.
5456

55-
The following data is stored on the managed resources.
57+
* **Encrypted data is stored in your subscription**
5658

57-
|Service|What it's used for|Example|
58-
|-----|-----|-----|
59-
|Azure Cosmos DB|Stores metadata for your Azure AI projects and tools|Index names, tags; Flow creation timestamps; deployment tags; evaluation metrics|
60-
|Azure AI Search|Stores indices that are used to help query your Azure AI Foundry content.|An index based off your model deployment names|
61-
|Azure Storage Account|Stores instructions for how customization tasks are orchestrated|JSON representation of flows you create in [Azure AI Foundry portal](https://ai.azure.com/)|
59+
Data is stored in your subscription using a Microsoft-managed resource group that includes an Azure Storage account, Azure Cosmos DB resource and Azure AI Search. The configuration of these resources cannot be modified. Changes to its configurations are not supported.
6260

63-
>[!IMPORTANT]
64-
> Azure AI Foundry uses Azure compute that is managed in the Microsoft subscription, for example when you fine-tune models or or build flows. Its disks are encrypted with Microsoft-managed keys. Compute is ephemeral, meaning after a task is completed the virtual machine is deprovisioned, and the OS disk is deleted. Compute instance machines used for 'Code' experiences are persistant. Azure Disk Encryption isn't supported for the OS disk.
61+
All projects using the same hub store data on the resources in a managed resource group identified by the name `azureml-rg-hubworkspacename_GUID`. Projects use Microsoft Entra ID authentication when interacting with these resources. If your hub has a private link endpoint, network access to the managed resources is restricted. The managed resource group is deleted, when the hub is deleted.
6562

66-
## (Preview) Service-side storage of encrypted data when using customer-managed keys
63+
The following data is stored on the managed resources.
6764

68-
A new architecture for customer-managed key encryption with hubs is available in preview, which resolves the dependency on the managed resource group. In this new model, encrypted data is stored service-side on Microsoft-managed resources instead of in managed resources in your subscription. Metadata is stored in multitenant resources using document-level CMK encryption. An Azure AI Search instance is hosted on the Microsoft-side per customer, and for each hub. Due to its dedicated resource model, its Azure cost is charged in your subscription via the hub resource.
65+
|Service|What it's used for|Example|
66+
|-----|-----|-----|
67+
|Azure Cosmos DB|Stores metadata for your Azure AI projects and tools|Index names, tags; Flow creation timestamps; deployment tags; evaluation metrics|
68+
|Azure AI Search|Stores indices that are used to help query your Azure AI Foundry content.|An index based off your model deployment names|
69+
|Azure Storage Account|Stores instructions for how customization tasks are orchestrated|JSON representation of flows you create in [Azure AI Foundry portal](https://ai.azure.com/)|
6970

70-
> [!NOTE]
71-
> - During this preview key rotation and user-assigned identity capabilities are not supported. Service-side encryption is currently not supported in reference to an Azure Key Vault for storing your encryption key that has public network access disabled.
72-
> - If you are using the preview server-side storage, Azure charges will continue to accrue during the soft delete retention period.
7371

7472
::: zone-end
7573

@@ -95,15 +93,16 @@ To enable customer-managed keys, the key vault containing your keys must meet th
9593
- If you use the [Key Vault firewall](/azure/key-vault/general/access-behind-firewall), you must allow trusted Microsoft services to access the key vault.
9694
- You must grant your hub and Azure AI Services resource's system-assigned managed identity the following permissions on your key vault: *get key*, *wrap key*, *unwrap key*.
9795

98-
The following limitations hold for Azure AI Services:
96+
The following limitations hold for Azure AI Foundry:
9997
- Only Azure Key Vault with [legacy access policies](/azure/key-vault/general/assign-access-policy) are supported.
10098
- Only RSA and RSA-HSM keys of size 2048 are supported with Azure AI services encryption. For more information about keys, see **Key Vault keys** in [About Azure Key Vault keys, secrets, and certificates](/azure/key-vault/general/about-keys-secrets-certificates).
99+
- Updates from Customer-Managed keys to Microsoft-managed keys are currently not supported for project sub-resources. Projects will keep referencing your encryption keys if updated.
101100

102-
### Enable your Azure AI Services resource's managed identity
101+
### Enable your Azure AI Foundry resource's managed identity
103102

104-
If connecting with Azure AI Services, or variants of Azure AI Services such as Azure OpenAI, you need to enable managed identity as a prerequisite for using customer-managed keys.
103+
Managed identity must be enabled as a prerequisite for using customer-managed keys.
105104

106-
1. Go to your Azure AI services resource.
105+
1. Go to your Azure AI Foundry resource in Azure portal.
107106
1. On the left, under **Resource Management**, select **Identity**.
108107
1. Switch the system-assigned managed identity status to **On**.
109108
1. Save your changes, and confirm that you want to enable the system-assigned managed identity.
@@ -149,11 +148,9 @@ Alternatively, use infrastructure-as-code options for automation. Example Bicep
149148

150149
* The customer-managed key for encryption can only be updated to keys in the same Azure Key Vault instance.
151150
* After deployment, hubs can't switch from Microsoft-managed keys to Customer-managed keys or vice versa.
152-
* [Azure AI services Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk) is required to use customer-managed keys in combination with Azure Speech and Content Moderator capabilities.
153-
* At the time of creation, you can't provide or modify resources that are created in the Microsoft-managed Azure resource group in your subscription.
154-
* You can't delete Microsoft-managed resources used for customer-managed keys without also deleting your hub.
155-
* [Azure AI services Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk) is still required for Speech and Content Moderator.
156-
* If you are using the [server-side preview](#preview-service-side-storage-of-encrypted-data-when-using-customer-managed-keys), Azure charges will continue to accrue during the soft delete retention period.
151+
* [Azure AI Foundry Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk) is required to use customer-managed keys in combination with Azure Speech and Content Moderator capabilities.
152+
* [Azure AI Foundry Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk) is still required for Speech and Content Moderator.
153+
* If your AI Foundry resource is in a soft-deleted state(#preview-service-side-storage-of-encrypted-data-when-using-customer-managed-keys), any additional Azure charges will continue to accrue during the soft delete retention period.
157154

158155
::: zone-end
159156

articles/ai-foundry/concepts/evaluation-evaluators/agent-evaluators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,5 +186,5 @@ If you're building agents outside of Azure AI Agent Service, this evaluator acce
186186

187187
## Related content
188188

189-
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-datasets)
189+
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-test-datasets-using-evaluate)
190190
- [How to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target)

articles/ai-foundry/concepts/evaluation-evaluators/azure-openai-graders.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ model_config = AzureOpenAIModelConfiguration(
4040
`AzureOpenAILabelGrader` uses your custom prompt to instruct a model to classify outputs based on labels you define. It returns structured results with explanations for why each label was chosen.
4141

4242
> [!NOTE]
43-
> We recommend using Azure Open AI GPT o3-mini for best results.
43+
> We recommend using Azure OpenAI GPT o3-mini for best results.
4444
4545
Here's an example `data.jsonl` that is used in the following code snippets:
4646

@@ -262,5 +262,5 @@ Aside from individual data evaluation results, the grader also returns a metric
262262

263263
## Related content
264264

265-
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-datasets)
265+
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-test-datasets-using-evaluate)
266266
- [How to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target)

articles/ai-foundry/concepts/evaluation-evaluators/custom-evaluators.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,5 @@ friendliness_score = friendliness_eval(response="I will not apologize for my beh
151151

152152
## Related content
153153

154-
- Learn [how to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-datasets) and [how to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target).
154+
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-test-datasets-using-evaluate)
155+
- [How to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target)

articles/ai-foundry/concepts/evaluation-evaluators/general-purpose-evaluators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,5 @@ While F1 score outputs a numerical score on 0-1 float scale, the other evaluator
160160

161161
## Related content
162162

163-
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-datasets)
163+
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-test-datasets-using-evaluate)
164164
- [How to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target)

articles/ai-foundry/concepts/evaluation-evaluators/rag-evaluators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,5 +316,5 @@ The numerical score on a likert scale (integer 1 to 5) and a higher score is bet
316316

317317
## Related content
318318

319-
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-datasets)
319+
- [How to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-test-datasets-using-evaluate)
320320
- [How to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target)

articles/ai-foundry/concepts/evaluation-evaluators/risk-safety-evaluators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,4 +485,4 @@ The label field returns a boolean true or false based on whether or not either o
485485
## Related content
486486

487487
- Read the [Transparency Note for Safety Evaluators](../safety-evaluations-transparency-note.md) to learn more about its limitations, use cases and how it was evaluated for quality and accuracy.
488-
- Learn [how to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-datasets) and [how to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target).
488+
- Learn [how to run batch evaluation on a dataset](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-test-datasets-using-evaluate) and [how to run batch evaluation on a target](../../how-to/develop/evaluate-sdk.md#local-evaluation-on-a-target).

0 commit comments

Comments
 (0)