Skip to content

Commit 0ef1b15

Browse files
authored
Merge pull request #25674 from microsoftgraph/revert-25252-huicong/addRequiredParameter
Revert "Add required parameters to new scenario and delete incorrect permission description "
2 parents 090e645 + 30cf5e0 commit 0ef1b15

File tree

3 files changed

+8
-46
lines changed

3 files changed

+8
-46
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

changelog/Microsoft.DeviceManagement.Monitoring.json

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,5 @@
11
{
22
"changelog": [
3-
{
4-
"ChangeList": [
5-
{
6-
"Id": "b023fd62-6131-49c4-bd7d-12b3f84e2317",
7-
"ApiChange": "Member",
8-
"ChangedApiName": "cloudPcFrontlineBufferUsageScenario",
9-
"ChangeType": "Addition",
10-
"Description": "Added the `cloudPcFrontlineBufferUsageScenario` member to the **alertRuleTemplate** enumeration.",
11-
"Target": "alertRuleTemplate"
12-
},
13-
{
14-
"Id": "b023fd62-6131-49c4-bd7d-12b3f84e2317",
15-
"ApiChange": "Member",
16-
"ChangedApiName": "frontlineBufferUsageDuration",
17-
"ChangeType": "Addition",
18-
"Description": "Added the `frontlineBufferUsageDuration` member to the **ruleCondition** enumeration.",
19-
"Target": "ruleCondition"
20-
},
21-
{
22-
"Id": "b023fd62-6131-49c4-bd7d-12b3f84e2317",
23-
"ApiChange": "Member",
24-
"ChangedApiName": "frontlineBufferUsageThreshold",
25-
"ChangeType": "Addition",
26-
"Description": "Added the `frontlineBufferUsageThreshold` member to the **ruleCondition** enumeration.",
27-
"Target": "ruleCondition"
28-
}
29-
],
30-
"Id": "b023fd62-6131-49c4-bd7d-12b3f84e2317",
31-
"Cloud": "Prod",
32-
"Version": "beta",
33-
"CreatedDateTime": "2024-10-24T10:40:03.4590295Z",
34-
"WorkloadArea": "Device and app management",
35-
"SubArea": "Cloud PC"
36-
},
373
{
384
"ChangeList": [
395
{
@@ -261,4 +227,4 @@
261227
"SubArea": "Cloud PC"
262228
}
263229
]
264-
}
230+
}

0 commit comments

Comments
 (0)