Skip to content

Commit 32f6098

Browse files
LJSpillerLJSpiller
authored
Merge pull request #219589 from MicrosoftDocs/main
Publish to live, Sunday 4 PM PST, 11/27
2 parents 63c7ef9 + 7ffc189 commit 32f6098

File tree

9 files changed

+72
-51
lines changed

9 files changed

+72
-51
lines changed

‎articles/backup/backup-azure-about-mars.md

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,58 @@
22
title: About the MARS Agent
33
description: Learn how the MARS Agent supports the backup scenarios
44
ms.topic: conceptual
5-
ms.date: 08/04/2020
5+
ms.date: 11/28/2022
6+
author: v-amallick
7+
ms.service: backup
8+
ms.author: v-amallick
9+
ms.custom: engagement-fy23
610
---
711

8-
# About the Microsoft Azure Recovery Services (MARS) agent
12+
# About the Microsoft Azure Recovery Services (MARS) agent for Azure Backup
913

10-
This article describes how the Azure Backup service uses the Microsoft Azure Recovery Services (MARS) agent to back up and restore files, folders, and the volume or system state from an on-premises computer to Azure.
14+
Azure Backup uses the Microsoft Azure Recovery Services (MARS) agent to back up and recover files, folders, and the volume or system state from an on-premises computer to Azure.
15+
16+
In this article, you'll learn about:
17+
18+
> [!div class="checklist"]
19+
> - Backup scenarios
20+
> - Recovery scenarios
21+
> - Backup process
1122
1223
## Backup scenarios
1324

1425
The MARS agent supports the following backup scenarios:
1526

16-
![MARS backup scenarios](./media/backup-try-azure-backup-in-10-mins/backup-scenarios.png)
27+
![Diagram shows the MARS backup scenarios.](./media/backup-try-azure-backup-in-10-mins/backup-scenarios.png)
1728

18-
- **Files and Folders**: Selectively protect Windows files and folders.
19-
- **Volume Level**: Protect an entire Windows volume of your machine.
20-
- **System Level**: Protect an entire Windows system state.
29+
| Scenarios | Description |
30+
| --- | --- |
31+
| **Files and Folders** | Selectively protect Windows files and folders. |
32+
| **Volume Level** | Protect an entire Windows volume of your machine. |
33+
| **System Level** | Protect an entire Windows system state. |
2134

2235
### Additional scenarios
2336

2437
- **Back up specific files and folders within Azure virtual machines**: The primary method for backing up Azure virtual machines (VMs) is to use an Azure Backup extension on the VM. The extension backs up the entire VM. If you want to back up specific files and folders within a VM, you can install the MARS agent in the Azure VMs. For more information, see [Architecture: Built-in Azure VM Backup](./backup-architecture.md#architecture-built-in-azure-vm-backup).
2538

2639
- **Offline seeding**: Initial full backups of data to Azure typically transfer large amounts of data and require more network bandwidth. Subsequent backups transfer only the delta, or incremental, amount of data. Azure Backup compresses the initial backups. Through the process of *offline seeding*, Azure Backup can use disks to upload the compressed initial backup data offline to Azure. For more information, see [Azure Backup offline-backup using Azure Data Box](offline-backup-azure-data-box.md).
2740

28-
## Restore scenarios
29-
30-
The MARS agent supports the following restore scenarios:
41+
## Recovery scenarios
3142

32-
![MARS recovery scenarios](./media/backup-try-azure-backup-in-10-mins/restore-scenarios.png)
43+
The MARS agent supports the following recovery scenarios:
3344

34-
- **Same Server**: The server on which the backup was originally created.
35-
- **Files and Folders**: Choose the individual files and folders that you want to restore.
36-
- **Volume Level**: Choose the volume and recovery point that you want to restore. Then restore it to the same location or an alternate location on the same machine. Create a copy of existing files, overwrite existing files, or skip recovering existing files.
37-
- **System Level**: Choose the system state and recovery point to restore to the same machine at a specified location.
45+
![Diagram shows the MARS recovery scenarios.](./media/backup-try-azure-backup-in-10-mins/restore-scenarios.png)
3846

39-
- **Alternate Server**: A server other than the server where the backup was taken.
40-
- **Files and Folders**: Choose the individual files and folders whose recovery point you want to restore to a target machine.
41-
- **Volume Level**: Choose the volume and recovery point that you want to restore to another location. Create a copy of existing files, overwrite existing files, or skip recovering existing files.
42-
- **System Level**: Choose the system state and recovery point to restore as a System State file to an alternate machine.
47+
| Server | Recovery scenario | Description |
48+
| --- | --- | --- |
49+
| **Same Server** | | The server on which the backup was originally created. |
50+
| | **Files and Folders** | Choose the individual files and folders that you want to restore. |
51+
| | **Volume Level** | Choose the volume and recovery point that you want to restore, and then restore it to the same location or an alternate location on the same machine. Create a copy of existing files, overwrite existing files, or skip recovering existing files. |
52+
| | **System Level** | Choose the system state and recovery point to restore to the same machine at a specified location. |
53+
| **Alternate Server** | | A server other than the server where the backup was taken. |
54+
| | **Files and Folders** | Choose the individual files and folders whose recovery point you want to restore to a target machine. |
55+
| | **Volume Level** | Choose the volume and recovery point that you want to restore to another location. Create a copy of existing files, overwrite existing files, or skip recovering existing files. |
56+
| | **System Level** | Choose the system state and recovery point to restore as a System State file to an alternate machine. |
4357

4458
## Backup process
4559

@@ -49,11 +63,14 @@ The MARS agent supports the following restore scenarios:
4963
3. [Install the agent](./install-mars-agent.md#install-and-register-the-agent) and use the downloaded vault credentials to register the machine to the Recovery Services vault.
5064
4. From the agent console on the client, [configure the backup](./backup-windows-with-mars-agent.md#create-a-backup-policy) to specify what to back up, when to back up (the schedule), how long the backups should be retained in Azure (the retention policy) and start protecting.
5165

52-
![Azure Backup agent diagram](./media/backup-try-azure-backup-in-10-mins/backup-process.png)
66+
67+
The following diagram shows the backup flow:
68+
69+
![Diagra shows the bacup flow of Azure Backup agent.](./media/backup-try-azure-backup-in-10-mins/backup-process.png)
5370

5471
### Additional information
5572

56-
- The **Initial Backup** (first backup) runs according to your backup settings. The MARS agent uses VSS to take a point-in-time snapshot of the volumes selected for backup. The agent only uses the Windows System Writer operation to capture the snapshot. It doesn't use any application VSS writers, and doesn't capture app-consistent snapshots. After taking the snapshot with VSS, the MARS agent creates a virtual hard disk (VHD) in the cache folder you specified when you configured the backup. The agent also stores checksums for each data block.
73+
- The **Initial Backup** (first backup) runs according to your backup settings. The MARS agent uses VSS to take a point-in-time snapshot of the volumes selected for backup. The agent only uses the Windows System Writer operation to capture the snapshot. It doesn't use any application VSS writers, and doesn't capture app-consistent snapshots. After VSS agent takes the snapshot, the MARS agent creates a virtual hard disk (VHD) in the cache folder you specified during the backup configuration. The agent also stores checksums for each data block.
5774

5875
- **Incremental backups** (subsequent backups) run according to the schedule you specify. During incremental backups, changed files are identified and a new VHD is created. The VHD is compressed and encrypted, and then it's sent to the vault. After the incremental backup finishes, the new VHD is merged with the VHD created after the initial replication. This merged VHD provides the latest state to be used for comparison for ongoing backup.
5976

‎articles/cost-management-billing/manage/ea-portal-rest-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Azure Enterprise REST APIs
33
description: This article describes the REST APIs for use with your Azure enterprise enrollment.
44
author: bandersmsft
55
ms.author: banders
6-
ms.date: 11/17/2022
6+
ms.date: 11/27/2022
77
ms.topic: conceptual
88
ms.service: cost-management-billing
99
ms.subservice: enterprise
@@ -30,7 +30,7 @@ Microsoft Enterprise Azure customers can get usage and billing information throu
3030

3131
**Billing Periods -** The [Billing Periods API](/rest/api/billing/enterprise/billing-enterprise-api-billing-periods) returns a list of billing periods that have consumption data for an enrollment in reverse chronological order. Each period contains a property pointing to the API route for the four sets of data, BalanceSummary, UsageDetails, Marketplace Charges, and PriceSheet. For more information, see [Reporting APIs for Enterprise customers - Billing Periods](/rest/api/billing/enterprise/billing-enterprise-api-billing-periods).
3232

33-
## Enable API data access
33+
## API key generation
3434

3535
Role owners can perform the following steps in the Azure portal to enable API data access.
3636

‎articles/defender-for-cloud/includes/azure-monitor-agent-availability.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ ms.author: benmansheim
44
ms.service: defender-for-cloud
55
ms.custom: ignite-2022
66
ms.topic: include
7-
ms.date: 08/14/2022
7+
ms.date: 11/27/2022
88
---
99

10-
| Aspect | Details |
11-
|------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
12-
| Release state: | Preview |
13-
| Relevant Defender plan: | - [Security posture management (CSPM)](../overview-page.md) (free and enabled by default) for [Endpoint protection assessment](../endpoint-protection-recommendations-technical.md)<br>- [Microsoft Defender for Servers Plan 2](../defender-for-servers-introduction.md) for [adaptive application controls](../adaptive-application-controls.md),[fileless attack detection](../defender-for-servers-introduction.md#plan-features), and [file integrity monitoring](../file-integrity-monitoring-enable-ama.md) |
14-
| Supported destinations: | :::image type="icon" source="../media/icons/yes-icon.png"::: Azure virtual machines<br> :::image type="icon" source="../media/icons/yes-icon.png"::: Azure Arc-enabled machines |
15-
| Policy-based: | :::image type="icon" source="../media/icons/yes-icon.png"::: Yes |
16-
| Clouds: | :::image type="icon" source="../media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="../media/icons/no-icon.png"::: Azure Government, Azure China 21Vianet |
10+
| Aspect | Details |
11+
|---|:--|
12+
| Release state: | Preview |
13+
| Relevant Defender plan: | - [Security posture management (CSPM)](../overview-page.md) (free and enabled by default) for [Endpoint protection assessment](../endpoint-protection-recommendations-technical.md)<br>- [Microsoft Defender for Servers Plan 2](../defender-for-servers-introduction.md) for [adaptive application controls](../adaptive-application-controls.md),[fileless attack detection](../defender-for-servers-introduction.md#plan-features), and [file integrity monitoring](../file-integrity-monitoring-enable-ama.md) |
14+
| Required roles and permissions (subscription-level): | [Owner](../../role-based-access-control/built-in-roles.md#owner) |
15+
| Supported destinations: | :::image type="icon" source="../media/icons/yes-icon.png"::: Azure virtual machines<br> :::image type="icon" source="../media/icons/yes-icon.png"::: Azure Arc-enabled machines |
16+
| Policy-based: | :::image type="icon" source="../media/icons/yes-icon.png"::: Yes |
17+
| Clouds: | :::image type="icon" source="../media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="../media/icons/no-icon.png"::: Azure Government, Azure China 21Vianet |

‎articles/defender-for-cloud/monitoring-components.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: bmansheim
55
ms.author: benmansheim
66
ms.topic: conceptual
77
ms.custom: ignite-2022
8-
ms.date: 09/12/2022
8+
ms.date: 11/27/2022
99
---
1010

1111
# How does Defender for Cloud collect data?
@@ -61,14 +61,15 @@ Learn more about [using the Azure Monitor Agent with Defender for Cloud](auto-de
6161

6262
### Log Analytics agent
6363

64-
| Aspect | Azure virtual machines | Azure Arc-enabled machines |
65-
|------------------------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
66-
| Release state: | Generally available (GA) | Generally available (GA) |
67-
| Relevant Defender plan: | [Microsoft Defender for Servers](defender-for-servers-introduction.md)<br>[Microsoft Defender for SQL](defender-for-sql-introduction.md) | [Microsoft Defender for Servers](defender-for-servers-introduction.md)<br>[Microsoft Defender for SQL](defender-for-sql-introduction.md) |
68-
| Required roles and permissions (subscription-level): | [Contributor](../role-based-access-control/built-in-roles.md#contributor) or [Security Admin](../role-based-access-control/built-in-roles.md#security-admin) | [Owner](../role-based-access-control/built-in-roles.md#owner) |
69-
| Supported destinations: | :::image type="icon" source="./media/icons/yes-icon.png"::: Azure virtual machines | :::image type="icon" source="./media/icons/yes-icon.png"::: Azure Arc-enabled machines |
70-
| Policy-based: | :::image type="icon" source="./media/icons/no-icon.png"::: No | :::image type="icon" source="./media/icons/yes-icon.png"::: Yes |
71-
| Clouds: | :::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/yes-icon.png"::: Azure Government, Azure China 21Vianet | :::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/no-icon.png"::: Azure Government, Azure China 21Vianet |
64+
| Aspect | Azure virtual machines | Azure Arc-enabled machines |
65+
|---|:--|:--|
66+
| Release state: | Generally available (GA) | Generally available (GA) |
67+
| Relevant Defender plan: | [Microsoft Defender for Servers](defender-for-servers-introduction.md)<br>[Microsoft Defender for SQL](defender-for-sql-introduction.md) | [Microsoft Defender for Servers](defender-for-servers-introduction.md)<br>[Microsoft Defender for SQL](defender-for-sql-introduction.md) |
68+
| Required roles and permissions (subscription-level): | [Contributor](../role-based-access-control/built-in-roles.md#contributor) or [Security Admin](../role-based-access-control/built-in-roles.md#security-admin) | [Owner](../role-based-access-control/built-in-roles.md#owner) |
69+
| Supported destinations: | :::image type="icon" source="./media/icons/yes-icon.png"::: Azure virtual machines | :::image type="icon" source="./media/icons/yes-icon.png"::: Azure Arc-enabled machines |
70+
| Policy-based: | :::image type="icon" source="./media/icons/no-icon.png"::: No | :::image type="icon" source="./media/icons/yes-icon.png"::: Yes |
71+
| Clouds: | :::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/yes-icon.png"::: Azure Government, Azure China 21Vianet | :::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/no-icon.png"::: Azure Government, Azure China 21Vianet |
72+
7273

7374
<a name="preexisting"></a>
7475

‎articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-plus-enterprise.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ The HPE ProLiant DL20 Gen10 Plus is also available for the on-premises managemen
1414
| Appliance characteristic |Details |
1515
|---------|---------|
1616
|**Hardware profile** | E1800 |
17-
|**Performance** | Max bandwidth: 1 Gbp/s <br>Max devices: 10,000 |
18-
|**Physical specifications** | Mounting: 1U <br> Ports: 8x RJ45 or 6x SFP (OPT)|
17+
|**Performance** | Max bandwidth: 1 Gbp/s <br>Max devices: 10,000<br> Up to 8x RJ45 monitoring ports or 6x SFP (OPT) |
18+
|**Physical specifications** | Mounting: 1U <br> Minimum dimensions ( H x W x D)1.70 x 17.11 x 15.05 in<br>Minimum dimensions ( H x W x D)4.32 x 43.46 x 38.22 cm|
1919
|**Status** | Supported, available pre-configured |
2020

2121
The following image shows a sample of the HPE ProLiant DL20 front panel:

‎articles/defender-for-iot/organizations/appliance-catalog/hpe-proliant-dl20-plus-smb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ The HPE ProLiant DL20 Gen10 Plus is also available for the on-premises managemen
1414
| Appliance characteristic |Details |
1515
|---------|---------|
1616
|**Hardware profile** | L500|
17-
|**Performance** | Max bandwidth: 200Mbp/s <br>Max devices: 1,000 |
18-
|**Physical specifications** | Mounting: 1U<br>Ports: 4x RJ45|
17+
|**Performance** | Max bandwidth: 200Mbp/s <br>Max devices: 1,000 <br>Up to 8x Monitoring ports|
18+
|**Physical specifications** | Mounting: 1U<br>Minimum dimensions ( H x W x D)1.70 x 17.11 x 15.05 in<br>Minimum dimensions ( H x W x D)4.32 x 43.46 x 38.22 cm|
1919
|**Status** | Supported; available pre-configured |
2020

2121
The following image shows a sample of the HPE ProLiant DL20 Gen10 front panel:

0 commit comments

Comments
 (0)