Skip to content

Commit 592d86d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ADTFreshnessTop40_Row39
2 parents 82fd157 + 7373e06 commit 592d86d

File tree

466 files changed

+2988
-16958
lines changed

Some content is hidden

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

466 files changed

+2988
-16958
lines changed

.openpublishing.redirection.json

Lines changed: 80 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/automation/change-tracking/enable-from-portal.md",
5+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/automation/change-tracking/enable-from-vm.md",
10+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/automation/change-tracking/enable-from-automation-account.md",
15+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/automation/change-tracking/configure-alerts.md",
20+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/automation/change-tracking/enable-from-runbook.md",
25+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/automation/change-tracking/manage-change-tracking.md",
30+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/automation/change-tracking/manage-inventory-vms.md",
35+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/automation/change-tracking/manage-scope-configurations.md",
40+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/automation/change-tracking/overview.md",
45+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/automation/change-tracking/remove-feature.md",
50+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/automation/change-tracking/remove-vms-from-change-tracking.md",
55+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/automation/how-to/region-mappings.md",
60+
"redirect_url": "/azure/automation/change-tracking/region-mappings-monitoring-agent",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/automation/automation-tutorial-installed-software.md",
65+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/automation/troubleshoot/change-tracking.md",
70+
"redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/automation/troubleshoot/onboarding.md",
75+
"redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
76+
"redirect_document_id": false
77+
},
378
{
479
"source_path": "articles/migrate/tutorial-modernize-asp-net-aks.md",
580
"redirect_url": "/azure/migrate/migrate-services-overview",
@@ -1865,6 +1940,11 @@
18651940
"redirect_url": "/azure/api-management/monitor-api-management",
18661941
"redirect_document_id": false
18671942
},
1943+
{
1944+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-cross-premises-options.md",
1945+
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
1946+
"redirect_document_id": false
1947+
},
18681948
{
18691949
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
18701950
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -4085,36 +4165,6 @@
40854165
"redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
40864166
"redirect_document_id": false
40874167
},
4088-
{
4089-
"source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
4090-
"redirect_url": "/azure/openshift/howto-byok",
4091-
"redirect_document_id": false
4092-
},
4093-
{
4094-
"source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
4095-
"redirect_url": "/azure/openshift/index",
4096-
"redirect_document_id": false
4097-
},
4098-
{
4099-
"source_path_from_root": "/articles/openshift/quickstart-portal.md",
4100-
"redirect_url": "/azure/openshift/create-cluster",
4101-
"redirect_document_id": false
4102-
},
4103-
{
4104-
"source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
4105-
"redirect_url": "/azure/openshift/connect-cluster",
4106-
"redirect_document_id": false
4107-
},
4108-
{
4109-
"source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
4110-
"redirect_url": "/azure/openshift/create-cluster",
4111-
"redirect_document_id": false
4112-
},
4113-
{
4114-
"source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
4115-
"redirect_url": "/azure/openshift/delete-cluster",
4116-
"redirect_document_id": false
4117-
},
41184168
{
41194169
"source_path_from_root": "/articles/operator-service-manager/overview.md",
41204170
"redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",

articles/api-management/api-management-faq.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,6 @@ sections:
138138
When you clone an API, the new instance is created with a system-generated value for the name, which you can't change. To specify a name for the API,
139139
manually create a new API and import the API definition. For more information, see [Import an API](api-management-howto-import-api.md).
140140
141+
- question: Can I integrate Azure API Management directly with Azure database solutions?
142+
answer: |
143+
Yes, you can integrate Azure API Management directly with other Azure services without an intermediary. For example, Azure API Management can integrate directly with Azure Cosmos DB REST APIs for CRUD operations, eliminating the need for intermediate services like Azure Functions.

articles/api-management/api-management-key-concepts.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ API Management integrates with many complementary Azure services to create enter
141141
* **[Event Hubs](api-management-howto-log-event-hubs.md)** for streaming events​
142142
* **[Azure Redis](api-management-howto-cache-external.md)** for caching responses​ with Azure Cache for Redis or Azure Managed Redis​
143143
* Several Azure compute offerings commonly used to build and host APIs on Azure, including **[Functions](import-function-app-as-api.md)**, **[Logic Apps](import-logic-app-as-api.md)**, **[Web Apps](import-app-service-as-api.md)**, **[Service Fabric](how-to-configure-service-fabric-backend.yml)**, and others including **[Azure OpenAI](azure-openai-api-from-specification.md)** service.​
144+
* Azure database offerings, including [Azure Cosmos DB](cosmosdb-data-source-policy.md), enabling direct CRUD (Create, Read, Update, Delete) operations without requiring intermediate compute resources.
144145

145146
**More information**:
146147
* [Basic enterprise integration](/azure/architecture/reference-architectures/enterprise-integration/basic-enterprise-integration?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)

articles/app-service/configure-language-php.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ Then, go to the Azure portal and add an Application Setting to scan the "ini" di
363363
1. Go to the [Azure portal](https://portal.azure.com) and select your App Service Linux PHP application.
364364
2. Select Application Settings for the app.
365365
3. Under the Application settings section, select **+ Add new setting**.
366-
4. For the App Setting Name, enter "PHP_INI_SCAN_DIR" and for value, enter "/home/site/wwwroot/ini".
366+
4. For the App Setting Name, enter "PHP_INI_SCAN_DIR" and for value, enter ":/home/site/wwwroot/ini".
367367
5. Select the save button.
368368

369369
> [!NOTE]

articles/app-service/deploy-intelligent-apps-dotnet-to-azure-sql.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ ms.collection: ce-skilling-ai-copilot
1111

1212
# Deploy a .NET Blazor app connected to Azure SQL and Azure OpenAI on Azure App Service
1313

14-
When creating intelligent apps, you may want to ground the context of your app using your own SQL data. With the recent announcement of [Azure SQL vector support (preview)](https://devblogs.microsoft.com/azure-sql/announcing-eap-native-vector-support-in-azure-sql-database/), you can ground the context using the Azure SQL data you already have with new [vector functions](https://learn.microsoft.com/sql/t-sql/functions/vector-functions-transact-sql) that help manage vector data.
14+
When creating intelligent apps, you may want to ground the context of your app using your own SQL data. With the recent announcement of [Azure SQL vector support (preview)](https://devblogs.microsoft.com/azure-sql/announcing-eap-native-vector-support-in-azure-sql-database/), you can ground the context using the Azure SQL data you already have with new [vector functions](/sql/t-sql/functions/vector-functions-transact-sql) that help manage vector data.
1515

1616
In this tutorial, you'll create a RAG sample application by setting up a Hybrid vector search against your Azure SQL database using a .NET 8 Blazor app. This example builds from the previous documentation to deploy a [.NET Blazor app with OpenAI](/azure/app-service/deploy-intelligent-apps?pivots=openai-dotnet).
1717

1818
## Prerequisites
1919

20-
- An [Azure OpenAI](https://learn.microsoft.com/azure/ai-services/openai/quickstart?pivots=programming-language-csharp&tabs=command-line%2Ckeyless%2Ctypescript-keyless%2Cpython#set-up) resource with deployed models
20+
- An [Azure OpenAI](/azure/ai-services/openai/quickstart?pivots=programming-language-csharp&tabs=command-line%2Ckeyless%2Ctypescript-keyless%2Cpython#set-up) resource with deployed models
2121
- A .NET 8 or 9 Blazor Web App deployed on App Service
2222
- An Azure SQL database resource with vector embeddings.
2323

@@ -135,15 +135,15 @@ In order to prepare your Azure SQL database for vector search, you need to make
135135
- `text-embedding-ada-002` is used to generate the embeddings
136136
- `gpt-3.5-turbo` is used for the language model
137137

138-
These two models need to be deployed before continuing the next step. Visit the [documentation](https://learn.microsoft.com/azure/ai-studio/how-to/deploy-models-openai) for deploying models with Azure OpenAI using Azure AI Foundry.
138+
These two models need to be deployed before continuing the next step. Visit the [documentation](/azure/ai-studio/how-to/deploy-models-openai) for deploying models with Azure OpenAI using Azure AI Foundry.
139139

140140
## 4. Vectorize your SQL database
141141

142142
To perform a hybrid vector search on your Azure SQL database, you first need to have the appropriate embeddings in your database. There are many ways you can vectorize your database. One option is to use the following [Azure SQL database vectorizer](https://github.com/Azure-Samples/azure-sql-db-vectorizer) to generate embeddings for your SQL database. Vectorize your Azure SQL database before continuing.
143143
144144
## 5. Create procedure to generate embeddings
145145

146-
With [Azure SQL vector support (preview)](https://devblogs.microsoft.com/azure-sql/announcing-eap-native-vector-support-in-azure-sql-database/), you can create a stored procedure that will use a Vector data type to store generated embeddings for search queries. The stored procedure invokes an external REST API endpoint to get the embeddings. See the [documentation](https://learn.microsoft.com/azure-data-studio/quickstart-sql-database) to use Azure Data Studio to connect to your database before running the query.
146+
With [Azure SQL vector support (preview)](https://devblogs.microsoft.com/azure-sql/announcing-eap-native-vector-support-in-azure-sql-database/), you can create a stored procedure that will use a Vector data type to store generated embeddings for search queries. The stored procedure invokes an external REST API endpoint to get the embeddings. See the [documentation](/azure-data-studio/quickstart-sql-database) to use Azure Data Studio to connect to your database before running the query.
147147
148148
- Use the following to create a stored procedure with your preferred SQL query editor. You need to populate the @url parameter with your Azure OpenAI resource name and populate the rest endpoint with the API key from your text embedding model. You'll notice the model name as part of the @url, which will be populated with your search query.
149149

@@ -469,4 +469,4 @@ Here's the full example of the added *OpenAI.razor* page:
469469
}
470470
}
471471

472-
```
472+
```

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-python-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ For Azure OpenAI, see [this documentation](/azure/ai-services/openai/quickstart?
8989
- Model name: The name of the chat completion model, like "gpt-4o".
9090
- Deployment name: This is sometimes the same as the model name, but you may have chosen to use a different name. This differentiates between different deployments of the same model.
9191
- Endpoint: A URL like "https://cog-xxk4qzq3tahic.openai.azure.com/"
92-
- API version: The desired API version, like "2024-10-21". See the [version history documentation](https://learn.microsoft.com/azure/ai-services/openai/api-version-deprecation) for the latest version.
92+
- API version: The desired API version, like "2024-10-21". See the [version history documentation](/azure/ai-services/openai/api-version-deprecation) for the latest version.
9393

9494
For OpenAI, see this [documentation](https://platform.openai.com/docs/api-reference) to retrieve the API keys. For our application, you need the following values:
9595

articles/app-service/includes/tutorial-connect-msi-azure-database/code-mysql-mi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ await connection.OpenAsync();
4747
<dependency>
4848
<groupId>mysql</groupId>
4949
<artifactId>mysql-connector-java</artifactId>
50-
<version>8.0.30</version>
50+
<version>8.0.33</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>com.azure</groupId>
5454
<artifactId>azure-identity-extensions</artifactId>
55-
<version>1.1.5</version>
55+
<version>1.2.0</version>
5656
</dependency>
5757
```
5858

articles/app-service/includes/tutorial-connect-msi-azure-database/code-postgres-mi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ using (var connection = new NpgsqlConnection(connectionString))
5353
<dependency>
5454
<groupId>org.postgresql</groupId>
5555
<artifactId>postgresql</artifactId>
56-
<version>42.3.6</version>
56+
<version>42.7.5</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.azure</groupId>
6060
<artifactId>azure-identity-extensions</artifactId>
61-
<version>1.1.5</version>
61+
<version>1.2.0</version>
6262
</dependency>
6363
```
6464

articles/app-service/overview-hosting-plans.md

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how App Service plans work in Azure App Service, how they're
44
keywords: app service, azure app service, scale, scalable, scalability, app service plan, app service cost
55
ms.assetid: dea3f41e-cf35-481b-a6bc-33d7fc9d01b1
66
ms.topic: article
7-
ms.date: 08/21/2024
7+
ms.date: 02/28/2025
88
ms.author: msangapu
99
author: msangapu-msft
1010
ms.custom: UpdateFrequency3
@@ -105,24 +105,11 @@ If your app is in the same App Service plan with other apps, you may want to imp
105105

106106
## Should I put an app in a new plan or an existing plan?
107107

108-
Since you pay for the computing resources your App Service plan allocates (see [How much does my App Service plan cost?](#cost)), you can potentially save money by putting multiple apps into one App Service plan. You can continue to add apps to an existing plan as long as the plan has enough resources to handle the load. However, keep in mind that apps in the same App Service plan all share the same compute resources. To determine whether the new app has the necessary resources, you need to understand the capacity of the existing App Service plan, and the expected load for the new app. Overloading an App Service plan can potentially cause downtime for your new and existing apps.
108+
Since you pay for the computing resources your App Service plan allocates (see [How much does my App Service plan cost?](#cost)), you can potentially save money by putting multiple apps into one App Service plan. You can continue to add apps to an existing plan as long as the plan has enough resources to handle the load. However, keep in mind that apps in the same App Service plan all share the same compute resources. To determine whether the new app has the necessary resources, you need to understand the capacity of the existing App Service plan, and the expected load for the new app. Overloading an App Service plan can potentially cause downtime for your new and existing apps. You can find more comparisons between plans at [App Service limits](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-app-service-limits).
109109

110110
Isolate your app into a new App Service plan when:
111111

112-
- The app is resource-intensive. The number may actually be lower depending on how resource intensive the hosted applications are. However, for general guidance, refer to the table below:
113-
114-
| App Service Plan SKU | Maximum Apps |
115-
|--|--|
116-
| B1, S1, P1v2, I1v1 | 8 |
117-
| B2, S2, P2v2, I2v1 | 16 |
118-
| B3, S3, P3v2, I3v1 | 32 |
119-
| P0v3 | 8 |
120-
| P1v3, I1v2 | 16 |
121-
| P2v3, I2v2, P1mv3 | 32 |
122-
| P3v3, I3v2, P2mv3 | 64 |
123-
| I4v2, I5v2, I6v2 | Maximum density bound by vCPU usage |
124-
| P3mv3, P4mv3, P5mv3 | Maximum density bound by vCPU usage |
125-
112+
- The app is resource-intensive.
126113
- You want to scale the app independently from the other apps in the existing plan.
127114
- The app needs resources in a different geographical region.
128115

0 commit comments

Comments
 (0)