From 7b927cf53f15dfbde515c6e0cc96f0b2b953efc3 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 8 Mar 2018 15:44:47 -0800 Subject: [PATCH 01/22] Added Tags filter for budgets and updated the api version Added Tags filter for budgets and updated the api version --- .../stable/2018-03-31/consumption.json | 2146 +++++++++++++++++ .../stable/2018-03-31/examples/Budget.json | 71 + .../2018-03-31/examples/BudgetsList.json | 159 ++ .../examples/CreateOrUpdateBudget.json | 184 ++ .../2018-03-31/examples/DeleteBudget.json | 12 + .../2018-03-31/examples/MarketplacesList.json | 42 + .../MarketplacesListForBillingPeriod.json | 44 + .../2018-03-31/examples/PriceSheet.json | 33 + .../2018-03-31/examples/PriceSheetExpand.json | 44 + .../examples/PriceSheetForBillingPeriod.json | 34 + .../examples/ReservationDetails.json | 34 + .../ReservationDetailsWithReservationId.json | 35 + .../examples/ReservationSummariesDaily.json | 36 + ...vationSummariesDailyWithReservationId.json | 37 + .../examples/ReservationSummariesMonthly.json | 35 + ...tionSummariesMonthlyWithReservationId.json | 36 + .../examples/UsageDetailsExpand.json | 58 + .../2018-03-31/examples/UsageDetailsList.json | 38 + .../UsageDetailsListForBillingPeriod.json | 39 + .../consumption/resource-manager/readme.md | 19 +- 20 files changed, 3131 insertions(+), 5 deletions(-) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json new file mode 100644 index 000000000000..d037dccbf6f2 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -0,0 +1,2146 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-03-31", + "title": "ConsumptionManagementClient", + "description": "Consumption management client provides access to consumption resources for Azure Enterprise Subscriptions." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetails_List", + "description": "Lists the usage details for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsList": { + "$ref": "./examples/UsageDetailsList.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetails_ListByBillingPeriod", + "description": "Lists the usage details for a scope by billing period. Usage details are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "UsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriod.json" + }, + "UsageDetailsExpand": { + "$ref": "./examples/UsageDetailsExpand.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "name": "$expand", + "description": "May be used to expand the properties/additionalProperties or properties/meterDetails within a list of usage details. By default, these fields are not included when listing usage details.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$filter", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N usageDetails.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/UsageDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "Marketplaces_List", + "description": "Lists the marketplaces for a scope by subscriptionId. Marketplaces are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "MarketplacesList": { + "$ref": "./examples/MarketplacesList.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/MarketplacesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "Marketplaces_ListByBillingPeriod", + "description": "Lists the marketplaces for a scope by billing period and subscripotionId. Marketplaces are available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "MarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesListForBillingPeriod.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter marketplaces by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the most recent N marketplaces.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/MarketplacesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationSummaries": { + "get": { + "tags": [ + "ReservedInstances" + ], + "operationId": "ReservationsSummaries_ListByReservationOrder", + "description": "Lists the reservations summaries for daily or monthly grain.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationSummariesDaily": { + "$ref": "./examples/ReservationSummariesDaily.json" + }, + "ReservationSummariesMonthly": { + "$ref": "./examples/ReservationSummariesMonthly.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "name": "grain", + "description": "Can be daily or monthly", + "in": "query", + "required": true, + "type": "string", + "enum": [ + "daily", + "monthly" + ], + "x-ms-enum": { + "name": "datagrain", + "modelAsString": true, + "values": [ + { + "value": "daily", + "description": "Daily grain of data", + "name": "DailyGrain" + }, + { + "value": "monthly", + "description": "Monthly grain of data", + "name": "MonthlyGrain" + } + ] + } + }, + { + "name": "$filter", + "description": "Required only for daily grain. The properties/UsageDate for start date and end date. The filter supports 'le' and 'ge'", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ReservationSummariesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.Consumption/reservationSummaries": { + "get": { + "tags": [ + "ReservedInstances" + ], + "operationId": "ReservationsSummaries_ListByReservationOrderAndReservation", + "description": "Lists the reservations summaries for daily or monthly grain.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationSummariesDailyWithReservationId": { + "$ref": "./examples/ReservationSummariesDailyWithReservationId.json" + }, + "ReservationSummariesMonthlyWithReservationId": { + "$ref": "./examples/ReservationSummariesMonthlyWithReservationId.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "$ref": "#/parameters/reservationIdParameter" + }, + { + "name": "grain", + "description": "Can be daily or monthly", + "in": "query", + "required": true, + "type": "string", + "enum": [ + "daily", + "monthly" + ], + "x-ms-enum": { + "name": "datagrain", + "modelAsString": true, + "values": [ + { + "value": "daily", + "description": "Daily grain of data", + "name": "DailyGrain" + }, + { + "value": "monthly", + "description": "Monthly grain of data", + "name": "MonthlyGrain" + } + ] + } + }, + { + "name": "$filter", + "description": "Required only for daily grain. The properties/UsageDate for start date and end date. The filter supports 'le' and 'ge'", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ReservationSummariesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationDetails": { + "get": { + "tags": [ + "ReservedInstances" + ], + "operationId": "ReservationsDetails_ListByReservationOrder", + "description": "Lists the reservations details for provided date range.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationDetails": { + "$ref": "./examples/ReservationDetails.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "name": "$filter", + "description": "Filter reservation details by date range. The properties/UsageDate for start date and end date. The filter supports 'le' and 'ge' ", + "in": "query", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ReservationDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/reservations/{reservationId}/providers/Microsoft.Consumption/reservationDetails": { + "get": { + "tags": [ + "ReservedInstances" + ], + "operationId": "ReservationsDetails_ListByReservationOrderAndReservation", + "description": "Lists the reservations details for provided date range.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationDetailsWithReservationId": { + "$ref": "./examples/ReservationDetailsWithReservationId.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/reservationOrderIdParameter" + }, + { + "$ref": "#/parameters/reservationIdParameter" + }, + { + "name": "$filter", + "description": "Filter reservation details by date range. The properties/UsageDate for start date and end date. The filter supports 'le' and 'ge' ", + "in": "query", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ReservationDetailsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/budgets": { + "get": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_List", + "description": "Lists all budgets for a subscription.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "BudgetsList": { + "$ref": "./examples/BudgetsList.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/BudgetsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Consumption/budgets": { + "get": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_ListByResourceGroupName", + "description": "Lists all budgets for a resource group under a subscription.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "BudgetsList": { + "$ref": "./examples/BudgetsList.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/BudgetsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/budgets/{budgetName}": { + "get": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_Get", + "description": "Gets the budget for a subscription by budget name.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "Budget": { + "$ref": "./examples/Budget.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/budgetNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Budget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_CreateOrUpdate", + "description": "The operation to create or update a budget. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "CreateOrUpdateBudget": { + "$ref": "./examples/CreateOrUpdateBudget.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/budgetNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Budget" + }, + "description": "Parameters supplied to the Create Budget operation." + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Budget" + } + }, + "201": { + "description": "Created.", + "schema": { + "$ref": "#/definitions/Budget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_Delete", + "description": "The operation to delete a budget.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "DeleteBudget": { + "$ref": "./examples/DeleteBudget.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/budgetNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Consumption/budgets/{budgetName}": { + "get": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_GetByResourceGroupName", + "description": "Gets the budget for a resource group under a subscription by budget name.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "Budget": { + "$ref": "./examples/Budget.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/budgetNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Budget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_CreateOrUpdateByResourceGroupName", + "description": "The operation to create or update a budget. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "CreateOrUpdateBudget": { + "$ref": "./examples/CreateOrUpdateBudget.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/budgetNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Budget" + }, + "description": "Parameters supplied to the Create Budget operation." + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Budget" + } + }, + "201": { + "description": "Created.", + "schema": { + "$ref": "#/definitions/Budget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_DeleteByResourceGroupName", + "description": "The operation to delete a budget.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "DeleteBudget": { + "$ref": "./examples/DeleteBudget.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/budgetNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Consumption/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "description": "Lists all of the available consumption REST API operations.", + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/pricesheets/default": { + "get": { + "tags": [ + "PriceSheet" + ], + "operationId": "PriceSheet_Get", + "description": "Gets the price sheet for a scope by subscriptionId. Price sheet is available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "PriceSheet": { + "$ref": "./examples/PriceSheet.json" + } + }, + "parameters": [ + { + "name": "$expand", + "description": "May be used to expand the properties/meterDetails within a price sheet. By default, these fields are not included when returning price sheet.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the top N results.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/PriceSheetResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/pricesheets/default": { + "get": { + "tags": [ + "PriceSheet" + ], + "operationId": "PriceSheet_GetByBillingPeriod", + "description": "Get the price sheet for a scope by subscriptionId and billing period. Price sheet is available via this API only for May 1, 2014 or later.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "PriceSheetForBillingPeriod": { + "$ref": "./examples/PriceSheetForBillingPeriod.json" + }, + "PriceSheetExpand": { + "$ref": "./examples/PriceSheetExpand.json" + } + }, + "parameters": [ + { + "name": "$expand", + "description": "May be used to expand the properties/meterDetails within a price sheet. By default, these fields are not included when returning price sheet.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$skiptoken", + "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "$top", + "description": "May be used to limit the number of results to the top N results.", + "in": "query", + "required": false, + "type": "integer", + "minimum": 1, + "maximum": 1000 + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/PriceSheetResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "MeterDetails": { + "description": "The properties of the meter detail.", + "properties": { + "meterName": { + "description": "The name of the meter, within the given meter category", + "type": "string", + "readOnly": true + }, + "meterCategory": { + "description": "The category of the meter, for example, 'Cloud services', 'Networking', etc..", + "type": "string", + "readOnly": true + }, + "meterSubCategory": { + "description": "The subcategory of the meter, for example, 'A6 Cloud services', 'ExpressRoute (IXP)', etc..", + "type": "string", + "readOnly": true + }, + "unit": { + "description": "The unit in which the meter consumption is charged, for example, 'Hours', 'GB', etc.", + "type": "string", + "readOnly": true + }, + "meterLocation": { + "description": "The location in which the Azure service is available.", + "type": "string", + "readOnly": true + }, + "totalIncludedQuantity": { + "description": "The total included quantity associated with the offer.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "pretaxStandardRate": { + "description": "The pretax listing price.", + "type": "number", + "format": "decimal", + "readOnly": true + } + } + }, + "UsageDetail": { + "description": "An usage detail resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/UsageDetailProperties", + "title": "Usage detail properties" + } + } + }, + "UsageDetailsListResult": { + "description": "Result of listing usage details. It contains a list of available usage details in reverse chronological order by billing period.", + "properties": { + "value": { + "description": "The list of usage details.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/UsageDetail" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "UsageDetailProperties": { + "description": "The properties of the usage detail.", + "properties": { + "billingPeriodId": { + "description": "The id of the billing period resource that the usage belongs to.", + "type": "string", + "readOnly": true + }, + "invoiceId": { + "description": "The id of the invoice resource that the usage belongs to.", + "type": "string", + "readOnly": true + }, + "usageStart": { + "description": "The start of the date time range covered by the usage detail.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "usageEnd": { + "description": "The end of the date time range covered by the usage detail.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "instanceName": { + "description": "The name of the resource instance that the usage is about.", + "type": "string", + "readOnly": true + }, + "instanceId": { + "description": "The uri of the resource instance that the usage is about.", + "type": "string", + "readOnly": true + }, + "instanceLocation": { + "description": "The location of the resource instance that the usage is about.", + "type": "string", + "readOnly": true + }, + "currency": { + "description": "The ISO currency in which the meter is charged, for example, USD.", + "type": "string", + "readOnly": true + }, + "usageQuantity": { + "description": "The quantity of usage.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "billableQuantity": { + "description": "The billable usage quantity.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "pretaxCost": { + "description": "The amount of cost before tax.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "isEstimated": { + "description": "The estimated usage is subject to change.", + "type": "boolean", + "readOnly": true + }, + "meterId": { + "description": "The meter id.", + "type": "string", + "readOnly": true + }, + "meterDetails": { + "description": "The details about the meter. By default this is not populated, unless it's specified in $expand.", + "$ref": "#/definitions/MeterDetails", + "readOnly": true + }, + "subscriptionGuid": { + "description": "Subscription guid.", + "type": "string", + "readOnly": true + }, + "subscriptionName": { + "description": "Subscription name.", + "type": "string", + "readOnly": true + }, + "accountName": { + "description": "Account name.", + "type": "string", + "readOnly": true + }, + "departmentName": { + "description": "Department name.", + "type": "string", + "readOnly": true + }, + "product": { + "description": "Product name.", + "type": "string", + "readOnly": true + }, + "consumedService": { + "description": "Consumed service name.", + "type": "string", + "readOnly": true + }, + "costCenter": { + "description": "The cost center of this department if it is a department and a costcenter exists", + "type": "string", + "readOnly": true + }, + "additionalProperties": { + "description": "Additional details of this usage item. By default this is not populated, unless it's specified in $expand.", + "type": "string", + "readOnly": true + } + } + }, + "Marketplace": { + "description": "An marketplace resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/MarketplaceProperties", + "title": "Marketplace properties" + } + } + }, + "MarketplacesListResult": { + "description": "Result of listing marketplaces. It contains a list of available marketplaces in reverse chronological order by billing period.", + "type": "object", + "properties": { + "value": { + "description": "The list of marketplaces.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Marketplace" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "MarketplaceProperties": { + "description": "The properties of the marketplace usage detail.", + "type": "object", + "properties": { + "billingPeriodId": { + "description": "The id of the billing period resource that the usage belongs to.", + "type": "string", + "readOnly": true + }, + "usageStart": { + "description": "The start of the date time range covered by the usage detail.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "usageEnd": { + "description": "The end of the date time range covered by the usage detail.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "resourceRate": { + "description": "The marketplace resource rate.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "offerName": { + "description": "The type of offer.", + "type": "string", + "readOnly": true + }, + "resourceGroup": { + "description": "The name of resource group.", + "type": "string", + "readOnly": true + }, + "orderNumber": { + "description": "The order number.", + "type": "string", + "readOnly": true + }, + "instanceName": { + "description": "The name of the resource instance that the usage is about.", + "type": "string", + "readOnly": true + }, + "instanceId": { + "description": "The uri of the resource instance that the usage is about.", + "type": "string", + "readOnly": true + }, + "currency": { + "description": "The ISO currency in which the meter is charged, for example, USD.", + "type": "string", + "readOnly": true + }, + "consumedQuantity": { + "description": "The quantity of usage.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "unitOfMeasure": { + "description": "The unit of measure.", + "type": "string", + "readOnly": true + }, + "pretaxCost": { + "description": "The amount of cost before tax.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "isEstimated": { + "description": "The estimated usage is subject to change.", + "type": "boolean", + "readOnly": true + }, + "meterId": { + "description": "The meter id.", + "type": "string", + "readOnly": true + }, + "subscriptionGuid": { + "description": "Subscription guid.", + "type": "string", + "readOnly": true + }, + "subscriptionName": { + "description": "Subscription name.", + "type": "string", + "readOnly": true + }, + "accountName": { + "description": "Account name.", + "type": "string", + "readOnly": true + }, + "departmentName": { + "description": "Department name.", + "type": "string", + "readOnly": true + }, + "consumedService": { + "description": "Consumed service name.", + "type": "string", + "readOnly": true + }, + "costCenter": { + "description": "The cost center of this department if it is a department and a costcenter exists", + "type": "string", + "readOnly": true + }, + "additionalProperties": { + "description": "Additional details of this usage item. By default this is not populated, unless it's specified in $expand.", + "type": "string", + "readOnly": true + }, + "publisherName": { + "description": "The name of publisher.", + "type": "string", + "readOnly": true + }, + "planName": { + "description": "The name of plan.", + "type": "string", + "readOnly": true + } + } + }, + "ReservationSummaries": { + "description": "reservation summaries resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ReservationSummariesProperties", + "title": "Reservation Summaries properties" + } + } + }, + "ReservationSummariesListResult": { + "description": "Result of listing reservation summaries.", + "properties": { + "value": { + "description": "The list of reservation summaries.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ReservationSummaries" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "ReservationSummariesProperties": { + "description": "The properties of the reservation summaries.", + "properties": { + "reservationOrderId": { + "description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.", + "type": "string", + "readOnly": true + }, + "reservationId": { + "description": "The reservation ID is the identifier of a reservation within a reservation order. Each reservation is the grouping for applying the benefit scope and also specifies the number of instances to which the reservation benefit can be applied to.", + "type": "string", + "readOnly": true + }, + "skuName": { + "description": "This is the ARM Sku name. It can be used to join with the servicetype field in additoinalinfo in usage records.", + "type": "string", + "readOnly": true + }, + "reservedHours": { + "description": "This is the total hours reserved. E.g. if reservation for 1 instance was made on 1 PM, this will be 11 hours for that day and 24 hours from subsequent days", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "usageDate": { + "description": "Data corresponding to the utilization record. If the grain of data is monthly, it will be first day of month.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "usedHours": { + "description": "Total used hours by the reservation", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "minUtilizationPercentage": { + "description": "This is the minimum hourly utilization in the usage time (day or month). E.g. if usage record corresponds to 12/10/2017 and on that for hour 4 and 5, utilization was 10%, this field will return 10% for that day", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "avgUtilizationPercentage": { + "description": "This is average utilization for the entire time range. (day or month depending on the grain)", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "maxUtilizationPercentage": { + "description": "This is the maximum hourly utilization in the usage time (day or month). E.g. if usage record corresponds to 12/10/2017 and on that for hour 4 and 5, utilization was 100%, this field will return 100% for that day.", + "type": "number", + "format": "decimal", + "readOnly": true + } + } + }, + "ReservationDetails": { + "description": "reservation details resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ReservationDetailsProperties", + "title": "Reservation Details properties" + } + } + }, + "ReservationDetailsListResult": { + "description": "Result of listing reservation details.", + "properties": { + "value": { + "description": "The list of reservation details.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ReservationDetails" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "ReservationDetailsProperties": { + "description": "The properties of the reservation details.", + "properties": { + "reservationOrderId": { + "description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.", + "type": "string", + "readOnly": true + }, + "reservationId": { + "description": "The reservation ID is the identifier of a reservation within a reservation order. Each reservation is the grouping for applying the benefit scope and also specifies the number of instances to which the reservation benefit can be applied to.", + "type": "string", + "readOnly": true + }, + "skuName": { + "description": "This is the ARM Sku name. It can be used to join with the servicetype field in additoinalinfo in usage records.", + "type": "string", + "readOnly": true + }, + "reservedHours": { + "description": "This is the total hours reserved for the day. E.g. if reservation for 1 instance was made on 1 PM, this will be 11 hours for that day and 24 hours from subsequent days.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "usageDate": { + "description": "The date on which consumption occurred.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "usedHours": { + "description": "This is the total hours used by the instance.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "instanceId": { + "description": "This identifier is the name of the resource or the fully qualified Resource ID.", + "type": "string", + "readOnly": true + }, + "totalReservedQuantity": { + "description": "This is the total count of instances that are reserved for the reservationid.", + "type": "number", + "format": "decimal", + "readOnly": true + } + } + }, + "BudgetsListResult": { + "description": "Result of listing budgets. It contains a list of available budgets in the scope provided.", + "properties": { + "value": { + "description": "The list of budgets.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Budget" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "Budget": { + "description": "A budget resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/BudgetProperties", + "title": "Budget properties" + } + } + }, + "BudgetProperties": { + "description": "The properties of the budget.", + "properties": { + "category": { + "description": "The category of the budget, whether the budget tracks cost or usage.", + "type": "string", + "enum": [ + "Cost", + "Usage" + ], + "x-ms-enum": { + "name": "CategoryType", + "modelAsString": true + } + }, + "amount": { + "description": "The total amount of cost to track with the budget", + "type": "number", + "format": "decimal" + }, + "timeGrain": { + "description": "The time covered by a budget. Tracking of the amount will be reset based on the time grain.", + "type": "string", + "enum": [ + "Monthly", + "Quarterly", + "Annually" + ], + "x-ms-enum": { + "name": "TimeGrainType", + "modelAsString": true + } + }, + "timePeriod": { + "description": "Has start and end date of the budget. The start date must be first of the month and should be less than the end date. Budget start date must be on or after June 1, 2017. Future start date should not be more than three months. Past start date should be selected within the timegrain preiod. There are no restrictions on the end date.", + "$ref": "#/definitions/BudgetTimePeriod" + }, + "filters": { + "description": "May be used to filter budgets by resource group, resource, or meter.", + "type": "object", + "$ref": "#/definitions/Filters" + }, + "currentSpend": { + "description": "The current amount of cost which is being tracked for a budget.", + "$ref": "#/definitions/CurrentSpend", + "readOnly": true + }, + "notifications": { + "type": "object", + "description": "Dictionary of notifications associated with the budget. Budget can have up to five notifications.", + "additionalProperties": { + "type": "object", + "$ref": "#/definitions/Notification" + }, + "maxItems": 5 + } + }, + "required": [ + "category", + "amount", + "timeGrain", + "timePeriod" + ] + }, + "BudgetTimePeriod": { + "description": "The start and end date for a budget.", + "properties": { + "startDate": { + "description": "The start date for the budget.", + "type": "string", + "format": "date-time" + }, + "endDate": { + "description": "The end date for the budget. If not provided, we default this to 10 years from the start date.", + "type": "string", + "format": "date-time" + } + }, + "required": [ + "startDate" + ] + }, + "Filters": { + "description": "May be used to filter budgets by resource group, resource, or meter.", + "properties": { + "resourceGroups": { + "description": "The list of filters on resource groups, allowed at subscription level only.", + "type": "array", + "items": { + "type": "string" + }, + "minItems": 0, + "maxItems": 10 + }, + "resources": { + "description": "The list of filters on resources.", + "type": "array", + "items": { + "type": "string" + }, + "minItems": 0, + "maxItems": 10 + }, + "meters": { + "description": "The list of filters on meters, mandatory for budgets of usage category. ", + "type": "array", + "items": { + "type": "string" + }, + "minItems": 0, + "maxItems": 10 + }, + "tags": { + "type": "object", + "description": "Dictionary of filters on tags.", + "additionalProperties": { + "type": "array", + "items": { + "type": "string" + } + }, + "minItems": 0, + "maxItems": 10 + } + } + }, + "CurrentSpend": { + "description": "The current amount of cost which is being tracked for a budget.", + "properties": { + "amount": { + "description": "The total amount of cost which is being tracked by the budget.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "unit": { + "description": "The unit of measure for the budget amount.", + "type": "string", + "readOnly": true + } + } + }, + "Notification": { + "description": "The notification associated with a budget.", + "properties": { + "enabled": { + "description": "The notification is enabled or not.", + "type": "boolean" + }, + "operator": { + "description": "The comparison operator.", + "type": "string", + "enum": [ + "EqualTo", + "GreaterThan", + "GreaterThanOrEqualTo" + ], + "x-ms-enum": { + "name": "OperatorType", + "modelAsString": true + } + }, + "threshold": { + "description": "Threshold value associated with a notification. Notification is sent when the cost exceeded the threshold. It is always percent and has to be between 0 and 1000.", + "type": "number", + "format": "decimal" + }, + "contactEmails": { + "description": "Email addresses to send the budget notification to when the threshold is exceeded.", + "type": "array", + "items": { + "type": "string" + }, + "minItems": 1, + "maxItems": 50 + }, + "contactRoles": { + "description": "Contact roles to send the budget notification to when the threshold is exceeded.", + "type": "array", + "items": { + "type": "string" + } + }, + "contactGroups": { + "description": "Action groups to send the budget notification to when the threshold is exceeded.", + "type": "array", + "items": { + "type": "string" + }, + "minItems": 0, + "maxItems": 50 + } + }, + "required": [ + "enabled", + "operator", + "threshold", + "contactEmails" + ] + }, + "ErrorDetails": { + "description": "The details of the error.", + "properties": { + "code": { + "description": "Error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string", + "readOnly": true + } + } + }, + "ErrorResponse": { + "description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message.", + "type": "object", + "properties": { + "error": { + "description": "The details of the error.", + "$ref": "#/definitions/ErrorDetails" + } + } + }, + "Operation": { + "description": "A Consumption REST API operation.", + "type": "object", + "properties": { + "name": { + "description": "Operation name: {provider}/{resource}/{operation}.", + "type": "string", + "readOnly": true + }, + "display": { + "description": "The object that represents the operation.", + "properties": { + "provider": { + "description": "Service provider: Microsoft.Consumption.", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "Resource on which the operation is performed: UsageDetail, etc.", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "Operation type: Read, write, delete, etc.", + "type": "string", + "readOnly": true + } + } + } + } + }, + "OperationListResult": { + "description": "Result of listing consumption operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "value": { + "description": "List of consumption operations supported by the Microsoft.Consumption resource provider.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Operation" + } + }, + "nextLink": { + "description": "URL to get the next set of operation list results if there are any.", + "type": "string", + "readOnly": true + } + } + }, + "Resource": { + "description": "The Resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + }, + "tags": { + "readOnly": true, + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags." + } + }, + "x-ms-azure-resource": true + }, + "ProxyResource": { + "description": "The Resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type." + }, + "eTag": { + "type": "string", + "description": "eTag of the resource. To handle concurrent update scenarion, this field will be used to determine whether the user is updating the latest version or not." + } + }, + "x-ms-azure-resource": true + }, + "PriceSheetResult": { + "description": "An pricesheet resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/PriceSheetModel", + "title": "Price sheet properties" + } + } + }, + "PriceSheetModel": { + "description": "price sheet result. It contains the pricesheet associated with billing period", + "properties": { + "pricesheets": { + "description": "Price sheet", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/PriceSheetProperties" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "PriceSheetProperties": { + "description": "The properties of the price sheet.", + "properties": { + "billingPeriodId": { + "description": "The id of the billing period resource that the usage belongs to.", + "type": "string", + "readOnly": true + }, + "meterId": { + "description": "The meter id", + "type": "string", + "readOnly": true + }, + "meterDetails": { + "description": "The details about the meter. By default this is not populated, unless it's specified in $expand.", + "$ref": "#/definitions/MeterDetails", + "readOnly": true + }, + "unitOfMeasure": { + "description": "Unit of measure", + "type": "string", + "readOnly": true + }, + "includedQuantity": { + "description": "Included quality for an offer", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "partNumber": { + "description": "Part Number", + "type": "string", + "readOnly": true + }, + "unitPrice": { + "description": "Unit Price", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "currencyCode": { + "description": "Currency Code", + "type": "string", + "readOnly": true + } + } + } + }, + "parameters": { + "apiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Version of the API to be used with the client request. The current version is 2018-03-31." + }, + "subscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Azure Subscription ID.", + "required": true, + "type": "string" + }, + "resourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "description": "Azure Resource Group Name.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "budgetNameParameter": { + "name": "budgetName", + "in": "path", + "description": "Budget Name.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "billingPeriodNameParameter": { + "name": "billingPeriodName", + "in": "path", + "description": "Billing Period Name.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "reservationOrderIdParameter": { + "name": "reservationOrderId", + "in": "path", + "description": "Order Id of the reservation", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "reservationIdParameter": { + "name": "reservationId", + "in": "path", + "description": "Id of the reservation", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json new file mode 100644 index 000000000000..21d9548d4d16 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json @@ -0,0 +1,71 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MPDEVTESTRG", + "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/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "fe167397-a38d-43c3-9bb3-8e2907e56a41" + ], + "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": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json new file mode 100644 index 000000000000..de946838fc00 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json @@ -0,0 +1,159 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MPDEVTESTRG" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "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/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "fe167397-a38d-43c3-9bb3-8e2907e56a41" + ], + "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": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ] + }, + "Actual_GreaterThanOrEqualTo_90_Percent": { + "enabled": true, + "operator": "GreaterThanOrEqualTo", + "threshold": 90, + "contactEmails": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + }, + { + "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget", + "name": "TestBudget", + "type": "Microsoft.Consumption/budgets", + "eTag": "\"1d34d012214157f\"", + "properties": { + "category": "Cost", + "amount": 600.65, + "timeGrain": "Monthly", + "timePeriod": { + "startDate": "2017-10-01T00:00:00Z", + "endDate": "2018-10-31T00:00:00Z" + }, + "filters": { + "resourceGroups": [ + "MPDEVTESTRG" + ], + "resources": [ + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "fe167397-a38d-43c3-9bb3-8e2907e56a41" + ], + "tags": { + "category": [ + "Dev", + "Prod" + ], + "department": [ + "engineering", + "sales" + ] + } + }, + "currentSpend": { + "amount": 120.89, + "unit": "USD" + }, + "notifications": { + "Actual_GreaterThan_40_Percent": { + "enabled": true, + "operator": "GreaterThan", + "threshold": 40, + "contactEmails": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ] + }, + "Actual_GreaterThanOrEqualTo_60_Percent": { + "enabled": true, + "operator": "GreaterThanOrEqualTo", + "threshold": 60, + "contactEmails": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json new file mode 100644 index 000000000000..ad7694ebd504 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json @@ -0,0 +1,184 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MPDEVTESTRG", + "budgetName": "TestBudget", + "parameters": { + "eTag": "\"1d34d016a593709\"", + "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/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "fe167397-a38d-43c3-9bb3-8e2907e56a41" + ], + "tags": { + "category": [ + "Dev", + "Prod" + ], + "department": [ + "engineering", + "sales" + ] + } + }, + "notifications": { + "Actual_GreaterThan_80_Percent": { + "enabled": true, + "operator": "GreaterThan", + "threshold": 80, + "contactEmails": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + }, + "responses": { + "201": { + "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/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "fe167397-a38d-43c3-9bb3-8e2907e56a41" + ], + "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": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + }, + "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/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "fe167397-a38d-43c3-9bb3-8e2907e56a41" + ], + "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": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json new file mode 100644 index 000000000000..33a432c5cbcd --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MPDEVTESTRG", + "budgetName": "TestBudget" + }, + "responses": { + "200": { + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json new file mode 100644 index 000000000000..13bf7e2d8612 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-4a5f-88ca-5fce9a69faa0" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/marketPlaces/marketplaceId1", + "name": "marketplaceId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "4ca79679-0000-0000-bfe5-b8ca1ff80e00", + "publisherName": "xyz", + "planName": "plan1", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-4a5f-88ca-5fce9a69faa0", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json new file mode 100644 index 000000000000..51c9e37dcf8f --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-4a5f-88ca-5fce9a69faa0", + "billingPeriodName": "201801" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketPlaces/marketplacesId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "4ca79679-0000-0000-bfe5-b8ca1ff80e2b", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-4a5f-88ca-5fce9a69faa0", + "subscriptionName": "azure subscription" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json new file mode 100644 index 000000000000..72a3d63113f8 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json @@ -0,0 +1,33 @@ +{ + "parameters": + { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": + { + "200": + { + "body": + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/pricesheets/default", + "name": "default", + "type": "Microsoft.Consumption/pricesheets", + "properties": + { + "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31&$skiptoken=AQAAAA%3D%3D", + "pricesheets": [ + { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "unitOfMeasure": "100 Hours", + "includedQuantity": 100, + "partNumber": "AB-11110", + "unitPrice": 0.00328, + "currencyCode": "EUR" + }] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json new file mode 100644 index 000000000000..ff9c78144bfb --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json @@ -0,0 +1,44 @@ +{ + "parameters": + { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "billingPeriodName": "201801", + "$expand": "meterDetails" + }, + "responses": + { + "200": + { + "body": + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default", + "name": "default", + "type": "Microsoft.Consumption/pricesheets", + "properties": + { + "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31&$skiptoken=AQAAAA%3D%3D&$expand=properties/pricesheets/meterDetails", + "pricesheets": [ + { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "unitOfMeasure": "100 Hours", + "includedQuantity": 100, + "partNumber": "AB-11110", + "unitPrice": 0.00328, + "currencyCode": "EUR", + "meterDetails": + { + "meterName": "Data Transfer Out (GB)", + "meterCategory": "Networking", + "unit": "GB", + "meterLocation": "Zone 2", + "totalIncludedQuantity": 0, + "pretaxStandardRate": 0.138 + } + }] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json new file mode 100644 index 000000000000..cc2177ac7340 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json @@ -0,0 +1,34 @@ +{ + "parameters": + { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "billingPeriodName": "201801" + }, + "responses": + { + "200": + { + "body": + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/pricesheets/default", + "name": "default", + "type": "Microsoft.Consumption/pricesheets", + "properties": + { + "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/microsoft.consumption/pricesheets/default?api-version=2018-01-31", + "pricesheets": [ + { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "unitOfMeasure": "100 Hours", + "includedQuantity": 100, + "partNumber": "AB-11110", + "unitPrice": 0.00328, + "currencyCode": "EUR" + }] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json new file mode 100644 index 000000000000..881c6548b58c --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ba4a5693-71ef-4ec2-a5ea-c4897ee7e740/providers/Microsoft.Consumption/reservationDetails/20171129", + "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ba4a5693-71ef-4ec2-a5ea-c4897ee7e740_20171129", + "type": "Microsoft.Consumption/reservationDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "usageDate": "2017-11-29T00:00:00Z", + "skuName": "Standard_D2_v2", + "instanceId": "/subscriptions/ace02136-302a-429c-a2c8-dac173f60bea/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/wvn-sql2014sp33", + "totalReservedQuantity": 1.000000000000000, + "reservedHours": 24.000000000000000, + "usedHours": 24.000000000000000 + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json new file mode 100644 index 000000000000..0fb6e5d35ec0 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ba4a5693-71ef-4ec2-a5ea-c4897ee7e740/providers/Microsoft.Consumption/reservationDetails/20171129", + "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ba4a5693-71ef-4ec2-a5ea-c4897ee7e740_20171129", + "type": "Microsoft.Consumption/reservationDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "usageDate": "2017-11-29T00:00:00Z", + "skuName": "Standard_D2_v2", + "instanceId": "/subscriptions/ace02136-302a-429c-a2c8-dac173f60bea/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/wvn-sql2014sp33", + "totalReservedQuantity": 1.000000000000000, + "reservedHours": 24.000000000000000, + "usedHours": 24.000000000000000 + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json new file mode 100644 index 000000000000..c8189ed301fd --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "grain":"daily", + "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-11-20'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "type": "Microsoft.Consumption/reservationsummaries", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "skuName": "Standard_D8s_v3", + "reservedHours": 0.0, + "usageDate": "2017-10-01T00:00:00Z", + "usedHours": 0.0, + "minUtilizationPercentage": 0.0, + "avgUtilizationPercentage": 0.0, + "maxUtilizationPercentage": 0.0 + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json new file mode 100644 index 000000000000..39dddd24a1d9 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "grain":"daily", + "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-11-20'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "type": "Microsoft.Consumption/reservationsummaries", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "skuName": "Standard_D8s_v3", + "reservedHours": 0.0, + "usageDate": "2017-10-01T00:00:00Z", + "usedHours": 0.0, + "minUtilizationPercentage": 0.0, + "avgUtilizationPercentage": 0.0, + "maxUtilizationPercentage": 0.0 + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json new file mode 100644 index 000000000000..9e98e91322a0 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "grain":"monthly" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "type": "Microsoft.Consumption/reservationsummaries", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "skuName": "Standard_D8s_v3", + "reservedHours": 0.0, + "usageDate": "2017-10-01T00:00:00Z", + "usedHours": 0.0, + "minUtilizationPercentage": 0.0, + "avgUtilizationPercentage": 0.0, + "maxUtilizationPercentage": 0.0 + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json new file mode 100644 index 000000000000..c91930f18e40 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "grain":"monthly" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "type": "Microsoft.Consumption/reservationsummaries", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "skuName": "Standard_D8s_v3", + "reservedHours": 0.0, + "usageDate": "2017-10-01T00:00:00Z", + "usedHours": 0.0, + "minUtilizationPercentage": 0.0, + "avgUtilizationPercentage": 0.0, + "maxUtilizationPercentage": 0.0 + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json new file mode 100644 index 000000000000..808c35157c05 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json @@ -0,0 +1,58 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "subid", + "billingPeriodName": "201702", + "$expand": "meterDetails,additionalProperties", + "$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14'", + "$top": 1 + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/subscriptions/subid/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "meterDetails": { + "meterName": "Data Transfer Out (GB)", + "meterCategory": "Networking", + "unit": "GB", + "meterLocation": "Zone 2", + "totalIncludedQuantity": 0, + "pretaxStandardRate": 0.138 + }, + "subscriptionGuid": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "subscriptionName": "Dummy subscription", + "accountName": "My account name", + "departmentName": "My department name", + "product": "My product name", + "consumedService": "My consumed service", + "costCenter": "Cost center 1", + "additionalProperties": "{\"MyType\":\"\",\"ServiceType\":\"\",\"VMName\":\"\",\"UsageType\":\"MyUsage\"}" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json new file mode 100644 index 000000000000..5c4bc3385128 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/subscriptions/subid/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json new file mode 100644 index 000000000000..e20b4ede8ca7 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "subid", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/subscriptions/subid/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/readme.md b/specification/consumption/resource-manager/readme.md index 65b3c969eb8b..a1ea5b98238d 100644 --- a/specification/consumption/resource-manager/readme.md +++ b/specification/consumption/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the Consumption API. ``` yaml openapi-type: arm -tag: package-2018-01 +tag: package-2018-03 azure-validator: true ``` @@ -40,13 +40,13 @@ input-file: ``` --- -### Tag: package-2018-01 +### Tag: package-2018-03 -These settings apply only when `--tag=package-2018-01` is specified on the command line. +These settings apply only when `--tag=package-2018-03` is specified on the command line. -``` yaml $(tag) == 'package-2018-01' +``` yaml $(tag) == 'package-2018-03' input-file: -- Microsoft.Consumption/stable/2018-01-31/consumption.json +- Microsoft.Consumption/stable/2018-03-31/consumption.json ``` ## Suppression @@ -154,6 +154,7 @@ batch: - tag: package-2017-11-30 - tag: package-2017-12-30-preview - tag: package-2018-01-31 + - tag: package-2018-03-31 ``` @@ -190,6 +191,14 @@ Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2018-03' && $(go) +output-folder: $(go-sdk-folder)/services/consumption/mgmt/2018-03-31/consumption +``` + ## Java These settings apply only when `--java` is specified on the command line. From c641158a0e8753654c0d36343ba3244865283f3a Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 8 Mar 2018 22:28:50 -0800 Subject: [PATCH 02/22] Updated comments Updated comments --- .../Microsoft.Consumption/stable/2018-03-31/consumption.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index d037dccbf6f2..4ef664c2ecd0 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1791,7 +1791,7 @@ }, "tags": { "type": "object", - "description": "Dictionary of filters on tags.", + "description": "The dictionary of filters on tags.", "additionalProperties": { "type": "array", "items": { From 0e276b2b94ebe626431581607e9ddf975a29df86 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Fri, 9 Mar 2018 19:47:49 -0800 Subject: [PATCH 03/22] Incorporated review comments Incorporated review comments --- .../stable/2018-03-31/consumption.json | 8 +++--- .../stable/2018-03-31/examples/Budget.json | 10 +++---- .../2018-03-31/examples/BudgetsList.json | 22 +++++++-------- .../examples/CreateOrUpdateBudget.json | 28 +++++++++---------- .../2018-03-31/examples/DeleteBudget.json | 2 +- .../2018-03-31/examples/MarketplacesList.json | 6 ++-- .../MarketplacesListForBillingPeriod.json | 8 +++--- .../2018-03-31/examples/PriceSheet.json | 4 +-- .../2018-03-31/examples/PriceSheetExpand.json | 4 +-- .../examples/PriceSheetForBillingPeriod.json | 4 +-- .../examples/ReservationDetails.json | 12 ++++---- .../ReservationDetailsWithReservationId.json | 14 +++++----- .../examples/ReservationSummariesDaily.json | 10 +++---- ...vationSummariesDailyWithReservationId.json | 12 ++++---- .../examples/ReservationSummariesMonthly.json | 10 +++---- ...tionSummariesMonthlyWithReservationId.json | 12 ++++---- .../examples/UsageDetailsExpand.json | 14 +++++----- .../2018-03-31/examples/UsageDetailsList.json | 12 ++++---- .../UsageDetailsListForBillingPeriod.json | 12 ++++---- .../consumption/resource-manager/readme.md | 10 +++++++ 20 files changed, 112 insertions(+), 102 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 4ef664c2ecd0..993fe77ce954 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1253,7 +1253,7 @@ "readOnly": true }, "meterId": { - "description": "The meter id.", + "description": "The meter id (GUID).", "type": "string", "readOnly": true }, @@ -1419,7 +1419,7 @@ "readOnly": true }, "meterId": { - "description": "The meter id.", + "description": "The meter id (GUID).", "type": "string", "readOnly": true }, @@ -1781,7 +1781,7 @@ "maxItems": 10 }, "meters": { - "description": "The list of filters on meters, mandatory for budgets of usage category. ", + "description": "The list of filters on meters (GUID), mandatory for budgets of usage category. ", "type": "array", "items": { "type": "string" @@ -2048,7 +2048,7 @@ "readOnly": true }, "meterId": { - "description": "The meter id", + "description": "The meter id (GUID)", "type": "string", "readOnly": true }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json index 21d9548d4d16..a1d05d081d63 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Budget.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-03-31", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "MPDEVTESTRG", + "resourceGroupName": "MYDEVTESTRG", "budgetName": "TestBudget" }, "responses": { @@ -25,11 +25,11 @@ "MPDEVTESTRG" ], "resources": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" ], "meters": [ - "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "00000000-0000-0000-0000-000000000000" ], "tags": { "category": [ @@ -60,7 +60,7 @@ "Reader" ], "contactGroups": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" ] } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json index de946838fc00..8ac06213049f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/BudgetsList.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-03-31", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "MPDEVTESTRG" + "resourceGroupName": "MYDEVTESTRG" }, "responses": { "200": { @@ -23,14 +23,14 @@ }, "filters": { "resourceGroups": [ - "MPDEVTESTRG" + "MYDEVTESTRG" ], "resources": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" ], "meters": [ - "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "00000000-0000-0000-0000-000000000000" ], "tags": { "category": [ @@ -74,7 +74,7 @@ "Reader" ], "contactGroups": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" ] } } @@ -95,14 +95,14 @@ }, "filters": { "resourceGroups": [ - "MPDEVTESTRG" + "MYDEVTESTRG" ], "resources": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" ], "meters": [ - "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "00000000-0000-0000-0000-000000000000" ], "tags": { "category": [ @@ -146,7 +146,7 @@ "Reader" ], "contactGroups": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" ] } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json index ad7694ebd504..947aaadf56e7 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateBudget.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-03-31", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "MPDEVTESTRG", + "resourceGroupName": "MYDEVTESTRG", "budgetName": "TestBudget", "parameters": { "eTag": "\"1d34d016a593709\"", @@ -16,14 +16,14 @@ }, "filters": { "resourceGroups": [ - "MPDEVTESTRG" + "MYDEVTESTRG" ], "resources": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" ], "meters": [ - "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "00000000-0000-0000-0000-000000000000" ], "tags": { "category": [ @@ -50,7 +50,7 @@ "Reader" ], "contactGroups": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" ] } } @@ -77,11 +77,11 @@ "MPDEVTESTRG" ], "resources": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" ], "meters": [ - "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "00000000-0000-0000-0000-000000000000" ], "tags": { "category": [ @@ -112,7 +112,7 @@ "Reader" ], "contactGroups": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" ] } } @@ -138,11 +138,11 @@ "MPDEVTESTRG" ], "resources": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSAWSIFT2", - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" ], "meters": [ - "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "00000000-0000-0000-0000-000000000000" ], "tags": { "category": [ @@ -173,7 +173,7 @@ "Reader" ], "contactGroups": [ - "/subscriptions/{subscription-id}/resourceGroups/MPDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" ] } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json index 33a432c5cbcd..d77e16b29e22 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/DeleteBudget.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2018-03-31", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "MPDEVTESTRG", + "resourceGroupName": "MYDEVTESTRG", "budgetName": "TestBudget" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json index 13bf7e2d8612..8c10effe6f71 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesList.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-31", - "subscriptionId": "00000000-0000-4a5f-88ca-5fce9a69faa0" + "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { "200": { @@ -27,11 +27,11 @@ "isEstimated": false, "offerName": "offer1", "resourceGroup": "TEST", - "orderNumber": "4ca79679-0000-0000-bfe5-b8ca1ff80e00", + "orderNumber": "00000000-0000-0000-0000-000000000000", "publisherName": "xyz", "planName": "plan1", "resourceRate": 0.24, - "subscriptionGuid": "00000000-0000-4a5f-88ca-5fce9a69faa0", + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", "subscriptionName": "azure subscription" } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json index 51c9e37dcf8f..3550e9657336 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/MarketplacesListForBillingPeriod.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-31", - "subscriptionId": "00000000-0000-4a5f-88ca-5fce9a69faa0", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201801" }, "responses": { @@ -26,14 +26,14 @@ "consumedQuantity": 0.00328, "pretaxCost": 0.67, "isEstimated": false, - "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "meterId": "00000000-0000-0000-0000-000000000000", "offerName": "offer1", "resourceGroup": "TEST", - "orderNumber": "4ca79679-0000-0000-bfe5-b8ca1ff80e2b", + "orderNumber": "00000000-0000-0000-0000-000000000000", "publisherName": "xyz", "planName": "plan2", "resourceRate": 0.24, - "subscriptionGuid": "00000000-0000-4a5f-88ca-5fce9a69faa0", + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", "subscriptionName": "azure subscription" } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json index 72a3d63113f8..cee0e7c90bf0 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheet.json @@ -19,10 +19,10 @@ "pricesheets": [ { "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", - "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "meterId": "00000000-0000-0000-0000-000000000000", "unitOfMeasure": "100 Hours", "includedQuantity": 100, - "partNumber": "AB-11110", + "partNumber": "XX-11110", "unitPrice": 0.00328, "currencyCode": "EUR" }] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json index ff9c78144bfb..31e47d096115 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetExpand.json @@ -21,10 +21,10 @@ "pricesheets": [ { "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", - "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "meterId": "00000000-0000-0000-0000-000000000000", "unitOfMeasure": "100 Hours", "includedQuantity": 100, - "partNumber": "AB-11110", + "partNumber": "XX-11110", "unitPrice": 0.00328, "currencyCode": "EUR", "meterDetails": diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json index cc2177ac7340..dbb0a1b7b5ea 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/PriceSheetForBillingPeriod.json @@ -20,10 +20,10 @@ "pricesheets": [ { "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", - "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "meterId": "00000000-0000-0000-0000-000000000000", "unitOfMeasure": "100 Hours", "includedQuantity": 100, - "partNumber": "AB-11110", + "partNumber": "XX-11110", "unitPrice": 0.00328, "currencyCode": "EUR" }] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json index 881c6548b58c..c5a3460cd183 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetails.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-31", - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'" }, "responses": { @@ -9,19 +9,19 @@ "body": { "value": [ { - "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ba4a5693-71ef-4ec2-a5ea-c4897ee7e740/providers/Microsoft.Consumption/reservationDetails/20171129", - "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ba4a5693-71ef-4ec2-a5ea-c4897ee7e740_20171129", + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationDetails/20171129", + "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171129", "type": "Microsoft.Consumption/reservationDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "usageDate": "2017-11-29T00:00:00Z", "skuName": "Standard_D2_v2", - "instanceId": "/subscriptions/ace02136-302a-429c-a2c8-dac173f60bea/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/wvn-sql2014sp33", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/abc-sql2014sp33", "totalReservedQuantity": 1.000000000000000, "reservedHours": 24.000000000000000, "usedHours": 24.000000000000000 diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json index 0fb6e5d35ec0..67ce88344331 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationDetailsWithReservationId.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-03-31", - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'" }, "responses": { @@ -10,19 +10,19 @@ "body": { "value": [ { - "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ba4a5693-71ef-4ec2-a5ea-c4897ee7e740/providers/Microsoft.Consumption/reservationDetails/20171129", - "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ba4a5693-71ef-4ec2-a5ea-c4897ee7e740_20171129", + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationDetails/20171129", + "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171129", "type": "Microsoft.Consumption/reservationDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "usageDate": "2017-11-29T00:00:00Z", "skuName": "Standard_D2_v2", - "instanceId": "/subscriptions/ace02136-302a-429c-a2c8-dac173f60bea/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/wvn-sql2014sp33", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/wvn-sql/providers/microsoft.compute/virtualmachines/wvn-sql2014sp33", "totalReservedQuantity": 1.000000000000000, "reservedHours": 24.000000000000000, "usedHours": 24.000000000000000 diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json index c8189ed301fd..108f4de1d686 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDaily.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-31", - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", "grain":"daily", "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-11-20'" }, @@ -10,16 +10,16 @@ "body": { "value": [ { - "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", - "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001", "type": "Microsoft.Consumption/reservationsummaries", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "skuName": "Standard_D8s_v3", "reservedHours": 0.0, "usageDate": "2017-10-01T00:00:00Z", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json index 39dddd24a1d9..29d5d9195bbf 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesDailyWithReservationId.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-03-31", - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "grain":"daily", "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-11-20'" }, @@ -11,16 +11,16 @@ "body": { "value": [ { - "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", - "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001", "type": "Microsoft.Consumption/reservationsummaries", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "skuName": "Standard_D8s_v3", "reservedHours": 0.0, "usageDate": "2017-10-01T00:00:00Z", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json index 9e98e91322a0..9a6e028b6b6b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthly.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-31", - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", "grain":"monthly" }, "responses": { @@ -9,16 +9,16 @@ "body": { "value": [ { - "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", - "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001", "type": "Microsoft.Consumption/reservationsummaries", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "skuName": "Standard_D8s_v3", "reservedHours": 0.0, "usageDate": "2017-10-01T00:00:00Z", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json index c91930f18e40..63446aec57d4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationSummariesMonthlyWithReservationId.json @@ -1,8 +1,8 @@ { "parameters": { "api-version": "2018-03-31", - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ba4a5693-71ef-4ec2-a5ea-c4897ee7e740", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "grain":"monthly" }, "responses": { @@ -10,16 +10,16 @@ "body": { "value": [ { - "id": "providers/Microsoft.Capacity/reservationOrders/87f3c981-3e33-43d0-b26b-dfca785cf18a/reservations/ed0bcc5a-8027-451e-8435-e96c4021abc3/providers/Microsoft.Consumption/reservationSummaries/20171001", - "name": "87f3c981-3e33-43d0-b26b-dfca785cf18a_ed0bcc5a-8027-451e-8435-e96c4021abc3_20171001", + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20171001", + "name": "00000000-0000-0000-0000-000000000000_00000000-0000-0000-0000-000000000000_20171001", "type": "Microsoft.Consumption/reservationsummaries", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "reservationOrderId": "87f3c981-3e33-43d0-b26b-dfca785cf18a", - "reservationId": "ed0bcc5a-8027-451e-8435-e96c4021abc3", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", "skuName": "Standard_D8s_v3", "reservedHours": 0.0, "usageDate": "2017-10-01T00:00:00Z", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json index 808c35157c05..00651e1d75bb 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-31", - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702", "$expand": "meterDetails,additionalProperties", "$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14'", @@ -12,7 +12,7 @@ "body": { "value": [ { - "id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -20,19 +20,19 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/subscriptions/subid/providers/Microsoft.Billing/invoices/201703-123456789", + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", - "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", "instanceLocation": "eastasia", "currency": "USD", "usageQuantity": 0.00328, "billableQuantity": 0.00328, "pretaxCost": 0.67, "isEstimated": false, - "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "meterId": "00000000-0000-0000-0000-000000000000", "meterDetails": { "meterName": "Data Transfer Out (GB)", "meterCategory": "Networking", @@ -41,7 +41,7 @@ "totalIncludedQuantity": 0, "pretaxStandardRate": 0.138 }, - "subscriptionGuid": "fe167397-a38d-43c3-9bb3-8e2907e56a41", + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", "subscriptionName": "Dummy subscription", "accountName": "My account name", "departmentName": "My department name", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json index 5c4bc3385128..3be20fd1e299 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsList.json @@ -1,14 +1,14 @@ { "parameters": { "api-version": "2018-03-31", - "subscriptionId": "subid" + "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/subid/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -16,19 +16,19 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/subscriptions/subid/providers/Microsoft.Billing/invoices/201703-123456789", + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", - "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", "instanceLocation": "eastasia", "currency": "USD", "usageQuantity": 0.00328, "billableQuantity": 0.00328, "pretaxCost": 0.67, "isEstimated": false, - "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "meterId": "00000000-0000-0000-0000-000000000000" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json index e20b4ede8ca7..05e7bde1f6fd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriod.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2018-03-31", - "subscriptionId": "subid", + "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702" }, "responses": { @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -17,19 +17,19 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/subscriptions/subid/providers/Microsoft.Billing/invoices/201703-123456789", + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", - "instanceId": "/subscriptions/subid/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", "instanceLocation": "eastasia", "currency": "USD", "usageQuantity": 0.00328, "billableQuantity": 0.00328, "pretaxCost": 0.67, "isEstimated": false, - "meterId": "fe167397-a38d-43c3-9bb3-8e2907e56a41" + "meterId": "00000000-0000-0000-0000-000000000000" } } ] diff --git a/specification/consumption/resource-manager/readme.md b/specification/consumption/resource-manager/readme.md index a1ea5b98238d..3f323329bfb7 100644 --- a/specification/consumption/resource-manager/readme.md +++ b/specification/consumption/resource-manager/readme.md @@ -39,6 +39,16 @@ input-file: - Microsoft.Consumption/stable/2017-11-30/consumption.json ``` +--- +### Tag: package-2018-01 + +These settings apply only when `--tag=package-2018-01` is specified on the command line. + +``` yaml $(tag) == 'package-2018-01' +input-file: +- Microsoft.Consumption/stable/2018-01-31/consumption.json +``` + --- ### Tag: package-2018-03 From 7be436462b7c40da7cc4f8054bd8ea195f7a5146 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 13 Mar 2018 10:51:40 -0700 Subject: [PATCH 04/22] Incorporated review comments Incorporated review comments --- .../stable/2018-03-31/consumption.json | 79 +++++++------------ 1 file changed, 29 insertions(+), 50 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 993fe77ce954..366c67993f8e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -342,31 +342,7 @@ "$ref": "#/parameters/reservationOrderIdParameter" }, { - "name": "grain", - "description": "Can be daily or monthly", - "in": "query", - "required": true, - "type": "string", - "enum": [ - "daily", - "monthly" - ], - "x-ms-enum": { - "name": "datagrain", - "modelAsString": true, - "values": [ - { - "value": "daily", - "description": "Daily grain of data", - "name": "DailyGrain" - }, - { - "value": "monthly", - "description": "Monthly grain of data", - "name": "MonthlyGrain" - } - ] - } + "$ref": "#/parameters/grainParameter" }, { "name": "$filter", @@ -424,31 +400,7 @@ "$ref": "#/parameters/reservationIdParameter" }, { - "name": "grain", - "description": "Can be daily or monthly", - "in": "query", - "required": true, - "type": "string", - "enum": [ - "daily", - "monthly" - ], - "x-ms-enum": { - "name": "datagrain", - "modelAsString": true, - "values": [ - { - "value": "daily", - "description": "Daily grain of data", - "name": "DailyGrain" - }, - { - "value": "monthly", - "description": "Monthly grain of data", - "name": "MonthlyGrain" - } - ] - } + "$ref": "#/parameters/grainParameter" }, { "name": "$filter", @@ -2141,6 +2093,33 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "grainParameter": { + "name": "grain", + "description": "Can be daily or monthly", + "in": "query", + "required": true, + "type": "string", + "enum": [ + "daily", + "monthly" + ], + "x-ms-enum": { + "name": "datagrain", + "modelAsString": true, + "values": [ + { + "value": "daily", + "description": "Daily grain of data", + "name": "DailyGrain" + }, + { + "value": "monthly", + "description": "Monthly grain of data", + "name": "MonthlyGrain" + } + ] + } } } } From bff7aa77477d67b893bef1a9130a802456dba136 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Tue, 13 Mar 2018 12:37:00 -0700 Subject: [PATCH 05/22] Incorporated review comment Incorporated review comment --- .../stable/2018-03-31/consumption.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 366c67993f8e..077dbd24d7be 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1207,6 +1207,7 @@ "meterId": { "description": "The meter id (GUID).", "type": "string", + "format":"uuid", "readOnly": true }, "meterDetails": { @@ -1217,6 +1218,7 @@ "subscriptionGuid": { "description": "Subscription guid.", "type": "string", + "format":"uuid", "readOnly": true }, "subscriptionName": { @@ -1373,11 +1375,13 @@ "meterId": { "description": "The meter id (GUID).", "type": "string", + "format":"uuid", "readOnly": true }, "subscriptionGuid": { "description": "Subscription guid.", "type": "string", + "format":"uuid", "readOnly": true }, "subscriptionName": { @@ -1736,7 +1740,8 @@ "description": "The list of filters on meters (GUID), mandatory for budgets of usage category. ", "type": "array", "items": { - "type": "string" + "type": "string", + "format":"uuid" }, "minItems": 0, "maxItems": 10 @@ -2002,6 +2007,7 @@ "meterId": { "description": "The meter id (GUID)", "type": "string", + "format":"uuid", "readOnly": true }, "meterDetails": { From 002a6dbdb5b9a98d96e17b04b0ce0163bfad8e30 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Wed, 14 Mar 2018 20:15:11 -0700 Subject: [PATCH 06/22] Added Tags filter and grouping for UsageDetails Added Tags filter and grouping for UsageDetails --- .../stable/2018-03-31/consumption.json | 146 +++++++++++++++++- .../examples/UsageDetailsExpand.json | 2 +- .../examples/UsageDetailsListFilterByTag.json | 38 +++++ ...DetailsListForBillingPeriodGroupByTag.json | 44 ++++++ .../UsageDetailsListGroupByTagDate.json | 47 ++++++ 5 files changed, 274 insertions(+), 3 deletions(-) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListFilterByTag.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodGroupByTag.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 077dbd24d7be..7645825d5000 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -47,6 +47,12 @@ "x-ms-examples": { "UsageDetailsList": { "$ref": "./examples/UsageDetailsList.json" + }, + "UsageDetailsListFilterByTag": { + "$ref": "./examples/UsageDetailsListFilterByTag.json" + }, + "UsageDetailsListGroupByTagDate": { + "$ref": "./examples/UsageDetailsListGroupByTagDate.json" } }, "parameters": [ @@ -62,7 +68,7 @@ }, { "name": "$filter", - "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName, properties/instanceId or tags. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", "in": "query", "required": false, "type": "string" @@ -83,6 +89,18 @@ "minimum": 1, "maximum": 1000 }, + { + "name": "$apply", + "description": "OData apply expression to aggregatie usageDetails by tags or (tags and properties/usageStart)", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, { "$ref": "#/parameters/apiVersionParameter" } @@ -122,6 +140,9 @@ }, "UsageDetailsExpand": { "$ref": "./examples/UsageDetailsExpand.json" + }, + "UsageDetailsListForBillingPeriodGroupByTag": { + "$ref": "./examples/UsageDetailsListForBillingPeriodGroupByTag.json" } }, "parameters": [ @@ -140,11 +161,23 @@ }, { "name": "$filter", - "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'.", + "description": "May be used to filter usageDetails by properties/usageEnd (Utc time), properties/usageStart (Utc time), properties/resourceGroup, properties/instanceName or properties/instanceId. The filter supports 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or 'not'. Tag filter is a key value pair string where key and value is separated by a colon (:).", "in": "query", "required": false, "type": "string" }, + { + "name": "$apply", + "description": "OData apply expression to aggregatie usageDetails by tags or (tags and properties/usageStart) for specified billing period", + "in": "query", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "x-ms-parameter-grouping": { + "name": "QueryOptions" + }, + "x-ms-client-name": "Apply" + }, { "name": "$skiptoken", "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", @@ -533,6 +566,55 @@ } } }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/reservationRecommendations": { + "get": { + "tags": [ + "ReservationRecommendations" + ], + "operationId": "reservationRecommendations_List", + "description": "List of recomendations for purchasing reserved instances.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationRecommendations": { + "$ref": "./examples/ReservationRecommendations.json" + }, + "ReservationRecommendationsFilterByScopeLookBackPeriod": { + "$ref": "./examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter reservationRecommendations by properties/scope and properties/lookBackPeriod.", + "in": "query", + "required": false, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ReservationRecommendationsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/budgets": { "get": { "tags": [ @@ -1550,6 +1632,66 @@ } } }, + "ReservationRecommendationsProperties": { + "description": "The properties of the reservation summaries.", + "properties": { + "reservationOrderId": { + "description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.", + "type": "string", + "readOnly": true + }, + "reservationId": { + "description": "The reservation ID is the identifier of a reservation within a reservation order. Each reservation is the grouping for applying the benefit scope and also specifies the number of instances to which the reservation benefit can be applied to.", + "type": "string", + "readOnly": true + }, + "skuName": { + "description": "This is the ARM Sku name. It can be used to join with the servicetype field in additoinalinfo in usage records.", + "type": "string", + "readOnly": true + }, + "reservedHours": { + "description": "This is the total hours reserved. E.g. if reservation for 1 instance was made on 1 PM, this will be 11 hours for that day and 24 hours from subsequent days", + "type": "number", + "format": "decimal", + "readOnly": true + } + } + }, + "ReservationRecommendations": { + "description": "reservation recommendations resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ReservationRecommendationsProperties", + "title": "Reservation Recommendations properties" + } + } + }, + "ReservationRecommendationsListResult": { + "description": "Result of listing reservation recommendations.", + "properties": { + "value": { + "description": "The list of reservation recommendations.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ReservationRecommendations" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, "ReservationDetailsProperties": { "description": "The properties of the reservation details.", "properties": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json index 00651e1d75bb..6dc01996b8cb 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsExpand.json @@ -4,7 +4,7 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702", "$expand": "meterDetails,additionalProperties", - "$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14'", + "$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14' AND tags eq 'dev:tools'", "$top": 1 }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListFilterByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListFilterByTag.json new file mode 100644 index 000000000000..8aaa20461016 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListFilterByTag.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "$filter": "tags eq 'dev:tools'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201703-123456789", + "usageStart": "2017-02-13T00:00:00Z", + "usageEnd": "2017-02-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00328, + "billableQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodGroupByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodGroupByTag.json new file mode 100644 index 000000000000..287d532992d5 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListForBillingPeriodGroupByTag.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "billingPeriodName": "201803", + "$apply": "groupby((tags))" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "description": "Azure VCAP STA - RDS Server" + }, + "properties": { + "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301", + "usageQuantity": 11.11111, + "pretaxCost": 0, + "currency": "USD" + } + }, + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "description": "Domain controller - STA" + }, + "properties": { + "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301", + "usageQuantity": 111.11111111111, + "pretaxCost": 0, + "currency": "USD" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json new file mode 100644 index 000000000000..641ad785745a --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "$apply": "groupby((tags,properties/usageStart))" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "description": "Azure VCAP STA - RDS Server" + }, + "properties": { + "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301", + "usageStart": "2018-03-01T00:00:00.0000000Z", + "usageEnd": "2018-03-01T23:59:59.0000000Z", + "usageQuantity": 11.11111, + "pretaxCost": 0, + "currency": "USD" + } + }, + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "description": "Domain controller - STA" + }, + "properties": { + "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301", + "usageStart": "2018-03-01T00:00:00.0000000Z", + "usageEnd": "2018-03-01T23:59:59.0000000Z", + "usageQuantity": 1.11111111111, + "pretaxCost": 0, + "currency": "USD" + } + } + ] + } + } + } +} \ No newline at end of file From 502d70ee5cc6fff27a257866710b457dfffb2924 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 15 Mar 2018 17:55:08 -0700 Subject: [PATCH 07/22] Added reservation recommendations and tags Added reservation recommendations and tags --- .../stable/2018-03-31/consumption.json | 70 ++++++++++++++++--- ...mendationsFilterByScopeLookBackPeriod.json | 52 ++++++++++++++ .../ReservationRecommendationsList.json | 51 ++++++++++++++ .../UsageDetailsListGroupByTagDate.json | 6 +- 4 files changed, 165 insertions(+), 14 deletions(-) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 7645825d5000..b874e010b9bd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -578,7 +578,7 @@ }, "x-ms-examples": { "ReservationRecommendations": { - "$ref": "./examples/ReservationRecommendations.json" + "$ref": "./examples/ReservationRecommendationsList.json" }, "ReservationRecommendationsFilterByScopeLookBackPeriod": { "$ref": "./examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json" @@ -1633,37 +1633,70 @@ } }, "ReservationRecommendationsProperties": { - "description": "The properties of the reservation summaries.", + "description": "The properties of the reservation recommendations.", "properties": { - "reservationOrderId": { - "description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.", + "lookBackPeriod": { + "description": "The number of days of usage to look back for recommendations.", "type": "string", "readOnly": true }, - "reservationId": { - "description": "The reservation ID is the identifier of a reservation within a reservation order. Each reservation is the grouping for applying the benefit scope and also specifies the number of instances to which the reservation benefit can be applied to.", + "meterId": { + "description": "The meter id (GUID)", "type": "string", + "format":"uuid", "readOnly": true }, - "skuName": { - "description": "This is the ARM Sku name. It can be used to join with the servicetype field in additoinalinfo in usage records.", + "term": { + "description": "RI recommendations in one or three year terms.", "type": "string", "readOnly": true }, - "reservedHours": { - "description": "This is the total hours reserved. E.g. if reservation for 1 instance was made on 1 PM, this will be 11 hours for that day and 24 hours from subsequent days", + "costWithNoReservedInstances": { + "description": "The total amount of cost without reserved instances.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "recommendedQuantity": { + "description": "Recomended quality for reserved instances.", "type": "number", "format": "decimal", "readOnly": true + }, + "totalCostWithReservedInstances": { + "description": "The total amount of cost with reserved instances.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "netSavings": { + "description": "Total estimated savings with reserved instances.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "firstUsageDate": { + "description": "The usage date for looking back.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "scope": { + "description": "Shared or single recommendation.", + "type": "string", + "readOnly": true } } }, "ReservationRecommendations": { - "description": "reservation recommendations resource.", + "description": "Reservation recommendations resource.", "type": "object", "allOf": [ { "$ref": "#/definitions/Resource" + }, + { + "$ref": "#/definitions/ResourceAttributes" } ], "properties": { @@ -2079,6 +2112,21 @@ }, "x-ms-azure-resource": true }, + "ResourceAttributes": { + "description": "The Resource model definition.", + "properties": { + "location": { + "readOnly": true, + "type": "string", + "description": "Resource location" + }, + "sku": { + "readOnly": true, + "type": "string", + "description": "Resource sku" + } + } + }, "ProxyResource": { "description": "The Resource model definition.", "properties": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json new file mode 100644 index 000000000000..f3e8031f315f --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "$filter": "properties/scope eq 'Single' AND properties/lookBackPeriod eq 'Last7Days'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations1", + "name": "reservationRecommendations1", + "type": "Microsoft.Consumption/reservationRecommendations", + "sku": "Standard_DS1_v2", + "location": "northeurope", + "properties": { + "lookBackPeriod": "Last7Days", + "meterId": "00000000-0000-0000-0000-000000000000", + "term": "P1Y", + "costWithNoReservedInstances": 0.0, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 0.0, + "netSavings": 4.634521202630137, + "firstUsageDate": "2018-03-06", + "scope": "Single" + } + }, + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations2", + "name": "reservationRecommendations2", + "type": "Microsoft.Consumption/reservationRecommendations", + "sku": "Standard_DS1_v2", + "location": "northeurope", + "properties": { + "lookBackPeriod": "Last7Days", + "meterId": "00000000-0000-0000-0000-000000000000", + "term": "P3Y", + "costWithNoReservedInstances": 0.0, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 0.0, + "netSavings": 7.2893157231780812, + "firstUsageDate": "2018-03-06", + "scope": "Single" + } + } + ], + "nextLink" : "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations?api-version=2018-03-31&$filter=properties/scope+eq+'Single'+AND+properties/lookBackPeriod+eq+'Last7Days'&$skiptoken=AQAAAA%3D%3D&" + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json new file mode 100644 index 000000000000..f7f8dc414bd5 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations1", + "name": "reservationRecommendations1", + "type": "Microsoft.Consumption/reservationRecommendations", + "sku": "Standard_DS1_v2", + "location": "northeurope", + "properties": { + "lookBackPeriod": "Last7Days", + "meterId": "00000000-0000-0000-0000-000000000000", + "term": "P1Y", + "costWithNoReservedInstances": 0.0, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 0.0, + "netSavings": 4.634521202630137, + "firstUsageDate": "2018-03-06", + "scope": "Single" + } + }, + { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations/reservationRecommendations2", + "name": "reservationRecommendations2", + "type": "Microsoft.Consumption/reservationRecommendations", + "sku": "Standard_DS1_v2", + "location": "northeurope", + "properties": { + "lookBackPeriod": "Last7Days", + "meterId": "00000000-0000-0000-0000-000000000000", + "term": "P3Y", + "costWithNoReservedInstances": 0.0, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 0.0, + "netSavings": 7.2893157231780812, + "firstUsageDate": "2018-03-06", + "scope": "Single" + } + } + ], + "nextLink" : "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations?api-version=2018-03-31&$skiptoken=AQAAAA%3D%3D&" + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json index 641ad785745a..635e84e55585 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/UsageDetailsListGroupByTagDate.json @@ -29,12 +29,12 @@ "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { - "description": "Domain controller - STA" + "description": "Azure VCAP STA - RDS Server" }, "properties": { "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301", - "usageStart": "2018-03-01T00:00:00.0000000Z", - "usageEnd": "2018-03-01T23:59:59.0000000Z", + "usageStart": "2018-03-02T00:00:00.0000000Z", + "usageEnd": "2018-03-02T23:59:59.0000000Z", "usageQuantity": 1.11111111111, "pretaxCost": 0, "currency": "USD" From 7956270d0054fb05a9eeb04f0b07631d6eecb85a Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Fri, 16 Mar 2018 11:09:24 -0700 Subject: [PATCH 08/22] Incorporated review comments Incorporated review comments --- .../stable/2018-03-31/consumption.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index b874e010b9bd..d8e49d20af66 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -571,7 +571,7 @@ "tags": [ "ReservationRecommendations" ], - "operationId": "reservationRecommendations_List", + "operationId": "ReservationRecommendations_List", "description": "List of recomendations for purchasing reserved instances.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -594,6 +594,9 @@ }, { "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" } ], "responses": { @@ -1678,7 +1681,7 @@ "firstUsageDate": { "description": "The usage date for looking back.", "type": "string", - "format": "date-time", + "format": "date", "readOnly": true }, "scope": { From 346ce83ba204f6477c49eb86f0917514db99ad81 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Fri, 16 Mar 2018 11:38:35 -0700 Subject: [PATCH 09/22] Incorporated review comments Incorporated review comments --- .../Microsoft.Consumption/stable/2018-03-31/consumption.json | 2 +- ...ReservationRecommendationsFilterByScopeLookBackPeriod.json | 4 ++-- .../2018-03-31/examples/ReservationRecommendationsList.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index d8e49d20af66..b4e43114095f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1681,7 +1681,7 @@ "firstUsageDate": { "description": "The usage date for looking back.", "type": "string", - "format": "date", + "format": "date-time", "readOnly": true }, "scope": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json index f3e8031f315f..f753e5a4f596 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json @@ -22,7 +22,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 4.634521202630137, - "firstUsageDate": "2018-03-06", + "firstUsageDate": "2018-03-06T00:00:00Z ", "scope": "Single" } }, @@ -40,7 +40,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 7.2893157231780812, - "firstUsageDate": "2018-03-06", + "firstUsageDate": "2018-03-06T00:00:00Z ", "scope": "Single" } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json index f7f8dc414bd5..b610d049a2e5 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json @@ -21,7 +21,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 4.634521202630137, - "firstUsageDate": "2018-03-06", + "firstUsageDate": "2018-03-06T00:00:00Z ", "scope": "Single" } }, @@ -39,7 +39,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 7.2893157231780812, - "firstUsageDate": "2018-03-06", + "firstUsageDate": "2018-03-06T00:00:00Z ", "scope": "Single" } } From a0072f9d553c5ed94fe7cee4b86f219c7cfc485d Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Fri, 16 Mar 2018 12:59:25 -0700 Subject: [PATCH 10/22] Removed unwanted space Removed unwanted space --- ...ReservationRecommendationsFilterByScopeLookBackPeriod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json index f753e5a4f596..a8785dded1d4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json @@ -22,7 +22,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 4.634521202630137, - "firstUsageDate": "2018-03-06T00:00:00Z ", + "firstUsageDate": "2018-03-06T00:00:00Z", "scope": "Single" } }, @@ -40,7 +40,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 7.2893157231780812, - "firstUsageDate": "2018-03-06T00:00:00Z ", + "firstUsageDate": "2018-03-06T00:00:00Z", "scope": "Single" } } From ee9bfc35451d0594a1e80e1ffbd8e5ba04b1ee9e Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Fri, 16 Mar 2018 15:40:21 -0700 Subject: [PATCH 11/22] Removed extra whitespace Removed extra whitespace --- .../2018-03-31/examples/ReservationRecommendationsList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json index b610d049a2e5..21237a8ac071 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/ReservationRecommendationsList.json @@ -21,7 +21,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 4.634521202630137, - "firstUsageDate": "2018-03-06T00:00:00Z ", + "firstUsageDate": "2018-03-06T00:00:00Z", "scope": "Single" } }, @@ -39,7 +39,7 @@ "recommendedQuantity": 1, "totalCostWithReservedInstances": 0.0, "netSavings": 7.2893157231780812, - "firstUsageDate": "2018-03-06T00:00:00Z ", + "firstUsageDate": "2018-03-06T00:00:00Z", "scope": "Single" } } From 6df7a9e2046d31bdf8c295c9f1e68c4a7ebe0c4f Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Fri, 16 Mar 2018 16:27:52 -0700 Subject: [PATCH 12/22] add swagger->sdk config for go --- specification/consumption/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/consumption/resource-manager/readme.md b/specification/consumption/resource-manager/readme.md index 2b57481024d5..4f03470efd87 100644 --- a/specification/consumption/resource-manager/readme.md +++ b/specification/consumption/resource-manager/readme.md @@ -98,6 +98,7 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: + - repo: azure-sdk-for-go - repo: azure-sdk-for-python ``` From 7a5eab1ead58ad3a9b36f7bef34eeacd76f9ec52 Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Fri, 16 Mar 2018 18:44:31 -0700 Subject: [PATCH 13/22] fix broken tags for go --- specification/consumption/resource-manager/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/consumption/resource-manager/readme.md b/specification/consumption/resource-manager/readme.md index 4f03470efd87..b128de08e57f 100644 --- a/specification/consumption/resource-manager/readme.md +++ b/specification/consumption/resource-manager/readme.md @@ -161,10 +161,10 @@ go: ``` yaml $(go) && $(multiapi) batch: - tag: package-2017-04-preview - - tag: package-2017-11-30 - - tag: package-2017-12-30-preview - - tag: package-2018-01-31 - - tag: package-2018-03-31 + - tag: package-2017-11 + - tag: package-2017-12-preview + - tag: package-2018-01 + - tag: package-2018-03 ``` From 6388784ef9904e750e9ce09918b2b65e7d984616 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 22 Mar 2018 18:51:35 -0700 Subject: [PATCH 14/22] Added schema spec for cost allocation tags Added schema spec for cost allocation tags --- .../stable/2018-03-31/consumption.json | 135 ++++++++++++++++++ .../examples/CostAllocationTags.json | 32 +++++ .../CreateOrUpdateCostAllocationTags.json | 72 ++++++++++ 3 files changed, 239 insertions(+) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index b4e43114095f..a42fe5c5bfe0 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1142,6 +1142,97 @@ } } } + }, + "/billingaccounts/{billingAccountId}/providers/microsoft.consumption/costallocationtags": { + "get": { + "tags": [ + "CostAllocationTags" + ], + "operationId": "CostAllocationTags_List", + "description": "Lists all cost allocation tags for a billing account.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "CostAllocationTags_List": { + "$ref": "./examples/CostAllocationTags.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/CostAllocationTags" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "CostAllocationTags" + ], + "operationId": "CostAllocationTags_CreateOrUpdate", + "description": "The operation to create or update cost allocation tags assiciated with a billing account. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "CreateOrUpdateCostAllocationTags": { + "$ref": "./examples/CreateOrUpdateCostAllocationTags.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/CostAllocationTags" + }, + "description": "Parameters supplied to the Create cost allocation tags operation." + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/CostAllocationTags" + } + }, + "201": { + "description": "Created.", + "schema": { + "$ref": "#/definitions/CostAllocationTags" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -2012,6 +2103,43 @@ "contactEmails" ] }, + "CostAllocationTags": { + "description": "A cost allocation tag resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/CostAllocationTagProperties", + "title": "Cost allocation tag properties" + } + } + }, + "CostAllocationTagProperties": { + "description": "The properties of the cost allocation tag.", + "properties": { + "costAllocationTags": { + "description": "Cost allocation tags.", + "type": "array", + "items": { + "$ref": "#/definitions/CostAllocationTag" + } + } + } + }, + "CostAllocationTag": { + "description": "The cost allocation tag.", + "properties": { + "keyName": { + "description": "Cost allocation tag key name.", + "type": "string" + } + } + }, "ErrorDetails": { "description": "The details of the error.", "properties": { @@ -2253,6 +2381,13 @@ "required": true, "type": "string" }, + "billingAccountIdParameter": { + "name": "billingAccountId", + "in": "path", + "description": "Azure Billing Account ID.", + "required": true, + "type": "string" + }, "resourceGroupNameParameter": { "name": "resourceGroupName", "in": "path", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json new file mode 100644 index 000000000000..17650395308a --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "12345" + }, + "responses": { + "200": { + "body": { + "id": "billingaccounts/{billingaccount-id}/providers/microsoft.consumption/costallocationtags/costAllocationTags1", + "name": "costAllocationTags1", + "type": "Microsoft.Consumption/costallocationtags", + "eTag": "\"1d34d012214157f\"", + "properties": { + "costAllocationTags": [ + { + "keyName": "Department" + }, + { + "keyName": "CostCenter" + }, + { + "keyName": "Portal" + }, + { + "keyName": "OrgName" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json new file mode 100644 index 000000000000..b2b6f93ba9d9 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "12345", + "parameters": { + "costAllocationTags": [ + { + "keyName": "Department" + }, + { + "keyName": "CostCenter" + }, + { + "keyName": "Portal" + }, + { + "keyName": "OrgName" + } + ] + } + }, + "responses": { + "201": { + "body": { + "id": "billingaccounts/{billingaccount-id}/providers/microsoft.consumption/costallocationtags/costAllocationTags1", + "name": "costAllocationTags1", + "type": "Microsoft.Consumption/costallocationtags", + "eTag": "\"1d34d012214157f\"", + "properties": { + "costAllocationTags": [ + { + "keyName": "Department" + }, + { + "keyName": "CostCenter" + }, + { + "keyName": "Portal" + }, + { + "keyName": "OrgName" + } + ] + } + } + }, + "200": { + "body": { + "id": "billingaccounts/{billingaccount-id}/providers/microsoft.consumption/costallocationtags/costAllocationTags1", + "name": "costAllocationTags1", + "type": "Microsoft.Consumption/costallocationtags", + "eTag": "\"1d34d012214157f\"", + "properties": { + "costAllocationTags": [ + { + "keyName": "Department" + }, + { + "keyName": "CostCenter" + }, + { + "keyName": "Portal" + }, + { + "keyName": "OrgName" + } + ] + } + } + } + } +} \ No newline at end of file From 3ccf1b464815326349f015f17a600df4ab5e35ab Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 22 Mar 2018 19:48:00 -0700 Subject: [PATCH 15/22] Updated Get Operation Updated Get Operation --- .../stable/2018-03-31/consumption.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index a42fe5c5bfe0..5f29cfa8a3dc 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1148,13 +1148,13 @@ "tags": [ "CostAllocationTags" ], - "operationId": "CostAllocationTags_List", - "description": "Lists all cost allocation tags for a billing account.", + "operationId": "CostAllocationTags_Get", + "description": "Get cost allocation tags for a billing account.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { - "CostAllocationTags_List": { + "CostAllocationTags_Get": { "$ref": "./examples/CostAllocationTags.json" } }, From 884aabe8882d794b987236ad2b0927a98317d28f Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Fri, 23 Mar 2018 12:04:11 -0700 Subject: [PATCH 16/22] Incorporated review comments Incorporated review comments --- .../Microsoft.Consumption/stable/2018-03-31/consumption.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 5f29cfa8a3dc..c577e4056bbe 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -2431,6 +2431,7 @@ "grainParameter": { "name": "grain", "description": "Can be daily or monthly", + "x-ms-parameter-location": "method", "in": "query", "required": true, "type": "string", From 3d1c7c16a7266814f1e4bd997169df1ebd1d2bce Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 26 Mar 2018 15:02:28 -0700 Subject: [PATCH 17/22] Review comments incorporated Review comments incorporated --- .../stable/2018-03-31/consumption.json | 7 +++--- .../examples/CostAllocationTags.json | 8 +++---- .../CreateOrUpdateCostAllocationTags.json | 24 +++++++++---------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index c577e4056bbe..f71a05684208 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -2134,8 +2134,8 @@ "CostAllocationTag": { "description": "The cost allocation tag.", "properties": { - "keyName": { - "description": "Cost allocation tag key name.", + "key": { + "description": "Cost allocation tag key.", "type": "string" } } @@ -2386,7 +2386,8 @@ "in": "path", "description": "Azure Billing Account ID.", "required": true, - "type": "string" + "type": "string", + "x-ms-parameter-location": "method" }, "resourceGroupNameParameter": { "name": "resourceGroupName", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json index 17650395308a..fb9fe0c157aa 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json @@ -13,16 +13,16 @@ "properties": { "costAllocationTags": [ { - "keyName": "Department" + "key": "Department" }, { - "keyName": "CostCenter" + "key": "CostCenter" }, { - "keyName": "Portal" + "key": "Portal" }, { - "keyName": "OrgName" + "key": "OrgName" } ] } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json index b2b6f93ba9d9..627cde8f5a80 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json @@ -5,16 +5,16 @@ "parameters": { "costAllocationTags": [ { - "keyName": "Department" + "key": "Department" }, { - "keyName": "CostCenter" + "key": "CostCenter" }, { - "keyName": "Portal" + "key": "Portal" }, { - "keyName": "OrgName" + "key": "OrgName" } ] } @@ -29,16 +29,16 @@ "properties": { "costAllocationTags": [ { - "keyName": "Department" + "key": "Department" }, { - "keyName": "CostCenter" + "key": "CostCenter" }, { - "keyName": "Portal" + "key": "Portal" }, { - "keyName": "OrgName" + "key": "OrgName" } ] } @@ -53,16 +53,16 @@ "properties": { "costAllocationTags": [ { - "keyName": "Department" + "key": "Department" }, { - "keyName": "CostCenter" + "key": "CostCenter" }, { - "keyName": "Portal" + "key": "Portal" }, { - "keyName": "OrgName" + "key": "OrgName" } ] } From def63250017ef0071aadd68a751623913f788af3 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Mon, 26 Mar 2018 17:09:22 -0700 Subject: [PATCH 18/22] Updated path Updated path --- .../stable/2018-03-31/consumption.json | 2 +- .../stable/2018-03-31/examples/CostAllocationTags.json | 4 ++-- .../examples/CreateOrUpdateCostAllocationTags.json | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index f71a05684208..9730584db0f6 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1143,7 +1143,7 @@ } } }, - "/billingaccounts/{billingAccountId}/providers/microsoft.consumption/costallocationtags": { + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/costAllocationTags": { "get": { "tags": [ "CostAllocationTags" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json index fb9fe0c157aa..b046c2b18b13 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json @@ -6,9 +6,9 @@ "responses": { "200": { "body": { - "id": "billingaccounts/{billingaccount-id}/providers/microsoft.consumption/costallocationtags/costAllocationTags1", + "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", "name": "costAllocationTags1", - "type": "Microsoft.Consumption/costallocationtags", + "type": "Microsoft.Consumption/costAllocationTags", "eTag": "\"1d34d012214157f\"", "properties": { "costAllocationTags": [ diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json index 627cde8f5a80..1a8a1b0e68cb 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json @@ -22,9 +22,9 @@ "responses": { "201": { "body": { - "id": "billingaccounts/{billingaccount-id}/providers/microsoft.consumption/costallocationtags/costAllocationTags1", + "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", "name": "costAllocationTags1", - "type": "Microsoft.Consumption/costallocationtags", + "type": "Microsoft.Consumption/costAllocationTags", "eTag": "\"1d34d012214157f\"", "properties": { "costAllocationTags": [ @@ -46,9 +46,9 @@ }, "200": { "body": { - "id": "billingaccounts/{billingaccount-id}/providers/microsoft.consumption/costallocationtags/costAllocationTags1", + "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", "name": "costAllocationTags1", - "type": "Microsoft.Consumption/costallocationtags", + "type": "Microsoft.Consumption/costAllocationTags", "eTag": "\"1d34d012214157f\"", "properties": { "costAllocationTags": [ From 1f2de0f37c163aa960c824541bb9094f41418b45 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 12 Apr 2018 13:16:03 -0700 Subject: [PATCH 19/22] Renamed cost allocation tags to cost tags and added schema for get list of all available tag keys Renamed cost allocation tags to cost tags and added schema for get list of all available tag keys --- .../stable/2018-03-31/consumption.json | 132 ++++++++++++++---- ...{CostAllocationTags.json => CostTags.json} | 8 +- ...nTags.json => CreateOrUpdateCostTags.json} | 18 +-- .../stable/2018-03-31/examples/Tags.json | 47 +++++++ 4 files changed, 164 insertions(+), 41 deletions(-) rename specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/{CostAllocationTags.json => CostTags.json} (70%) rename specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/{CreateOrUpdateCostAllocationTags.json => CreateOrUpdateCostTags.json} (71%) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Tags.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 9730584db0f6..bd4d027b18d9 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1143,19 +1143,19 @@ } } }, - "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/costAllocationTags": { + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/costTags": { "get": { "tags": [ - "CostAllocationTags" + "CostTags" ], - "operationId": "CostAllocationTags_Get", - "description": "Get cost allocation tags for a billing account.", + "operationId": "CostTags_Get", + "description": "Get cost tags for a billing account.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { - "CostAllocationTags_Get": { - "$ref": "./examples/CostAllocationTags.json" + "CostTags_Get": { + "$ref": "./examples/CostTags.json" } }, "parameters": [ @@ -1170,7 +1170,7 @@ "200": { "description": "OK. The request has succeeded.", "schema": { - "$ref": "#/definitions/CostAllocationTags" + "$ref": "#/definitions/CostTags" } }, "default": { @@ -1183,16 +1183,16 @@ }, "put": { "tags": [ - "CostAllocationTags" + "CostTags" ], - "operationId": "CostAllocationTags_CreateOrUpdate", - "description": "The operation to create or update cost allocation tags assiciated with a billing account. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.", + "operationId": "CostTags_CreateOrUpdate", + "description": "The operation to create or update cost tags assiciated with a billing account. Update operation requires latest eTag to be set in the request mandatorily. You may obtain the latest eTag by performing a get operation. Create operation does not require eTag.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { - "CreateOrUpdateCostAllocationTags": { - "$ref": "./examples/CreateOrUpdateCostAllocationTags.json" + "CreateOrUpdateCostTags": { + "$ref": "./examples/CreateOrUpdateCostTags.json" } }, "parameters": [ @@ -1207,22 +1207,61 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/CostAllocationTags" + "$ref": "#/definitions/CostTags" }, - "description": "Parameters supplied to the Create cost allocation tags operation." + "description": "Parameters supplied to the Create cost tags operation." } ], "responses": { "200": { "description": "OK. The request has succeeded.", "schema": { - "$ref": "#/definitions/CostAllocationTags" + "$ref": "#/definitions/CostTags" } }, "201": { "description": "Created.", "schema": { - "$ref": "#/definitions/CostAllocationTags" + "$ref": "#/definitions/CostTags" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.CostManagement/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/tags": { + "get": { + "tags": [ + "Tags" + ], + "operationId": "Tags_Get", + "description": "Get all available tag keys for a billing account.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "CostTags_Get": { + "$ref": "./examples/Tags.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Tags" } }, "default": { @@ -1868,6 +1907,43 @@ } } }, + "Tags": { + "description": "A tag resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/TagProperties", + "title": "Tag properties" + } + } + }, + "TagProperties": { + "description": "The properties of the tag.", + "properties": { + "costTags": { + "description": "Tags.", + "type": "array", + "items": { + "$ref": "#/definitions/Tag" + } + } + } + }, + "Tag": { + "description": "The tag.", + "properties": { + "key": { + "description": "Tag key.", + "type": "string" + } + } + }, "BudgetsListResult": { "description": "Result of listing budgets. It contains a list of available budgets in the scope provided.", "properties": { @@ -2103,8 +2179,8 @@ "contactEmails" ] }, - "CostAllocationTags": { - "description": "A cost allocation tag resource.", + "CostTags": { + "description": "A cost tag resource.", "type": "object", "allOf": [ { @@ -2114,28 +2190,28 @@ "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/CostAllocationTagProperties", - "title": "Cost allocation tag properties" + "$ref": "#/definitions/CostTagProperties", + "title": "Cost tag properties" } } }, - "CostAllocationTagProperties": { - "description": "The properties of the cost allocation tag.", + "CostTagProperties": { + "description": "The properties of the cost tag.", "properties": { - "costAllocationTags": { - "description": "Cost allocation tags.", + "costTags": { + "description": "Cost tags.", "type": "array", "items": { - "$ref": "#/definitions/CostAllocationTag" + "$ref": "#/definitions/CostTag" } } } }, - "CostAllocationTag": { - "description": "The cost allocation tag.", + "CostTag": { + "description": "The cost tag.", "properties": { "key": { - "description": "Cost allocation tag key.", + "description": "Cost tag key.", "type": "string" } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostTags.json similarity index 70% rename from specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json rename to specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostTags.json index b046c2b18b13..c67713a4bc65 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CostTags.json @@ -6,12 +6,12 @@ "responses": { "200": { "body": { - "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", - "name": "costAllocationTags1", - "type": "Microsoft.Consumption/costAllocationTags", + "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1", + "name": "costTags1", + "type": "Microsoft.Consumption/costTags", "eTag": "\"1d34d012214157f\"", "properties": { - "costAllocationTags": [ + "costTags": [ { "key": "Department" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostTags.json similarity index 71% rename from specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json rename to specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostTags.json index 1a8a1b0e68cb..37a9db21be3b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostAllocationTags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/CreateOrUpdateCostTags.json @@ -3,7 +3,7 @@ "api-version": "2018-03-31", "billingAccountId": "12345", "parameters": { - "costAllocationTags": [ + "costTags": [ { "key": "Department" }, @@ -22,12 +22,12 @@ "responses": { "201": { "body": { - "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", - "name": "costAllocationTags1", - "type": "Microsoft.Consumption/costAllocationTags", + "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1", + "name": "costTags1", + "type": "Microsoft.Consumption/costTags", "eTag": "\"1d34d012214157f\"", "properties": { - "costAllocationTags": [ + "costTags": [ { "key": "Department" }, @@ -46,12 +46,12 @@ }, "200": { "body": { - "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costAllocationTags/costAllocationTags1", - "name": "costAllocationTags1", - "type": "Microsoft.Consumption/costAllocationTags", + "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/costTags/costTags1", + "name": "costTags1", + "type": "Microsoft.Consumption/costTags", "eTag": "\"1d34d012214157f\"", "properties": { - "costAllocationTags": [ + "costTags": [ { "key": "Department" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Tags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Tags.json new file mode 100644 index 000000000000..ab3c184142be --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/examples/Tags.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "api-version": "2018-03-31", + "billingAccountId": "12345" + }, + "responses": { + "200": { + "body": { + "id": "providers/Microsoft.CostManagement/billingAccounts/{billingaccount-id}/providers/Microsoft.Consumption/tags/tags1", + "name": "tags1", + "type": "Microsoft.Consumption/tags", + "eTag": "\"1d34d012214157f\"", + "properties": { + "tags": [ + { + "key": "Department" + }, + { + "key": "CostCenter" + }, + { + "key": "Portal" + }, + { + "key": "OrgName" + }, + { + "key": "Namespace" + }, + { + "key": "resourceType" + }, + { + "key": "Subsystem" + }, + { + "key": "Environment" + }, + { + "key": "clusterName" + } + ] + } + } + } + } +} \ No newline at end of file From 5699a841d9bb36bb99d1fbeecf46459473d054ac Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 12 Apr 2018 14:27:03 -0700 Subject: [PATCH 20/22] Incorporated review comments Incorporated review comments --- .../stable/2018-03-31/consumption.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index bd4d027b18d9..9c9d17685c08 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1245,7 +1245,7 @@ "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" }, "x-ms-examples": { - "CostTags_Get": { + "Tags_Get": { "$ref": "./examples/Tags.json" } }, @@ -1908,7 +1908,7 @@ } }, "Tags": { - "description": "A tag resource.", + "description": "A resource listing tags.", "type": "object", "allOf": [ { @@ -1926,7 +1926,7 @@ "TagProperties": { "description": "The properties of the tag.", "properties": { - "costTags": { + "tags": { "description": "Tags.", "type": "array", "items": { From 3bd6450532e1e5132bbbe60dd88be6ff2716818a Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 12 Apr 2018 14:28:07 -0700 Subject: [PATCH 21/22] Incorporated review comments Incorporated review comments --- .../Microsoft.Consumption/stable/2018-03-31/consumption.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index 9c9d17685c08..de68f652c333 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1908,7 +1908,7 @@ } }, "Tags": { - "description": "A resource listing tags.", + "description": "A resource listing all tags.", "type": "object", "allOf": [ { From 7f53393ed97f6918aed8a574dc62a42fd1e36011 Mon Sep 17 00:00:00 2001 From: asarkar84 <33848291+asarkar84@users.noreply.github.com> Date: Thu, 12 Apr 2018 14:48:25 -0700 Subject: [PATCH 22/22] Incorporated review comments Incorporated review comments --- .../Microsoft.Consumption/stable/2018-03-31/consumption.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json index de68f652c333..e2c2bcc4d9fa 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2018-03-31/consumption.json @@ -1927,7 +1927,7 @@ "description": "The properties of the tag.", "properties": { "tags": { - "description": "Tags.", + "description": "A list of Tag.", "type": "array", "items": { "$ref": "#/definitions/Tag" @@ -1936,7 +1936,7 @@ } }, "Tag": { - "description": "The tag.", + "description": "The tag resource.", "properties": { "key": { "description": "Tag key.",