Skip to content

Commit 1360ef1

Browse files
authored
Merge pull request #292325 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 20b118f + 529a3e0 commit 1360ef1

18 files changed

+65
-39
lines changed

articles/app-service/configure-language-java-deploy-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ az webapp config appsettings set --resource-group myResourceGroup --name myApp -
631631
<Valve prefix="site_access_log.${catalina.instance.name}" pattern="%h %l %u %t &quot;%r&quot; %s %b %D %{x-arr-log-id}i" directory="${site.logdir}/http/RawLogs" maxDays="${site.logRetentionDays}" className="org.apache.catalina.valves.AccessLogValve" suffix=".txt"/>
632632
```
633633
* `directory` is set to `AZURE_LOGGING_DIR`, which defaults to `home\logFiles`
634-
* `maxDays` is to `WEBSITE_HTTPLOGGING_RETENTION_DAYS`, which defaults to `0` [forever]
634+
* `maxDays` is to `WEBSITE_HTTPLOGGING_RETENTION_DAYS`, which defaults to `7`. This aligns with the Application Logging platform default
635635

636636
On Linux, it has all of the same customization, plus:
637637

articles/automation/extension-based-hybrid-runbook-worker-install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article provides information about deploying the extension-bas
44
services: automation
55
ms.subservice: process-automation
66
ms.custom: devx-track-azurepowershell, devx-track-azurecli, devx-track-bicep, linux-related-content
7-
ms.date: 12/03/2024
7+
ms.date: 12/23/2024
88
ms.topic: how-to
99
#Customer intent: As a developer, I want to learn about extension so that I can efficiently deploy Hybrid Runbook Workers.
1010
ms.service: azure-automation
@@ -37,7 +37,7 @@ Azure Automation stores and manages runbooks and then delivers them to one or mo
3737

3838
| Windows (x64) | Linux (x64) |
3939
|---|---|
40-
| &#9679; Windows Server 2022 (including Server Core) <br> &#9679; Windows Server 2019 (including Server Core) <br> &#9679; Windows Server 2016, version 1709, and 1803 (excluding Server Core) <br> &#9679; Windows Server 2012, 2012 R2 (excluding Server Core) <br> &#9679; Windows 10 Enterprise (including multi-session) and Pro | &#9679; Debian GNU/Linux 8, 9, 10, and 11 <br> &#9679; Ubuntu 18.04 LTS, 20.04 LTS, and 22.04 LTS <br> &#9679; SUSE Linux Enterprise Server 15.2, and 15.3 <br> &#9679; Red Hat Enterprise Linux Server 7, 8, and 9 <br> &#9679; SUSE Linux Enterprise Server (SLES) 15 <br> &#9679; Rocky Linux 9 </br> &#9679; Oracle Linux 7 and 8 <br> *Hybrid Worker extension would follow support timelines of the OS vendor*.|
40+
| &#9679; Windows Server 2022 (including Server Core) <br> &#9679; Windows Server 2019 (including Server Core) <br> &#9679; Windows Server 2016, version 1709, and 1803 (excluding Server Core) <br> &#9679; Windows Server 2012, 2012 R2 (excluding Server Core) <br> &#9679; Windows 10 Enterprise (including multi-session) and Pro | &#9679; Debian GNU/Linux 8, 9, 10, 11, and 12 <br> &#9679; Ubuntu 18.04 LTS, 20.04 LTS, 22.04 LTS, and 24.04 LTS <br> &#9679; SUSE Linux Enterprise Server 15.2, 15.3, 15.4, 15.5, and 15.6 <br> &#9679; Red Hat Enterprise Linux Server 7, 8, and 9 <br> &#9679; Rocky Linux 9 </br> &#9679; Oracle Linux 7, 8, and 9 <br> *Hybrid Worker extension would follow support timelines of the OS vendor*.|
4141

4242

4343
### Other Requirements

articles/backup/back-up-hyper-v-virtual-machines-mabs.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up Hyper-V virtual machines with MABS
33
description: This article contains the procedures for backing up and recovery of virtual machines using Microsoft Azure Backup Server (MABS).
44
ms.topic: how-to
5-
ms.date: 12/20/2024
5+
ms.date: 12/23/2024
66
ms.service: azure-backup
77
ms.custom: engagement-fy24
88
author: AbhishekMallick-MS
@@ -13,8 +13,7 @@ ms.author: v-abhmallick
1313

1414
This article describes how to back up and restore Hyper-V virtual machines using Microsoft Azure Backup Server (MABS).
1515

16-
>[!Note]
17-
>When the trim is performed within the guest OS, the tracking of incremental blocks is reset, resulting in a full backup. The trim within the guest OS releases unused blocks of the virtual disk (VHDX) and optimizes the disk size. However, this reduces the size of the VHDX and changes the SequenceNumber of the tracked incremental blocks, resulting in a full backup size. Unless the purpose is to improve the efficiency of storage on the Hyper-V host side, we recommend you to stop the trim process within the guest to avoid an increase in backup size.
16+
[!INCLUDE [The functionality of Azure Backup trim process.](../../includes/backup-trim-process-notification.md)]
1817

1918

2019
## Supported scenarios

articles/backup/backup-azure-alternate-dpm-server.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Recover data from an Azure Backup Server by using Azure Backup
33
description: Recover the data you've protected to a Recovery Services vault from any Azure Backup Server registered to that vault.
44
ms.topic: how-to
5-
ms.date: 01/26/2024
5+
ms.date: 12/24/2024
66
ms.service: azure-backup
77
ms.custom: engagement-fy24
88
author: AbhishekMallick-MS
@@ -13,6 +13,9 @@ ms.author: v-abhmallick
1313

1414
This article describes how to recover data from Azure Backup Server.
1515

16+
[!INCLUDE [The functionality of Azure Backup trim process.](../../includes/backup-trim-process-notification.md)]
17+
18+
1619
You can use Azure Backup Server to recover the data you've backed-up to a Recovery Services vault. The process for doing so is integrated into the Azure Backup Server management console, and is similar to the recovery workflow for other Azure Backup components.
1720

1821
> [!NOTE]

articles/backup/backup-azure-backup-cloud-as-tape.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Replace your tape infrastructure by using Azure Backup
33
description: Learn how Azure Backup provides tape-like semantics that enable you to back up and restore data in Azure
44
ms.service: azure-backup
55
ms.topic: how-to
6-
ms.date: 03/29/2024
6+
ms.date: 12/24/2024
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
99
ms.custom: engagement-fy24
@@ -19,6 +19,8 @@ Azure Backup and System Center Data Protection Manager enable you to:
1919
* Retain the backup data for longer periods.
2020
* Make Azure a part of your long-term retention needs (instead of tape).
2121

22+
[!INCLUDE [The functionality of Azure Backup trim process.](../../includes/backup-trim-process-notification.md)]
23+
2224
## What is the Backup Schedule?
2325

2426
The backup schedule indicates the frequency of the backup operation. For example, the settings in the following screen indicate that backups are taken daily at 6pm and at midnight.

articles/backup/backup-azure-backup-exchange-server.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Back up an Exchange server via System Center DPM
33
description: Learn how to back up an Exchange server to Azure Backup using System Center 2012 R2 DPM
44
ms.reviewer: kasinh
55
ms.topic: how-to
6-
ms.date: 09/09/2024
6+
ms.date: 12/24/2024
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
99
---
@@ -12,6 +12,8 @@ ms.author: v-abhmallick
1212

1313
This article describes how to configure a System Center 2012 R2 Data Protection Manager (DPM) server to back up a Microsoft Exchange server to Azure Backup.
1414

15+
[!INCLUDE [The functionality of Azure Backup trim process.](../../includes/backup-trim-process-notification.md)]
16+
1517
## Updates
1618

1719
To successfully register the DPM server with Azure Backup, you must install the latest update rollup for System Center 2012 R2 DPM and the latest version of the Azure Backup Agent. Get the latest update rollup from the [Microsoft Catalog](https://catalog.update.microsoft.com/v7/site/Search.aspx?q=System%20Center%202012%20R2%20Data%20protection%20manager).

articles/backup/backup-azure-backup-sharepoint.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up a SharePoint farm to Azure with DPM
33
description: This article provides an overview of DPM/Azure Backup server protection of a SharePoint farm to Azure
44
ms.topic: how-to
5-
ms.date: 07/08/2024
5+
ms.date: 12/24/2024
66
ms.service: azure-backup
77
ms.custom: engagement-fy23
88
author: AbhishekMallick-MS
@@ -16,6 +16,8 @@ This article describes how to back up and restore SharePoint data using System C
1616

1717
System Center Data Protection Manager (DPM) enables you back up a SharePoint farm to Microsoft Azure, which gives an experience similar to back up of other data sources. Azure Backup provides flexibility in the backup schedule to create daily, weekly, monthly, or yearly backup points, and gives you retention policy options for various backup points. DPM provides the capability to store local disk copies for quick recovery-time objectives (RTO) and to store copies to Azure for economical, long-term retention.
1818

19+
[!INCLUDE [The functionality of Azure Backup trim process.](../../includes/backup-trim-process-notification.md)]
20+
1921
## SharePoint supported scenarios
2022

2123
For information on the supported SharePoint versions and the DPM versions required to back them up, see [this article](/system-center/dpm/dpm-protection-matrix#applications-backup).

articles/backup/backup-azure-backup-sql.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up SQL Server to Azure as a DPM workload
33
description: An introduction to backing up SQL Server databases by using the Azure Backup service
44
ms.topic: how-to
5-
ms.date: 01/26/2024
5+
ms.date: 12/24/2024
66
ms.service: azure-backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -15,6 +15,8 @@ This article describes how to back up and restore the SQL Server databases using
1515

1616
Azure Backup helps you to back up SQL Server databases to Azure via an Azure account. If you don't have one, you can create a free account in just a few minutes. For more information, see [Create your Azure free account](https://azure.microsoft.com/pricing/free-trial/).
1717

18+
[!INCLUDE [The functionality of Azure Backup trim process.](../../includes/backup-trim-process-notification.md)]
19+
1820
## Backup flow for SQL Server database
1921

2022
To back up a SQL Server database to Azure and to recover it from Azure:

articles/backup/backup-azure-dpm-introduction.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Prepare the DPM server to back up workloads
33
description: In this article, learn how to prepare for System Center Data Protection Manager (DPM) backups to Azure, using the Azure Backup service.
44
ms.topic: overview
5-
ms.date: 09/09/2024
5+
ms.date: 12/24/2024
66
ms.service: azure-backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -20,6 +20,8 @@ The article provides:
2020
- Steps for preparing the DPM server, including downloading vault credentials, installing the Azure Backup agent, and registering the DPM server in the vault.
2121
- Troubleshooting tips for common errors.
2222

23+
[!INCLUDE [The functionality of Azure Backup trim process.](../../includes/backup-trim-process-notification.md)]
24+
2325
## Why back up DPM to Azure?
2426

2527
[System Center DPM](/system-center/dpm/dpm-overview) backs up file and application data. DPM interacts with Azure Backup as follows:
@@ -144,7 +146,7 @@ Every machine that's backed up by Azure Backup must have the Backup agent (also
144146
5. In **Recovery Folder Setting**, specify a location that can be used during data recovery.
145147

146148
- Azure Backup uses this location as a temporary holding area for recovered data.
147-
- After finishing data recovery, Azure Backup will clean up the data in this area.
149+
- After the data recovery process is complete, Azure Backup will clean up the data in this area.
148150
- The location must have enough space to hold items that you expect to recover in parallel.
149151

150152
![Recovery Folder Setting](../../includes/media/backup-install-agent/DPM_SetupOnlineBackup_RecoveryFolder.png)

articles/data-factory/connector-azure-file-storage.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: jianleishen
77
ms.subservice: data-movement
88
ms.topic: conceptual
99
ms.custom: synapse
10-
ms.date: 09/13/2024
10+
ms.date: 12/16/2024
1111
---
1212

1313
# Copy data from or to Azure Files by using Azure Data Factory
@@ -486,6 +486,9 @@ The following properties are supported for Azure Files under `storeSettings` set
486486
]
487487
```
488488

489+
>[!NOTE]
490+
>You can copy up to 4 MB of data to the sink when using system-assigned or user-assigned managed identity as the authentication type.
491+
489492
### Folder and file filter examples
490493

491494
This section describes the resulting behavior of the folder path and file name with wildcard filters.

0 commit comments

Comments
 (0)