Skip to content

Commit 8829364

Browse files
mnorman-msmnorman-ms
authored
Merge branch 'main' into mwahl-em-rr-noid
2 parents 64a1af0 + 8d968c5 commit 8829364

9 files changed

+190
-84
lines changed

‎api-reference/beta/api/cloudpcusersetting-get.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "AshleyYangSZ"
55
ms.localizationpriority: medium
66
ms.subservice: "cloud-pc"
77
doc_type: apiPageType
8-
ms.date: 04/05/2024
8+
ms.date: 12/04/2024
99
---
1010

1111
# Get cloudPcUserSetting
@@ -129,6 +129,15 @@ Content-Type: application/json
129129
"frequencyType": "sixteenHours",
130130
"userRestoreEnabled": true
131131
},
132+
"crossRegionDisasterRecoverySetting": {
133+
"crossRegionDisasterRecoveryEnabled": true,
134+
"maintainCrossRegionRestorePointEnabled": true,
135+
"disasterRecoveryNetworkSetting": {
136+
"regionName": "westus",
137+
"regionGroup": "usEast"
138+
},
139+
"disasterRecoveryType": "premium"
140+
},
132141
"lastModifiedDateTime": "2021-02-01T10:29:57Z",
133142
"createdDateTime": "2021-02-01T10:29:57Z"
134143
}
@@ -210,6 +219,15 @@ Content-Type: application/json
210219
"frequencyType": "sixteenHours",
211220
"userRestoreEnabled": true
212221
},
222+
"crossRegionDisasterRecoverySetting": {
223+
"crossRegionDisasterRecoveryEnabled": true,
224+
"maintainCrossRegionRestorePointEnabled": true,
225+
"disasterRecoveryNetworkSetting": {
226+
"regionName": "westus",
227+
"regionGroup": "usEast"
228+
},
229+
"disasterRecoveryType": "premium"
230+
},
213231
"lastModifiedDateTime": "2021-02-01T10:29:57Z",
214232
"createdDateTime": "2021-02-01T10:29:57Z",
215233
"assignments": [

‎api-reference/beta/api/cloudpcusersetting-update.md

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "AshleyYangSZ"
55
ms.localizationpriority: medium
66
ms.subservice: "cloud-pc"
77
doc_type: apiPageType
8-
ms.date: 04/05/2024
8+
ms.date: 12/04/2024
99
---
1010

1111
# Update cloudPcUserSetting
@@ -51,7 +51,8 @@ The following table shows the properties that are required when you update the [
5151

5252
|Property|Type|Description|
5353
|:---|:---|:---|
54-
|displayName|String|The setting name displayed in the user interface.|
54+
|crossRegionDisasterRecoverySetting |[cloudPcCrossRegionDisasterRecoverySetting](../resources/cloudpccrossregiondisasterrecoverysetting.md)|Indicates cross-region disaster recovery settings for the user's Cloud PC.|
55+
|displayName|String|The setting name displayed in the user interface. |
5556
|lastModifiedDateTime|DateTimeOffset|The last date and time the setting was modified. The timestamp type represents the date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. |
5657
|localAdminEnabled|Boolean|To turn on the local admin option, change this setting to `true`.|
5758
|resetEnabled|Boolean|Indicates whether an end user is allowed to reset their Cloud PC. When `true`, the user is allowed to reset their Cloud PC. When `false`, end-user initiated reset is not allowed. The default value is `false`. |
@@ -60,15 +61,14 @@ The following table shows the properties that are required when you update the [
6061

6162
## Response
6263

63-
If successful, this method returns a `200 OK` response code and an updated [cloudPcUserSetting](../resources/cloudpcusersetting.md) object in the response body.
64+
If successful, this method returns a `204 No Content` response code and an updated [cloudPcUserSetting](../resources/cloudpcusersetting.md) object in the response body.
6465

6566
## Examples
6667

6768
### Request
6869

6970
The following example shows a request.
7071

71-
# [HTTP](#tab/http)
7272
<!-- {
7373
"blockType": "request",
7474
"name": "update_cloudpcusersetting"
@@ -87,45 +87,20 @@ Content-Type: application/json
8787
"frequencyType": "sixteenHours",
8888
"userRestoreEnabled": true
8989
},
90+
"crossRegionDisasterRecoverySetting": {
91+
"crossRegionDisasterRecoveryEnabled": true,
92+
"maintainCrossRegionRestorePointEnabled": true,
93+
"disasterRecoveryNetworkSetting": {
94+
"regionName": "westus",
95+
"regionGroup": "usEast"
96+
},
97+
"disasterRecoveryType": "premium"
98+
},
9099
"localAdminEnabled": false,
91100
"resetEnabled": true
92101
}
93102
```
94103

95-
# [C#](#tab/csharp)
96-
[!INCLUDE [sample-code](../includes/snippets/csharp/update-cloudpcusersetting-csharp-snippets.md)]
97-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
98-
99-
# [CLI](#tab/cli)
100-
[!INCLUDE [sample-code](../includes/snippets/cli/update-cloudpcusersetting-cli-snippets.md)]
101-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
102-
103-
# [Go](#tab/go)
104-
[!INCLUDE [sample-code](../includes/snippets/go/update-cloudpcusersetting-go-snippets.md)]
105-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
106-
107-
# [Java](#tab/java)
108-
[!INCLUDE [sample-code](../includes/snippets/java/update-cloudpcusersetting-java-snippets.md)]
109-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
110-
111-
# [JavaScript](#tab/javascript)
112-
[!INCLUDE [sample-code](../includes/snippets/javascript/update-cloudpcusersetting-javascript-snippets.md)]
113-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
114-
115-
# [PHP](#tab/php)
116-
[!INCLUDE [sample-code](../includes/snippets/php/update-cloudpcusersetting-php-snippets.md)]
117-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
118-
119-
# [PowerShell](#tab/powershell)
120-
[!INCLUDE [sample-code](../includes/snippets/powershell/update-cloudpcusersetting-powershell-snippets.md)]
121-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
122-
123-
# [Python](#tab/python)
124-
[!INCLUDE [sample-code](../includes/snippets/python/update-cloudpcusersetting-python-snippets.md)]
125-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
126-
127-
---
128-
129104
### Response
130105

131106
The following example shows the response.

‎api-reference/beta/api/security-ediscoverysearch-post-additionalsources.md

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ You can specify the following properties when you create a **dataSource**.
5656
If successful, this method returns a `201 Created` and a [microsoft.graph.security.dataSource](../resources/security-datasource.md) object in the response body.
5757

5858
## Examples
59-
60-
### Request
61-
The following example shows a request.
59+
### Example 1: Create an additional eDiscovery source from a site source
60+
#### Request
61+
The following example shows a request that creates an eDiscovery source from a site source.
6262

6363
# [HTTP](#tab/http)
6464
<!-- {
@@ -111,7 +111,7 @@ POST https://graph.microsoft.com/beta/security/cases/ediscoveryCases/{ediscovery
111111

112112
---
113113

114-
### Response
114+
#### Response
115115
The following example shows the response.
116116
>**Note:** The response object shown here might be shortened for readability.
117117
<!-- {
@@ -140,3 +140,42 @@ HTTP/1.1 201 Created
140140
}
141141
}
142142
```
143+
### Example 2: Create an additional eDiscovery source from a user source
144+
### Request
145+
The following example shows a request that creates an eDiscovery source from a user source.
146+
147+
```
148+
POST https://graph.microsoft.com/beta/security/cases/ediscoveryCases/17011798-ca63-4282-9cb3-0086f1042bfc/searches/2f5cc5a6-9728-4ba0-acfa-edce25e91244/additionalSources
149+
150+
{
151+
"@odata.type": "microsoft.graph.security.userSource",
152+
"email": "admin@edbig.onmicrosoft.com"
153+
}
154+
```
155+
#### Response
156+
157+
The following example shows the response.
158+
159+
``` http
160+
HTTP/1.1 200 Created
161+
162+
{
163+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#security/cases/ediscoveryCases('17011798-ca63-4282-9cb3-0086f1042bfc')/searches('2f5cc5a6-9728-4ba0-acfa-edce25e91244')/additionalSources/$entity",
164+
"@odata.type": "#microsoft.graph.security.userSource",
165+
"displayName": "eDisco Big",
166+
"createdDateTime": "2024-11-19T20:11:11.5950513Z",
167+
"holdStatus": "0",
168+
"id": "5933247d-7011-494d-b9a6-65a3870d88fa",
169+
"email": "admin@edbig.onmicrosoft.com",
170+
"includedSources": "mailbox,site",
171+
"siteWebUrl": "https://edbig-my.sharepoint.com/personal/admin_edbig_onmicrosoft_com",
172+
"createdBy": {
173+
"application": null,
174+
"user": {
175+
"id": null,
176+
"displayName": null
177+
}
178+
}
179+
}
180+
```
181+

‎api-reference/beta/api/virtualendpoint-list-usersettings.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ author: "AshleyYangSZ"
55
ms.localizationpriority: medium
66
ms.subservice: "cloud-pc"
77
doc_type: apiPageType
8+
ms.date: 12/04/2024
89
---
910

1011
# List userSettings
@@ -126,6 +127,15 @@ Content-Type: application/json
126127
"frequencyInHours": 16,
127128
"userRestoreEnabled": true
128129
},
130+
"crossRegionDisasterRecoverySetting": {
131+
"crossRegionDisasterRecoveryEnabled": true,
132+
"maintainCrossRegionRestorePointEnabled": true,
133+
"disasterRecoveryNetworkSetting": {
134+
"regionName": "westus",
135+
"regionGroup": "usEast"
136+
},
137+
"disasterRecoveryType": "premium"
138+
},
129139
"lastModifiedDateTime": "2021-02-01T10:29:57Z",
130140
"createdDateTime": "2021-02-01T10:29:57Z"
131141
}

‎api-reference/beta/api/virtualendpoint-post-usersettings.md

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "AshleyYangSZ"
55
ms.localizationpriority: medium
66
ms.subservice: "cloud-pc"
77
doc_type: apiPageType
8-
ms.date: 04/05/2024
8+
ms.date: 12/04/2024
99
---
1010

1111
# Create cloudPcUserSetting
@@ -51,6 +51,7 @@ The following table lists the properties that are required when you create the [
5151

5252
|Property|Type|Description|
5353
|:---|:---|:---|
54+
|crossRegionDisasterRecoverySetting |[cloudPcCrossRegionDisasterRecoverySetting](../resources/cloudpccrossregiondisasterrecoverysetting.md)|Indicates cross-region disaster recovery settings for the user's Cloud PC.|
5455
|displayName|String|The setting name as it appears in the UI. |
5556
|lastModifiedDateTime|DateTimeOffset|The last date and time the setting was modified. The timestamp type represents the date and time information using ISO 8601 format and is always in UTC. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. |
5657
|localAdminEnabled|Boolean|To turn on the local admin option, change this setting to `true`.  |
@@ -67,7 +68,6 @@ If successful, this method returns a `201 Created` response code and a [cloudPcU
6768

6869
The following example shows a request.
6970

70-
# [HTTP](#tab/http)
7171
<!-- {
7272
"blockType": "request",
7373
"name": "create_cloudpcusersetting_from_"
@@ -82,6 +82,15 @@ Content-Type: application/json
8282
"displayName": "Example",
8383
"selfServiceEnabled": false,
8484
"localAdminEnabled": true,
85+
"crossRegionDisasterRecoverySetting": {
86+
"crossRegionDisasterRecoveryEnabled": true,
87+
"maintainCrossRegionRestorePointEnabled": true,
88+
"disasterRecoveryNetworkSetting": {
89+
"regionName": "westus",
90+
"regionGroup": "usEast"
91+
},
92+
"disasterRecoveryType": "premium"
93+
},
8594
"restorePointSetting": {
8695
"frequencyInHours": 16,
8796
"frequencyType": "sixteenHours",
@@ -90,40 +99,6 @@ Content-Type: application/json
9099
}
91100
```
92101

93-
# [C#](#tab/csharp)
94-
[!INCLUDE [sample-code](../includes/snippets/csharp/create-cloudpcusersetting-from--csharp-snippets.md)]
95-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96-
97-
# [CLI](#tab/cli)
98-
[!INCLUDE [sample-code](../includes/snippets/cli/create-cloudpcusersetting-from--cli-snippets.md)]
99-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
100-
101-
# [Go](#tab/go)
102-
[!INCLUDE [sample-code](../includes/snippets/go/create-cloudpcusersetting-from--go-snippets.md)]
103-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
104-
105-
# [Java](#tab/java)
106-
[!INCLUDE [sample-code](../includes/snippets/java/create-cloudpcusersetting-from--java-snippets.md)]
107-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
108-
109-
# [JavaScript](#tab/javascript)
110-
[!INCLUDE [sample-code](../includes/snippets/javascript/create-cloudpcusersetting-from--javascript-snippets.md)]
111-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
112-
113-
# [PHP](#tab/php)
114-
[!INCLUDE [sample-code](../includes/snippets/php/create-cloudpcusersetting-from--php-snippets.md)]
115-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
116-
117-
# [PowerShell](#tab/powershell)
118-
[!INCLUDE [sample-code](../includes/snippets/powershell/create-cloudpcusersetting-from--powershell-snippets.md)]
119-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
120-
121-
# [Python](#tab/python)
122-
[!INCLUDE [sample-code](../includes/snippets/python/create-cloudpcusersetting-from--python-snippets.md)]
123-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
124-
125-
---
126-
127102
### Response
128103
The following example shows the response.
129104
>**Note:** The response object shown here might be shortened for readability.
@@ -143,6 +118,15 @@ Content-Type: application/json
143118
"displayName": "Example",
144119
"selfServiceEnabled": false,
145120
"localAdminEnabled": true,
121+
"crossRegionDisasterRecoverySetting": {
122+
"crossRegionDisasterRecoveryEnabled": true,
123+
"maintainCrossRegionRestorePointEnabled": true,
124+
"disasterRecoveryNetworkSetting": {
125+
"regionName": "westus",
126+
"regionGroup": "usEast"
127+
},
128+
"disasterRecoveryType": "premium"
129+
},
146130
"restorePointSetting": {
147131
"frequencyInHours": 16,
148132
"frequencyType": "sixteenHours",

‎api-reference/beta/resources/cloudpccrossregiondisasterrecoverysetting.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,18 @@ Represents the settings for cross-region disaster recovery on a Cloud PC.
2323
|:---|:---|:---|
2424
|crossRegionDisasterRecoveryEnabled|Boolean|`True` if an end user is allowed to set up cross-region disaster recovery for Cloud PC; otherwise, `false`. The default value is `false`.|
2525
|disasterRecoveryNetworkSetting|[cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md)|Indicates the network settings of the Cloud PC during a cross-region disaster recovery operation.|
26+
|disasterRecoveryType|[cloudPcDisasterRecoveryType](#cloudpcdisasterrecoverytype-values)|Indicates the type of disaster recovery to perform when a disaster occurs on the user's Cloud PC. The possible values are: `notConfigured`, `crossRegion`, `premium`, `unknownFutureValue`. The default value is `notConfigured`.|
2627
|maintainCrossRegionRestorePointEnabled|Boolean|Indicates whether Windows 365 maintain the cross-region disaster recovery function generated restore points. If `true`, the Windows 365 stored restore points; `false` indicates that Windows 365 doesn't generate or keep the restore point from the original Cloud PC. If a disaster occurs, the new Cloud PC can only be provisioned using the initial image. This limitation can result in the loss of some user data on the original Cloud PC. The default value is `false`.|
2728

29+
### cloudPcDisasterRecoveryType values
30+
31+
| Value | Description |
32+
|:-------------------|:-------------------------------------------------------------------------------------------------------|
33+
| notConfigured | Default. Indicates that the administrator didn't set up the Cloud PC disaster recovery functionality. |
34+
| crossRegion | Indicates that the administrator set up the Cloud PC cross-region disaster recovery functionality. |
35+
| premium | Indicates that the administrator set up the Cloud PC premium disaster recovery functionality. |
36+
| unknownFutureValue | Evolvable enumeration sentinel value. Don't use. |
37+
2838
## Relationships
2939

3040
None.
@@ -40,9 +50,10 @@ The following JSON representation shows the resource type.
4050

4151
``` json
4252
{
43-
"@odata.type": "#microsoft.graph.cloudPcRestorePointSetting",
53+
"@odata.type": "#microsoft.graph.cloudPcCrossRegionDisasterRecoverySetting",
4454
"crossRegionDisasterRecoveryEnabled": "Boolean",
4555
"disasterRecoveryNetworkSetting": {"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"},
56+
"disasterRecoveryType": "String",
4657
"maintainCrossRegionRestorePointEnabled": "Boolean"
4758
}
4859
```

0 commit comments

Comments
 (0)