Skip to content

Commit d023d2c

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 1683e89 + 36cbd12 commit d023d2c

File tree

1,297 files changed

+9604
-6551
lines changed

Some content is hidden

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

1,297 files changed

+9604
-6551
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,6 @@
12891289
".openpublishing.redirection.azure-databricks.json",
12901290
".openpublishing.redirection.azure-datalake-storage-gen1.json",
12911291
".openpublishing.redirection.azure-hpc.json",
1292-
".openpublishing.redirection.azure-kubernetes-service.json",
12931292
".openpublishing.redirection.azure-monitor.json",
12941293
".openpublishing.redirection.azure-percept.json",
12951294
".openpublishing.redirection.azure-productivity.json",
@@ -1337,7 +1336,6 @@
13371336
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
13381337
"articles/ai-services.openpublishing.redirection.ai-services.json",
13391338
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1340-
"articles/aks/.openpublishing.redirection.aks.json",
13411339
"articles/analysis-services/.openpublishing.redirection.analysis-services.json",
13421340
"articles/application-gateway/.openpublishing.redirection.application-gateway.json",
13431341
"articles/automation/.openpublishing.redirection.automation.json",

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

.openpublishing.redirection.container-registry.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@
165165
"source_path": "articles/container-registry/monitor-service-reference.md",
166166
"redirect_url": "/azure/container-registry/monitor-container-registry-reference",
167167
"redirect_document_id": true
168+
},
169+
{
170+
"source_path_from_root": "/articles/container-registry/container-registry-auth-aks.md",
171+
"redirect_url": "/azure/aks/cluster-container-registry-integration",
172+
"redirect_document_id": false
173+
},
174+
{
175+
"source_path_from_root": "/articles/container-service/kubernetes/container-service-kubernetes-jenkins.md",
176+
"redirect_url": "/azure/aks/jenkins-continuous-deployment",
177+
"redirect_document_id": false
168178
}
169179
]
170180
}

.openpublishing.redirection.json

Lines changed: 4592 additions & 4594 deletions
Large diffs are not rendered by default.

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,20 @@ You can deploy to a standalone Teams app directly from Azure OpenAI Studio. Foll
349349

350350
1. Provision your app: (detailed instructions in [Provision cloud resources](/microsoftteams/platform/toolkit/provision))
351351

352-
1. Assign the **Cognitive Service OpenAI User** role to your deployed App Service resource
353-
1. Go to the Azure portal and select the newly created Azure App Service resource
354-
1. Go to **settings** -> **identity** -> **enable system assigned identity**
355-
1. Select **Azure role assignments** and then **add role assignments**. Specify the following parameters:
356-
* Scope: resource group
357-
* Subscription: the subscription of your Azure OpenAI resource
358-
* Resource group of your Azure OpenAI resource
359-
* Role: **Cognitive Service OpenAI user**
352+
1. Assign the **Cognitive Service OpenAI User** role to your deployed **User Assigned Managed Identity** resource of your custom copilot.
353+
1. Go to the Azure portal and select the newly created **User Assigned Managed Identity** resource for your custom copilot.
354+
1. Go to **Azure Role Assignments**.
355+
1. Select **add role assignment**. Specify the following parameters:
356+
* Scope: resource group
357+
* Subscription: the subscription of your Azure OpenAI resource
358+
* Resource group of your Azure OpenAI resource
359+
* Role: **Cognitive Service OpenAI user**
360360

361361
1. Deploy your app to Azure by following the instructions in [Deploy to the cloud](/microsoftteams/platform/toolkit/deploy).
362362

363363
1. Publish your app to Teams by following the instructions in [Publish Teams app](/microsoftteams/platform/toolkit/publish).
364+
> [!IMPORTANT]
365+
> Your Teams app is intended for use within the same tenant of your Azure account used during setup, as it is securely configured by default for single-tenant usage. Using this app with a Teams account not associated with the Azure tenant used during setup will result in an error.
364366
365367
The README file in your Teams app has additional details and tips. Also, see [Tutorial - Build Custom Copilot using Teams](/microsoftteams/platform/teams-ai-library-tutorial) for guided steps.
366368

articles/ai-studio/how-to/configure-managed-network.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -764,24 +764,25 @@ If you plan to use __HuggingFace models__ with the hub, add outbound _FQDN_ rule
764764
Private endpoints are currently supported for the following Azure services:
765765

766766
* AI Studio hub
767-
* Azure Machine Learning
768-
* Azure Machine Learning registries
769-
* Azure Storage (all sub resource types)
770-
* Azure Container Registry
771-
* Azure Key Vault
772-
* Azure AI services
773767
* Azure AI Search
774-
* Azure SQL Server
775-
* Azure Data Factory
768+
* Azure AI services
769+
* Azure API Management
770+
* Azure Container Registry
776771
* Azure Cosmos DB (all sub resource types)
777-
* Azure Event Hubs
778-
* Azure Redis Cache
779-
* Azure Databricks
772+
* Azure Data Factory
780773
* Azure Database for MariaDB
781-
* Azure Database for PostgreSQL Single Server
782774
* Azure Database for MySQL
783-
* Azure SQL Managed Instance
784-
* Azure API Management
775+
* Azure Database for PostgreSQL Single Server
776+
* Azure Database for PostgreSQL Flexible Server
777+
* Azure Databricks
778+
* Azure Event Hubs
779+
* Azure Key Vault
780+
* Azure Machine Learning
781+
* Azure Machine Learning registries
782+
* Azure Redis Cache
783+
* Azure SQL Server
784+
* Azure Storage (all sub resource types)
785+
785786

786787
> [!IMPORTANT]
787788
> While you can create a private endpoint for Azure AI services and Azure AI Search, the connected services must allow public networking. For more information, see [Connectivity to other services](#connectivity-to-other-services).

articles/application-gateway/add-http-header-rewrite-rule-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Rewrite HTTP headers in Azure Application Gateway
33
description: This article provides information on how to rewrite HTTP headers in Azure Application Gateway by using Azure PowerShell
44
services: application-gateway
55
author: greg-lindsay
6-
ms.service: application-gateway
6+
ms.service: azure-application-gateway
77
ms.topic: how-to
88
ms.date: 04/12/2019
99
ms.author: greglin

articles/application-gateway/application-gateway-autoscaling-zone-redundant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Scaling and Zone-redundant Application Gateway v2
33
description: This article introduces the Azure Application Standard_v2 and WAF_v2 SKU Autoscaling and Zone-redundant features.
44
services: application-gateway
55
author: greg-lindsay
6-
ms.service: application-gateway
6+
ms.service: azure-application-gateway
77
ms.topic: conceptual
88
ms.date: 11/02/2023
99
ms.author: greglin

articles/application-gateway/application-gateway-backend-health-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Troubleshoot backend health issues in Azure Application Gateway
33
description: Describes how to troubleshoot backend health issues for Azure Application Gateway
44
services: application-gateway
55
author: greg-lindsay
6-
ms.service: application-gateway
6+
ms.service: azure-application-gateway
77
ms.topic: troubleshooting
88
ms.date: 03/08/2024
99
ms.author: greglin

articles/application-gateway/application-gateway-backend-health.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure Application Gateway
44
description: Learn how to use Backend health report in Azure Application Gateway
55
services: application-gateway
66
author: jaesoni
7-
ms.service: application-gateway
7+
ms.service: azure-application-gateway
88
ms.topic: article
99
ms.date: 05/30/2024
1010
ms.author: jaysoni

0 commit comments

Comments
 (0)