Skip to content

Commit a732f35

Browse files
LauragraLauragra
authored
Merge pull request #23085 from microsoftgraph/guoan/crossRegionDR
[CloudPC] Add CrossRegionDisasterRecoverySetting in UserSetting
2 parents a49986e + b751b2b commit a732f35

11 files changed

+249
-4
lines changed

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
title: "cloudPcCrossRegionDisasterRecoverySetting resource type"
3+
description: "Represents the settings for cross-region disaster recovery on a Cloud PC."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
toc.title: Cloud PC cross-region disaster recovery setting
9+
---
10+
11+
# cloudPcCrossRegionDisasterRecoverySetting resource type
12+
13+
Namespace: microsoft.graph
14+
15+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
16+
17+
Represents the settings for cross-region disaster recovery on a Cloud PC.
18+
19+
## Properties
20+
21+
|Property|Type|Description|
22+
|:---|:---|:---|
23+
|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`.|
24+
|disasterRecoveryNetworkSetting|[cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md)|Indicates the network settings of the Cloud PC during a cross-region disaster recovery operation.|
25+
|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`.|
26+
27+
## Relationships
28+
29+
None.
30+
31+
## JSON representation
32+
33+
The following JSON representation shows the resource type.
34+
<!-- {
35+
"blockType": "resource",
36+
"@odata.type": "microsoft.graph.cloudPcCrossRegionDisasterRecoverySetting"
37+
}
38+
-->
39+
40+
``` json
41+
{
42+
"@odata.type": "#microsoft.graph.cloudPcRestorePointSetting",
43+
"crossRegionDisasterRecoveryEnabled": "Boolean",
44+
"disasterRecoveryNetworkSetting": {"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"},
45+
"maintainCrossRegionRestorePointEnabled": "Boolean"
46+
}
47+
```

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
title: "cloudPcDisasterRecoveryAzureConnectionSetting resource type"
3+
description: "Represents the Azure network connection configuration of backup Cloud PCs provisioned for cross-region disaster recovery."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
---
9+
10+
# cloudPcDisasterRecoveryAzureConnectionSetting resource type
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Represents the Azure network connection configuration of backup Cloud PCs provisioned for cross-region disaster recovery.
17+
18+
Inherits from [cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md).
19+
20+
## Properties
21+
22+
|Property|Type|Description|
23+
|:---|:---|:---|
24+
|onPremisesConnectionId|String|Indicates the unique ID of the virtual network that the new Cloud PC joins.|
25+
26+
## Relationships
27+
28+
None.
29+
30+
## JSON representation
31+
32+
The following JSON representation shows the resource type.
33+
<!-- {
34+
"blockType": "resource",
35+
"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryAzureConnectionSetting"
36+
}
37+
-->
38+
39+
``` json
40+
{
41+
"@odata.type": "#microsoft.graph.cloudPcDisasterRecoveryAzureConnectionSetting",
42+
"onPremisesConnectionId": "String"
43+
}
44+
```

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
title: "cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting resource type"
3+
description: "Represents the configuration of Microsoft-hosted network for backup Cloud PCs provisioned for cross-region disaster recovery."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
---
9+
10+
# cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting resource type
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Represents the configuration of Microsoft-hosted network for backup Cloud PCs provisioned for cross-region disaster recovery.
17+
18+
Inherits from [cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md).
19+
20+
## Properties
21+
22+
|Property|Type|Description|
23+
|:---|:---|:---|
24+
|regionGroup|[cloudPcRegionGroup](../resources/cloudpcsupportedregion.md#cloudpcregiongroup-values)|Indicates the logic geographic group this region belongs to. Multiple regions can belong to one region group. When a region group is configured for disaster recovery, the new Cloud PC is assigned to one of the regions within the group based on resource availability. For example, the `europeUnion` region group contains the North Europe and West Europe regions. Possible values are: `default`, `australia`, `canada`, `usCentral`, `usEast`, `usWest`, `france`, `germany`, `europeUnion`, `unitedKingdom`, `japan`, `asia`, `india`, `southAmerica`, `euap`, `usGovernment`, `usGovernmentDOD`, `unknownFutureValue`, `norway`, `switzerland`，`southKorea`. You must use the `Prefer: include-unknown-enum-members` request header to get the following values in this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `norway`, `switzerland`，`southKorea`.|
25+
|regionName|String|Indicates the Azure region that the new Cloud PC is assigned to. The Windows 365 service creates and manages the underlying virtual network.|
26+
27+
## Relationships
28+
29+
None.
30+
31+
## JSON representation
32+
33+
The following JSON representation shows the resource type.
34+
<!-- {
35+
"blockType": "resource",
36+
"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting"
37+
}
38+
-->
39+
40+
``` json
41+
{
42+
"@odata.type": "#microsoft.graph.cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting",
43+
"regionGroup": "String",
44+
"regionName": "String"
45+
}
46+
```

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
title: "cloudPcDisasterRecoveryNetworkSetting resource type"
3+
description: "An abstract type that represents the network configuration of backup Cloud PCs provisioned for cross-region disaster recovery."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
---
9+
10+
# cloudPcDisasterRecoveryNetworkSetting resource type
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
An abstract type that represents the network configuration of backup Cloud PCs provisioned for cross-region disaster recovery.
17+
18+
Base type of [cloudPcDisasterRecoveryAzureConnectionSetting](../resources/cloudpcdisasterrecoveryazureconnectionsetting.md) and [cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting](../resources/cloudpcdisasterrecoverymicrosofthostednetworksetting.md)
19+
20+
## Properties
21+
22+
None.
23+
24+
## Relationships
25+
26+
None.
27+
28+
## JSON representation
29+
30+
The following JSON representation shows the resource type.
31+
<!-- {
32+
"blockType": "resource",
33+
"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"
34+
}
35+
-->
36+
37+
``` json
38+
{
39+
"@odata.type": "#microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"
40+
}
41+
```

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ Represents a Cloud PC user setting.
2929
|Property|Type|Description|
3030
|:---|:---|:---|
3131
|createdDateTime|DateTimeOffset|The date and time the setting was created. 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 looks like this: '2014-01-01T00:00:00Z'. |
32+
|crossRegionDisasterRecoverySetting|[cloudPcCrossRegionDisasterRecoverySetting](../resources/cloudpccrossregiondisasterrecoverysetting.md)|Defines whether the user's Cloud PC enables cross-region disaster recovery and specifies the network for the disaster recovery.|
3233
|displayName|String|The setting name displayed in the user interface. |
3334
|id|String|Unique identifier for the Cloud PC user setting. Read-only.|
3435
|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 looks like this: '2014-01-01T00:00:00Z'. |
3536
|localAdminEnabled|Boolean|Indicates whether the local admin option is enabled. Default value is `false`. To enable the local admin option, change the setting to `true`. If the local admin option is enabled, the end user can be an admin of the Cloud PC device. |
36-
|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`. |
37+
|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 isn't allowed. The default value is `false`. |
3738
|restorePointSetting|[cloudPcRestorePointSetting](../resources/cloudpcrestorepointsetting.md)|Defines how frequently a restore point is created that is, a snapshot is taken) for users' provisioned Cloud PCs (default is 12 hours), and whether the user is allowed to restore their own Cloud PCs to a backup made at a specific point in time.|
3839
|selfServiceEnabled (deprecated)|Boolean|Indicates whether the self-service option is enabled. Default value is `false`. To enable the self-service option, change the setting to `true`. If the self-service option is enabled, the end user is allowed to perform some self-service operations, such as upgrading the Cloud PC through the end user portal. The **selfServiceEnabled** property is deprecated and will stop returning data on December 1, 2023.|
3940

@@ -55,6 +56,7 @@ The following JSON representation shows the resource type.
5556
{
5657
"@odata.type": "#microsoft.graph.cloudPcUserSetting",
5758
"createdDateTime": "String (timestamp)",
59+
"crossRegionDisasterRecoverySetting": {"@odata.type": "microsoft.graph.cloudPcCrossRegionDisasterRecoverySetting"},
5860
"displayName": "String",
5961
"id": "String (identifier)",
6062
"lastModifiedDateTime": "String (timestamp)",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ author: "RuiHou105"
55
ms.localizationpriority: medium
66
ms.subservice: "cloud-pc"
77
doc_type: resourcePageType
8+
toc.title: Cloud PC Windows setting
89
---
910

1011
# cloudPcWindowsSetting resource type

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ author: "RuiHou105"
55
ms.localizationpriority: medium
66
ms.subservice: "cloud-pc"
77
doc_type: resourcePageType
8+
toc.title: Cloud PC Windows settings
89
---
910

1011
# cloudPcWindowsSettings resource type

‎api-reference/beta/toc/device-and-app-management/toc.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,14 @@ items:
438438
href: ../../resources/cloudpcconnectivityevent.md
439439
- name: Cloud PC connectivity result
440440
href: ../../resources/cloudpcconnectivityresult.md
441+
- name: Cloud PC cross-region disaster recovery setting
442+
href: ../../resources/cloudpccrossregiondisasterrecoverysetting.md
443+
- name: Cloud PC disaster recovery Azure connection setting
444+
href: ../../resources/cloudpcdisasterrecoveryazureconnectionsetting.md
445+
- name: Cloud PC disaster recovery Microsoft hosted network setting
446+
href: ../../resources/cloudpcdisasterrecoverymicrosofthostednetworksetting.md
447+
- name: Cloud PC disaster recovery network setting
448+
href: ../../resources/cloudpcdisasterrecoverynetworksetting.md
441449
- name: Cloud PC domain join configuration
442450
href: ../../resources/cloudpcdomainjoinconfiguration.md
443451
- name: Cloud PC forensic storage account
@@ -482,9 +490,9 @@ items:
482490
href: ../../resources/cloudpcuserrolescopetaginfo.md
483491
- name: Cloud PC user setting assignment
484492
href: ../../resources/cloudpcusersettingassignment.md
485-
- name: Cloud PC windows setting
493+
- name: Cloud PC Windows setting
486494
href: ../../resources/cloudpcwindowssetting.md
487-
- name: Cloud PC windows settings
495+
- name: Cloud PC Windows settings
488496
href: ../../resources/cloudpcwindowssettings.md
489497
- name: Key value pair
490498
href: ../../resources/keyvaluepair.md

‎api-reference/beta/toc/toc.mapping.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,10 @@
426426
"cloudPcBulkRemoteActionResult",
427427
"cloudPcConnectivityEvent",
428428
"cloudPcConnectivityResult",
429+
"cloudPcCrossRegionDisasterRecoverySetting",
430+
"cloudPcDisasterRecoveryAzureConnectionSetting",
431+
"cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting",
432+
"cloudPcDisasterRecoveryNetworkSetting",
429433
"cloudPcDomainJoinConfiguration",
430434
"cloudPcForensicStorageAccount",
431435
"cloudPcHealthCheckItem",

‎changelog/Microsoft.CloudManagedDesktop.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,56 @@
290290
"WorkloadArea": "Device and app management",
291291
"SubArea": "Cloud PC"
292292
},
293+
{
294+
"ChangeList": [
295+
{
296+
"Id": "9cbdf346-f050-4ca6-bb06-64ceb8146547",
297+
"ApiChange": "Property",
298+
"ChangedApiName": "crossRegionDisasterRecoverySetting",
299+
"ChangeType": "Addition",
300+
"Description": "Added the **crossRegionDisasterRecoverySetting** property to the [cloudPcUserSetting](https://learn.microsoft.com/en-us/graph/api/resources/cloudpcusersetting?view=graph-rest-beta) resource.",
301+
"Target": "cloudPcUserSetting"
302+
},
303+
{
304+
"Id": "9cbdf346-f050-4ca6-bb06-64ceb8146547",
305+
"ApiChange": "Resource",
306+
"ChangedApiName": "cloudPcCrossRegionDisasterRecoverySetting",
307+
"ChangeType": "Addition",
308+
"Description": "Added the [cloudPcCrossRegionDisasterRecoverySetting](https://learn.microsoft.com/en-us/graph/api/resources/cloudPcCrossRegionDisasterRecoverySetting?view=graph-rest-beta) resource type.",
309+
"Target": "cloudPcCrossRegionDisasterRecoverySetting"
310+
},
311+
{
312+
"Id": "9cbdf346-f050-4ca6-bb06-64ceb8146547",
313+
"ApiChange": "Resource",
314+
"ChangedApiName": "cloudPcDisasterRecoveryAzureConnectionSetting",
315+
"ChangeType": "Addition",
316+
"Description": "Added the [cloudPcDisasterRecoveryAzureConnectionSetting](https://learn.microsoft.com/en-us/graph/api/resources/cloudPcDisasterRecoveryAzureConnectionSetting?view=graph-rest-beta) resource type.",
317+
"Target": "cloudPcDisasterRecoveryAzureConnectionSetting"
318+
},
319+
{
320+
"Id": "9cbdf346-f050-4ca6-bb06-64ceb8146547",
321+
"ApiChange": "Resource",
322+
"ChangedApiName": "cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting",
323+
"ChangeType": "Addition",
324+
"Description": "Added the [cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting](https://learn.microsoft.com/en-us/graph/api/resources/cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting?view=graph-rest-beta) resource type.",
325+
"Target": "cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting"
326+
},
327+
{
328+
"Id": "9cbdf346-f050-4ca6-bb06-64ceb8146547",
329+
"ApiChange": "Resource",
330+
"ChangedApiName": "cloudPcDisasterRecoveryNetworkSetting",
331+
"ChangeType": "Addition",
332+
"Description": "Added the [cloudPcDisasterRecoveryNetworkSetting](https://learn.microsoft.com/en-us/graph/api/resources/cloudPcDisasterRecoveryNetworkSetting?view=graph-rest-beta) resource type.",
333+
"Target": "cloudPcDisasterRecoveryNetworkSetting"
334+
}
335+
],
336+
"Id": "9cbdf346-f050-4ca6-bb06-64ceb8146547",
337+
"Cloud": "Prod",
338+
"Version": "beta",
339+
"CreatedDateTime": "2024-08-29T02:11:25.5385096Z",
340+
"WorkloadArea": "Device and app management",
341+
"SubArea": "Cloud PC"
342+
},
293343
{
294344
"ChangeList": [
295345
{

0 commit comments

Comments
 (0)