Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.Consumption to add versi…
Browse files Browse the repository at this point in the history 
…on 2019-01-01 (Azure#5139)

* Adds base for updating Microsoft.Consumption from version stable/2018-10-01 to version 2019-01-01

* Updates readme

* Updates API version in new specs and examples

* updated readme to support new stable version 2019-01-01

* version introduced for java readme.md

* Updating swaggeer to SDK section for java SDK generation

* introducing MG scope for tags/budgets
introduce scope (method) parameter for APIs that support numerous scopes (arm-team suggestion implemented)

* Fixing Java code-generation (#1)

* Fixing Java code-generation

* Removing duplicate directive from java section

* update indentation
  • Loading branch information
@shbhamsft @veronicagg
shbhamsft authored and veronicagg committed Feb 5, 2019
1 parent 99f7da5 commit c9016f5
Show file tree
Hide file tree
Showing 58 changed files with 5,772 additions and 8 deletions.
2,930 changes: 2,930 additions & 0 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2019-01-01/consumption.json
View file

Large diffs are not rendered by default.

47 changes: 47 additions & 0 deletions ...ger/Microsoft.Consumption/stable/2019-01-01/examples/AggregatedCostByManagementGroup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parameters": {
"api-version": "2019-01-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-01-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-01-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 ...t.Consumption/stable/2019-01-01/examples/AggregatedCostByManagementGroupFilterByDate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parameters": {
"api-version": "2019-01-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 ...nsumption/stable/2019-01-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parameters": {
"api-version": "2019-01-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 ...ce-manager/Microsoft.Consumption/stable/2019-01-01/examples/BalancesByBillingAccount.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"parameters": {
"api-version": "2019-01-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 ...soft.Consumption/stable/2019-01-01/examples/BalancesByBillingAccountForBillingPeriod.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parameters": {
"api-version": "2019-01-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
}
]
}
}
}
}
}
71 changes: 71 additions & 0 deletions ...consumption/resource-manager/Microsoft.Consumption/stable/2019-01-01/examples/Budget.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"parameters": {
"api-version": "2019-01-01",
"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"
]
}
}
}
}
}
}
}
Loading

0 comments on commit c9016f5

Please sign in to comment.