Skip to content

Commit fcd757c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rs-subnet
2 parents 902bf27 + 518dd81 commit fcd757c

File tree

102 files changed

+788
-2395
lines changed

Some content is hidden

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

102 files changed

+788
-2395
lines changed

.openpublishing.redirection.json

Lines changed: 75 additions & 0 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",

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/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

0 commit comments

Comments
 (0)