Skip to content

Commit b299c90

Browse files
committed
Merge branch 'main' into release-esan-backup
2 parents ba71c52 + b61631e commit b299c90

File tree

161 files changed

+6793
-551
lines changed

Some content is hidden

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

161 files changed

+6793
-551
lines changed

articles/api-management/sap-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Choose one of the following methods to import your API to API Management:
116116
|---------|---------|
117117
|`HEAD /` | Enables the client to exchange cross-site request forgery (CSRF) tokens with the SAP server when required.<br/><br/>SAP also allows CSRF token exchange via the GET verb.<br/><br/> CSRF token exchange isn’t covered in this article. See an [example API Management policy snippet](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Get%20X-CSRF%20token%20from%20SAP%20gateway%20using%20send%20request.policy.xml) to broker token exchange. |
118118

119-
:::image type="content" source="media/sap-api/head-root-operation.png" alt-text="Sceenshot that shows the operation for fetching tokens.":::
119+
:::image type="content" source="media/sap-api/head-root-operation.png" alt-text="Screenshot that shows the operation for fetching tokens.":::
120120

121121
- `GET /`
122122

articles/app-service/app-service-key-vault-references.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ If the secret version isn't specified in the reference, the app uses the latest
9595

9696
The delay is because App Service caches the values of the Key Vault references and refetches them every 24 hours. Any configuration change to the app causes an app restart and an immediate refetch of all referenced secrets.
9797

98+
To force resolution of your app's Key Vault references, make an authenticated POST request to the API endpoint `https://management.azure.com/[Resource ID]/config/configreferences/appsettings/refresh?api-version=2022-03-01`.
99+
98100
## <a name = "source-app-settings-from-key-vault"></a> Understand source app settings from Key Vault
99101

100102
To use a Key Vault reference, set the reference as the value of the setting. Your app can reference the secret through its key as normal. No code changes are required.

articles/app-service/includes/tutorial-sidecar/common-faqs.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,29 @@ No. App Service routes internet requests only to the main container. For code-ba
1818

1919
For more information on configuring `IsMain`, see [Microsoft.Web sites/sitecontainers](/azure/templates/microsoft.web/sites/sitecontainers).
2020

21+
### How do I use volume mounts?
22+
23+
The Volume mounts feature enables you to share non-persistent files and directories between containers within your Web App.
24+
25+
:::image type="content" source="../../media/tutorial-custom-container-sidecar/configure-volume-mounts.png" alt-text="Screenshot showing a volume mount configuration for a sidecar container.":::
26+
27+
**Volume sub path:** This is a logical directory path that is automatically created, and is not referenced within the container. Containers that are configured with the same volume sub path can share files and directories with each other.
28+
29+
**Container mount path:** This corresponds to a directory path that you reference within the container. The container mount path is mapped to the volume sub path.
30+
31+
For example, suppose the following volume mounts are configured:
32+
33+
| Sidecar name | Volume sub path | Container mount path | Read-only |
34+
| ------------ | --------------- | -------------------- | --------- |
35+
| Container1 | /directory1/directory2 | /container1Vol | False |
36+
| Container2 | /directory1/directory2 | /container2Vol | True |
37+
| Container3 | /directory1/directory2/directory3 | /container3Vol | False |
38+
| Container4 | /directory4 | /container1Vol | False |
39+
40+
Based on these settings, the following conditions apply:
41+
- If Container1 creates **/container1Vol/myfile.txt**, Container2 can read the file via **/container2Vol/myfile.txt**.
42+
- If Container1 creates **/container1Vol/directory3/myfile.txt**, Container2 can read the file via **/container2Vol/directory3/myfile.txt**, and Container3 can read and write to the file via **/container3Vol/myfile.txt**.
43+
- Container4 does not share a volume mount in common with any of the other containers.
44+
45+
> [!Note]
46+
> For code-based Linux apps, the built-in Linux container cannot use volume mounts.
1.84 KB
Loading

articles/azure-cache-for-redis/TOC.yml

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -291,55 +291,35 @@
291291

292292
- name: Reference
293293
items:
294-
- name: Azure Managed Redis
295-
items:
296-
- name: .NET
297-
href: /dotnet/api/overview/azure/resourcemanager.redisenterprise-readme
298-
- name: Java
299-
href: /java/api/overview/azure/resourcemanager-redisenterprise-readme
300-
- name: Azure PowerShell
301-
href: /powershell/module/az.redisenterprisecache
302-
- name: Azure CLI
303-
href: /cli/azure/redisenterprise
304-
- name: REST
305-
href: /rest/api/redis/redisenterprisecache/operation-groups
306-
- name: Resource Manager template
307-
href: /azure/templates/microsoft.cache/redisenterprise
308-
- name: Azure Cache for Redis
309-
items:
310-
- name: .NET
311-
href: /dotnet/api/microsoft.azure.management.redis
312-
- name: Java
313-
href: /java/api/com.microsoft.azure.management.redis.rediscache
314-
- name: Azure PowerShell
315-
href: /powershell/module/az.rediscache
316-
- name: Azure CLI
317-
href: /cli/azure/redis
318-
- name: REST
319-
href: /rest/api/redis/
320-
- name: Resource Manager template
321-
href: /azure/templates/microsoft.cache/allversions
322-
- name: Azure Policy built-ins
323-
displayName: samples, policies, definitions
324-
href: policy-reference.md
325-
- name: Redis commands
326-
href: https://redis.io/commands#
327-
- name: Monitoring data reference
328-
href: /azure/redis/monitor-cache-reference
329-
294+
- name: .NET
295+
href: /dotnet/api/microsoft.azure.management.redis
296+
- name: Java
297+
href: /java/api/com.microsoft.azure.management.redis.rediscache
298+
- name: Azure PowerShell
299+
href: /powershell/module/az.rediscache
300+
- name: Azure CLI
301+
href: /cli/azure/redis
302+
- name: REST
303+
href: /rest/api/redis/
304+
- name: Resource Manager template
305+
href: /azure/templates/microsoft.cache/allversions
306+
- name: Azure Policy built-ins
307+
displayName: samples, policies, definitions
308+
href: policy-reference.md
309+
- name: Redis commands
310+
href: https://redis.io/commands#
311+
- name: Monitoring data reference
312+
href: /azure/redis/monitor-cache-reference
330313
- name: Resources
331314
items:
332-
- name: Azure Cache for Redis FAQs
315+
- name: Azure Redis FAQ
333316
href: /azure/redis/faq
334317
- name: Retirements from Azure Cache for Redis
335318
href: cache-retired-features.md
336319
- name: Videos
337320
href: https://www.youtube.com/results?search_query=azure+cache+redis
338321
- name: Microsoft Q&A question page
339-
href: /answers/topics/azure-cache-redis.html
322+
href: https://learn.microsoft.com/answers/tags/170/azure-cache-redis
340323
- name: Pricing
341324
href: https://azure.microsoft.com/pricing/details/cache/
342-
- name: Build your skills with Microsoft Learn training
343-
href: /training/browse/?products=azure-redis-cache
344-
- name: Azure Roadmap
345-
href: https://azure.microsoft.com/roadmap/?category=databases
325+

articles/azure-functions/create-first-function-vs-code-other.md

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create a function in Go or Rust using Visual Studio Code - Azure Functions
33
description: Learn how to create a Go function as an Azure Functions custom handler, then publish the local project to serverless hosting in Azure Functions using the Azure Functions extension in Visual Studio Code.
44
ms.topic: quickstart
5-
ms.date: 06/03/2024
5+
ms.date: 05/20/2025
66
ms.devlang: golang
77
# ms.devlang: golang, rust
88
ms.custom: mode-api, vscode-azure-extension-update-complete
@@ -16,7 +16,8 @@ In this article, you use Visual Studio Code to create a [custom handler](functio
1616

1717
Custom handlers can be used to create functions in any language or runtime by running an HTTP server process. This article supports both [Go](create-first-function-vs-code-other.md?tabs=go) and [Rust](create-first-function-vs-code-other.md?tabs=rust).
1818

19-
Completing this quickstart incurs a small cost of a few USD cents or less in your Azure account.
19+
>[!TIP]
20+
>Completing this quickstart creates an app that runs in an [Elastic Premium plan](functions-premium-plan.md), which can incur costs in your Azure account even when you're not using it. You should [Clean up resources](#clean-up-resources) to remove the function app, App Service plan, and related resources after you've completed the article.
2021
2122
## Configure your environment
2223

@@ -291,18 +292,24 @@ In this section, you publish your project to Azure in a function app running Lin
291292

292293
In this section, you create a function app and related resources in your Azure subscription.
293294

294-
1. Choose the Azure icon in the Activity bar. Then in the **Resources** area, select the **+** icon and choose the **Create Function App in Azure** option.
295+
1. In the command palette, enter **Azure Functions: Create function app in Azure...(Advanced)**.
295296

296-
![Create a resource in your Azure subscription](../../includes/media/functions-publish-project-vscode/function-app-create-resource.png)
297+
1. If you're not signed in, you're prompted to **Sign in to Azure**. You can also **Create a free Azure account**. After signing in from the browser, go back to Visual Studio Code.
297298

298-
1. Provide the following information at the prompts:
299+
1. Following the prompts, provide this information:
299300

300-
|Prompt|Selection|
301-
|--|--|
302-
|**Select subscription**| Choose the subscription to use. You won't see this when you have only one subscription visible under **Resources**. |
303-
|**Enter a globally unique name for the function app**| Type a name that is valid in a URL path. The name you type is validated to make sure that it's unique in Azure Functions.|
304-
|**Select a runtime stack**| Choose **Custom Handler**. |
305-
|**Select a location for new resources**| For better performance, choose a [region](https://azure.microsoft.com/regions/) near you.|
301+
| Prompt | Selection |
302+
| ------ | --------- |
303+
| Enter a globally unique name for the new function app. | Type a globally unique name that identifies your new function app and then select Enter. Valid characters for a function app name are `a-z`, `0-9`, and `-`. |
304+
| Select a hosting plan. | Choose the **Premium** [hosting plan](functions-scale.md), which provides serverless hosting on Linux that scales dynamically as needed. |
305+
| Select a location for new resources. | Select a location in a [region](https://azure.microsoft.com/regions/) near you or near other services that your functions access. Only regions that support your chosen hosting plan are displayed. |
306+
| Select a runtime stack. | Select **Custom handler**. |
307+
| Select an OS. | Select **Linux** since the app was compiled to run on Linux. |
308+
| Select a Linux App Service plan | For Elastic Premium plans, you must explicitly **Create a new app service plan**, enter the plan name, and select the **EP1** pricing tier. |
309+
| Select resource authentication type | Select **Managed identity**, which is the most secure option for connecting to the [default host storage account](storage-considerations.md#storage-account-guidance). When using managed identities with an Elastic Premium plan, secret key access to the default host storage remains enabled for Azure Files access. For more information, see [run without Azure Files](storage-considerations.md#create-an-app-without-azure-files). |
310+
| Select a storage account. | Choose **Create new storage account**, and at the prompt, enter a globally unique name for the new storage account used by your function app. Storage account names must be between 3 and 24 characters long and can contain only numbers and lowercase letters. |
311+
| Select an Application Insights resource for your app. | Choose **Create new Application Insights resource**, and at the prompt, enter a name for the instance used to store runtime data from your functions. |
312+
| Select a user assigned identity | Choose **Create a new user assigned identity**. This identity is used when accessing the default host storage account using Microsoft Entra ID authentication. |
306313

307314
The extension shows the status of individual resources as they are being created in Azure in the **Azure: Activity Log** panel.
308315

@@ -312,6 +319,8 @@ In this section, you create a function app and related resources in your Azure s
312319

313320
[!INCLUDE [functions-vs-code-created-resources](../../includes/functions-vs-code-created-resources.md)]
314321

322+
+ A user-assigned managed identity that's added to the [Storage Blob Data Contributor](/azure/role-based-access-control/built-in-roles/storage#storage-blob-data-contributor) role in the new default host storage account.
323+
315324
A notification is displayed after your function app is created and the deployment package is applied.
316325
317326
[!INCLUDE [functions-vs-code-create-tip](../../includes/functions-vs-code-create-tip.md)]

articles/azure-functions/functions-container-apps-hosting.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ms.custom: build-2024, linux-related-content
99

1010
# Azure Container Apps hosting of Azure Functions
1111

12+
[!INCLUDE [functions-aca-v2-note](../../includes/functions-aca-v2-note.md)]
13+
1214
Azure Functions provides integrated support for developing, deploying, and managing containerized function apps on [Azure Container Apps](../container-apps/overview.md). Use Azure Container Apps to host your function app containers when you need to run your event-driven functions in Azure in the same environment as other microservices, APIs, websites, workflows, or any container hosted programs. Container Apps hosting lets you run your functions in a fully managed, Kubernetes-based environment with built-in support for open-source monitoring, mTLS, Dapr, and Kubernetes Event-driven Autoscaling (KEDA).
1315

1416
You can write your function code in any [language stack supported by Functions](supported-languages.md). You can use the same Functions triggers and bindings with event-driven scaling. You can also use existing Functions client tools and the Azure portal to create containers, deploy function app containers to Container Apps, and configure continuous deployment.
@@ -140,3 +142,5 @@ Keep in mind the following considerations when deploying your function app conta
140142

141143
+ [Hosting and scale](./functions-scale.md)
142144
+ [Create your first containerized functions on Container Apps](./functions-deploy-container-apps.md)
145+
+ [Native Azure Functions Support in Azure Container Apps](../../articles/container-apps/functions-overview.md)
146+
+ [Create your Native Azure Functions on Azure Container Apps](../../articles/container-apps/functions-usage.md)

articles/azure-functions/functions-deploy-container-apps.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ zone_pivot_groups: programming-languages-set-functions
1111

1212
In this article, you create a function app running in a Linux container and deploy it to an Azure Container Apps environment from a container registry. By deploying to Container Apps, you're able to integrate your function apps into cloud-native microservices. For more information, see [Azure Container Apps hosting of Azure Functions](functions-container-apps-hosting.md).
1313

14+
[!INCLUDE [functions-aca-v2-note](../../includes/functions-aca-v2-note.md)]
15+
1416
This article shows you how to create functions running in a Linux container and deploy the container to a Container Apps environment.
1517

1618
Completing this quickstart incurs a small cost of a few USD cents or less in your Azure account, which you can minimize by [cleaning-up resources](#clean-up-resources) when you're done.
@@ -189,7 +191,11 @@ az group delete --name AzureFunctionsContainers-rg
189191
## Next steps
190192

191193
> [!div class="nextstepaction"]
192-
> [Azure Container Apps hosting of Azure Functions](./functions-container-apps-hosting.md)
194+
> [Azure Container Apps hosting of Azure Functions](./functions-container-apps-hosting.md)
195+
> [!div class="nextstepaction"]
196+
> [Native Azure Functions Support in Azure Container Apps](../../articles/container-apps/functions-overview.md)
197+
> [!div class="nextstepaction"]
198+
> [Create your Native Azure Functions on Azure Container Apps](../../articles/container-apps/functions-usage.md)
193199
> [!div class="nextstepaction"]
194200
> [Working with containers and Azure Functions](./functions-how-to-custom-container.md)
195201
> [!div class="nextstepaction"]

articles/azure-functions/functions-how-to-custom-container.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ zone_pivot_groups: functions-container-hosting
1111

1212
:::zone pivot="container-apps"
1313
This article demonstrates the support that Azure Functions provides for working with containerized function apps running in an Azure Container Apps environment. For more information, see [Azure Container Apps hosting of Azure Functions](functions-container-apps-hosting.md).
14+
15+
[!INCLUDE [functions-aca-v2-note](../../includes/functions-aca-v2-note.md)]
16+
1417
::: zone-end
1518
:::zone pivot="azure-functions,azure-arc"
1619
This article demonstrates the support that Azure Functions provides for working with function apps running in Linux containers.
@@ -407,8 +410,10 @@ SSH enables secure communication between a container and a client. With SSH enab
407410
The following articles provide more information about deploying and managing containers:
408411
409412
+ [Azure Container Apps hosting of Azure Functions](./functions-container-apps-hosting.md)
413+
+ [Native Azure Functions Support in Azure Container Apps](../../articles/container-apps/functions-overview.md)
414+
+ [Create your Native Azure Functions on Azure Container Apps](../../articles/container-apps/functions-usage.md)
410415
+ [Scale and hosting options](functions-scale.md)
411416
+ [Kubernetes-based serverless hosting](functions-kubernetes-keda.md)
412417
413418
414-
[Azure portal]: https://portal.azure.com
419+
[Azure portal]: https://portal.azure.com

articles/azure-health-insights/includes/example-1-inference-follow-up-recommendation-json-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
author: JanSchietse
33
ms.author: janschietse
4-
ms.date: 01/25/2024
4+
ms.date: 03/17/2025
55
ms.topic: include
66
ms.service: azure-health-insights
77
---

0 commit comments

Comments
 (0)