Skip to content

Commit e099b06

Browse files
ariehfAnuTalluri
ariehf
authored and
AnuTalluri
committed
[Hub Generated] Review request for Microsoft.CostManagement to add version 2019-03-01-preview (Azure#5021)
* Adds base for updating Microsoft.CostManagement from version preview/2018-12-01-preview to version 2019-03-01-preview * Updates readme * Updates API version in new specs and examples * Add Microsoft.CostManagment/cloudConnectors * Add Microsoft.CostManagement/AwsConsolidatedAccount and AwsLinkedAccount * Fix readonly linter check errors * Improve new parameter descriptions * ExternalBillingAccounts,ExternalSubscriptions,getEntities * Fix apiVersion case * daysTrialRemaining integer * Add EntityInfo/kind * es/managementGroupId,cloudConnectors/defaultManagementGroupId * managementGroupId description * Remove tags:CloudConnectors,ExternalSubscriptions,ExternalBillingAccount * Put MG to ES - return 204 * Fix linter errors in examples * Suppress OperationsAPIImplementation error for Microsoft.Billing
1 parent 4f4b85c commit e099b06

File tree

46 files changed

+5675
-4
lines changed

Some content is hidden

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

46 files changed

+5675
-4
lines changed

‎specification/cost-management/resource-manager/Microsoft.CostManagement/preview/2019-03-01-preview/costmanagement.json‎

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

‎specification/cost-management/resource-manager/Microsoft.CostManagement/preview/2019-03-01-preview/examples/BillingAccountDimensionsList.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-03-01-preview",
4+
"billingAccountId": "100"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"value": [
10+
{
11+
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceGroup_2018-12-01_2018-12-31",
12+
"name": "dimensions_ResourceGroup_2018-12-01_2018-12-31",
13+
"type": "microsoft.consumption/dimensions",
14+
"properties": {
15+
"data": [],
16+
"total": 3,
17+
"category": "SubscriptionGuid",
18+
"usageStart": "2018-12-01T00:00:00-07:00",
19+
"usageEnd": "2018-12-31T00:00:00-07:00",
20+
"description": "Subscription Guid",
21+
"filterEnabled": true,
22+
"groupingEnabled": true
23+
}
24+
},
25+
{
26+
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceType_2018-12-01_2018-12-31",
27+
"name": "dimensions_ResourceType_2018-12-01_2018-12-31",
28+
"type": "microsoft.consumption/dimensions",
29+
"properties": {
30+
"data": [],
31+
"total": 37,
32+
"category": "Account Name",
33+
"usageStart": "2018-12-01T00:00:00-07:00",
34+
"usageEnd": "2018-12-31T00:00:00-07:00",
35+
"description": "Resource type",
36+
"filterEnabled": true,
37+
"groupingEnabled": true
38+
}
39+
}
40+
]
41+
}
42+
}
43+
}
44+
}

‎specification/cost-management/resource-manager/Microsoft.CostManagement/preview/2019-03-01-preview/examples/BillingAccountDimensionsListExpandAndTop.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-03-01-preview",
4+
"billingAccountId": "100",
5+
"$expand": "properties/data",
6+
"$top": 5
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"value": [
12+
{
13+
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceGroup_2018-12-01_2018-12-31_5",
14+
"name": "dimensions_ResourceGroup_2018-12-01_2018-12-31_5",
15+
"type": "microsoft.consumption/dimensions",
16+
"properties": {
17+
"data": [
18+
"thoroetrg01",
19+
"default-notificationhubs-westus",
20+
"jedikeyvaultrg",
21+
"contosocodeflow8d4a",
22+
"noobaa"
23+
],
24+
"total": 377,
25+
"category": "ResourceGroup",
26+
"usageStart": "2018-12-01T00:00:00-07:00",
27+
"usageEnd": "2018-12-31T00:00:00-07:00",
28+
"description": "Resource group",
29+
"filterEnabled": true,
30+
"groupingEnabled": true
31+
}
32+
},
33+
{
34+
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceType_2018-12-31_2018-12-31_5",
35+
"name": "dimensions_ResourceType_2018-12-01_2018-12-31_5",
36+
"type": "microsoft.consumption/dimensions",
37+
"properties": {
38+
"data": [
39+
"microsoft.automation/automationaccounts",
40+
"microsoft.databricks/workspaces",
41+
"microsoft.dbformysql/servers",
42+
"microsoft.containerregistry/registries",
43+
"microsoft.search/searchservices"
44+
],
45+
"total": 37,
46+
"category": "ResourceType",
47+
"usageStart": "2018-12-01T00:00:00-07:00",
48+
"usageEnd": "2018-12-31T00:00:00-07:00",
49+
"description": "Resource type",
50+
"filterEnabled": true,
51+
"groupingEnabled": true
52+
}
53+
}
54+
]
55+
}
56+
}
57+
}
58+
}

‎specification/cost-management/resource-manager/Microsoft.CostManagement/preview/2019-03-01-preview/examples/BillingAccountDimensionsListWithFilter.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-03-01-preview",
4+
"billingAccountId": "100",
5+
"$expand": "properties/data",
6+
"$top": 5,
7+
"$filter": "properties/category eq 'resourceId'"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"value": [
13+
{
14+
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceId_2018-12-01_2018-12-31_5",
15+
"name": "dimensions_ResourceId_2018-12-01_2018-12-31_5",
16+
"type": "microsoft.consumption/dimensions",
17+
"properties": {
18+
"data": [
19+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/urphealthaccount",
20+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
21+
"/subscriptions/67e24f6b-1ec2-4c90-993a-dc2d25b00b6c/resourcegroups/defaultresourcegroup-eus/providers/microsoft.operationalinsights/workspaces/defaultworkspace-67e24f6b-1ec2-4c90-993a-dc2d25b00b6c-eus",
22+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg-sql-ha/providers/microsoft.compute/virtualmachines/sql-4qqp1",
23+
"/subscriptions/a98d6dc5-eb8f-46cf-8938-f1fb08f03706/resourcegroups/databricks-rg-testwsp-xijmsdubneexm/providers/microsoft.compute/disks/488cdb42bf74474a98075415be3f806c-containerrootvolume"
24+
],
25+
"total": 1409,
26+
"category": "ResourceId",
27+
"usageStart": "2018-12-01T00:00:00-07:00",
28+
"usageEnd": "2018-12-31T00:00:00-07:00",
29+
"description": "Resource Id",
30+
"filterEnabled": true,
31+
"groupingEnabled": true,
32+
"nextLink": "http://management.azure.com/ccmapi/providers/Microsoft.Billing/billingAccounts/100/providers/Microsoft.Consumption/Dimensions?$filter=properties/category eq 'resourceId'&$top=5&api-version=2019-03-01-preview&$expand=properties/data&$skiptoken=AQAAAA%3D%3D"
33+
}
34+
}
35+
]
36+
}
37+
}
38+
}
39+
}

‎specification/cost-management/resource-manager/Microsoft.CostManagement/preview/2019-03-01-preview/examples/BillingAccountForecast.json‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-03-01-preview",
4+
"billingAccountId": "70664866",
5+
"parameters":{
6+
"type": "Usage",
7+
"timeframe": "Custom",
8+
"timePeriod": {
9+
"from": "2018-08-01T00:00:00.000Z",
10+
"to": "2018-10-31T00:00:00.000Z"
11+
},
12+
"dataset": {
13+
"granularity": "Daily",
14+
"filter":{
15+
"and": [
16+
{
17+
"or":[
18+
{
19+
"dimension": {
20+
"name": "SubscriptionName",
21+
"operator": "In",
22+
"values": [
23+
"Azure Dev",
24+
"Azure Prod",
25+
"Azure PPE"
26+
]
27+
}
28+
},
29+
{
30+
"tag": {
31+
"name": "Environment",
32+
"operator": "In",
33+
"values": [
34+
"Dev",
35+
"PPE",
36+
"Prod"
37+
]
38+
}
39+
}
40+
]
41+
},
42+
{
43+
"dimension": {
44+
"name": "DepartmentName",
45+
"operator": "In",
46+
"values": [
47+
"Azure Dept"
48+
]
49+
}
50+
}
51+
]
52+
}
53+
}
54+
}
55+
},
56+
"responses": {
57+
"200": {
58+
"body": {
59+
"value": [
60+
{
61+
"id": "providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Forecast/ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
62+
"name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
63+
"type": "microsoft.costmanagement/Forecast",
64+
"properties": {
65+
"nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Forecast?api-version=2019-03-01-preview&$skiptoken=AQAAAA%3D%3D",
66+
"columns": [
67+
{
68+
"name": "PreTaxCost",
69+
"type": "Number"
70+
},
71+
{
72+
"name": "UsageDate",
73+
"type": "Number"
74+
},
75+
{
76+
"name": "CostStatus",
77+
"type": "String"
78+
},
79+
{
80+
"name": "Currency",
81+
"type": "String"
82+
}
83+
],
84+
"rows": [
85+
[
86+
19.545363672276512,
87+
20180831,
88+
"Actual",
89+
"USD"
90+
],
91+
[
92+
20.41979233490323,
93+
20180930,
94+
"Actual",
95+
"USD"
96+
],
97+
[
98+
21.322216562625452,
99+
20181031,
100+
"Actual",
101+
"USD"
102+
],
103+
[
104+
22.545363672276532,
105+
20180831,
106+
"Actual",
107+
"USD"
108+
],
109+
[
110+
23.41979675590323,
111+
20180930,
112+
"Forecast",
113+
"USD"
114+
],
115+
[
116+
24.359416562626652,
117+
20181031,
118+
"Forecast",
119+
"USD"
120+
]
121+
]
122+
}
123+
}
124+
]
125+
}
126+
}
127+
}
128+
}

‎specification/cost-management/resource-manager/Microsoft.CostManagement/preview/2019-03-01-preview/examples/BillingAccountQuery.json‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-03-01-preview",
4+
"billingAccountId": "70664866",
5+
"parameters":{
6+
"type": "Usage",
7+
"timeframe": "Custom",
8+
"timePeriod": {
9+
"from": "2018-08-01T00:00:00.000Z",
10+
"to": "2018-10-31T00:00:00.000Z"
11+
},
12+
"dataset": {
13+
"granularity": "Daily",
14+
"filter":{
15+
"and": [
16+
{
17+
"or":[
18+
{
19+
"dimension": {
20+
"name": "SubscriptionName",
21+
"operator": "In",
22+
"values": [
23+
"Azure Dev",
24+
"Azure Prod",
25+
"Azure PPE"
26+
]
27+
}
28+
},
29+
{
30+
"tag": {
31+
"name": "Environment",
32+
"operator": "In",
33+
"values": [
34+
"Dev",
35+
"PPE",
36+
"Prod"
37+
]
38+
}
39+
}
40+
]
41+
},
42+
{
43+
"dimension": {
44+
"name": "DepartmentName",
45+
"operator": "In",
46+
"values": [
47+
"Azure Dept"
48+
]
49+
}
50+
}
51+
]
52+
}
53+
}
54+
}
55+
},
56+
"responses": {
57+
"200": {
58+
"body": {
59+
"value": [
60+
{
61+
"id": "providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query/ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
62+
"name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
63+
"type": "microsoft.costmanagement/Query",
64+
"properties": {
65+
"nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2019-03-01-preview&$skiptoken=AQAAAA%3D%3D",
66+
"columns": [
67+
{
68+
"name": "PreTaxCost",
69+
"type": "Number"
70+
},
71+
{
72+
"name": "UsageDate",
73+
"type": "Number"
74+
},
75+
{
76+
"name": "Currency",
77+
"type": "String"
78+
}
79+
],
80+
"rows": [
81+
[
82+
19.545363672276512,
83+
20180831,
84+
"USD"
85+
],
86+
[
87+
173.41979241290323,
88+
20180930,
89+
"USD"
90+
],
91+
[
92+
20.359416562625452,
93+
20181031,
94+
"USD"
95+
]
96+
]
97+
}
98+
}
99+
]
100+
}
101+
}
102+
}
103+
}

0 commit comments

Comments
 (0)