Merge branch 'main' into release-DO-NOT-MERGE-TO-MAIN-test-branch

Author: v-alje

.openpublishing.publish.config.json

@@ -1232,6 +1232,7 @@
   ".openpublishing.redirection.government.json",
   ".openpublishing.redirection.guidance.json",
   ".openpublishing.redirection.industry.json",
+  ".openpublishing.redirection.iot-develop.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
   ".openpublishing.redirection.json",
   ".openpublishing.redirection.key-vault.json",
@@ -1298,7 +1299,6 @@
   "articles/internet-peering/.openpublishing.redirection.internet-peering.json",
   "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
   "articles/iot-central/.openpublishing.redirection.iot-central.json",
-  "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
   "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",

articles/iot-develop/.openpublishing.redirection.iot-develop.json renamed to .openpublishing.redirection.iot-develop.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/sap/deploy-data-connector-agent-container-other-methods.md",
+            "redirect_url": "/azure/sentinel/sap/deploy-data-connector-agent-container",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/sentinel/data-connectors/abnormalsecurity-using-azure-function.md",
             "redirect_url": "/azure/sentinel/data-connectors/abnormalsecurity-using-azure-functions",

.openpublishing.redirection.sentinel.json

@@ -70,7 +70,7 @@ With the introduction of [**custom classification models**](./concept-custom-cla
 
 * With models composed using v2.1 of the API continues to be supported, requiring no updates.
 
-* For custom models, the maximum number that can be composed is 100.
+* For custom models, the maximum number that can be composed is 200.
 
 ::: moniker-end
 

articles/ai-services/document-intelligence/concept-composed-models.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Provides guidance on how to set managed identity with Microsoft Entra ID
 ms.service: azure-ai-openai
 ms.topic: how-to 
-ms.date: 02/29/2024
+ms.date: 04/03/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -31,7 +31,7 @@ In the following sections, you'll use the Azure CLI to sign in, and obtain a bea
 
 ## Assign yourself to the Cognitive Services User role
 
-Assign yourself the [Cognitive Services User](role-based-access-control.md#cognitive-services-contributor) role to allow you to use your account to make Azure OpenAI API calls rather than having to use key-based auth. After you make this change it can take up to 5 minutes before the change takes effect.
+Assign yourself either the [Cognitive Services OpenAI User](role-based-access-control.md#cognitive-services-openai-user) or [Cognitive Services OpenAI Contributor](role-based-access-control.md#cognitive-services-openai-contributor) role to allow you to use your account to make Azure OpenAI inference API calls rather than having to use key-based auth. After you make this change it can take up to 5 minutes before the change takes effect.
 
 ## Sign into the Azure CLI
 

articles/ai-services/document-intelligence/media/rag/rag-analyze-options.png

@@ -7,7 +7,7 @@ author: mrbullwinkle
 manager: nitinme
 ms.service: azure-ai-language
 ms.topic: how-to
-ms.date: 11/15/2023
+ms.date: 04/03/2024
 ms.author: mbullwin
 recommendations: false
 ---
@@ -53,6 +53,7 @@ If a user were granted role-based access to only this role for an Azure OpenAI r
 ✅ Ability to view the resource and associated model deployments in Azure OpenAI Studio. <br>
 ✅ Ability to view what models are available for deployment in Azure OpenAI Studio. <br>
 ✅ Use the Chat, Completions, and DALL-E (preview) playground experiences to generate text and images with any models that have already been deployed to this Azure OpenAI resource. <br>
+✅ Make inference API calls with Microsoft Entra ID.
 
 A user with only this role assigned would be unable to:
 
@@ -101,6 +102,7 @@ This role is typically granted access at the resource group level for a user in
 A user with only this role assigned would be unable to:
 
 ❌ Access quota <br>
+❌ Make inference API calls with Microsoft Entra ID.
 
 ### Cognitive Services Usages Reader
 
@@ -148,7 +150,7 @@ All the capabilities of Cognitive Services Contributor plus the ability to:
 |Create customized content filters|❌|❌|✅| ➖ |
 |Add a data source for the “on your data” feature|❌|❌|✅| ➖ |
 |Access quota|❌|❌|❌|✅|
-
+|Make inference API calls with Microsoft Entra ID| ✅ | ✅ | ❌ |  ➖ | 
 ## Common Issues
 
 ### Unable to view Azure Cognitive Search option in Azure OpenAI Studio

articles/ai-services/openai/how-to/managed-identity.md

@@ -243,7 +243,7 @@ items:
         - name: Data source - Pinecone (preview)
           href: ./references/pinecone.md
         - name: Ingestion API (preview)
-          href: /rest/api/azureopenai/ingestion-jobs
+          href: /rest/api/azureopenai/ingestion-jobs?context=/azure/ai-services/openai/context/context
     - name: Azure Resource Manager/Bicep/Terraform
       href: /azure/templates/microsoft.cognitiveservices/accounts?pivots=deployment-language-bicep
       displayName: ARM, ARM template, template 

articles/ai-services/openai/how-to/role-based-access-control.md

@@ -4,6 +4,9 @@ description: Learn how to access clusters when integrating Microsoft Entra ID in
 ms.topic: article
 ms.subservice: aks-integration
 ms.date: 04/20/2023
+author: tamram
+ms.author: tamram
+
 ms.custom: devx-track-azurecli
 ---
 
@@ -176,3 +179,4 @@ Make sure the admin of the security group has given your account an *Active* ass
 [az-role-assignment-create]: /cli/azure/role/assignment#az_role_assignment_create
 [aad-assignments]: ../active-directory/privileged-identity-management/groups-assign-member-owner.md#assign-an-owner-or-member-of-a-group
 [az-aks-create]: /cli/azure/aks#az_aks_create
+

articles/ai-services/openai/toc.yml

@@ -5,6 +5,9 @@ ms.topic: article
 ms.subservice: aks-security
 ms.custom: devx-track-azurecli
 ms.date: 09/15/2023
+author: schaffererin
+ms.author: schaffererin
+
 ---
 
 # Access a private Azure Kubernetes Service (AKS) cluster
@@ -135,3 +138,4 @@ In this article, you learned how to access a private cluster and run commands on
 <!-- links - internal -->
 
 [command-invoke-troubleshoot]: /troubleshoot/azure/azure-kubernetes/resolve-az-aks-command-invoke-failures
+