Skip to content

[Hub Generated] Review request for Microsoft.Consumption to add version preview/2019-04-01-preview #5622

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

Merged
veronicagg merged 31 commits into from
May 2, 2019
Merged

[Hub Generated] Review request for Microsoft.Consumption to add version preview/2019-04-01-preview #5622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e42fa06
Adds base for updating Microsoft.Consumption from version stable/2019…
ampravinr Apr 11, 2019
61a5c40
Updates readme
ampravinr Apr 11, 2019
c64058b
Updates API version in new specs and examples
ampravinr Apr 11, 2019
3c3c283
Usage Details API Contract changes for 2019-04-01-preview
ampravinr Apr 11, 2019
7b39dc1
Usage Details API contract changes
ampravinr Apr 11, 2019
db03399
Usage Details API contract changes for 2019-04-01-preview
ampravinr Apr 11, 2019
ba98b1e
Usage Details API contract changes for 2019-04-01-preview
ampravinr Apr 11, 2019
28f3cd2
Usage API contract changes
ampravinr Apr 11, 2019
ef8c082
Update UsageDetailsExpand.json
ampravinr Apr 11, 2019
99335ce
Update UsageDetailsExpand.json
ampravinr Apr 11, 2019
5a2304f
Update consumption.json
ampravinr Apr 11, 2019
07fb3b4
Scope parameters added for the samples
ampravinr Apr 12, 2019
4b0ebb8
Scope parameter fix
ampravinr Apr 12, 2019
7645b8f
Scope parameters
ampravinr Apr 12, 2019
3f24bd5
changed the scope parameter
ampravinr Apr 12, 2019
0252952
Correcting scope parameter
ampravinr Apr 12, 2019
f31e7c3
Update Tags.json
ampravinr Apr 12, 2019
bcc27a7
Fixed download and mg aggregated cost issues
ampravinr Apr 12, 2019
3eff072
UsageDetails_Download operation id change
ampravinr Apr 12, 2019
3ac4bda
Changed the casing for usage downloads operations
ampravinr Apr 12, 2019
25663d7
Usage Details API contract changes
ampravinr Apr 12, 2019
caf49bb
Usage Detail API contract changes
ampravinr Apr 12, 2019
253dae6
Usage Details API contract changes
ampravinr Apr 12, 2019
1320e10
Usage Details API contract changes
ampravinr Apr 13, 2019
edc4c8d
metricParameter changes
ampravinr Apr 19, 2019
2465970
Changed the samples for ValidTill
ampravinr Apr 19, 2019
f451273
Fixed the enum values for metric types
ampravinr Apr 25, 2019
b68ef19
changed the sample to match the case
ampravinr Apr 25, 2019
bc07306
As per review removed the OData-EntityId
ampravinr Apr 26, 2019
5eb100d
Changed the examples
ampravinr Apr 26, 2019
f7c6fd4
OperationId change for Downloads
ampravinr Apr 26, 2019
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,168 changes: 3,168 additions & 0 deletions ...mption/resource-manager/Microsoft.Consumption/preview/2019-04-01-preview/consumption.json
View file
Open in desktop

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions ...soft.Consumption/preview/2019-04-01-preview/examples/AggregatedCostByManagementGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parameters": {
"api-version": "2019-04-01-preview",
"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-04-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-04-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 ...tion/preview/2019-04-01-preview/examples/AggregatedCostByManagementGroupFilterByDate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parameters": {
"api-version": "2019-04-01-preview",
"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 .../preview/2019-04-01-preview/examples/AggregatedCostForBillingPeriodByManagementGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parameters": {
"api-version": "2019-04-01-preview",
"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 ...r/Microsoft.Consumption/preview/2019-04-01-preview/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": "2019-04-01-preview",
"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 ...umption/preview/2019-04-01-preview/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": "2019-04-01-preview",
"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 ...on/resource-manager/Microsoft.Consumption/preview/2019-04-01-preview/examples/Budget.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"parameters": {
"api-version": "2019-04-01-preview",
"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": [
"[email protected]",
"[email protected]"
],
"contactRoles": [
"Contributor",
"Reader"
],
"contactGroups": [
"/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
]
}
}
}
}
}
}
}
Loading