-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Release consumption microsoft.consumption stable/2025 04 01 #33626
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ShaswatPrabhat
wants to merge
53
commits into
Azure:main
Choose a base branch
from
ShaswatPrabhat:release-consumption-Microsoft.Consumption-stable/2025-04-01
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 30 commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
8c64aa9
Copy files from stable/2021-05-01
ShaswatPrabhat 42c32ab
Update version to stable/2025-04-01
ShaswatPrabhat 608ba1f
Added tag for 2025-04-01 in readme file
ShaswatPrabhat 2ca3f53
Add fields for MACC Currency in events API
ShaswatPrabhat 2ecb4cf
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 174fa08
Update new fields in consumption definition file
ShaswatPrabhat 3720ea6
Remove charges usage from EventsGetByBillingAccountWithFilters-Primary
ShaswatPrabhat 2d3b313
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 3eeb6ec
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 84c52f4
Add reference to pricesheet json file in ReadMe
ShaswatPrabhat e789fd0
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 38ca174
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 13c6b80
Reintroduce old fields to ensure API backwards compatibility
ShaswatPrabhat 44dd8a2
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 1f4514b
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 56931fa
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 5ecff63
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat f2c33aa
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 82abdd6
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 1a40479
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 2daf73a
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat bae5ea0
Fix comments
ShaswatPrabhat 656383e
Fix Swagger failure
ShaswatPrabhat 0fd9092
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat cbb6ea6
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat a9eb233
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat db22428
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 5aecafe
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat a19b679
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 338ea94
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 5d3c954
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat dba4232
Revert "Fix Swagger failure"
ShaswatPrabhat 2adbb51
Revert "Fix comments"
ShaswatPrabhat 9b5a58b
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 6c2b40e
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 09887b2
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 33c4ef4
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 206af1c
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat bb111d0
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 83bb46a
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat b0505bd
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat ff49bbf
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 3ae2bbf
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 6bd8fbe
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat c3edcb5
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat f30cee5
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat a054058
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat cd5ebd6
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 765d1a2
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat bd889b3
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat a2a5e47
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 3305ab5
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat 46daaaf
Merge branch 'main' into release-consumption-Microsoft.Consumption-st…
ShaswatPrabhat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
6,137 changes: 6,137 additions & 0 deletions
6,137
...ion/consumption/resource-manager/Microsoft.Consumption/stable/2025-04-01/consumption.json
Large diffs are not rendered by default.
Oops, something went wrong.
159 changes: 159 additions & 0 deletions
159
...tion/resource-manager/Microsoft.Consumption/stable/2025-04-01/consumption_pricesheet.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
{ | ||
Check notice on line 1 in specification/consumption/resource-manager/Microsoft.Consumption/stable/2025-04-01/consumption_pricesheet.json
|
||
"swagger": "2.0", | ||
"info": { | ||
"version": "2025-04-01", | ||
"title": "ConsumptionManagementClient", | ||
"description": "Consumption management client provides access to consumption resources for Azure Enterprise Subscriptions." | ||
}, | ||
"host": "management.azure.com", | ||
"schemes": [ | ||
"https" | ||
], | ||
"consumes": [ | ||
"application/json" | ||
], | ||
"produces": [ | ||
"application/json" | ||
], | ||
"security": [ | ||
{ | ||
"azure_auth": [ | ||
"user_impersonation" | ||
] | ||
} | ||
], | ||
"securityDefinitions": { | ||
"azure_auth": { | ||
"type": "oauth2", | ||
"authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", | ||
"flow": "implicit", | ||
"description": "Azure Active Directory OAuth2 Flow.", | ||
"scopes": { | ||
"user_impersonation": "impersonate your user account" | ||
} | ||
} | ||
}, | ||
"paths": { | ||
"/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/pricesheets/download": { | ||
"post": { | ||
"tags": [ | ||
"PriceSheet" | ||
], | ||
"operationId": "PriceSheet_DownloadByBillingAccountPeriod", | ||
"description": "Generates the pricesheet for the provided billing period asynchronously based on the enrollment id", | ||
"externalDocs": { | ||
"url": "https://docs.microsoft.com/en-us/rest/api/consumption/" | ||
}, | ||
"x-ms-long-running-operation": true, | ||
"x-ms-long-running-operation-options": { | ||
"final-state-via": "location" | ||
}, | ||
"x-ms-examples": { | ||
"EAPriceSheetForBillingPeriod": { | ||
"$ref": "./examples/EAPriceSheetForBillingPeriod.json" | ||
} | ||
}, | ||
"parameters": [ | ||
{ | ||
"$ref": "#/parameters/billingAccountIdParameter" | ||
}, | ||
{ | ||
"$ref": "../../../../../common-types/resource-management/v6/types.json#/parameters/ApiVersionParameter" | ||
}, | ||
{ | ||
"$ref": "#/parameters/billingPeriodNameParameter" | ||
} | ||
], | ||
"responses": { | ||
"200": { | ||
"description": "Request processing completed.", | ||
"schema": { | ||
"$ref": "#/definitions/OperationStatus" | ||
} | ||
}, | ||
"202": { | ||
"description": "Accepted", | ||
"headers": { | ||
"Location": { | ||
"type": "string" | ||
}, | ||
"Retry-After": { | ||
"type": "integer", | ||
"format": "int64" | ||
} | ||
} | ||
}, | ||
"default": { | ||
"description": "Error response describing why the operation failed.", | ||
"schema": { | ||
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" | ||
} | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
"definitions": { | ||
"OperationStatus": { | ||
"description": "The status of the long running operation.", | ||
"type": "object", | ||
"properties": { | ||
"status": { | ||
"description": "The status of the long running operation.", | ||
"type": "string", | ||
"enum": [ | ||
"Running", | ||
"Completed", | ||
"Failed" | ||
], | ||
"x-ms-enum": { | ||
"name": "OperationStatusType", | ||
"modelAsString": true | ||
} | ||
}, | ||
"properties": { | ||
"x-ms-client-flatten": true, | ||
"description": "The properties of the resource generated.", | ||
"$ref": "#/definitions/PricesheetDownloadProperties" | ||
} | ||
} | ||
}, | ||
"PricesheetDownloadProperties": { | ||
"description": "The properties of the price sheet download.", | ||
"type": "object", | ||
"properties": { | ||
"downloadUrl": { | ||
"description": "The link (url) to download the pricesheet.", | ||
"type": "string", | ||
"format": "uri", | ||
"readOnly": true | ||
}, | ||
"validUntil": { | ||
"format": "date-time", | ||
"description": "Download link validity in dd-mm-yyyy format. The timestamp is in RFC3339 format: `yyyy-MM-ddTHH:mm:ssZ`.", | ||
"type": "string", | ||
"example": "2020-09-08T15:55:41Z" | ||
} | ||
} | ||
} | ||
}, | ||
"parameters": { | ||
"billingAccountIdParameter": { | ||
"name": "billingAccountId", | ||
"in": "path", | ||
"description": "BillingAccount ID", | ||
"required": true, | ||
"type": "string", | ||
"x-ms-parameter-location": "method" | ||
}, | ||
"billingPeriodNameParameter": { | ||
"name": "billingPeriodName", | ||
"in": "path", | ||
"description": "Billing Period Name.", | ||
"required": true, | ||
"type": "string", | ||
"pattern": "^[0-9]*$", | ||
"x-ms-parameter-location": "method" | ||
} | ||
} | ||
} |
47 changes: 47 additions & 0 deletions
47
...ger/Microsoft.Consumption/stable/2025-04-01/examples/AggregatedCostByManagementGroup.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
{ | ||
"parameters": { | ||
"api-version": "2025-04-01", | ||
"managementGroupId": "managementGroupForTest" | ||
}, | ||
"responses": { | ||
"200": { | ||
"body": { | ||
"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1", | ||
"name": "aggregatedcostId1", | ||
"type": "Microsoft.Consumption/aggregatedcost", | ||
"properties": { | ||
"includedSubscriptions": [ | ||
"1caaa5a3-2b66-438e-8ab4-bce37d518c5d" | ||
], | ||
"excludedSubscriptions": [], | ||
"usageStart": "2023-03-01T00:00:00.0000000Z", | ||
"usageEnd": "2025-04-01T00:00:00.0000000Z", | ||
"azureCharges": 250.9876, | ||
"marketplaceCharges": 150.786, | ||
"chargesBilledSeparately": 120.345, | ||
"currency": "USD", | ||
"children": [ | ||
{ | ||
"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2", | ||
"name": "aggregatedcostId2", | ||
"type": "Microsoft.Consumption/aggregatedcost", | ||
"properties": { | ||
"includedSubscriptions": [ | ||
"c349567d-c83a-48c9-ab0e-578c69dc97a4" | ||
], | ||
"excludedSubscriptions": [], | ||
"usageStart": "2023-03-01T00:00:00.0000000Z", | ||
"usageEnd": "2025-04-01T00:00:00.0000000Z", | ||
"azureCharges": 150.0, | ||
"marketplaceCharges": 50.786, | ||
"chargesBilledSeparately": 30.345, | ||
"currency": "USD", | ||
"children": [] | ||
} | ||
} | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
...t.Consumption/stable/2025-04-01/examples/AggregatedCostByManagementGroupFilterByDate.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{ | ||
"parameters": { | ||
"api-version": "2025-04-01", | ||
"managementGroupId": "managementGroupForTest", | ||
"$filter": "usageStart ge '2018-08-15' and properties/usageStart le '2018-08-31'" | ||
}, | ||
"responses": { | ||
"200": { | ||
"body": { | ||
"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1", | ||
"name": "aggregatedcostId1", | ||
"type": "Microsoft.Consumption/aggregatedcost", | ||
"properties": { | ||
"includedSubscriptions": [ | ||
"1caaa5a3-2b66-438e-8ab4-bce37d518c5d" | ||
], | ||
"excludedSubscriptions": [], | ||
"usageStart": "2018-08-15T00:00:00.0000000Z", | ||
"usageEnd": "2018-08-31T00:00:00.0000000Z", | ||
"azureCharges": 150.9876, | ||
"marketplaceCharges": 80.786, | ||
"chargesBilledSeparately": 90.345, | ||
"currency": "USD", | ||
"children": [ | ||
{ | ||
"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2", | ||
"name": "aggregatedcostId2", | ||
"type": "Microsoft.Consumption/aggregatedcost", | ||
"properties": { | ||
"includedSubscriptions": [ | ||
"c349567d-c83a-48c9-ab0e-578c69dc97a4" | ||
], | ||
"excludedSubscriptions": [], | ||
"usageStart": "2018-08-15T00:00:00.0000000Z", | ||
"usageEnd": "2018-08-31T00:00:00.0000000Z", | ||
"azureCharges": 50.0, | ||
"marketplaceCharges": 10.786, | ||
"chargesBilledSeparately": 30.345, | ||
"currency": "USD", | ||
"children": [] | ||
} | ||
} | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
...nsumption/stable/2025-04-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
{ | ||
"parameters": { | ||
"api-version": "2025-04-01", | ||
"managementGroupId": "managementGroupForTest", | ||
"billingPeriodName": "201807" | ||
}, | ||
"responses": { | ||
"200": { | ||
"body": { | ||
"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1", | ||
"name": "aggregatedcostId1", | ||
"type": "Microsoft.Consumption/aggregatedcost", | ||
"properties": { | ||
"usageStart": "2018-07-01T00:00:00.0000000Z", | ||
"usageEnd": "2018-07-31T00:00:00.0000000Z", | ||
"azureCharges": 250.9876, | ||
"marketplaceCharges": 150.786, | ||
"chargesBilledSeparately": 120.345, | ||
"currency": "USD", | ||
"children": [ | ||
{ | ||
"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2", | ||
"name": "aggregatedcostId2", | ||
"type": "Microsoft.Consumption/aggregatedcost", | ||
"properties": { | ||
"usageStart": "2018-07-01T00:00:00.0000000Z", | ||
"usageEnd": "2018-07-31T00:00:00.0000000Z", | ||
"azureCharges": 150.0, | ||
"marketplaceCharges": 50.786, | ||
"chargesBilledSeparately": 30.345, | ||
"currency": "USD", | ||
"children": [] | ||
} | ||
} | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
47 changes: 47 additions & 0 deletions
47
...ce-manager/Microsoft.Consumption/stable/2025-04-01/examples/BalancesByBillingAccount.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
{ | ||
"parameters": { | ||
"api-version": "2025-04-01", | ||
"billingAccountId": "123456" | ||
}, | ||
"responses": { | ||
"200": { | ||
"body": { | ||
"id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", | ||
"name": "balanceId1", | ||
"type": "Microsoft.Consumption/balances", | ||
"properties": { | ||
"currency": "USD ", | ||
"beginningBalance": 3396469.19, | ||
"endingBalance": 2922371.02, | ||
"newPurchases": 0, | ||
"adjustments": 0, | ||
"utilized": 474098.17, | ||
"serviceOverage": 0, | ||
"chargesBilledSeparately": 0, | ||
"totalOverage": 0, | ||
"totalUsage": 474098.17, | ||
"azureMarketplaceServiceCharges": 609.82, | ||
"billingFrequency": "Month", | ||
"priceHidden": false, | ||
"overageRefund": 2012.61, | ||
"newPurchasesDetails": [ | ||
{ | ||
"name": "Promo Purchase", | ||
"value": 1 | ||
} | ||
], | ||
"adjustmentDetails": [ | ||
{ | ||
"name": "Promo Credit", | ||
"value": 1.1 | ||
}, | ||
{ | ||
"name": "SIE Credit", | ||
"value": 1.0 | ||
} | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
...soft.Consumption/stable/2025-04-01/examples/BalancesByBillingAccountForBillingPeriod.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{ | ||
"parameters": { | ||
"api-version": "2025-04-01", | ||
"billingAccountId": "123456", | ||
"billingPeriodName": "201702" | ||
}, | ||
"responses": { | ||
"200": { | ||
"body": { | ||
"id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", | ||
"name": "balanceId1", | ||
"type": "Microsoft.Consumption/balances", | ||
"properties": { | ||
"currency": "USD ", | ||
"beginningBalance": 3396469.19, | ||
"endingBalance": 2922371.02, | ||
"newPurchases": 0, | ||
"adjustments": 0, | ||
"utilized": 474098.17, | ||
"serviceOverage": 0, | ||
"chargesBilledSeparately": 0, | ||
"totalOverage": 0, | ||
"totalUsage": 474098.17, | ||
"azureMarketplaceServiceCharges": 609.82, | ||
"billingFrequency": "Month", | ||
"priceHidden": false, | ||
"overageRefund": 2012.61, | ||
"newPurchasesDetails": [ | ||
{ | ||
"name": "Promo Purchase", | ||
"value": 1 | ||
} | ||
], | ||
"adjustmentDetails": [ | ||
{ | ||
"name": "Promo Credit", | ||
"value": 1.1 | ||
}, | ||
{ | ||
"name": "SIE Credit", | ||
"value": 1.0 | ||
} | ||
] | ||
} | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.