Skip to content
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.

Sign up for GitHub

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

Adding new properties to Consumption Usage Details #3357

Merged
merged 23 commits into from
Jul 12, 2018
Merged

Adding new properties to Consumption Usage Details #3357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
16a1362
Usage details V3 with location, service tier and service name
ampravinr Jul 5, 2018
4394e3b
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 5, 2018
6ddddfc
Fixed the API versions for the examples.
ampravinr Jul 5, 2018
142dcc1
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 6, 2018
3e43230
Added new version settings details for Java to the ReadMe file
ampravinr Jul 6, 2018
8b45200
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 9, 2018
5620f27
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 10, 2018
861b130
Included all the previous operations and examples in the changeset so…
ampravinr Jul 10, 2018
8d551a2
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 10, 2018
5a5118c
Removing Python from the list of SDKs which should be generated by th…
ampravinr Jul 10, 2018
2535231
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 11, 2018
c8b37e6
Reverting back and adding the Python to the list of SDKs which should…
ampravinr Jul 11, 2018
7b16adb
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 11, 2018
d1ba04a
Added missing properties merged from both 03/2018 and 05/2018
ampravinr Jul 11, 2018
bac7ebe
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 11, 2018
4c944a7
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 12, 2018
891beec
Modified the Operation Id to follow the best practices.
ampravinr Jul 12, 2018
09d8ca0
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 12, 2018
b9b62fd
Fixed model namings for - ReservationSummaries (now: ReservationSumma…
ampravinr Jul 12, 2018
5d36df6
Fixed the naming for model CostTags.
ampravinr Jul 12, 2018
c5a8c67
Fixing the SDKViolation error on - model Tags.
ampravinr Jul 12, 2018
8db0ff5
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
ampravinr Jul 12, 2018
b28e418
Changed the CostTagResult to CostTag as per review comments. Also cha…
ampravinr Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,906 changes: 3,906 additions & 0 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/consumption.json
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 46 additions & 0 deletions ...ce-manager/Microsoft.Consumption/stable/2018-06-30/examples/BalancesByBillingAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"parameters": {
"api-version": "2018-03-31",
"billingAccountId": "123456"
},
"responses": {
"200": {
"body": {
"id": "/providers/Microsoft.Billing/billingAccounts/123456/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 ...soft.Consumption/stable/2018-06-30/examples/BalancesByBillingAccountForBillingPeriod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parameters": {
"api-version": "2018-03-31",
"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
}
]
}
}
}
}
}
71 changes: 71 additions & 0 deletions ...consumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/Budget.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "MYDEVTESTRG",
"budgetName": "TestBudget"
},
"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": [
"[email protected]",
"[email protected]"
],
"contactRoles": [
"Contributor",
"Reader"
],
"contactGroups": [
"/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
]
}
}
}
}
}
}
}
159 changes: 159 additions & 0 deletions ...mption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/BudgetsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
{
"parameters": {
"api-version": "2018-03-31",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "MYDEVTESTRG"
},
"responses": {
"200": {
"body": {
"value": [
{
"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": [
"MYDEVTESTRG"
],
"resources": [
"/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2",
"/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": [
"[email protected]",
"[email protected]"
],
"contactRoles": [
"Contributor",
"Reader"
]
},
"Actual_GreaterThanOrEqualTo_90_Percent": {
"enabled": true,
"operator": "GreaterThanOrEqualTo",
"threshold": 90,
"contactEmails": [
"[email protected]",
"[email protected]"
],
"contactRoles": [
"Contributor",
"Reader"
],
"contactGroups": [
"/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
]
}
}
}
},
{
"id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget",
"name": "TestBudget",
"type": "Microsoft.Consumption/budgets",
"eTag": "\"1d34d012214157f\"",
"properties": {
"category": "Cost",
"amount": 600.65,
"timeGrain": "Monthly",
"timePeriod": {
"startDate": "2017-10-01T00:00:00Z",
"endDate": "2018-10-31T00:00:00Z"
},
"filters": {
"resourceGroups": [
"MYDEVTESTRG"
],
"resources": [
"/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2",
"/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": 120.89,
"unit": "USD"
},
"notifications": {
"Actual_GreaterThan_40_Percent": {
"enabled": true,
"operator": "GreaterThan",
"threshold": 40,
"contactEmails": [
"[email protected]",
"[email protected]"
],
"contactRoles": [
"Contributor",
"Reader"
]
},
"Actual_GreaterThanOrEqualTo_60_Percent": {
"enabled": true,
"operator": "GreaterThanOrEqualTo",
"threshold": 60,
"contactEmails": [
"[email protected]",
"[email protected]"
],
"contactRoles": [
"Contributor",
"Reader"
],
"contactGroups": [
"/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
]
}
}
}
}
]
}
}
}
}
32 changes: 32 additions & 0 deletions ...nsumption/resource-manager/Microsoft.Consumption/stable/2018-06-30/examples/CostTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parameters": {
"api-version": "2018-03-31",
"billingAccountId": "12345"
},
"responses": {
"200": {
"body": {
"id": "providers/Microsoft.Billing/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1",
"name": "costTags1",
"type": "Microsoft.Consumption/costTags",
"eTag": "\"1d34d012214157f\"",
"properties": {
"costTags": [
{
"key": "Department"
},
{
"key": "CostCenter"
},
{
"key": "Portal"
},
{
"key": "OrgName"
}
]
}
}
}
}
}
Loading