diff --git a/.github/comment.yml b/.github/comment.yml index d6cb61933e04..69ef402decd7 100644 --- a/.github/comment.yml +++ b/.github/comment.yml @@ -26,11 +26,13 @@ - rule: type: label label: ARMChangesRequested + booleanFilterExpression: "!NotReadyForARMReview" onLabeledRemoveLabels: - WaitForARMFeedback - rule: type: unlabeled label: ARMChangesRequested + booleanFilterExpression: "!NotReadyForARMReview" onUnlabeledAddLabels: - WaitForARMFeedback diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/consumption.json index d118b57147ff..8876f362c049 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/consumption.json @@ -1088,6 +1088,9 @@ "ReservationRecommendationsByBillingAccount-Legacy": { "$ref": "./examples/ReservationRecommendationsByBillingAccount.json" }, + "ReservationRecommendationsByBillingAccountFilterForScope": { + "$ref": "./examples/ReservationRecommendationsByBillingAccountFilterByScope.json" + }, "ReservationRecommendationsByBillingProfile-Modern": { "$ref": "./examples/ReservationRecommendationsByBillingProfile.json" } @@ -5005,6 +5008,7 @@ }, "ErrorDetails": { "description": "The details of the error.", + "type": "object", "properties": { "code": { "description": "Error code.", @@ -5044,7 +5048,7 @@ } }, "ErrorResponse": { - "description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. \n\nSome Error responses: \n\n * 429 TooManyRequests - Request is throttled. Retry after waiting for the time specified in the \"x-ms-ratelimit-microsoft.consumption-retry-after\" header. \n\n * 503 ServiceUnavailable - Service is temporarily unavailable. Retry after waiting for the time specified in the \"Retry-After\" header.", + "description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. \n\nSome Error responses: \n\n * 429 TooManyRequests - Request is throttled. Retry after waiting for the time specified in the \"x-ms-ratelimit-microsoft.consumption-retry-after\" header. \n\n * 503 ServiceUnavailable - Service is temporarily unavailable. Retry after waiting for the time specified in the \"Retry-After\" header. \n\n * 504 Gateway Timeout - Service timed out while processing the request. Reduce the date range in the request, if possible.", "type": "object", "properties": { "error": { @@ -6115,4 +6119,4 @@ "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/examples/ReservationRecommendationsByBillingAccountFilterByScope.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/examples/ReservationRecommendationsByBillingAccountFilterByScope.json new file mode 100644 index 000000000000..1f0f693b77bf --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2023-11-01/examples/ReservationRecommendationsByBillingAccountFilterByScope.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "api-version": "2023-11-01", + "resourceScope": "providers/Microsoft.Billing/billingAccounts/123456", + "$filter": "properties/scope eq 'Single'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "kind": "legacy", + "id": "billingAccount/123456/providers/Microsoft.Consumption/reservationRecommendations/71fd91a7-13b9-4ade-bb11-85cfd6422d9d", + "name": "71fd91a7-13b9-4ade-bb11-85cfd6422d9d", + "type": "Microsoft.Consumption/reservationRecommendations", + "location": "westus3", + "sku": "Standard_B4ms", + "properties": { + "meterId": "9a3781ce-d0dc-5f76-99d7-29eb5aec447f", + "term": "P1Y", + "costWithNoReservedInstances": 0.332, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 0.19474885844748857, + "netSavings": 0.13725114155251145, + "firstUsageDate": "2024-04-30T07:00:00Z", + "scope": "Single", + "lookBackPeriod": "Last7Days", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceType": "virtualmachines", + "instanceFlexibilityRatio": 8, + "instanceFlexibilityGroup": "BS Series High Memory", + "normalizedSize": "Standard_B1ms", + "recommendedQuantityNormalized": 8, + "skuProperties": [] + } + }, + { + "kind": "legacy", + "id": "billingAccount/123456/providers/Microsoft.Consumption/reservationRecommendations/904b99c2-baf3-4bff-98ff-a96238ccbc96", + "name": "904b99c2-baf3-4bff-98ff-a96238ccbc96", + "type": "Microsoft.Consumption/reservationRecommendations", + "location": "westus3", + "sku": "Standard_B4ms", + "properties": { + "meterId": "9a3781ce-d0dc-5f76-99d7-29eb5aec447f", + "term": "P3Y", + "costWithNoReservedInstances": 0.332, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 0.12511415525114156, + "netSavings": 0.20688584474885846, + "firstUsageDate": "2024-04-30T07:00:00Z", + "scope": "Single", + "lookBackPeriod": "Last7Days", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceType": "virtualmachines", + "instanceFlexibilityRatio": 8, + "instanceFlexibilityGroup": "BS Series High Memory", + "normalizedSize": "Standard_B1ms", + "recommendedQuantityNormalized": 8, + "skuProperties": [] + } + } + ] + } + }, + "204": {} + } +} \ No newline at end of file diff --git a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2023-11-01/examples/CostAllocationRuleCreate.json b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2023-11-01/examples/CostAllocationRuleCreate.json index ebff07eb6dd1..1c3aa2f52f25 100644 --- a/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2023-11-01/examples/CostAllocationRuleCreate.json +++ b/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2023-11-01/examples/CostAllocationRuleCreate.json @@ -26,7 +26,7 @@ "values": [ { "name": "destinationRG", - "percentage": 45 + "percentage": 46 }, { "name": "destinationRG2",