Skip to content

Commit 6cda646

Browse files
authored
Merge branch 'main' into backupStorage_errorCodes
2 parents a260479 + 4abb590 commit 6cda646

20 files changed

+98
-26
lines changed

api-reference/beta/api/backuprestoreroot-enable.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Namespace: microsoft.graph
1616

1717
Enable the [Microsoft 365 Backup Storage](../resources/backuprestoreroot.md) service for a tenant.
1818

19+
Before you call this API, call [List protection policies](../api/backuprestoreroot-list-protectionpolicies.md) to initialize the data store in the tenant. Data store initialization takes about 5 minutes. If you call this API before the data store is initialized, the call results in an error.
20+
1921
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2022

2123
## Permissions

api-reference/beta/api/backuprestoreroot-list-restorepoints.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "List restorePoints"
3-
description: "Get a list of the restorePoint objects and their properties."
3+
description: "Get a list of restorePoint objects and their properties."
44
author: "tushar20"
55
ms.reviewer: "manikantsinghms"
66
ms.localizationpriority: medium
@@ -14,7 +14,9 @@ Namespace: microsoft.graph
1414

1515
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1616

17-
Get a list of the [restorePoint](../resources/restorepoint.md) objects and their properties.
17+
Get a list of [restorePoint](../resources/restorepoint.md) objects and their properties.
18+
19+
> **Note:** This API returns a maximum of five **restorePoint** objects. If you don't include the `orderBy` parameter, the five most recent restore points are returned.
1820
1921
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2022

@@ -28,7 +30,6 @@ Choose the permission or permissions marked as least privileged for this API. Us
2830
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
2931
|Application|BackupRestore-Restore.Read.All|BackupRestore-Restore.ReadWrite.All|
3032

31-
3233
## HTTP request
3334

3435
<!-- {
@@ -40,9 +41,10 @@ GET /solutions/backupRestore/restorePoints?$expand=protectionUnit($filter=id eq
4041
```
4142

4243
## Optional query parameters
43-
This method supports the `$expand` and `$filter` [OData puery parameters](/graph/query-parameters), as shown in the following [example](../api/backuprestoreroot-list-restorepoints.md#request).
4444

45-
The two query parameters are required.
45+
This method supports the `$expand`, `$filter` and `orderBy` [OData query parameters](/graph/query-parameters), as shown in the [example](../api/backuprestoreroot-list-restorepoints.md#request) later in this topic.
46+
47+
The `$expand` and `$filter` query parameters are required.
4648

4749
## Request headers
4850

api-reference/beta/api/protectionpolicybase-activate.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Namespace: microsoft.graph
1616

1717
Activate a [protectionPolicyBase](../resources/protectionpolicybase.md).
1818

19+
Currently, only one active backup policy per underlying service is supported (that is, one for OneDrive accounts, one for SharePoint sites, and one for Exchange Online users). You can add or remove artifacts (sites or user accounts) to or from each active policy.
20+
1921
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2022

2123
## Permissions
@@ -53,9 +55,9 @@ For a list of possible error responses, see [Backup Storage API error responses]
5355

5456
## Examples
5557

56-
### Example 1 : Activate an inactive protection policy
58+
### Example 1: Activate an inactive protection policy
5759

58-
Activate an inactive protection policy.
60+
The following example shows a request to activate an inactive protection policy.
5961

6062
#### Request
6163

@@ -163,9 +165,9 @@ Content-Location: https://graph.microsoft.com/beta/solutions/backupRestore/prote
163165
}
164166
```
165167

166-
### Example 2 : Activate an active protection policy
168+
### Example 2: Activate an active protection policy
167169

168-
Activate an already active protection policy.
170+
The following example shows a request to activate a protection policy that's already active. This request results in an error.
169171

170172
#### Request
171173

api-reference/beta/api/restorepoint-search.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ In the request body, supply a JSON representation of the following parameters.
6565

6666
If successful, this action returns a `200 OK` response code and a [restorePointSearchResponse](../resources/restorepointsearchresponse.md) object in the response body.
6767

68+
> [!NOTE]
69+
> - Calls return a maximum of five restore points.
70+
> - You can include a maximum of 20 protection units in one request and the response won't be paginated.
71+
6872
For a list of possible error responses, see [Backup Storage API error responses](/graph/backup-storage-error-codes).
6973

7074
## Examples

api-reference/beta/api/restoresessionbase-activate.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,18 @@ Namespace: microsoft.graph
1414

1515
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1616

17-
Activate a draft [restoreSessionBase](../resources/restoresessionbase.md) object.
17+
Activate a draft [restoreSessionBase](../resources/restoresessionbase.md) object to restore a [protection unit](../resources/protectionunitbase.md).
18+
19+
The following points apply to restoring a protection unit:
20+
21+
- The SharePoint sites and OneDrive accounts being restored aren't locked in a ready-only state.
22+
- For SharePoint and OneDrive sites restored to new URLs, users don't have the same permissions they had to the original site. Only the global admin or SharePoint admin has permission to the restored site. However, for in-place or restores to the same URL, the permissions from the original site at the time of restoration are preserved.
23+
- Restoration of SharePoint site and OneDrive user content that was removed from the recycle bin isn't supported.
24+
- Mailboxes, OneDrive accounts, and SharePoint sites that are under legal or in-place holds can't be restored unless the legal hold is removes. To restore a SharePoint site under legal hold, you need to restore the site to a new URL.
25+
- Mailbox draft items aren't backed up and can't be restored.
26+
- A restore isn't performed if the current state of the mailbox is the same as the point in time you're trying to restore it to.
27+
- SharePoint sites and OneDrive accounts that are restored to a new URL have a read-only lock on that new URL until the restore completes. The global admin can still download documents or remove the read-only lock manually.
28+
- The global admin, SharePoint admin, or Exchange admin can initiate a restore of up to 1,000 SharePoint sites, 1,000 OneDrive users, and 1000 mailboxes queued in parallel at a time.
1829

1930
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2031

api-reference/beta/resources/protectionrulebase.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "protectionRuleBase resource type"
3-
description: "Describes Protection Rule and its properties "
3+
description: "Represents a protection rule specified by the client as part of a protection plan applied to Microsoft 365 data in an organization. "
44
author: "tushar20"
55
ms.reviewer: "manikantsinghms"
66
ms.localizationpriority: medium
@@ -21,6 +21,12 @@ Protection rules can be static or dynamic, which means that the rules can run on
2121

2222
This abstract type is the base type for [siteProtectionRule](../resources/siteprotectionrule.md), [mailboxProtectionRule](../resources/mailboxprotectionrule.md), and [driveProtectionRule](../resources/driveprotectionrule.md).
2323

24+
The following limitations apply to this resource:
25+
26+
- The protection rule APIs for bulk addition of sites via site names or URL in the backup policy creation workflow can accommodate a maximum of 10 keywords at a time. Each keyword can have a minimum of three characters and a maximum of 255 characters.
27+
- The protection rule APIs for bulk addition of user accounts via security groups or distribution lists can accommodate a maximum of three groups at a time.
28+
- The rules are static and applied one time only. That is, the security groups or distribution lists are flattened at the time they're added to the backup configuration policy. For example, groups or lists aren't dynamically updated in the system if users are added or removed from the original security group.
29+
2430
## Properties
2531

2632
|Property|Type|Description|

api-reference/beta/resources/protectionunitbase.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "protectionUnitBase resource type"
3-
description: "Represents a site, drive, or mailbox that is protected by a protection policy."
3+
description: "Represents a site, drive, or mailbox that's protected by a protection policy."
44
author: "tushar20"
55
ms.reviewer: "manikantsinghms"
66
ms.localizationpriority: medium
@@ -15,7 +15,7 @@ Namespace: microsoft.graph
1515

1616
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1717

18-
Represents a site, drive, or mailbox that's protected by a [protection policy](protectionpolicybase.md).
18+
Represents a site, drive, or mailbox that's protected by a [protection policy](protectionpolicybase.md). All the protection units in a protection policy have the same retention period by default.
1919

2020
This resource is an abstract type.
2121

api-reference/beta/resources/restorepoint.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ Namespace: microsoft.graph
1616

1717
Represents the date and time when an [artifact](../resources/restoreartifactbase.md) is protected by a [protectionPolicy](../resources/protectionpolicybase.md) and can be restored.
1818

19+
The following limitations apply to this API:
20+
21+
- When sites or mailboxes are added to a backup policy, it might take up to 15 minutes per 1,000 sites or mailboxes for restore points to become available.
22+
- Although OneDrive account and mailbox backups of deleted users are maintained and restorable after the user’s Microsoft Entra ID is deleted, the user is displayed as an empty user in results.
23+
1924
## Methods
2025

2126
|Method|Return type|Description|

api-reference/beta/resources/restoresessionbase.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ Namespace: microsoft.graph
1515

1616
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1717

18-
Represents a restore session for a [protection unit](protectionunitbase.md) that's protected by a [protection policy](protectionpolicybase.md). APIs are used by Global Admin or SharePoint Online Admin for SharePoint Online/OneDrive & Exchange Online Admin for Exchange Online to perform restore related tasks on artifacts that are protected as part of Protection Policy.
18+
Represents a restore session for a [protection unit](protectionunitbase.md) that's protected by a [protection policy](protectionpolicybase.md). Restore session APIs are used by global admins, SharePoint Online admins, and Exchange Online admins to perform restore-related tasks on artifacts that are protected as part of protection policy.
19+
20+
Restoring to both a new location and the same URL in a single restore session is not supported.
1921

2022
## Methods
2123

api-reference/beta/resources/sharepointprotectionpolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Namespace: microsoft.graph
1515

1616
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1717

18-
Represents a plan defined by the SharePoint Online Admin to protect SharePoint Online, including what data to protect, when to protect it, and for what time period to retain the protected data.
18+
Represents a plan defined by the SharePoint Online admin to protect SharePoint Online, including what data to protect, when to protect it, and for what time period to retain the protected data. Currently, policies are supported only for SharePoint Online sites in the main geolocation only; multi-geo tenants aren't supported.
1919

2020
Inherits from [protectionPolicyBase](../resources/protectionpolicybase.md).
2121

0 commit comments

Comments
 (0)