-
Notifications
You must be signed in to change notification settings - Fork 5.7k
[Hub Generated] Review request for Microsoft.Consumption to add version stable/2019-05-01 #6620
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
Merged
yungezz
merged 43 commits into
Azure:master
from
santoshsinha100:dev-consumption-Microsoft.Consumption-2019-05-01
Aug 6, 2019
Merged
Changes from all commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
71e2dcb
Adds base for updating Microsoft.Consumption from version stable/2019…
santoshsinha100 037ada6
Updates readme
santoshsinha100 31e6fa4
Updates API version in new specs and examples
santoshsinha100 88ecde3
Updated scope for Usage detail list
santoshsinha100 faca65d
Update UsageDetailsList.json
santoshsinha100 1420327
Update UsageDetailsList.json
santoshsinha100 db17122
Update BudgetsList.json
santoshsinha100 7b45b10
Update UsageDetailsList.json
santoshsinha100 b949996
fixing syntax error
santoshsinha100 40b87bf
added scope parameter
santoshsinha100 a422c46
scope added
santoshsinha100 08b2b2b
added scope
santoshsinha100 5cbdfba
added scope
santoshsinha100 9492159
added scope
santoshsinha100 c5bfb87
Update Budget.json
santoshsinha100 cc1f6f2
added scope
santoshsinha100 47da520
added scope
santoshsinha100 fa66189
added scope
santoshsinha100 de22a9c
json correction
santoshsinha100 9ee8c70
syntax correction
santoshsinha100 0637fa7
added reservationRecommendation, RI Usage Summary and RI Usage details
santoshsinha100 d6b335f
syntax correction
santoshsinha100 d57b0c3
bug fix
santoshsinha100 b95e703
bug fix
santoshsinha100 4d48f7e
bug fix
santoshsinha100 c0f05dc
bug fix
santoshsinha100 02e3236
bug fix
santoshsinha100 41d751b
bug fix
santoshsinha100 9d3e764
bug fix
santoshsinha100 63967a1
bug fix
santoshsinha100 72bd87e
added additional properties
santoshsinha100 6695deb
updated example json
santoshsinha100 38927b7
bug fix
santoshsinha100 e8b25d3
Update specification/consumption/resource-manager/Microsoft.Consumpti…
santoshsinha100 1f03a59
Update specification/consumption/resource-manager/Microsoft.Consumpti…
santoshsinha100 7774db3
Update specification/consumption/resource-manager/Microsoft.Consumpti…
santoshsinha100 3ace331
Update specification/consumption/resource-manager/Microsoft.Consumpti…
santoshsinha100 b4ed81a
Update specification/consumption/resource-manager/Microsoft.Consumpti…
santoshsinha100 0708eec
bug fix
santoshsinha100 4045e81
Merge branch 'dev-consumption-Microsoft.Consumption-2019-05-01' of ht…
santoshsinha100 9c70c56
bug fix
santoshsinha100 d04e302
Bug fix
santoshsinha100 052f9db
Merge branch 'master' into dev-consumption-Microsoft.Consumption-2019…
yungezz 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
3,267 changes: 3,267 additions & 0 deletions
3,267
...ion/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json
Large diffs are not rendered by default.
Oops, something went wrong.
47 changes: 47 additions & 0 deletions
47
...ger/Microsoft.Consumption/stable/2019-05-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": "2019-05-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": "2019-05-01T00:00:00.0000000Z", | ||
| "usageEnd": "2018-10-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": { | ||
| "includedSubscriptions": [ | ||
| "c349567d-c83a-48c9-ab0e-578c69dc97a4" | ||
| ], | ||
| "excludedSubscriptions": [], | ||
| "usageStart": "2019-05-01T00:00:00.0000000Z", | ||
| "usageEnd": "2018-10-31T00: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/2019-05-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": "2019-05-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/2019-05-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": "2019-05-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": [] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
...ce-manager/Microsoft.Consumption/stable/2019-05-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,46 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2019-05-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, | ||
| "newPurchasesDetails": [ | ||
| { | ||
| "name": "Promo Purchase", | ||
| "value": 1 | ||
| } | ||
| ], | ||
| "adjustmentDetails": [ | ||
| { | ||
| "name": "Promo Credit", | ||
| "value": 1.1 | ||
| }, | ||
| { | ||
| "name": "SIE Credit", | ||
| "value": 1.0 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...soft.Consumption/stable/2019-05-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,47 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2019-05-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, | ||
| "newPurchasesDetails": [ | ||
| { | ||
| "name": "Promo Purchase", | ||
| "value": 1 | ||
| } | ||
| ], | ||
| "adjustmentDetails": [ | ||
| { | ||
| "name": "Promo Credit", | ||
| "value": 1.1 | ||
| }, | ||
| { | ||
| "name": "SIE Credit", | ||
| "value": 1.0 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
72 changes: 72 additions & 0 deletions
72
...consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.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,72 @@ | ||
| { | ||
| "parameters": { | ||
| "api-version": "2019-05-01", | ||
| "subscriptionId": "00000000-0000-0000-0000-000000000000", | ||
| "resourceGroupName": "MYDEVTESTRG", | ||
| "budgetName": "TestBudget", | ||
| "scope": "subscriptions/00000000-0000-0000-0000-000000000000" | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget", | ||
| "name": "TestBudget", | ||
| "type": "Microsoft.Consumption/budgets", | ||
| "eTag": "\"1d34d012214157f\"", | ||
| "properties": { | ||
| "category": "Cost", | ||
| "amount": 100.65, | ||
| "timeGrain": "Monthly", | ||
| "timePeriod": { | ||
| "startDate": "2017-10-01T00:00:00Z", | ||
| "endDate": "2018-10-31T00:00:00Z" | ||
| }, | ||
| "filters": { | ||
| "resourceGroups": [ | ||
| "MPDEVTESTRG" | ||
| ], | ||
| "resources": [ | ||
| "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSVM2", | ||
| "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" | ||
| ], | ||
| "meters": [ | ||
| "00000000-0000-0000-0000-000000000000" | ||
| ], | ||
| "tags": { | ||
| "category": [ | ||
| "Dev", | ||
| "Prod" | ||
| ], | ||
| "department": [ | ||
| "engineering", | ||
| "sales" | ||
| ] | ||
| } | ||
| }, | ||
| "currentSpend": { | ||
| "amount": 80.89, | ||
| "unit": "USD" | ||
| }, | ||
| "notifications": { | ||
| "Actual_GreaterThan_80_Percent": { | ||
| "enabled": true, | ||
| "operator": "GreaterThan", | ||
| "threshold": 80, | ||
| "contactEmails": [ | ||
| "johndoe@contoso.com", | ||
| "janesmith@contoso.com" | ||
| ], | ||
| "contactRoles": [ | ||
| "Contributor", | ||
| "Reader" | ||
| ], | ||
| "contactGroups": [ | ||
| "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
usageStart is later than usageEnd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi I am unable to resolve the conflict in readme.md file. UI doesn't allow me to resolve. Looking at the conflict, I will go with "### Tag: package-2019-05" not the preview one. Will it be possible to get this resolved at your end .