Skip to content

Commit 8b8d03f

Browse files
mitagargMita GargAlex Goldschmidt
authored and
LeiWang3
committed
[Hub Generated] Review request for Microsoft.Consumption to add version stable/2021-10-01 (Azure#15958)
* Adds base for updating Microsoft.Consumption from version stable/2021-05-01 to version 2021-10-01 * Updates readme * Updates API version in new specs and examples * added benefitid and benefitname * adding descr for benefitid and benefitname * Deprecate Forecasts * added provider in modern * Adding description for the provider * 1) removed BenefitId and BenefitName from legacy 2) chnaged value of Publishertype fro 1pp to Microsoft 3) updated examples with ReservationName and BenefitId and BeneftName for modern * Make changes based on s360 * Fix example errors * Missed an instance of purchaseDate type * No schema for 204 * No schema for 204 * No schema for 204 * Ran prettier * Add changes to 10.01.21 * Ran prettier * Revert "Ran prettier" This reverts commit 1a0fbfe. * Revert "No schema for 204" This reverts commit 181f6c5. * Revert "Missed an instance of purchaseDate type" This reverts commit d77898d. * Revert "Fix example errors" This reverts commit 06be042. * Revert "Make changes based on s360" This reverts commit 0960cc2. * Manually change 2021-05-01 * removing reservationName * costAllocationRule * Adding missing fields * Operation scopeReservationRecommendationDetails had two params with the same name scope, so fixing it. * chnaging the casing for eTag * chnaging the casing for eTag * reservation api * Arm feedback - add enum to PricingModel * pretty check * linter check * pretty check Co-authored-by: Mita Garg <[email protected]> Co-authored-by: Alex Goldschmidt <[email protected]>
1 parent 776562b commit 8b8d03f

File tree

89 files changed

+10985
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+10985
-3
lines changed

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/consumption.json

Lines changed: 5695 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/AggregatedCostByManagementGroup.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01",
4+
"managementGroupId": "managementGroupForTest"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1",
10+
"name": "aggregatedcostId1",
11+
"type": "Microsoft.Consumption/aggregatedcost",
12+
"properties": {
13+
"includedSubscriptions": [
14+
"1caaa5a3-2b66-438e-8ab4-bce37d518c5d"
15+
],
16+
"excludedSubscriptions": [],
17+
"usageStart": "2021-10-01T00:00:00.0000000Z",
18+
"usageEnd": "2018-10-31T00:00:00.0000000Z",
19+
"azureCharges": 250.9876,
20+
"marketplaceCharges": 150.786,
21+
"chargesBilledSeparately": 120.345,
22+
"currency": "USD",
23+
"children": [
24+
{
25+
"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2",
26+
"name": "aggregatedcostId2",
27+
"type": "Microsoft.Consumption/aggregatedcost",
28+
"properties": {
29+
"includedSubscriptions": [
30+
"c349567d-c83a-48c9-ab0e-578c69dc97a4"
31+
],
32+
"excludedSubscriptions": [],
33+
"usageStart": "2021-10-01T00:00:00.0000000Z",
34+
"usageEnd": "2018-10-31T00:00:00.0000000Z",
35+
"azureCharges": 150.0,
36+
"marketplaceCharges": 50.786,
37+
"chargesBilledSeparately": 30.345,
38+
"currency": "USD",
39+
"children": []
40+
}
41+
}
42+
]
43+
}
44+
}
45+
}
46+
}
47+
}

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/AggregatedCostByManagementGroupFilterByDate.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01",
4+
"managementGroupId": "managementGroupForTest",
5+
"$filter": "usageStart ge '2018-08-15' and properties/usageStart le '2018-08-31'"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1",
11+
"name": "aggregatedcostId1",
12+
"type": "Microsoft.Consumption/aggregatedcost",
13+
"properties": {
14+
"includedSubscriptions": [
15+
"1caaa5a3-2b66-438e-8ab4-bce37d518c5d"
16+
],
17+
"excludedSubscriptions": [],
18+
"usageStart": "2018-08-15T00:00:00.0000000Z",
19+
"usageEnd": "2018-08-31T00:00:00.0000000Z",
20+
"azureCharges": 150.9876,
21+
"marketplaceCharges": 80.786,
22+
"chargesBilledSeparately": 90.345,
23+
"currency": "USD",
24+
"children": [
25+
{
26+
"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2",
27+
"name": "aggregatedcostId2",
28+
"type": "Microsoft.Consumption/aggregatedcost",
29+
"properties": {
30+
"includedSubscriptions": [
31+
"c349567d-c83a-48c9-ab0e-578c69dc97a4"
32+
],
33+
"excludedSubscriptions": [],
34+
"usageStart": "2018-08-15T00:00:00.0000000Z",
35+
"usageEnd": "2018-08-31T00:00:00.0000000Z",
36+
"azureCharges": 50.0,
37+
"marketplaceCharges": 10.786,
38+
"chargesBilledSeparately": 30.345,
39+
"currency": "USD",
40+
"children": []
41+
}
42+
}
43+
]
44+
}
45+
}
46+
}
47+
}
48+
}

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01",
4+
"managementGroupId": "managementGroupForTest",
5+
"billingPeriodName": "201807"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1",
11+
"name": "aggregatedcostId1",
12+
"type": "Microsoft.Consumption/aggregatedcost",
13+
"properties": {
14+
"usageStart": "2018-07-01T00:00:00.0000000Z",
15+
"usageEnd": "2018-07-31T00:00:00.0000000Z",
16+
"azureCharges": 250.9876,
17+
"marketplaceCharges": 150.786,
18+
"chargesBilledSeparately": 120.345,
19+
"currency": "USD",
20+
"children": [
21+
{
22+
"id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2",
23+
"name": "aggregatedcostId2",
24+
"type": "Microsoft.Consumption/aggregatedcost",
25+
"properties": {
26+
"usageStart": "2018-07-01T00:00:00.0000000Z",
27+
"usageEnd": "2018-07-31T00:00:00.0000000Z",
28+
"azureCharges": 150.0,
29+
"marketplaceCharges": 50.786,
30+
"chargesBilledSeparately": 30.345,
31+
"currency": "USD",
32+
"children": []
33+
}
34+
}
35+
]
36+
}
37+
}
38+
}
39+
}
40+
}

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/BalancesByBillingAccount.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01",
4+
"billingAccountId": "123456"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1",
10+
"name": "balanceId1",
11+
"type": "Microsoft.Consumption/balances",
12+
"properties": {
13+
"currency": "USD ",
14+
"beginningBalance": 3396469.19,
15+
"endingBalance": 2922371.02,
16+
"newPurchases": 0,
17+
"adjustments": 0,
18+
"utilized": 474098.17,
19+
"serviceOverage": 0,
20+
"chargesBilledSeparately": 0,
21+
"totalOverage": 0,
22+
"totalUsage": 474098.17,
23+
"azureMarketplaceServiceCharges": 609.82,
24+
"billingFrequency": "Month",
25+
"priceHidden": false,
26+
"newPurchasesDetails": [
27+
{
28+
"name": "Promo Purchase",
29+
"value": 1
30+
}
31+
],
32+
"adjustmentDetails": [
33+
{
34+
"name": "Promo Credit",
35+
"value": 1.1
36+
},
37+
{
38+
"name": "SIE Credit",
39+
"value": 1.0
40+
}
41+
]
42+
}
43+
}
44+
}
45+
}
46+
}

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/BalancesByBillingAccountForBillingPeriod.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01",
4+
"billingAccountId": "123456",
5+
"billingPeriodName": "201702"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1",
11+
"name": "balanceId1",
12+
"type": "Microsoft.Consumption/balances",
13+
"properties": {
14+
"currency": "USD ",
15+
"beginningBalance": 3396469.19,
16+
"endingBalance": 2922371.02,
17+
"newPurchases": 0,
18+
"adjustments": 0,
19+
"utilized": 474098.17,
20+
"serviceOverage": 0,
21+
"chargesBilledSeparately": 0,
22+
"totalOverage": 0,
23+
"totalUsage": 474098.17,
24+
"azureMarketplaceServiceCharges": 609.82,
25+
"billingFrequency": "Month",
26+
"priceHidden": false,
27+
"newPurchasesDetails": [
28+
{
29+
"name": "Promo Purchase",
30+
"value": 1
31+
}
32+
],
33+
"adjustmentDetails": [
34+
{
35+
"name": "Promo Credit",
36+
"value": 1.1
37+
},
38+
{
39+
"name": "SIE Credit",
40+
"value": 1.0
41+
}
42+
]
43+
}
44+
}
45+
}
46+
}
47+
}

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2021-10-01/examples/Budget.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-10-01",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "MYDEVTESTRG",
6+
"budgetName": "TestBudget",
7+
"scope": "subscriptions/00000000-0000-0000-0000-000000000000"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Consumption/budgets/TestBudget",
13+
"name": "TestBudget",
14+
"type": "Microsoft.Consumption/budgets",
15+
"eTag": "\"1d34d012214157f\"",
16+
"properties": {
17+
"category": "Cost",
18+
"amount": 100.65,
19+
"timeGrain": "Monthly",
20+
"timePeriod": {
21+
"startDate": "2017-10-01T00:00:00Z",
22+
"endDate": "2018-10-31T00:00:00Z"
23+
},
24+
"filter": {
25+
"and": [
26+
{
27+
"dimensions": {
28+
"name": "ResourceId",
29+
"operator": "In",
30+
"values": [
31+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSVM2",
32+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1"
33+
]
34+
}
35+
},
36+
{
37+
"tags": {
38+
"name": "category",
39+
"operator": "In",
40+
"values": [
41+
"Dev",
42+
"Prod"
43+
]
44+
}
45+
},
46+
{
47+
"tags": {
48+
"name": "department",
49+
"operator": "In",
50+
"values": [
51+
"engineering",
52+
"sales"
53+
]
54+
}
55+
}
56+
]
57+
},
58+
"currentSpend": {
59+
"amount": 80.89,
60+
"unit": "USD"
61+
},
62+
"notifications": {
63+
"Actual_GreaterThan_80_Percent": {
64+
"enabled": true,
65+
"operator": "GreaterThan",
66+
"threshold": 80,
67+
"contactEmails": [
68+
"[email protected]",
69+
"[email protected]"
70+
],
71+
"contactRoles": [
72+
"Contributor",
73+
"Reader"
74+
],
75+
"contactGroups": [
76+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup"
77+
],
78+
"thresholdType": "Actual"
79+
}
80+
}
81+
}
82+
}
83+
}
84+
}
85+
}

0 commit comments

Comments
 (0)