Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.CostManagement to add ve…
Browse files Browse the repository at this point in the history
…rsion 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
  • Loading branch information
ariehf authored and AnuTalluri committed Feb 6, 2019
1 parent 4f4b85c commit e099b06
Show file tree
Hide file tree
Showing 46 changed files with 5,675 additions and 4 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"api-version": "2019-03-01-preview",
"billingAccountId": "100"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceGroup_2018-12-01_2018-12-31",
"name": "dimensions_ResourceGroup_2018-12-01_2018-12-31",
"type": "microsoft.consumption/dimensions",
"properties": {
"data": [],
"total": 3,
"category": "SubscriptionGuid",
"usageStart": "2018-12-01T00:00:00-07:00",
"usageEnd": "2018-12-31T00:00:00-07:00",
"description": "Subscription Guid",
"filterEnabled": true,
"groupingEnabled": true
}
},
{
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceType_2018-12-01_2018-12-31",
"name": "dimensions_ResourceType_2018-12-01_2018-12-31",
"type": "microsoft.consumption/dimensions",
"properties": {
"data": [],
"total": 37,
"category": "Account Name",
"usageStart": "2018-12-01T00:00:00-07:00",
"usageEnd": "2018-12-31T00:00:00-07:00",
"description": "Resource type",
"filterEnabled": true,
"groupingEnabled": true
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"parameters": {
"api-version": "2019-03-01-preview",
"billingAccountId": "100",
"$expand": "properties/data",
"$top": 5
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceGroup_2018-12-01_2018-12-31_5",
"name": "dimensions_ResourceGroup_2018-12-01_2018-12-31_5",
"type": "microsoft.consumption/dimensions",
"properties": {
"data": [
"thoroetrg01",
"default-notificationhubs-westus",
"jedikeyvaultrg",
"contosocodeflow8d4a",
"noobaa"
],
"total": 377,
"category": "ResourceGroup",
"usageStart": "2018-12-01T00:00:00-07:00",
"usageEnd": "2018-12-31T00:00:00-07:00",
"description": "Resource group",
"filterEnabled": true,
"groupingEnabled": true
}
},
{
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceType_2018-12-31_2018-12-31_5",
"name": "dimensions_ResourceType_2018-12-01_2018-12-31_5",
"type": "microsoft.consumption/dimensions",
"properties": {
"data": [
"microsoft.automation/automationaccounts",
"microsoft.databricks/workspaces",
"microsoft.dbformysql/servers",
"microsoft.containerregistry/registries",
"microsoft.search/searchservices"
],
"total": 37,
"category": "ResourceType",
"usageStart": "2018-12-01T00:00:00-07:00",
"usageEnd": "2018-12-31T00:00:00-07:00",
"description": "Resource type",
"filterEnabled": true,
"groupingEnabled": true
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"parameters": {
"api-version": "2019-03-01-preview",
"billingAccountId": "100",
"$expand": "properties/data",
"$top": 5,
"$filter": "properties/category eq 'resourceId'"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Billing/billingAccounts/100/providers/microsoft.consumption/dimensions_ResourceId_2018-12-01_2018-12-31_5",
"name": "dimensions_ResourceId_2018-12-01_2018-12-31_5",
"type": "microsoft.consumption/dimensions",
"properties": {
"data": [
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/urphealthaccount",
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/system.orlando/providers/microsoft.storage/storageaccounts/srphytenaccount",
"/subscriptions/67e24f6b-1ec2-4c90-993a-dc2d25b00b6c/resourcegroups/defaultresourcegroup-eus/providers/microsoft.operationalinsights/workspaces/defaultworkspace-67e24f6b-1ec2-4c90-993a-dc2d25b00b6c-eus",
"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg-sql-ha/providers/microsoft.compute/virtualmachines/sql-4qqp1",
"/subscriptions/a98d6dc5-eb8f-46cf-8938-f1fb08f03706/resourcegroups/databricks-rg-testwsp-xijmsdubneexm/providers/microsoft.compute/disks/488cdb42bf74474a98075415be3f806c-containerrootvolume"
],
"total": 1409,
"category": "ResourceId",
"usageStart": "2018-12-01T00:00:00-07:00",
"usageEnd": "2018-12-31T00:00:00-07:00",
"description": "Resource Id",
"filterEnabled": true,
"groupingEnabled": true,
"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"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{
"parameters": {
"api-version": "2019-03-01-preview",
"billingAccountId": "70664866",
"parameters":{
"type": "Usage",
"timeframe": "Custom",
"timePeriod": {
"from": "2018-08-01T00:00:00.000Z",
"to": "2018-10-31T00:00:00.000Z"
},
"dataset": {
"granularity": "Daily",
"filter":{
"and": [
{
"or":[
{
"dimension": {
"name": "SubscriptionName",
"operator": "In",
"values": [
"Azure Dev",
"Azure Prod",
"Azure PPE"
]
}
},
{
"tag": {
"name": "Environment",
"operator": "In",
"values": [
"Dev",
"PPE",
"Prod"
]
}
}
]
},
{
"dimension": {
"name": "DepartmentName",
"operator": "In",
"values": [
"Azure Dept"
]
}
}
]
}
}
}
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Forecast/ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
"name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
"type": "microsoft.costmanagement/Forecast",
"properties": {
"nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Forecast?api-version=2019-03-01-preview&$skiptoken=AQAAAA%3D%3D",
"columns": [
{
"name": "PreTaxCost",
"type": "Number"
},
{
"name": "UsageDate",
"type": "Number"
},
{
"name": "CostStatus",
"type": "String"
},
{
"name": "Currency",
"type": "String"
}
],
"rows": [
[
19.545363672276512,
20180831,
"Actual",
"USD"
],
[
20.41979233490323,
20180930,
"Actual",
"USD"
],
[
21.322216562625452,
20181031,
"Actual",
"USD"
],
[
22.545363672276532,
20180831,
"Actual",
"USD"
],
[
23.41979675590323,
20180930,
"Forecast",
"USD"
],
[
24.359416562626652,
20181031,
"Forecast",
"USD"
]
]
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"parameters": {
"api-version": "2019-03-01-preview",
"billingAccountId": "70664866",
"parameters":{
"type": "Usage",
"timeframe": "Custom",
"timePeriod": {
"from": "2018-08-01T00:00:00.000Z",
"to": "2018-10-31T00:00:00.000Z"
},
"dataset": {
"granularity": "Daily",
"filter":{
"and": [
{
"or":[
{
"dimension": {
"name": "SubscriptionName",
"operator": "In",
"values": [
"Azure Dev",
"Azure Prod",
"Azure PPE"
]
}
},
{
"tag": {
"name": "Environment",
"operator": "In",
"values": [
"Dev",
"PPE",
"Prod"
]
}
}
]
},
{
"dimension": {
"name": "DepartmentName",
"operator": "In",
"values": [
"Azure Dept"
]
}
}
]
}
}
}
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query/ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
"name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
"type": "microsoft.costmanagement/Query",
"properties": {
"nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2019-03-01-preview&$skiptoken=AQAAAA%3D%3D",
"columns": [
{
"name": "PreTaxCost",
"type": "Number"
},
{
"name": "UsageDate",
"type": "Number"
},
{
"name": "Currency",
"type": "String"
}
],
"rows": [
[
19.545363672276512,
20180831,
"USD"
],
[
173.41979241290323,
20180930,
"USD"
],
[
20.359416562625452,
20181031,
"USD"
]
]
}
}
]
}
}
}
}
Loading

0 comments on commit e099b06

Please sign in to comment.