Skip to content

Commit 52d2560

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into er-vnet
2 parents 85aa935 + ccf309d commit 52d2560

File tree

245 files changed

+1843
-2138
lines changed

Some content is hidden

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

245 files changed

+1843
-2138
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-create-vm.md",
5+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-create-vm",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-download-files.md",
10+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-download-files",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-upload-files.md",
15+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-upload-files",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/storage/blobs/storage-blob-scalable-app-verify-metrics.md",
20+
"redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-verify-metrics",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path": "articles/api-management/self-hosted-gateway-migration-guide.md",
525
"redirect_url": "/previous-versions/azure/api-management/self-hosted-gateway-migration-guide",

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636
/articles/lighthouse @jasonwhowell @thomps23
3737
/articles/quotas @jasonwhowell @thomps23
3838
/articles/container-registry @jasonwhowell @thomps23
39-
/articles/kubernetes-fleet @jasonwhowell @thomps23
39+
/articles/kubernetes-fleet @MicrosoftDocs/azure-docs-codeowners

articles/app-service/breadcrumb/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ items:
99
- name: App Service
1010
tocHref: /azure/reliability/
1111
topicHref: /azure/app-service/index
12+
- name: App Service
13+
tocHref: /azure/developer/
14+
topicHref: /azure/app-service/index
1215
items:
1316
- name: Web Apps
1417
tocHref: /entra/fundamentals/
18+
topicHref: /azure/app-service/index
19+
- name: Web Apps
20+
tocHref: /azure/developer/
1521
topicHref: /azure/app-service/index

articles/app-service/overview-authentication-authorization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Authentication and authorization
33
description: Find out about the built-in authentication and authorization support in Azure App Service and Azure Functions, and how it can help secure your app against unauthorized access.
44
ms.assetid: b7151b57-09e5-4c77-a10c-375a262f17e5
55
ms.topic: article
6-
ms.date: 03/14/2023
6+
ms.date: 09/27/2024
77
ms.reviewer: mahender
88
ms.custom: UpdateFrequency3, fasttrack-edit, AppServiceIdentity
99
author: cephalin

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Environment variables and app settings reference
33
description: Describes the commonly used environment variables, and which ones can be modified with app settings.
44
ms.topic: article
5-
ms.date: 09/14/2023
5+
ms.date: 09/27/2024
66
author: cephalin
77
ms.author: cephalin
88
---

articles/app-service/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
- name: Connect Java Tomcat to Postgres
208208
href: tutorial-java-tomcat-connect-managed-identity-postgresql-database.md
209209
- name: Connect Python Flask app to Postgres
210-
href: /azure/developer/python/tutorial-python-managed-identity-cli?toc=/azure/app-service/toc.json&bc=/azure/bread/toc.json
210+
href: /azure/developer/python/tutorial-python-managed-identity-cli?toc=/azure/app-service/toc.json&bc=/azure/app-service/breadcrumb/toc.json
211211
- name: Connect to Microsoft Graph with managed identity
212212
items:
213213
- name: Use .NET

articles/automation/automation-linux-hrw-install.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ ms.service: azure-automation
1111

1212
# Deploy an agent-based Linux Hybrid Runbook Worker in Automation
1313

14-
> [!CAUTION]
15-
> This article references CentOS, a Linux distribution that is End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](/azure/virtual-machines/workloads/centos/centos-end-of-life).
16-
1714
[!INCLUDE [./agent-based-user-hybrid-runbook-worker-retirement.md](./includes/agent-based-user-hybrid-runbook-worker-retirement.md)]
1815

1916
You can use the user Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on the Azure or non-Azure machine, including servers registered with [Azure Arc-enabled servers](/azure/azure-arc/servers/overview). From the machine or server that's hosting the role, you can run runbooks directly it and against resources in the environment to manage those local resources.

articles/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: snehasudhirG
55
services: automation
66
ms.subservice: change-inventory-management
77
ms.topic: how-to
8-
ms.date: 09/09/2024
8+
ms.date: 09/27/2024
99
ms.author: sudhirsneha
1010
ms.custom:
1111
ms.service: azure-automation
@@ -22,6 +22,11 @@ Using the Azure portal, you can migrate from Change Tracking & Inventory with LA
2222
- Migrate single/multiple VMs from the Virtual Machines page.
2323
- Migrate multiples VMs on LA version solution within a particular Automation Account.
2424

25+
> [!NOTE]
26+
> File Integrity Monitoring (FIM) using [Microsoft Defender for Endpoint (MDE)](https://learn.microsoft.com/azure/defender-for-cloud/file-integrity-monitoring-enable-defender-endpoint) is now currently available. Follow the guidance to migrate from:
27+
> - [FIM with Change Tracking and Inventory using AMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-ama).
28+
> - [FIM with Change Tracking and Inventory using MMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-mma).
29+
2530
## Onboarding to Change tracking and inventory using Azure Monitoring Agent
2631

2732
### [Using Azure portal - Azure single VM](#tab/ct-single-vm)

articles/automation/change-tracking/overview-monitoring-agent.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Automation Change Tracking and Inventory overview using Azure Monit
33
description: This article describes the Change Tracking and Inventory feature using Azure monitoring agent, which helps you identify software and Microsoft service changes in your environment.
44
services: automation
55
ms.subservice: change-inventory-management
6-
ms.date: 09/09/2024
6+
ms.date: 09/27/2024
77
ms.topic: overview
88
ms.service: azure-automation
99
---
@@ -19,7 +19,10 @@ ms.service: azure-automation
1919
This article explains on the latest version of change tracking support using Azure Monitoring Agent as a singular agent for data collection.
2020

2121
> [!NOTE]
22-
> The [Current GA version](/azure/defender-for-cloud/file-integrity-monitoring-enable-log-analytics) of File Integrity Monitoring based on Log Analytics agent, will be deprecated in August 2024, and a **new version will be provided over MDE soon**.  The **[FIM Public Preview](/azure/defender-for-cloud/file-integrity-monitoring-enable-ama) based on Azure Monitor Agent (AMA), will be deprecated when the alternative is provided over MDE**. Hence, the FIM with AMA Public Preview version is not planned for GA. Read the announcement [here](https://techcommunity.microsoft.com/t5/microsoft-defender-for-cloud/microsoft-defender-for-cloud-strategy-and-plan-towards-log/ba-p/3883341).
22+
> File Integrity Monitoring (FIM) using [Microsoft Defender for Endpoint (MDE)](https://learn.microsoft.com/azure/defender-for-cloud/file-integrity-monitoring-enable-defender-endpoint) is now currently available. Follow the guidance to migrate from:
23+
> - [FIM with Change Tracking and Inventory using AMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-ama).
24+
> - [FIM with Change Tracking and Inventory using MMA](https://learn.microsoft.com/azure/defender-for-cloud/migrate-file-integrity-monitoring#migrate-from-fim-over-mma).
25+
2326

2427
## Key benefits
2528

articles/automation/change-tracking/overview.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ ms.service: azure-automation
1111

1212
# Change Tracking and Inventory overview
1313

14-
> [!CAUTION]
15-
> This article references CentOS, a Linux distribution that is End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](/azure/virtual-machines/workloads/centos/centos-end-of-life).
16-
1714
> [!Important]
1815
> Change Tracking and Inventory using Log Analytics agent has retired on **31 August 2024** and we recommend that you use Azure Monitoring Agent as the new supporting agent. Follow the guidelines for [migration from Change Tracking and inventory using Log Analytics to Change Tracking and inventory using Azure Monitoring Agent version](guidance-migration-log-analytics-monitoring-agent.md).
1916

0 commit comments

Comments
 (0)