Skip to content

Commit 69a0ce6

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into watchlist-limitation
2 parents 22e0188 + 2dcb632 commit 69a0ce6

File tree

90 files changed

+2039
-381
lines changed

Some content is hidden

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

90 files changed

+2039
-381
lines changed

articles/api-management/send-one-way-request-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ This example uses the `send-one-way-request` policy to send a message to a Slack
8989

9090
## Related policies
9191

92-
* [Intergration and external communication](api-management-policies.md#integration-and-external-communication)
92+
* [Integration and external communication](api-management-policies.md#integration-and-external-communication)
9393

9494
[!INCLUDE [api-management-policy-ref-next-steps](../../includes/api-management-policy-ref-next-steps.md)]

articles/app-service/app-service-configure-premium-v4-tier.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Premium V4 tier
33
description: Learn how to better performance for your web, mobile, and API app in Azure App Service by scaling to the new Premium V4 pricing tier.
44
keywords: app service, azure app service, scale, scalable, app service plan, app service cost
55
ms.topic: article
6-
ms.date: 05/12/2025
6+
ms.date: 06/09/2025
77
ms.author: msangapu
88
author: msangapu-msft
99
ms.custom:
@@ -96,9 +96,18 @@ Premium V4 is available in the following regions:
9696

9797
### Azure Public
9898

99+
- Australia East
100+
- Canada Central
101+
- North Europe
99102
- East US
100-
- West Central US
103+
- East US 2
104+
- France Central
101105
- North Europe
106+
- Southeast Asia
107+
- Sweden Central
108+
- West Central US
109+
- West Europe
110+
- West US 3
102111

103112
## Scale up from an unsupported resource group and region combination
104113

articles/app-service/index.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,32 @@ landingContent:
5555
- text: Custom container
5656
url: quickstart-custom-container.md
5757

58+
- title: Integrate AI with App Service
59+
linkLists:
60+
- linkListType: concept
61+
links:
62+
- text: Introduction to AI integration with App Service
63+
url: overview-ai-integration.md
64+
- linkListType: tutorial
65+
links:
66+
- text: Build a RAG application with Azure OpenAI and Azure AI Search (.NET)
67+
url: tutorial-ai-openai-search-dotnet.md
68+
- text: Build a chatbot with Azure OpenAI (Blazor)
69+
url: tutorial-ai-openai-chatbot-dotnet.md
70+
- text: Build a chatbot with Azure OpenAI (Spring Boot)
71+
url: tutorial-ai-openai-chatbot-java.md
72+
- text: Run a chatbot with a local SLM (Express.js)
73+
url: tutorial-ai-slm-expressjs.md
74+
- text: Invoke OpenAPI web app from Azure AI Agent
75+
url: invoke-openapi-web-app-from-azure-ai-agent-service.md
76+
77+
- title: Troubleshoot with Azure SRE Agent (AI)
78+
linkLists:
79+
- linkListType: tutorial
80+
links:
81+
- text: Fix application issues with SRE Agent
82+
url: tutorial-sre-agent.md
83+
5884
- title: Build a CRUD app
5985
linkLists:
6086
- linkListType: tutorial
@@ -90,3 +116,4 @@ landingContent:
90116
url: deploy-continuous-deployment.md
91117
- text: Upload content with FTP
92118
url: deploy-ftp.md
119+

articles/app-service/overview-ai-integration.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: cephalin
55
ms.author: cephalin
66
ms.service: azure-app-service
77
ms.topic: overview
8-
ms.date: 05/17/2025
8+
ms.date: 06/06/2025
99
ms.custom:
1010
- build-2025
1111
---
@@ -14,7 +14,7 @@ ms.custom:
1414

1515
This article guides you to language-specific tutorials and resources to help you build intelligent applications with App Service.
1616

17-
Azure App Service makes it easy to integrate AI capabilities into your web applications across multiple programming languages and frameworks. Whether you want to use powerful Azure OpenAI models, deploy local small language models (SLMs) directly with your apps, or implement advanced patterns like retrieval augmented generation (RAG), App Service provides the flexible, secure platform you need for AI-powered applications.
17+
Azure App Service makes it easy to integrate AI capabilities into your web applications across multiple programming languages and frameworks. Whether you want to use powerful Azure OpenAI models, deploy local small language models (SLMs) directly with your apps, host Model Context Protocol (MCP) servers or implement advanced patterns like retrieval augmented generation (RAG), App Service provides the flexible, secure platform you need for AI-powered applications.
1818

1919
App Service offers several advantages for developing and deploying AI-powered applications:
2020

@@ -62,6 +62,16 @@ Implement AI capabilities in your Python web applications:
6262
- [Run a chatbot with a local SLM (FastAPI)](tutorial-ai-slm-fastapi.md) - Deploy a FastAPI application with a local SLM sidecar.
6363
- [Azure AI Foundry tutorial: Deploy an enterprise chat web app](/azure/ai-foundry/tutorials/deploy-chat-web-app?toc=/azure/app-service/toc.json&bc=/azure/bread/toc.json) - Deploy fully integrated AI web app straight from your deployment in Azure AI Foundry.
6464

65+
## Model Context Protocol (MCP) servers
66+
67+
Host [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) in your web applications:
68+
69+
- [Host a .NET MCP server on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-dotnet) - Deploy an MCP server with .NET.
70+
- [Host a Node.js MCP server on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-node) - Deploy an MCP server with Node.js.
71+
- [Host a Python MCP server on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-python) - Deploy an MCP server with Python.
72+
- [Host a Pyton MCP server with key-based authorization on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-python-auth) - Deploy an MCP server with Python and key-based authorization.
73+
- [Host a Pyton MCP server with OAuth 2.0 authorization on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-python-auth-oauth) - Deploy an MCP server with Python and [Open Authorization (OAuth) 2.0 authorization with Micrososft Entra ID](/entra/architecture/auth-oauth2).
74+
6575
## More resources
6676

6777
- [Azure OpenAI Service documentation](/azure/ai-services/openai/)

articles/automation/automation-child-runbooks.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,18 @@ The parameters of a child runbook called inline can be of any data type, includi
4242
Currently, PowerShell 5.1 is supported and only certain runbook types can call each other:
4343

4444
* A [PowerShell runbook](automation-runbook-types.md#powershell-runbooks) and a [graphical runbook](automation-runbook-types.md#graphical-runbooks) can call each other inline, because both are PowerShell based.
45-
* A [PowerShell Workflow runbook](automation-runbook-types.md#powershell-workflow-runbooks) and a graphical PowerShell Workflow runbook can call each other inline, because both are PowerShell Workflow based.
45+
* A [PowerShell Workflow runbook](automation-runbook-types.md#powershell-workflow-runbooks) can call another PowerShell Workflow runbook inline.
4646
* The PowerShell types and the PowerShell Workflow types can't call each other inline. They must use `Start-AzAutomationRunbook`.
4747

4848
> [!IMPORTANT]
49-
> Executing child scripts using `.\child-runbook.ps1` is not supported in PowerShell 7.1 and PowerShell 7.2
49+
> * Executing child scripts using `.\child-runbook.ps1` is not supported in PowerShell 7.1 and PowerShell 7.2
5050
**Workaround**: Use `Start-AutomationRunbook` ([internal cmdlet](/azure/automation/shared-resources/modules#internal-cmdlets)) or `Start-AzAutomationRunbook` (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) to start another runbook from parent runbook.
51+
> * Executing child scripts using Graphical PowerShell Workflow runbooks is not supported.
52+
**Workaround**: Use Start-AzAutomationRunbook (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook (via an InlineScript block) to start another runbook.
5153

52-
The publish order of runbooks matters only for PowerShell Workflow and graphical PowerShell Workflow runbooks.
54+
The publish order of runbooks matters only for PowerShell Workflow runbooks.
5355

54-
When your runbook calls a graphical or PowerShell Workflow child runbook by using inline execution, it uses the name of the runbook. The name must start with `.\\` to specify that the script is in the local directory.
56+
When your runbook calls a PowerShell Workflow child runbook by using inline execution, it uses the name of the runbook. The name must start with `.\\` to specify that the script is in the local directory.
5557

5658
### Example
5759

articles/automation/troubleshoot/runbooks.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,41 @@ ms.custom: has-adal-ref, devx-track-azurepowershell
1111

1212
This article describes runbook issues that might occur and how to resolve them. For general information, see [Runbook execution in Azure Automation](../automation-runbook-execution.md).
1313

14+
## Graphical PowerShell Workflow runbooks with child runbooks fail to execute
15+
16+
### Issue
17+
Graphical PowerShell Workflow runbooks with child runbooks fail to execute as expected.
18+
19+
### Cause
20+
To improve the security posture of Graphical PowerShell Workflow runbooks, the service no longer executes Graphical PowerShell Workflow runbooks with child scripts.
21+
22+
### Resolution
23+
24+
Workaround is to use Start-AzAutomationRunbook (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook to start child runbook. For example, use the InlineScript block:
25+
26+
```
27+
28+
$job = Start-AzAutomationRunbook `
29+
30+
-AutomationAccountName "MyAccount" `
31+
32+
-ResourceGroupName "MyRG" `
33+
34+
-Name "ReusableTaskRunbook" `
35+
36+
-Parameters @{ TaskId = '1234' }
37+
38+
39+
40+
#Optional: Wait for job completion
41+
42+
do {
43+
44+
Start-Sleep -Seconds 5
45+
46+
$jobStatus = Get-AzAutomationJob -Id $job.Id -AutomationAccountName "MyAccount" -ResourceGroupName "MyRG"} while ($jobStatus.Status -ne "Completed")
47+
48+
```
1449

1550
## It is no longer possible to use cmdlets from imported non-default modules in graphical PowerShell runbooks
1651

articles/azure-functions/flex-consumption-plan.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ Keep these other considerations in mind when using Flex Consumption plan:
147147
+ **Triggers**: While all triggers are fully supported in a Flex Consumption plan, the Blob storage trigger only supports the [Event Grid source](./functions-event-grid-blob-trigger.md). Non-C# function apps must use version `[4.0.0, 5.0.0)` of the [extension bundle](./extension-bundles.md), or a later version.
148148
+ **Regions**: Not all regions are currently supported. To learn more, see [View currently supported regions](flex-consumption-how-to.md#view-currently-supported-regions).
149149
+ **Deployments**: Deployment slots aren't currently supported.
150+
+ **Proxies**: Functions Proxies aren't supported. Consider integrating your function apps with Azure API Management.
150151
+ **Scale**: The lowest maximum scale is currently `40`. The highest currently supported value is `1000`.
151152
+ **Managed dependencies**: [Managed dependencies in PowerShell](functions-reference-powershell.md#managed-dependencies-feature) aren't supported by Flex Consumption. You must instead [upload modules with app content](functions-reference-powershell.md#including-modules-in-app-content).
152153
+ **Diagnostic settings**: Diagnostic settings aren't currently supported.

articles/azure-government/documentation-government-csp-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The following tables contain lists of all the authorized Cloud Solution Provider
1818

1919
|Partner name|
2020
|----------------------------|
21-
|[2w Technologies LLC](https://2wtech.com)|
21+
|[2w Technologies Inc](https://2wtech.com/)|
2222
|[10th Magnitude](https://www.10thmagnitude.com)|
2323
|[12:34 MicroTechnolgies Inc.](https://www.1234micro.com/)|
2424
|[1901 Group, LLC](https://1901group.com)|

articles/azure-health-insights/radiology-insights/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ items:
8080
href: /java/api/overview/azure/health-insights-radiologyinsights-readme
8181
- name: Python
8282
href: /python/api/overview/azure/healthinsights-radiologyinsights-readme
83-
# still being finalized- name: JavaScript
84-
# href: /javascript/api/overview/azure/health-insights-radiologyinsights-rest-readme
83+
- name: JavaScript
84+
href: /javascript/api/overview/azure/health-insights-radiologyinsights-rest-readme?view=azure-node-latest
8585
- name: Resources
8686
items:
8787
- name: FAQ
18.4 KB
Loading

0 commit comments

Comments
 (0)