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

Jump to bottom

Above-Subscription Level Marketplace and Usage Detail, and Enrollment Level Balances #2857

Merged
merged 9 commits into from
Apr 30, 2018
Merged

Above-Subscription Level Marketplace and Usage Detail, and Enrollment Level Balances #2857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0d10889
This PR includes above-subscription level (Enrollment, Department, or…
parisa-naeimi Apr 12, 2018
e8a464b
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
parisa-naeimi Apr 12, 2018
247831c
Updated consumption.json to fix build failure issues
parisa-naeimi Apr 12, 2018
a198973
Added "Get" to Operation Name 'BalancesByBillingAccount' and also rep…
parisa-naeimi Apr 12, 2018
c70d23f
Added Enrollment-Level balances by BillingPeriod
parisa-naeimi Apr 17, 2018
f00a550
Updated BalancesByBillingAccount example files and added x-ms-paramet…
parisa-naeimi Apr 18, 2018
876f31a
Replaced Microsoft.CostManagment with Microsoft.Billing
parisa-naeimi Apr 26, 2018
650b7b3
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
parisa-naeimi Apr 26, 2018
d53bf42
Fixed example errors
parisa-naeimi Apr 27, 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
1,328 changes: 1,245 additions & 83 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/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-03-31/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-03-31/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
}
]
}
}
}
}
}
2 changes: 1 addition & 1 deletion ...nsumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"responses": {
"200": {
"body": {
"id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1",
"id": "providers/Microsoft.Billing/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1",
"name": "costTags1",
"type": "Microsoft.Consumption/costTags",
"eTag": "\"1d34d012214157f\"",
Expand Down
4 changes: 2 additions & 2 deletions ...urce-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"responses": {
"201": {
"body": {
"id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1",
"id": "providers/Microsoft.Billing/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1",
"name": "costTags1",
"type": "Microsoft.Consumption/costTags",
"eTag": "\"1d34d012214157f\"",
Expand All @@ -46,7 +46,7 @@
},
"200": {
"body": {
"id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1",
"id": "providers/Microsoft.Billing/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1",
"name": "costTags1",
"type": "Microsoft.Consumption/costTags",
"eTag": "\"1d34d012214157f\"",
Expand Down
42 changes: 42 additions & 0 deletions ...er/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByBillingAccountList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"parameters": {
"api-version": "2018-03-31",
"billingAccountId": "123456"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
"name": "marketplaceId1",
"type": "Microsoft.Consumption/marketPlaces",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"currency": "USD",
"consumedQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"offerName": "offer1",
"resourceGroup": "TEST",
"orderNumber": "00000000-0000-0000-0000-000000000000",
"publisherName": "xyz",
"planName": "plan1",
"resourceRate": 0.24,
"subscriptionGuid": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "azure subscription"
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...sumption/stable/2018-03-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-03-31",
"billingAccountId": "123456",
"billingPeriodName": "201702"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
"name": "marketplacesId1",
"type": "Microsoft.Consumption/marketPlaces",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"currency": "USD",
"consumedQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"offerName": "offer1",
"resourceGroup": "TEST",
"orderNumber": "00000000-0000-0000-0000-000000000000",
"publisherName": "xyz",
"planName": "plan2",
"resourceRate": 0.24,
"subscriptionGuid": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "azure subscription"
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...anager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByDepartmentList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-03-31",
"departmentId": "123456",
"billingPeriodName": "201702"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
"name": "marketplacesId1",
"type": "Microsoft.Consumption/marketPlaces",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"currency": "USD",
"consumedQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"offerName": "offer1",
"resourceGroup": "TEST",
"orderNumber": "00000000-0000-0000-0000-000000000000",
"publisherName": "xyz",
"planName": "plan2",
"resourceRate": 0.24,
"subscriptionGuid": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "azure subscription"
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ....Consumption/stable/2018-03-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-03-31",
"departmentId": "123456",
"billingPeriodName": "201702"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
"name": "marketplacesId1",
"type": "Microsoft.Consumption/marketPlaces",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"currency": "USD",
"consumedQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"offerName": "offer1",
"resourceGroup": "TEST",
"orderNumber": "00000000-0000-0000-0000-000000000000",
"publisherName": "xyz",
"planName": "plan2",
"resourceRate": 0.24,
"subscriptionGuid": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "azure subscription"
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesByEnrollmentAccountList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-03-31",
"enrollmentAccountId": "123456",
"billingPeriodName": "201702"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
"name": "marketplacesId1",
"type": "Microsoft.Consumption/marketPlaces",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"currency": "USD",
"consumedQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"offerName": "offer1",
"resourceGroup": "TEST",
"orderNumber": "00000000-0000-0000-0000-000000000000",
"publisherName": "xyz",
"planName": "plan2",
"resourceRate": 0.24,
"subscriptionGuid": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "azure subscription"
}
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...tion/stable/2018-03-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2018-03-31",
"enrollmentAccountId": "123456",
"billingPeriodName": "201702"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1",
"name": "marketplacesId1",
"type": "Microsoft.Consumption/marketPlaces",
"tags": {
"env": "newcrp",
"dev": "tools"
},
"properties": {
"billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",
"usageStart": "2017-02-13T00:00:00Z",
"usageEnd": "2017-02-13T23:59:59Z",
"instanceName": "shared1",
"instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1",
"currency": "USD",
"consumedQuantity": 0.00328,
"pretaxCost": 0.67,
"isEstimated": false,
"meterId": "00000000-0000-0000-0000-000000000000",
"offerName": "offer1",
"resourceGroup": "TEST",
"orderNumber": "00000000-0000-0000-0000-000000000000",
"publisherName": "xyz",
"planName": "plan2",
"resourceRate": 0.24,
"subscriptionGuid": "00000000-0000-0000-0000-000000000000",
"subscriptionName": "azure subscription"
}
}
]
}
}
}
}
Loading