Skip to content

Commit fbcb6aa

Browse files
authored
Merge pull request #25686 from microsoftgraph/main
Merge to publish.
2 parents d8a18a2 + 0b59f07 commit fbcb6aa

12 files changed

+39
-61
lines changed

api-reference/beta/resources/devicemanagement-alertrule.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ For more information, see the [monitoring](devicemanagement-monitoring.md) resou
3232

3333
|Property|Type|Description|
3434
|:---|:---|:---|
35-
|alertRuleTemplate|[microsoft.graph.deviceManagement.alertRuleTemplate](#alertruletemplate-values)|The rule template of the alert event. The possible values are: `cloudPcProvisionScenario`, `cloudPcImageUploadScenario`, `cloudPcOnPremiseNetworkConnectionCheckScenario`, `cloudPcInGracePeriodScenario`, `cloudPcFrontlineInsufficientLicensesScenario`, `cloudPcInaccessibleScenario`. You must use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `cloudPcInGracePeriodScenario`.|
35+
|alertRuleTemplate|[microsoft.graph.deviceManagement.alertRuleTemplate](#alertruletemplate-values)|The rule template of the alert event. The possible values are: `cloudPcProvisionScenario`, `cloudPcImageUploadScenario`, `cloudPcOnPremiseNetworkConnectionCheckScenario`, `cloudPcInGracePeriodScenario`, `cloudPcFrontlineInsufficientLicensesScenario`, `cloudPcInaccessibleScenario`. Note that you must use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `cloudPcInGracePeriodScenario`.|
3636
|description|String|The rule description.|
3737
|displayName|String|The display name of the rule.|
3838
|enabled|Boolean|The status of the rule that indicates whether the rule is enabled or disabled. If `true`, the rule is enabled; otherwise, the rule is disabled.|
@@ -50,11 +50,10 @@ For more information, see the [monitoring](devicemanagement-monitoring.md) resou
5050
|cloudPcProvisionScenario|The alert rule was triggered for an issue with the Cloud PC provisioning. For a system rule, the alert rule was triggered for a Cloud PC provisioning failure.|
5151
|cloudPcImageUploadScenario|The alert rule was triggered for an issue with the process to upload the Cloud PC image. For a system rule, the alert rule was triggered for a failure to upload the Cloud PC image.|
5252
|cloudPcOnPremiseNetworkConnectionCheckScenario|The alert rule was triggered for an issue with the on-premises network connection check. For a system rule, the alert rule was triggered for a failure with the on-premises network connection.|
53-
|unknownFutureValue|Evolvable enumeration sentinel value. Don't use.|
53+
|unknownFutureValue|Evolvable enumeration sentinel value. Do not use.|
5454
|cloudPcInGracePeriodScenario |The alert rule was triggered when the Cloud PC entered the grace period.|
5555
|cloudPcFrontlineInsufficientLicensesScenario| The alert rule was triggered for the Frontline Cloud PCs where more concurrent Cloud PC connections were active than the concurrency limit allows.|
5656
|cloudPcInaccessibleScenario| The alert rule was triggered when Cloud PCs couldn't connect due to host health failure, connection errors, or a zone outage. Alternatively, because they were under provisioning or restoring device status.|
57-
|cloudPcFrontlineBufferUsageScenario| The alert rule was triggered for the Frontline Cloud PCs buffer usage when the buffer is used over the time limit or the count limit. When the tenants use all of the frontline licenses, there's a predefined buffer time or number of licenses that allows Cloud PC users to continue to use them. This alert is triggered when tenants use all of the buffered time or licenses.|
5857

5958
### ruleSeverityType values
6059

@@ -64,7 +63,7 @@ For more information, see the [monitoring](devicemanagement-monitoring.md) resou
6463
|informational|The severity level is `informational`.|
6564
|warning|The severity level is `warning`.|
6665
|critical|The severity level is `critical`.|
67-
|unknownFutureValue|Evolvable enumeration sentinel value. Don't use.|
66+
|unknownFutureValue|Evolvable enumeration sentinel value. Do not use.|
6867

6968
## Relationships
7069

api-reference/beta/resources/devicemanagement-rulecondition.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Represents the rule conditions for an [alert rule](devicemanagement-alertrule.md
2121

2222
|Property|Type|Description|
2323
|:---|:---|:---|
24-
|relationshipType|[microsoft.graph.deviceManagement.relationshipType](#relationshiptype-values)| The relationship type. Possible values are: `and`, `or`.|
24+
|relationshipType|[microsoft.graph.deviceManagement.relationshipType](#relationshiptype-values)| The relationship type. Possible values are: `and`, `or`.|
2525
|conditionCategory|[microsoft.graph.deviceManagement.conditionCategory](#conditioncategory-values)|The property that the rule condition monitors. Possible values are: `provisionFailures`, `imageUploadFailures`, `azureNetworkConnectionCheckFailures`, `cloudPcInGracePeriod`, `frontlineInsufficientLicenses`, `cloudPcConnectionErrors`, `cloudPcHostHealthCheckFailures`, `cloudPcZoneOutage`, `unknownFutureValue`.|
2626
|aggregation|[microsoft.graph.deviceManagement.aggregationType](#aggregationtype-values)|The built-in aggregation method for the rule condition. The possible values are: `count`, `percentage`, `affectedCloudPcCount`, `affectedCloudPcPercentage`, `unknownFutureValue`.|
2727
|operator|[microsoft.graph.deviceManagement.operatorType](#operatortype-values)|The built-in operator for the rule condition. The possible values are: `greaterOrEqual`, `equal`, `greater`, `less`, `lessOrEqual`, `notEqual`, `unknownFutureValue`.|
@@ -46,9 +46,7 @@ Represents the rule conditions for an [alert rule](devicemanagement-alertrule.md
4646
|cloudPcConnectionErrors| The rule condition targets Cloud PC connection errors.|
4747
|cloudPcHostHealthCheckFailures| The rule condition targets Cloud PC host health check failures.|
4848
|cloudPcZoneOutage| The rule condition targets Cloud PC zone outage.|
49-
|unknownFutureValue| Evolvable enumeration sentinel value. Don't use.|
50-
|frontlineBufferUsageDuration| The alert rule condition targets Frontline buffer usage exceeds time duration.|
51-
|frontlineBufferUsageThreshold| The alert rule condition targets Frontline buffer usage exceeds limiting frequency.|
49+
|unknownFutureValue| Evolvable enumeration sentinel value. Do not use.|
5250

5351
### aggregationType values
5452

@@ -58,8 +56,7 @@ Represents the rule conditions for an [alert rule](devicemanagement-alertrule.md
5856
|percentage|The percentage of the items that match the rule conditions.|
5957
|affectedCloudPcCount|The total number of Cloud PCs that meet the rule conditions.|
6058
|affectedCloudPcPercentage|The percentage of Cloud PCs that meet the rule conditions.|
61-
|unknownFutureValue|Evolvable enumeration sentinel value. Don't use.|
62-
|durationInMinute| The time range during which Cloud PCs that meet the alert rule conditions are affected.|
59+
|unknownFutureValue|Evolvable enumeration sentinel value. Do not use.|
6360

6461
### operatorType values
6562

@@ -71,7 +68,7 @@ Represents the rule conditions for an [alert rule](devicemanagement-alertrule.md
7168
|less|The operator is less than the threshold target.|
7269
|lessOrEqual|The operator is less than or equal to the threshold target.|
7370
|notEqual|The operator isn't equal to the threshold target.|
74-
|unknownFutureValue|Evolvable enumeration sentinel value. Don't use.|
71+
|unknownFutureValue|Evolvable enumeration sentinel value. Do not use.|
7572

7673
## Relationships
7774

api-reference/beta/resources/identity-network-access-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,4 @@ For detailed information about licensing for different features, see [Microsoft
149149

150150
- [Implement identity standards with Microsoft Entra ID](/entra/standards/)
151151
- [Microsoft Entra ID Guide for independent software developers](/entra/architecture/guide-for-independent-software-developers)
152+
- Review the [Microsoft Entra deployment plans](/entra/architecture/deployment-plans) to help you build your plan to deploy the Microsoft Entra suite of capabilities.

api-reference/beta/resources/identitygovernance-overview.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,5 @@ Microsoft Entra ID Governance capabilities are available as part of different su
7474

7575
## Related content
7676

77-
+ [What is Microsoft Entra ID Governance?](/azure/active-directory/governance/identity-governance-overview)
78-
+ [Microsoft Entra built-in roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json)
79-
80-
81-
<!-- {
82-
"type": "#page.annotation",
83-
"description": "",
84-
"keywords": "",
85-
"section": "documentation",
86-
"suppressions": []
87-
} -->
77+
- [What is Microsoft Entra ID Governance?](/azure/active-directory/governance/identity-governance-overview)
78+
- [Plan new governance scenarios for business partners and external users](/entra/id-governance/scenarios/govern-guest-lifecycle-new-project)

api-reference/beta/resources/signin.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ The [Microsoft Entra data retention policies](/azure/active-directory/reports-mo
9191
|servicePrincipalName|String|The application name used for sign-in. This field is populated when you're signing in using an application. <br/><br/> Supports `$filter` (`eq`, `startsWith`).|
9292
|sessionLifetimePolicies|[sessionLifetimePolicy](sessionlifetimepolicy.md) collection|Any conditional access session management policies that were applied during the sign-in event.|
9393
|signInEventTypes|String collection|Indicates the category of sign in that the event represents. For user sign ins, the category can be `interactiveUser` or `nonInteractiveUser` and corresponds to the value for the **isInteractive** property on the signin resource. For managed identity sign ins, the category is `managedIdentity`. For service principal sign-ins, the category is **servicePrincipal**. Possible values are: `interactiveUser`, `nonInteractiveUser`, `servicePrincipal`, `managedIdentity`, `unknownFutureValue`. <br/><br/> Supports `$filter` (`eq`, `ne`).|
94+
|sessionId|String|Identifier of the session that was generated during the sign-in.|
9495
|signInIdentifier|String|The identification that the user provided to sign in. It can be the userPrincipalName, but is also populated when a user signs in using other identifiers.|
9596
|signInIdentifierType|signInIdentifierType|The type of sign in identifier. Possible values are: `userPrincipalName`, `phoneNumber`, `proxyAddress`, `qrCode`, `onPremisesUserPrincipalName`, `unknownFutureValue`.|
9697
|signInTokenProtectionStatus|tokenProtectionStatus|Token protection creates a cryptographically secure tie between the token and the device it's issued to. This field indicates whether the signin token was bound to the device or not. The possible values are: `none`, `bound`, `unbound`, `unknownFutureValue`.|
@@ -216,6 +217,7 @@ The following JSON representation shows the resource type.
216217
"servicePrincipalCredentialThumbprint": "String",
217218
"servicePrincipalId": "String",
218219
"servicePrincipalName": "String",
220+
"sessionId": "String",
219221
"sessionLifetimePolicies": [{"@odata.type": "microsoft.graph.sessionLifetimePolicy"}],
220222
"signInEventTypes": [
221223
"String"

api-reference/beta/resources/user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ This resource supports:
243243
| onPremisesUserPrincipalName | String | Contains the on-premises `userPrincipalName` synchronized from the on-premises directory. <br><br>Supports `$filter` (`eq`, `ne`, `not`, `ge`, `le`, `in`, `startsWith`). |
244244
| otherMails | String collection | A list of additional email addresses for the user; for example: `["bob@contoso.com", "Robert@fabrikam.com"]`.<br>NOTE: This property can't contain accent characters.<br><br>Supports `$filter` (`eq`, `not`, `ge`, `le`, `in`, `startsWith`, `endsWith`, `/$count eq 0`, `/$count ne 0`). |
245245
| passwordPolicies | String | Specifies password policies for the user. This value is an enumeration with one possible value being `DisableStrongPassword`, which allows weaker passwords than the default policy to be specified. `DisablePasswordExpiration` can also be specified. The two may be specified together; for example: `DisablePasswordExpiration, DisableStrongPassword`. For more information on the default password policies, see [Microsoft Entra password policies](/azure/active-directory/authentication/concept-sspr-policy#password-policies-that-only-apply-to-cloud-user-accounts). <br><br>Supports `$filter` (`ne`, `not`, and `eq` on `null` values).|
246-
| passwordProfile | [passwordProfile](passwordprofile.md) | Specifies the password profile for the user. The profile contains the user's password. This property is required when a user is created. The password in the profile must satisfy minimum requirements as specified by the **passwordPolicies** property. By default, a strong password is required. <br><br>Supports `$filter` (`eq`, `ne`, `not`, `in`, and `eq` on `null` values). <br><br>To update this property: <br><li> In delegated access, the calling app must be assigned the *Directory.AccessAsUser.All* delegated permission on behalf of the signed-in user. <li> In application-only access, the calling app must be assigned the *User.ReadWrite.All* (least privilege) or *Directory.ReadWrite.All* (higher privilege) application permission *and* at least the *User Administrator* [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).|
246+
| passwordProfile | [passwordProfile](passwordprofile.md) | Specifies the password profile for the user. The profile contains the user's password. This property is required when a user is created. The password in the profile must satisfy minimum requirements as specified by the **passwordPolicies** property. By default, a strong password is required. <br><br>Supports `$filter` (`eq`, `ne`, `not`, `in`, and `eq` on `null` values). <br><br>To update this property: <br><li> In delegated access, the calling app must be assigned the *User-PasswordProfile.ReadWrite.All* delegated permission on behalf of the signed-in user. <li> In application-only access, the calling app must be assigned the *User-PasswordProfile.ReadWrite.All* application permission *and* at least the *User Administrator* [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).|
247247
| pastProjects | String collection | A list for users to enumerate their past projects. <br><br>Returned only on `$select`. |
248248
| postalCode | String | The postal code for the user's postal address. The postal code is specific to the user's country/region. In the United States of America, this attribute contains the ZIP code. Maximum length is 40 characters. <br><br>Supports `$filter` (`eq`, `ne`, `not`, `ge`, `le`, `in`, `startsWith`, and `eq` on `null` values).|
249249
| preferredDataLocation | String | The preferred data location for the user. For more information, see [OneDrive Online Multi-Geo](/sharepoint/dev/solution-guidance/multigeo-introduction).|

api-reference/v1.0/resources/identity-network-access-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,4 @@ For detailed information about licensing for different features, see [Microsoft
131131

132132
- [Implement identity standards with Microsoft Entra ID](/entra/standards/)
133133
- [Microsoft Entra ID Guide for independent software developers](/entra/architecture/guide-for-independent-software-developers)
134+
- Review the [Microsoft Entra deployment plans](/entra/architecture/deployment-plans) to help you build your plan to deploy the Microsoft Entra suite of capabilities.

api-reference/v1.0/resources/identitygovernance-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ Microsoft Entra ID Governance capabilities are available as part of different su
7272

7373
## Related content
7474

75-
+ [What is Microsoft Entra ID Governance?](/azure/active-directory/governance/identity-governance-overview)
76-
+ [Microsoft Entra built-in roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json)
75+
- [What is Microsoft Entra ID Governance?](/azure/active-directory/governance/identity-governance-overview)
76+
- [Plan new governance scenarios for business partners and external users](/entra/id-governance/scenarios/govern-guest-lifecycle-new-project)
7777

api-reference/v1.0/resources/user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ This resource supports:
207207
|onPremisesUserPrincipalName|String| Contains the on-premises `userPrincipalName` synchronized from the on-premises directory. The property is only populated for customers who are synchronizing their on-premises directory to Microsoft Entra ID via Microsoft Entra Connect. Read-only. <br><br>Returned only on `$select`. Supports `$filter` (`eq`, `ne`, `not`, `ge`, `le`, `in`, `startsWith`).|
208208
|otherMails|String collection| A list of other email addresses for the user; for example: `["bob@contoso.com", "Robert@fabrikam.com"]`. <br>NOTE: This property can't contain accent characters. <br><br>Returned only on `$select`. Supports `$filter` (`eq`, `not`, `ge`, `le`, `in`, `startsWith`, `endsWith`, `/$count eq 0`, `/$count ne 0`).|
209209
|passwordPolicies|String|Specifies password policies for the user. This value is an enumeration with one possible value being `DisableStrongPassword`, which allows weaker passwords than the default policy to be specified. `DisablePasswordExpiration` can also be specified. The two might be specified together; for example: `DisablePasswordExpiration, DisableStrongPassword`. <br><br>Returned only on `$select`. For more information on the default password policies, see [Microsoft Entra password policies](/azure/active-directory/authentication/concept-sspr-policy#password-policies-that-only-apply-to-cloud-user-accounts). Supports `$filter` (`ne`, `not`, and `eq` on `null` values).|
210-
|passwordProfile|[passwordProfile](passwordprofile.md)|Specifies the password profile for the user. The profile contains the user's password. This property is required when a user is created. The password in the profile must satisfy minimum requirements as specified by the **passwordPolicies** property. By default, a strong password is required. <br><br>Returned only on `$select`. Supports `$filter` (`eq`, `ne`, `not`, `in`, and `eq` on `null` values). <br><br>To update this property: <br><li> In delegated access, the calling app must be assigned the *Directory.AccessAsUser.All* delegated permission on behalf of the signed-in user. <li> In application-only access, the calling app must be assigned the *User.ReadWrite.All* (least privilege) or *Directory.ReadWrite.All* (higher privilege) application permission *and* at least the *User Administrator* [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).|
210+
|passwordProfile|[passwordProfile](passwordprofile.md)|Specifies the password profile for the user. The profile contains the user's password. This property is required when a user is created. The password in the profile must satisfy minimum requirements as specified by the **passwordPolicies** property. By default, a strong password is required. <br><br>Returned only on `$select`. Supports `$filter` (`eq`, `ne`, `not`, `in`, and `eq` on `null` values). <br><br>To update this property: <br><li> In delegated access, the calling app must be assigned the *User-PasswordProfile.ReadWrite.All* delegated permission on behalf of the signed-in user. <li> In application-only access, the calling app must be assigned the *User-PasswordProfile.ReadWrite.All* application permission *and* at least the *User Administrator* [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).|
211211
|pastProjects|String collection|A list for the user to enumerate their past projects. <br><br>Returned only on `$select`.|
212212
|postalCode|String|The postal code for the user's postal address. The postal code is specific to the user's country/region. In the United States of America, this attribute contains the ZIP code. Maximum length is 40 characters. <br><br>Returned only on `$select`. Supports `$filter` (`eq`, `ne`, `not`, `ge`, `le`, `in`, `startsWith`, and `eq` on `null` values).|
213213
| preferredDataLocation | String | The preferred data location for the user. For more information, see [OneDrive Online Multi-Geo](/sharepoint/dev/solution-guidance/multigeo-introduction).|

api-reference/v1.0/toc/sites-and-lists/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ items:
1616
href: ../../api/site-getallsites.md
1717
- name: List subsites for a site
1818
href: ../../api/site-list-subsites.md
19+
- name: List root sites
20+
href: ../../api/site-list.md
1921
- name: Get site by path
2022
href: ../../api/site-getbypath.md
2123
- name: Get site for a group

0 commit comments

Comments
 (0)