Skip to content

Commit 80f2c16

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into iot-overview-consistency
2 parents eeeb046 + 7401943 commit 80f2c16

File tree

90 files changed

+1196
-1475
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

+1196
-1475
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5749,6 +5749,26 @@
57495749
"redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
57505750
"redirect_document_id": false
57515751
},
5752+
{
5753+
"source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-encryption-tde.md",
5754+
"redirect_url": "/azure/azure-sql/",
5755+
"redirect_document_id": false
5756+
},
5757+
{
5758+
"source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-tde-tsql.md",
5759+
"redirect_url": "/azure/azure-sql/",
5760+
"redirect_document_id": false
5761+
},
5762+
{
5763+
"source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-index-all-articles.md",
5764+
"redirect_url": "/azure/azure-sql/",
5765+
"redirect_document_id": false
5766+
},
5767+
{
5768+
"source_path_from_root": "/articles/sql-server-stretch-database/index.yml",
5769+
"redirect_url": "/azure/azure-sql/",
5770+
"redirect_document_id": false
5771+
},
57525772
{
57535773
"source_path_from_root": "/articles/vs-azure-tools-access-private-azure-clouds-with-visual-studio.md",
57545774
"redirect_url": "/visualstudio/azure/vs-azure-tools-access-private-azure-clouds-with-visual-studio",

articles/application-gateway/for-containers/application-gateway-for-containers-components.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ A set of routing rules evaluates how the request for that hostname should be ini
8686

8787
### HTTP/2 Requests
8888

89-
Application Gateway for Containers fully supports HTTP/2 protocol for communication from the client to the frontend. Communication from Application Gateway for Containers to the backend target uses the HTTP/1.1 protocol. The HTTP/2 setting is always enabled and can't be changed. If clients prefer to use HTTP/1.1 for their communication to the frontend of Application Gateway for Containers, they may continue to negotiate accordingly.
89+
Application Gateway for Containers supports both HTTP/2 and HTTP/1.1 protocols for communication between the client and the frontend. The HTTP/2 setting is always enabled and can't be changed. If clients prefer to use HTTP/1.1 for their communication to the frontend of Application Gateway for Containers, they may continue to negotiate accordingly.
90+
91+
Communication between Application Gateway for Containers and the backend target is always via HTTP/1.1, except for gRPC, which uses HTTP/2.
9092

9193
### Modifications to the request
9294

articles/azure-functions/functions-triggers-bindings.md

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Binding to a function is a way of declaratively connecting your functions to oth
1818

1919
You can mix and match different bindings to suit your function's specific scenario. Bindings are optional and a function might have one or multiple input and/or output bindings.
2020

21-
Triggers and bindings let you avoid hardcoding access to other services. Your function receives data (for example, the content of a queue message) in function parameters. You send data (for example, to create a queue message) by using the return value of the function.
21+
Triggers and bindings let you avoid hardcoding access to other services. Your function receives data (for example, the content of a queue message) in function parameters. You send data (for example, to create a queue message) by using the return value of the function.
2222

2323
Consider the following examples of how you could implement different functions.
2424

@@ -41,6 +41,8 @@ A function has a single trigger and one or more bindings. The type of binding is
4141

4242
Triggers and bindings are defined differently depending on the development language. Make sure to select your language at the [top](#top) of the article.
4343

44+
Trigger and binding names are limited to alphanumeric characters and `_`, the underscore.
45+
4446
This example shows an HTTP triggered function with an output binding that writes a message to an Azure Storage queue.
4547

4648
::: zone pivot="programming-language-csharp"
@@ -52,7 +54,7 @@ The HTTP trigger (`HttpTrigger`) is defined on the `Run` method for a function n
5254

5355
:::code language="csharp" source="~/functions-docs-csharp/functions-add-output-binding-storage-queue-isolated/HttpExample.cs" range="11-14":::
5456

55-
This example shows the `MultiResponse` object definition which both returns an `HttpResponse` to the HTTP request and also writes a message to a storage queue using a `QueueOutput` binding:
57+
This example shows the `MultiResponse` object definition which both returns an `HttpResponse` to the HTTP request and also writes a message to a storage queue using a `QueueOutput` binding:
5658

5759
:::code language="csharp" source="~/functions-docs-csharp/functions-add-output-binding-storage-queue-isolated/HttpExample.cs" range="33-38":::
5860

@@ -90,13 +92,13 @@ In Node.js for Functions version 3, you configure triggers and bindings in a fun
9092

9193
---
9294

93-
::: zone-end
95+
::: zone-end
9496
This example is an HTTP triggered function that creates a queue item for each HTTP request received.
9597

96-
::: zone pivot="programming-language-javascript"
98+
::: zone pivot="programming-language-javascript"
9799
### [v4](#tab/node-v4)
98100

99-
The `http` method on the exported `app` object defines an HTTP trigger, and the `storageQueue` method on `output` defines an output binding on this trigger.
101+
The `http` method on the exported `app` object defines an HTTP trigger, and the `storageQueue` method on `output` defines an output binding on this trigger.
100102

101103
:::code language="javascript" source="~/azure-functions-nodejs-v4/js/src/functions/storageQueueOutput1.js" :::
102104

@@ -131,8 +133,8 @@ This example `function.json` file defines the HTTP trigger function that returns
131133

132134
---
133135

134-
::: zone-end
135-
::: zone pivot="programming-language-typescript"
136+
::: zone-end
137+
::: zone pivot="programming-language-typescript"
136138
### [v4](#tab/node-v4)
137139

138140
The `http` method on the exported `app` object defines an HTTP trigger, and the `storageQueue` method on `output` defines an output binding on this trigger.
@@ -168,20 +170,20 @@ This example `function.json` file defines the HTTP trigger function that returns
168170
}
169171
```
170172

171-
::: zone-end
172-
::: zone pivot="programming-language-powershell"
173+
::: zone-end
174+
::: zone pivot="programming-language-powershell"
173175
This example `function.json` file defines the function:
174176

175177
:::code language="json" source="~/functions-docs-powershell/functions-add-output-binding-storage-queue-cli/HttpExample/function.json" range="3-26":::
176178

177179
For more information, see the [PowerShell developer guide](functions-reference-powershell.md#bindings).
178-
::: zone-end
179-
::: zone pivot="programming-language-python"
180+
::: zone-end
181+
::: zone pivot="programming-language-python"
180182
The way that the function is defined depends on the version of Python for Functions:
181183

182184
### [v2](#tab/python-v2)
183185

184-
In Python for Functions version 2, you define the function directly in code using decorators.
186+
In Python for Functions version 2, you define the function directly in code using decorators.
185187

186188
:::code language="python" source="~/functions-docs-python-v2/function_app.py" range="4-9" :::
187189

@@ -194,25 +196,25 @@ In Python for Functions version 1, this example `function.json` file defines an
194196

195197
---
196198

197-
::: zone-end
199+
::: zone-end
198200

199201
## Add bindings to a function
200202

201-
You can connect your function to other services by using input or output bindings. Add a binding by adding its specific definitions to your function. To learn how, see [Add bindings to an existing function in Azure Functions](add-bindings-existing-function.md).
203+
You can connect your function to other services by using input or output bindings. Add a binding by adding its specific definitions to your function. To learn how, see [Add bindings to an existing function in Azure Functions](add-bindings-existing-function.md).
202204

203-
Azure Functions supports multiple bindings, which must be configured correctly. For example, a function can read data from a queue (input binding) and write data to a database (output binding) simultaneously.
205+
Azure Functions supports multiple bindings, which must be configured correctly. For example, a function can read data from a queue (input binding) and write data to a database (output binding) simultaneously.
204206

205207
## Supported bindings
206208

207209
[!INCLUDE [Full bindings table](../../includes/functions-bindings.md)]
208210

209-
For information about which bindings are in preview or are approved for production use, see [Supported languages](supported-languages.md).
211+
For information about which bindings are in preview or are approved for production use, see [Supported languages](supported-languages.md).
210212

211213
Specific binding extension versions are only supported while the underlying service SDK is supported. Changes to support in the underlying service SDK version affect the support for the consuming extension.
212214

213215
## Bindings code examples
214216

215-
Use the following table to find more examples of specific binding types that show you how to work with bindings in your functions. First, choose the language tab that corresponds to your project.
217+
Use the following table to find more examples of specific binding types that show you how to work with bindings in your functions. First, choose the language tab that corresponds to your project.
216218

217219
[!INCLUDE [functions-bindings-code-example-chooser](../../includes/functions-bindings-code-example-chooser.md)]
218220

articles/azure-maps/open-source-projects.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ Find more open-source Azure Maps projects.
7171
7272
[@azure-maps/animations]: https://www.npmjs.com/package/@azure-maps/animations
7373
[@azure-maps/gridded-data-source]: https://www.npmjs.com/package/@azure-maps/gridded-data-source
74-
[Azure Maps & Microsoft Entra ID Samples]: https://github.com/Azure-Samples/Azure-Maps-AzureAD-Samples
7574
[Azure Maps Animation module]: https://github.com/Azure-Samples/azure-maps-animations
7675
[Azure Maps Bring Data Into View Control module]: https://github.com/Azure-Samples/azure-maps-bring-data-into-view-control
7776
[Azure Maps Code Samples]: https://github.com/Azure-Samples/AzureMapsCodeSamples
@@ -87,7 +86,6 @@ Find more open-source Azure Maps projects.
8786
[Azure Maps Sync Map module]: https://github.com/Azure-Samples/azure-maps-sync-maps
8887
[Code samples]: /samples/browse/?products=azure-maps
8988
[Getting Started]: https://azure.github.io/react-azure-maps-playground/?path=/docs/getting-started--docs
90-
[Implement IoT spatial analytics using Azure Maps]: https://github.com/Azure-Samples/iothub-to-azure-maps-geofencing
9189
[React Azure Maps Playground]: https://azure.github.io/react-azure-maps-playground/?path=/docs/getting-started--docs
9290
[react-azure-maps]: https://github.com/Azure/react-azure-maps
9391
[react-azure-maps-npm]: https://www.npmjs.com/package/react-azure-maps

articles/business-continuity-center/index.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
ms.topic: landing-page
1414
author: jyothisuri
1515
ms.author: jsuri
16-
ms.date: 03/03/2025
16+
ms.date: 03/25/2025
1717
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
1818

1919
landingContent:
@@ -64,3 +64,11 @@ landingContent:
6464
links:
6565
- text: Manage BCDR estate (preview)
6666
url: tutorial-manage-data-using-copilot.md
67+
68+
# Card (optional)
69+
- title: Architecture
70+
linkLists:
71+
- linkListType: architecture
72+
links:
73+
- text: Well-Architecture design recommendation for monitoring/ alerting
74+
url: /azure/well-architected/reliability/monitoring-alerting-strategy#azure-facilitation

articles/business-continuity-center/tutorial-monitor-alerts-metrics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tutorial - Monitor alerts and metrics in Azure Business Continuity Center
33
description: In this tutorial, learn how to monitor alerts and configure notifications for your business continuity estate using Azure Business Continuity center.
44
ms.topic: tutorial
5-
ms.date: 12/30/2024
5+
ms.date: 03/30/2025
66
ms.service: azure-business-continuity-center
77
ms.custom:
88
- ignite-2023
@@ -76,6 +76,6 @@ To view metrics, follow these steps:
7676

7777
## Next steps
7878

79-
- [Configure datasources](./tutorial-configure-protection-datasource.md)
80-
79+
- [Configure datasources](./tutorial-configure-protection-datasource.md).
80+
- [Well-Architected Framework design recommendation for reliable monitoring and alerting strategy](/azure/well-architected/reliability/monitoring-alerting-strategy#azure-facilitation).
8181

articles/business-continuity-center/tutorial-view-protected-items-and-perform-actions.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.service: azure-business-continuity-center
66
ms.custom:
77
- ignite-2023
88
- ignite-2024
9-
ms.date: 11/19/2024
9+
ms.date: 03/30/2025
1010
author: jyothisuri
1111
ms.author: jsuri
1212
---
@@ -155,4 +155,5 @@ With the protected items view, you can choose to perform actions from:
155155

156156
## Next steps
157157

158-
For more information about Azure Business Continuity center and how it works, check out [Configure protection from ABC Center](./tutorial-configure-protection-datasource.md).
158+
- For more information about Azure Business Continuity center and how it works, check out [Configure protection from ABC Center](./tutorial-configure-protection-datasource.md).
159+
- [Cloud-Adoption Framework for business continuity and disaster recovery of SAP migration](/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery#backup-and-restore).

articles/container-apps/services.md

Lines changed: 97 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,108 @@ description: Learn how to use runtime services in Azure Container Apps.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
7-
ms.custom:
8-
- ignite-2023
97
ms.topic: conceptual
10-
ms.date: 11/02/2023
8+
ms.date: 03/31/2025
119
ms.author: cshoe
1210
---
1311

1412
# Connect to services in Azure Container Apps (preview)
1513

16-
As you develop applications in Azure Container Apps, you often need to connect to different services. Rather than creating services ahead of time and manually connecting them to your container app, you can quickly create instances of development-grade services that are designed for nonproduction environments known as add-ons.
14+
> [!IMPORTANT]
15+
> The public preview add-ons feature will be retired on September 30, 2025. To prepare for this change, transition to Azure-managed services, such as Azure Cache for Redis or Azure Database for PostgreSQL for a production-level service. For development and testing purposes, review the supported open-source software (OSS) quickstart images.
1716
18-
Add-ons allow you to use OSS services without the burden of manual downloads, creation, and configuration.
17+
As you develop applications in Azure Container Apps, you often need to connect to different services. Rather than creating services ahead of time and manually connecting them to your container app, you can quickly create instances of development-grade services that are designed for nonproduction environments known as add-ons.
1918

20-
Once you're ready for your app to use a production level service, you can connect your application to an Azure managed service.
19+
Add-ons allow you to use OSS services without the burden of manual downloads, creation, and configuration. Since add-ons will be retired on September 30, 2025, we recommend you use our new OSS quickstarts if you want to continue using these OSS services for nonproduction environments.
20+
21+
If you're ready for your app to use a production level service, you can connect your application to an Azure managed service.
22+
23+
## Migration Guide
24+
25+
As add-ons are being retired, you need to plan how to transition your applications away from this preview feature. Use the following steps help you for either a production level service if you're using open source technologies in a development or testing capacity.
26+
27+
Make sure you prepare for data continuity between your add-on and your new Container App.
28+
29+
### Option 1: Transition to Azure managed services
30+
31+
If you're ready for a production level service, follow these steps to transition your add-on to an Azure managed service.
32+
33+
1. Identify add-ons in use. Run the following command to locate all existing add-ons in your environment.
34+
35+
Before you run the following command, make sure to replace the placeholders surrounded by `<>` with you values.
36+
37+
```azurecli
38+
az containerapp add-on list \
39+
--environment <ENVIRONMENT_NAME> \
40+
--resource-group <RESOURCE_GROUP>
41+
```
42+
43+
1. Plan data continuity.
44+
45+
Create a backup or snapshot of your data in the current add-on if applicable.
46+
47+
1. Deploy the new managed service.
48+
49+
For example, create an [Azure Cache for Redis](/azure/azure-cache-for-redis/scripts/create-manage-cache?pivots=azure-managed-redis) or [Azure Database for PostgreSQL](/azure/postgresql/) instance using the Azure portal or CLI.
50+
51+
1. Create a new container app.
52+
53+
Create a new app using the [Azure portal](quickstart-portal.md) or [CLI](get-started.md?tabs=bash).
54+
55+
1. Configure connection settings.
56+
57+
In your new container app configuration, set the environment variables and network settings to point to your new managed service’s connection string, credentials, and endpoints.
58+
59+
1. Remove the add-on.
60+
61+
Once the add-on is no longer needed, delete it with the following command.
62+
63+
Before you run the following command, make sure to replace the placeholders surrounded by `<>` with you values.
64+
65+
```azurecli
66+
az containerapp add-on <SERVICE_TYPE> delete \
67+
--name <ADDON_NAME> \
68+
--resource-group <RESOURCE-GROUP>
69+
```
70+
71+
### Option 2: Use open source quickstart images
72+
73+
If you only need these services for development or testing environments and don't require production-level guarantees, follow these steps to switch to use the open-source quickstart images.
74+
75+
1. Identify add-ons in use. Run the following command to locate all existing add-ons in your environment.
76+
77+
Before you run the following command, make sure to replace the placeholders surrounded by `<>` with you values.
78+
79+
```azurecli
80+
az containerapp add-on list \
81+
--environment <ENVIRONMENT_NAME> \
82+
--resource-group <RESOURCE_GROUP>
83+
```
84+
85+
1. Review the supported quickstart images: Redis, PostgreSQL, MariaDB, Qdrant, and Kafka.
86+
87+
1. Plan data continuity.
88+
89+
Create a backup or snapshot of your data in the current add-on if applicable.
90+
91+
1. Create a new [Container App](quickstart-portal.md) using a quickstart image.
92+
93+
1. Remove the add-on.
94+
95+
Once the add-on is no longer needed, delete it with the following command.
96+
97+
Before you run the following command, make sure to replace the placeholders surrounded by `<>` with you values.
98+
99+
```azurecli
100+
az containerapp add-on <SERVICE_TYPE> delete \
101+
--name <ADDON_NAME> \
102+
--resource-group <RESOURCE-GROUP>
103+
```
104+
105+
## Add-ons
106+
107+
> [!IMPORTANT]
108+
> The public preview add-ons feature will be retired on September 30, 2025. To prepare for this change, transition to Azure-managed services, such as Azure Cache for Redis or Azure Database for PostgreSQL for a production-level service. For development and testing purposes, review the supported open-source quickstarts.
21109
22110
Services available as an add-on include:
23111
@@ -81,7 +169,7 @@ You're responsible for data continuity between development and production enviro
81169

82170
To connect a service to an application, you first need to create the service.
83171

84-
Use the `az containerapp add-on <SERVICE_TYPE> create` command with the service type and name to create a new service.
172+
To create a new service, use the `az containerapp add-on <SERVICE_TYPE> create` command with the service type and name.
85173

86174
``` CLI
87175
az containerapp add-on redis create \
@@ -124,9 +212,9 @@ For more information on the service commands and arguments, see the
124212
- Add-ons are in public preview.
125213
- Any container app created before May 23, 2023 isn't eligible to use add-ons.
126214
- Add-ons come with minimal guarantees. For instance, they're automatically restarted if they crash, however there's no formal quality of service or high-availability guarantees associated with them. For production workloads, use Azure-managed services.
127-
- If you use your own VNET, you must use a workload profiles environment. The Add-ons feature is not supported in consumption only environments that use custom VNETs.
215+
- If you use your own virtual network (virtual network), you must use a workload profiles environment. The Add-ons feature isn't supported in consumption only environments that use custom virtual networks.
128216

129217
## Next steps
130218

131219
> [!div class="nextstepaction"]
132-
> [Connect services to a container app](connect-services.md)
220+
> [Connect services to a container app](connect-services.md)

0 commit comments

Comments
 (0)