From 71e2dcbd4d0f5e6367ed7a6ec72f77356da1f487 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Thu, 11 Jul 2019 20:19:40 -0700 Subject: [PATCH 01/41] Adds base for updating Microsoft.Consumption from version stable/2019-01-01 to version 2019-05-01 --- .../stable/2019-05-01/consumption.json | 2949 +++++++++++++++++ .../AggregatedCostByManagementGroup.json | 47 + ...atedCostByManagementGroupFilterByDate.json | 48 + ...CostForBillingPeriodByManagementGroup.json | 40 + .../examples/BalancesByBillingAccount.json | 46 + ...ancesByBillingAccountForBillingPeriod.json | 47 + .../stable/2019-05-01/examples/Budget.json | 71 + .../2019-05-01/examples/BudgetsList.json | 159 + .../ChargesForBillingPeriodByDepartment.json | 26 + ...esForBillingPeriodByEnrollmentAccount.json | 26 + .../examples/ChargesListForDepartment.json | 44 + ...ListForDepartmentFilterByStartEndDate.json | 44 + .../ChargesListForEnrollmentAccount.json | 44 + ...EnrollmentAccountFilterByStartEndDate.json | 43 + .../examples/CreateOrUpdateBudget.json | 184 + .../2019-05-01/examples/DeleteBudget.json | 11 + .../2019-05-01/examples/ForecastsList.json | 51 + .../examples/ForecastsListFilterByDates.json | 52 + .../examples/ForecastsListFilterByGrain.json | 52 + .../MarketplacesByBillingAccountList.json | 48 + ...sByBillingAccountListForBillingPeriod.json | 50 + .../MarketplacesByDepartmentList.json | 50 + ...lacesByDepartment_ListByBillingPeriod.json | 50 + .../MarketplacesByEnrollmentAccountList.json | 50 + ...nrollmentAccounts_ListByBillingPeriod.json | 50 + .../MarketplacesByManagementGroupList.json | 84 + ...yManagementGroup_ListForBillingPeriod.json | 85 + .../2019-05-01/examples/MarketplacesList.json | 48 + .../MarketplacesListForBillingPeriod.json | 50 + .../2019-05-01/examples/PriceSheet.json | 30 + .../2019-05-01/examples/PriceSheetExpand.json | 40 + .../examples/PriceSheetForBillingPeriod.json | 31 + .../examples/ReservationDetails.json | 34 + .../ReservationDetailsWithReservationId.json | 35 + ...mendationsFilterByScopeLookBackPeriod.json | 52 + .../ReservationRecommendationsList.json | 51 + .../examples/ReservationSummariesDaily.json | 36 + ...vationSummariesDailyWithReservationId.json | 37 + .../examples/ReservationSummariesMonthly.json | 35 + ...tionSummariesMonthlyWithReservationId.json | 36 + .../stable/2019-05-01/examples/Tags.json | 47 + .../examples/UsageDetailsExpand.json | 65 + .../2019-05-01/examples/UsageDetailsList.json | 43 + .../UsageDetailsListByBillingAccount.json | 43 + .../UsageDetailsListByDepartment.json | 43 + .../UsageDetailsListByEnrollmentAccount.json | 43 + .../UsageDetailsListByManagementGroup.json | 70 + .../examples/UsageDetailsListFilterByTag.json | 43 + .../UsageDetailsListForBillingPeriod.json | 44 + ...sListForBillingPeriodByBillingAccount.json | 44 + ...tailsListForBillingPeriodByDepartment.json | 44 + ...stForBillingPeriodByEnrollmentAccount.json | 44 + ...ListForBillingPeriodByManagementGroup.json | 71 + ...DetailsListForBillingPeriodGroupByTag.json | 44 + .../UsageDetailsListGroupByTagDate.json | 47 + 55 files changed, 5701 insertions(+) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsWithReservationId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json new file mode 100644 index 000000000000..811ec94288c8 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -0,0 +1,2949 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "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": { + "/{scope}/providers/Microsoft.Consumption/usageDetails": { + "get": { + "tags": [ + "UsageDetails" + ], + "operationId": "UsageDetails_List", + "description": "Lists the usage details for the defined scope. 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" + }, + "UsageDetailsListFilterByTag": { + "$ref": "./examples/UsageDetailsListFilterByTag.json" + }, + "UsageDetailsListGroupByTagDate": { + "$ref": "./examples/UsageDetailsListGroupByTagDate.json" + }, + "UsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriod.json" + }, + "UsageDetailsExpand": { + "$ref": "./examples/UsageDetailsExpand.json" + }, + "UsageDetailsListForBillingPeriodGroupByTag": { + "$ref": "./examples/UsageDetailsListForBillingPeriodGroupByTag.json" + }, + "BillingAccountUsageDetailsList": { + "$ref": "./examples/UsageDetailsListByBillingAccount.json" + }, + "BillingAccountUsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByBillingAccount.json" + }, + "DepartmentUsageDetailsList": { + "$ref": "./examples/UsageDetailsListByDepartment.json" + }, + "DepartmentUsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByDepartment.json" + }, + "EnrollmentAccountUsageDetailsList": { + "$ref": "./examples/UsageDetailsListByEnrollmentAccount.json" + }, + "EnrollmentAccountUsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json" + }, + "ManagementGroupUsageDetailsList": { + "$ref": "./examples/UsageDetailsListByManagementGroup.json" + }, + "ManagementGroupUsageDetailsListForBillingPeriod": { + "$ref": "./examples/UsageDetailsListForBillingPeriodByManagementGroup.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/scopeUsageDetailsParameter" + }, + { + "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, 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" + }, + { + "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 + }, + { + "name": "$apply", + "description": "OData apply expression to aggregate 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" + } + ], + "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" + } + } + }, + "/{scope}/providers/Microsoft.Consumption/marketplaces": { + "get": { + "tags": [ + "Marketplaces" + ], + "x-ms-odata": "#/definitions/Marketplace", + "operationId": "Marketplaces_List", + "description": "Lists the marketplaces for a scope at the defined scope. 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": { + "SubscriptionMarketplacesList": { + "$ref": "./examples/MarketplacesList.json" + }, + "SubscriptionMarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesListForBillingPeriod.json" + }, + "BillingAccountMarketplacesList": { + "$ref": "./examples/MarketplacesByBillingAccountList.json" + }, + "BillingAccountMarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesByBillingAccountListForBillingPeriod.json" + }, + "DepartmentMarketplacesList": { + "$ref": "./examples/MarketplacesByDepartmentList.json" + }, + "DepartmentMarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesByDepartment_ListByBillingPeriod.json" + }, + "EnrollmentAccountMarketplacesList": { + "$ref": "./examples/MarketplacesByEnrollmentAccountList.json" + }, + "EnrollmentAccountMarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json" + }, + "ManagementGroupMarketplacesList": { + "$ref": "./examples/MarketplacesByManagementGroupList.json" + }, + "ManagementGroupMarketplacesListForBillingPeriod": { + "$ref": "./examples/MarketplacesByManagementGroup_ListForBillingPeriod.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/scopeMarketplaceParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "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" + } + } + }, + "/{scope}/providers/Microsoft.Consumption/budgets": { + "get": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_List", + "description": "Lists all budgets for the defined scope.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "BudgetsList": { + "$ref": "./examples/BudgetsList.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/scopeBudgetParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "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" + } + } + }, + "/{scope}/providers/Microsoft.Consumption/budgets/{budgetName}": { + "get": { + "tags": [ + "Budgets" + ], + "operationId": "Budgets_Get", + "description": "Gets the budget for the scope 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/scopeBudgetParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$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/scopeBudgetParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$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/scopeBudgetParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/budgetNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/{scope}/providers/Microsoft.Consumption/tags": { + "get": { + "tags": [ + "Tags" + ], + "operationId": "Tags_Get", + "description": "Get all available tag keys for the defined scope", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "Tags_Get": { + "$ref": "./examples/Tags.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/scopeTagsParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/TagsResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/{scope}/providers/Microsoft.Consumption/charges": { + "get": { + "tags": [ + "Charges" + ], + "operationId": "Charges_ListByScope", + "description": "Lists the charges based for the defined scope.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ChargesListForEnrollmentAccount": { + "$ref": "./examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json" + }, + "ChangesForBillingPeriodByEnrollmentAccount": { + "$ref": "./examples/ChargesForBillingPeriodByEnrollmentAccount.json" + }, + "ChargesListByDepartment": { + "$ref": "./examples/ChargesListForDepartmentFilterByStartEndDate.json" + }, + "ChangesForBillingPeriodByDepartment": { + "$ref": "./examples/ChargesForBillingPeriodByDepartment.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/scopeChargesParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "name": "$filter", + "description": "May be used to filter charges by properties/usageEnd (Utc time), properties/usageStart (Utc time). 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" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ChargeSummary" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/balances": { + "get": { + "tags": [ + "Balances" + ], + "operationId": "Balances_GetByBillingAccount", + "description": "Gets the balances for a scope by billingAccountId. Balances 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": { + "Balances": { + "$ref": "./examples/BalancesByBillingAccount.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Balance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/providers/Microsoft.Consumption/balances": { + "get": { + "tags": [ + "Balances" + ], + "operationId": "Balances_GetForBillingPeriodByBillingAccount", + "description": "Gets the balances for a scope by billing period and billingAccountId. Balances 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": { + "Balances": { + "$ref": "./examples/BalancesByBillingAccountForBillingPeriod.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/Balance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/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" + }, + { + "$ref": "#/parameters/grainParameter" + }, + { + "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" + }, + { + "$ref": "#/parameters/grainParameter" + }, + { + "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/reservationRecommendations": { + "get": { + "tags": [ + "ReservationRecommendations" + ], + "operationId": "ReservationRecommendations_List", + "description": "List of recommendations for purchasing reserved instances.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationRecommendations": { + "$ref": "./examples/ReservationRecommendationsList.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" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + } + ], + "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/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" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/forecasts": { + "get": { + "tags": [ + "Forecasts" + ], + "x-ms-odata": "#/definitions/Forecast", + "operationId": "Forecasts_List", + "description": "Lists the forecast charges by subscriptionId.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ForecastsList": { + "$ref": "./examples/ForecastsList.json" + }, + "ForecastsListFilterByGrain": { + "$ref": "./examples/ForecastsListFilterByGrain.json" + }, + "ForecastsListFilterByDates": { + "$ref": "./examples/ForecastsListFilterByDates.json" + } + }, + "parameters": [ + { + "name": "$filter", + "description": "May be used to filter forecasts by properties/usageDate (Utc time), properties/chargeType or properties/grain. 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" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "$ref": "#/parameters/subscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ForecastsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, + "/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" + } + } + }, + "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Consumption/aggregatedcost": { + "get": { + "tags": [ + "AggregatedCost" + ], + "operationId": "AggregatedCost_GetByManagementGroup", + "description": "Provides the aggregate cost of a management group and all child management groups by current billing period.", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "AggregatedCostByManagementGroup": { + "$ref": "./examples/AggregatedCostByManagementGroup.json" + }, + "AggregatedCostByManagementGroupFilterByDate": { + "$ref": "./examples/AggregatedCostByManagementGroupFilterByDate.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/managementGroupIdParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + }, + { + "name": "$filter", + "description": "May be used to filter aggregated cost by properties/usageStart (Utc time), properties/usageEnd (Utc time). 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" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ManagementGroupAggregatedCostResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}/Microsoft.Consumption/aggregatedcost": { + "get": { + "tags": [ + "AggregatedCost" + ], + "operationId": "AggregatedCost_GetForBillingPeriodByManagementGroup", + "description": "Provides the aggregate cost of a management group and all child management groups by specified billing period", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "AggregatedCostListForBillingPeriodByManagementGroup": { + "$ref": "./examples/AggregatedCostForBillingPeriodByManagementGroup.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/managementGroupIdParameter" + }, + { + "$ref": "#/parameters/billingPeriodNameParameter" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ManagementGroupAggregatedCostResult" + } + }, + "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 + }, + "serviceName": { + "description": "The name of the service.", + "type": "string", + "readOnly": true + }, + "serviceTier": { + "description": "The service tier.", + "type": "string", + "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 (GUID).", + "type": "string", + "format": "uuid", + "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", + "format": "uuid", + "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 + }, + "partNumber": { + "description": "Part Number", + "type": "string", + "readOnly": true + }, + "resourceGuid": { + "description": "Resource Guid", + "type": "string", + "readOnly": true + }, + "offerId": { + "description": "Offer Id", + "type": "string", + "readOnly": true + }, + "chargesBilledSeparately": { + "description": "Charges billed separately", + "type": "boolean", + "readOnly": true + }, + "location": { + "description": "Resource Location", + "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 (GUID).", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "subscriptionGuid": { + "description": "Subscription guid.", + "type": "string", + "format": "uuid", + "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 + }, + "isRecurringCharge": { + "description": "Flag indicating whether this is a recurring charge or not.", + "type": "boolean", + "readOnly": true + } + } + }, + "Balance": { + "description": "A balance resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/BalanceProperties", + "title": "Balance properties" + } + } + }, + "BalanceProperties": { + "description": "The properties of the balance.", + "type": "object", + "properties": { + "currency": { + "description": "The ISO currency in which the meter is charged, for example, USD.", + "type": "string", + "readOnly": true + }, + "beginningBalance": { + "description": "The beginning balance for the billing period.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "endingBalance": { + "description": "The ending balance for the billing period (for open periods this will be updated daily).", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "newPurchases": { + "description": "Total new purchase amount.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "adjustments": { + "description": "Total adjustment amount.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "utilized": { + "description": "Total Commitment usage.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "serviceOverage": { + "description": "Overage for Azure services.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "chargesBilledSeparately": { + "description": "Charges Billed separately.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "totalOverage": { + "description": "serviceOverage + chargesBilledSeparately.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "totalUsage": { + "description": "Azure service commitment + total Overage.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "azureMarketplaceServiceCharges": { + "description": "Total charges for Azure Marketplace.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "billingFrequency": { + "description": "The billing frequency.", + "type": "string", + "enum": [ + "Month", + "Quarter", + "Year" + ], + "x-ms-enum": { + "name": "BillingFrequency", + "modelAsString": true + } + }, + "priceHidden": { + "description": "Price is hidden or not.", + "type": "boolean", + "readOnly": true + }, + "newPurchasesDetails": { + "description": "List of new purchases.", + "type": "array", + "items": { + "type": "object", + "properties": { + "name": { + "description": "the name of new purchase.", + "type": "string", + "readOnly": true + }, + "value": { + "description": "the value of new purchase.", + "type": "number", + "format": "decimal", + "readOnly": true + } + } + }, + "readOnly": true + }, + "adjustmentDetails": { + "description": "List of Adjustments (Promo credit, SIE credit etc.).", + "type": "array", + "items": { + "type": "object", + "properties": { + "name": { + "description": "the name of new adjustment.", + "type": "string", + "readOnly": true + }, + "value": { + "description": "the value of new adjustment.", + "type": "number", + "format": "decimal", + "readOnly": true + } + } + }, + "readOnly": true + } + } + }, + "ReservationSummary": { + "description": "reservation summary resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ReservationSummaryProperties", + "title": "Reservation Summary properties" + } + } + }, + "ReservationSummariesListResult": { + "description": "Result of listing reservation summaries.", + "properties": { + "value": { + "description": "The list of reservation summaries.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ReservationSummary" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "ReservationSummaryProperties": { + "description": "The properties of the reservation summary.", + "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 additional info 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 + } + } + }, + "ReservationDetail": { + "description": "reservation detail resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ReservationDetailProperties", + "title": "Reservation Detail properties" + } + } + }, + "ReservationDetailsListResult": { + "description": "Result of listing reservation details.", + "properties": { + "value": { + "description": "The list of reservation details.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ReservationDetail" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "ReservationDetailProperties": { + "description": "The properties of the reservation detail.", + "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 additional info 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 + } + } + }, + "ReservationRecommendation": { + "description": "Reservation recommendation resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + }, + { + "$ref": "#/definitions/ResourceAttributes" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ReservationRecommendationProperties", + "title": "Reservation Recommendation properties" + } + } + }, + "ReservationRecommendationsListResult": { + "description": "Result of listing reservation recommendations.", + "properties": { + "value": { + "description": "The list of reservation recommendations.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ReservationRecommendation" + } + }, + "nextLink": { + "description": "The link (url) to the next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "ReservationRecommendationProperties": { + "description": "The properties of the reservation recommendation.", + "properties": { + "lookBackPeriod": { + "description": "The number of days of usage to look back for recommendation.", + "type": "string", + "readOnly": true + }, + "meterId": { + "description": "The meter id (GUID)", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "term": { + "description": "RI recommendations in one or three year terms.", + "type": "string", + "readOnly": true + }, + "costWithNoReservedInstances": { + "description": "The total amount of cost without reserved instances.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "recommendedQuantity": { + "description": "Recommended 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 + } + } + }, + "TagsResult": { + "description": "A resource listing all tags.", + "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": { + "tags": { + "description": "A list of Tag.", + "type": "array", + "items": { + "$ref": "#/definitions/Tag" + } + } + } + }, + "Tag": { + "description": "The tag resource.", + "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": { + "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", + "BillingMonth", + "BillingQuarter", + "BillingAnnual" + ], + "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 period. 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 (GUID), mandatory for budgets of usage category. ", + "type": "array", + "items": { + "type": "string", + "format": "uuid" + }, + "minItems": 0, + "maxItems": 10 + }, + "tags": { + "type": "object", + "description": "The 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" + ] + }, + "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 (GUID)", + "type": "string", + "format": "uuid", + "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 + }, + "offerId": { + "description": "Offer Id", + "type": "string", + "readOnly": true + } + } + }, + "Forecast": { + "description": "A forecast resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ForecastProperties", + "title": "Forecast properties" + } + } + }, + "ForecastsListResult": { + "description": "Result of listing forecasts. It contains a list of available forecasts.", + "type": "object", + "properties": { + "value": { + "description": "The list of forecasts.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Forecast" + } + } + } + }, + "ForecastProperties": { + "description": "The properties of the forecast charge.", + "type": "object", + "properties": { + "usageDate": { + "description": "The usage date of the forecast.", + "type": "string", + "readOnly": true + }, + "grain": { + "description": "The granularity of forecast.", + "type": "string", + "enum": [ + "Daily", + "Monthly", + "Yearly" + ], + "x-ms-enum": { + "name": "Grain", + "modelAsString": true + } + }, + "charge": { + "description": "The amount of charge", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "currency": { + "description": "The ISO currency in which the meter is charged, for example, USD.", + "type": "string", + "readOnly": true + }, + "chargeType": { + "description": "The type of the charge. Could be actual or forecast", + "type": "string", + "enum": [ + "Actual", + "Forecast" + ], + "x-ms-enum": { + "name": "ChargeType", + "modelAsString": true + } + }, + "confidenceLevels": { + "description": "The details about the forecast confidence levels. This is populated only when chargeType is Forecast.", + "type": "array", + "items": { + "type": "object", + "properties": { + "percentage": { + "description": "The percentage level of the confidence", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "bound": { + "description": "The boundary of the percentage, values could be 'Upper' or 'Lower'", + "type": "string", + "enum": [ + "Upper", + "Lower" + ], + "x-ms-enum": { + "name": "Bound", + "modelAsString": true + } + }, + "value": { + "description": "The amount of forecast within the percentage level", + "type": "number", + "format": "decimal", + "readOnly": true + } + } + }, + "readOnly": true + } + } + }, + "ManagementGroupAggregatedCostResult": { + "description": "A management group aggregated cost resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ManagementGroupAggregatedCostProperties", + "title": "Management Group Aggregated Cost properties" + } + } + }, + "ManagementGroupAggregatedCostProperties": { + "description": "The properties of the Management Group Aggregated Cost.", + "type": "object", + "properties": { + "billingPeriodId": { + "description": "The id of the billing period resource that the aggregated cost belongs to.", + "type": "string", + "readOnly": true + }, + "usageStart": { + "description": "The start of the date time range covered by aggregated cost.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "usageEnd": { + "description": "The end of the date time range covered by the aggregated cost.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "azureCharges": { + "description": "Azure Charges.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "marketplaceCharges": { + "description": "Marketplace Charges.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "chargesBilledSeparately": { + "description": "Charges Billed Separately.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "currency": { + "description": "The ISO currency in which the meter is charged, for example, USD.", + "type": "string", + "readOnly": true + }, + "children": { + "description": "Children of a management group", + "type": "array", + "items": { + "$ref": "#/definitions/ManagementGroupAggregatedCostResult" + } + }, + "includedSubscriptions": { + "description": "List of subscription Guids included in the calculation of aggregated cost", + "type": "array", + "items": { + "type": "string" + } + }, + "excludedSubscriptions": { + "description": "List of subscription Guids excluded from the calculation of aggregated cost", + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "ChargesListResult": { + "description": "Result of listing charge summary.", + "properties": { + "value": { + "description": "The list of charge summary", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ChargeSummary" + } + } + } + }, + "ChargeSummary": { + "description": "A charge summary resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ChargeSummaryProperties", + "title": "Charge summary properties" + } + } + }, + "ChargeSummaryProperties": { + "description": "The properties of the charge summary.", + "type": "object", + "properties": { + "billingPeriodId": { + "description": "The id of the billing period resource that the charge belongs to.", + "type": "string", + "readOnly": true + }, + "usageStart": { + "description": "Usage start date.", + "type": "string", + "readOnly": true + }, + "usageEnd": { + "description": " Usage end date.", + "type": "string", + "readOnly": true + }, + "azureCharges": { + "description": "Azure Charges.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "chargesBilledSeparately": { + "description": "Charges Billed separately.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "marketplaceCharges": { + "description": "Marketplace Charges.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "currency": { + "description": "Currency Code", + "type": "string", + "readOnly": true + } + } + }, + "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 + }, + "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": { + "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 scenario, this field will be used to determine whether the user is updating the latest version or not." + } + }, + "x-ms-azure-resource": true + } + }, + "parameters": { + "scopeChargesParameter": { + "name": "scope", + "in": "path", + "required": true, + "type": "string", + "description": "The scope associated with usage details operations. This includes '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope and '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope. For department and enrollment accounts, you can also add billing period to the scope using '/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'. For e.g. to specify billing period at department scope use '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'", + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true + }, + "scopeUsageDetailsParameter": { + "name": "scope", + "in": "path", + "required": true, + "type": "string", + "description": "The scope associated with usage details operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For subscription, billing account, department, enrollment account and management group, you can also add billing period to the scope using '/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'. For e.g. to specify billing period at department scope use '/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'", + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true + }, + "scopeMarketplaceParameter": { + "name": "scope", + "in": "path", + "required": true, + "type": "string", + "description": "The scope associated with marketplace operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For subscription, billing account, department, enrollment account and ManagementGroup, you can also add billing period to the scope using '/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'. For e.g. to specify billing period at department scope use '/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'", + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true + }, + "scopeBudgetParameter": { + "name": "scope", + "in": "path", + "required": true, + "type": "string", + "description": "The scope associated with budget operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/billingProfiles/{billingProfileId}' for billingProfile scope, 'providers/Microsoft.Billing/billingAccounts/{billingAccountId}/invoiceSections/{invoiceSectionId}' for invoiceSection scope.", + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true + }, + "scopeTagsParameter": { + "name": "scope", + "in": "path", + "required": true, + "type": "string", + "description": "The scope associated with tags operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope..", + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true + }, + "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 2019-01-01." + }, + "billingAccountIdParameter": { + "name": "billingAccountId", + "in": "path", + "description": "BillingAccount ID", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "departmentIdParameter": { + "name": "departmentId", + "in": "path", + "description": "Department ID", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "enrollmentAccountIdParameter": { + "name": "enrollmentAccountId", + "in": "path", + "description": "EnrollmentAccount ID", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "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" + }, + "grainParameter": { + "name": "grain", + "description": "Can be daily or monthly", + "x-ms-parameter-location": "method", + "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" + } + ] + } + }, + "managementGroupIdParameter": { + "name": "managementGroupId", + "in": "path", + "description": "Azure Management Group ID.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "billingProfileIdParameter": { + "name": "billingProfileId", + "in": "path", + "description": "Azure Billing Profile ID.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "invoiceSectionIdParameter": { + "name": "invoiceSectionId", + "in": "path", + "description": "Azure Invoice Section ID.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json new file mode 100644 index 000000000000..d5712997a069 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "managementGroupId": "managementGroupForTest" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1", + "name": "aggregatedcostId1", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "includedSubscriptions": [ + "1caaa5a3-2b66-438e-8ab4-bce37d518c5d" + ], + "excludedSubscriptions": [], + "usageStart": "2019-01-01T00:00:00.0000000Z", + "usageEnd": "2018-10-31T00:00:00.0000000Z", + "azureCharges": 250.9876, + "marketplaceCharges": 150.786, + "chargesBilledSeparately": 120.345, + "currency": "USD", + "children": [ + { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2", + "name": "aggregatedcostId2", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "includedSubscriptions": [ + "c349567d-c83a-48c9-ab0e-578c69dc97a4" + ], + "excludedSubscriptions": [], + "usageStart": "2019-01-01T00:00:00.0000000Z", + "usageEnd": "2018-10-31T00:00:00.0000000Z", + "azureCharges": 150.0, + "marketplaceCharges": 50.786, + "chargesBilledSeparately": 30.345, + "currency": "USD", + "children": [] + } + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json new file mode 100644 index 000000000000..abc1b152ae96 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "managementGroupId": "managementGroupForTest", + "$filter": "usageStart ge '2018-08-15' and properties/usageStart le '2018-08-31'" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1", + "name": "aggregatedcostId1", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "includedSubscriptions": [ + "1caaa5a3-2b66-438e-8ab4-bce37d518c5d" + ], + "excludedSubscriptions": [], + "usageStart": "2018-08-15T00:00:00.0000000Z", + "usageEnd": "2018-08-31T00:00:00.0000000Z", + "azureCharges": 150.9876, + "marketplaceCharges": 80.786, + "chargesBilledSeparately": 90.345, + "currency": "USD", + "children": [ + { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2", + "name": "aggregatedcostId2", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "includedSubscriptions": [ + "c349567d-c83a-48c9-ab0e-578c69dc97a4" + ], + "excludedSubscriptions": [], + "usageStart": "2018-08-15T00:00:00.0000000Z", + "usageEnd": "2018-08-31T00:00:00.0000000Z", + "azureCharges": 50.0, + "marketplaceCharges": 10.786, + "chargesBilledSeparately": 30.345, + "currency": "USD", + "children": [] + } + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json new file mode 100644 index 000000000000..6efa54ae9c2c --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "managementGroupId": "managementGroupForTest", + "billingPeriodName": "201807" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupForTest/providers/Microsoft.Consumption/aggregatedcostId1", + "name": "aggregatedcostId1", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "usageStart": "2018-07-01T00:00:00.0000000Z", + "usageEnd": "2018-07-31T00:00:00.0000000Z", + "azureCharges": 250.9876, + "marketplaceCharges": 150.786, + "chargesBilledSeparately": 120.345, + "currency": "USD", + "children": [ + { + "id": "/providers/Microsoft.Management/managementGroups/managementGroupChildForTest/providers/Microsoft.Consumption/aggregatedcostId2", + "name": "aggregatedcostId2", + "type": "Microsoft.Consumption/aggregatedcost", + "properties": { + "usageStart": "2018-07-01T00:00:00.0000000Z", + "usageEnd": "2018-07-31T00:00:00.0000000Z", + "azureCharges": 150.0, + "marketplaceCharges": 50.786, + "chargesBilledSeparately": 30.345, + "currency": "USD", + "children": [] + } + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json new file mode 100644 index 000000000000..30da2bb06bd3 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "123456" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", + "name": "balanceId1", + "type": "Microsoft.Consumption/balances", + "properties": { + "currency": "USD ", + "beginningBalance": 3396469.19, + "endingBalance": 2922371.02, + "newPurchases": 0, + "adjustments": 0, + "utilized": 474098.17, + "serviceOverage": 0, + "chargesBilledSeparately": 0, + "totalOverage": 0, + "totalUsage": 474098.17, + "azureMarketplaceServiceCharges": 609.82, + "billingFrequency": "Month", + "priceHidden": false, + "newPurchasesDetails": [ + { + "name": "Promo Purchase", + "value": 1 + } + ], + "adjustmentDetails": [ + { + "name": "Promo Credit", + "value": 1.1 + }, + { + "name": "SIE Credit", + "value": 1.0 + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json new file mode 100644 index 000000000000..b4f39863717a --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/balances/balanceId1", + "name": "balanceId1", + "type": "Microsoft.Consumption/balances", + "properties": { + "currency": "USD ", + "beginningBalance": 3396469.19, + "endingBalance": 2922371.02, + "newPurchases": 0, + "adjustments": 0, + "utilized": 474098.17, + "serviceOverage": 0, + "chargesBilledSeparately": 0, + "totalOverage": 0, + "totalUsage": 474098.17, + "azureMarketplaceServiceCharges": 609.82, + "billingFrequency": "Month", + "priceHidden": false, + "newPurchasesDetails": [ + { + "name": "Promo Purchase", + "value": 1 + } + ], + "adjustmentDetails": [ + { + "name": "Promo Credit", + "value": 1.1 + }, + { + "name": "SIE Credit", + "value": 1.0 + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json new file mode 100644 index 000000000000..4320245d45da --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json @@ -0,0 +1,71 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MYDEVTESTRG", + "budgetName": "TestBudget" + }, + "responses": { + "200": { + "body": { + "id": "subscriptions/{subscription-id}/providers/Microsoft.Consumption/budgets/TestBudget", + "name": "TestBudget", + "type": "Microsoft.Consumption/budgets", + "eTag": "\"1d34d012214157f\"", + "properties": { + "category": "Cost", + "amount": 100.65, + "timeGrain": "Monthly", + "timePeriod": { + "startDate": "2017-10-01T00:00:00Z", + "endDate": "2018-10-31T00:00:00Z" + }, + "filters": { + "resourceGroups": [ + "MPDEVTESTRG" + ], + "resources": [ + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MSVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "00000000-0000-0000-0000-000000000000" + ], + "tags": { + "category": [ + "Dev", + "Prod" + ], + "department": [ + "engineering", + "sales" + ] + } + }, + "currentSpend": { + "amount": 80.89, + "unit": "USD" + }, + "notifications": { + "Actual_GreaterThan_80_Percent": { + "enabled": true, + "operator": "GreaterThan", + "threshold": 80, + "contactEmails": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json new file mode 100644 index 000000000000..cbb9d0fbfe2f --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json @@ -0,0 +1,159 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MYDEVTESTRG" + }, + "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": [ + "MYDEVTESTRG" + ], + "resources": [ + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "00000000-0000-0000-0000-000000000000" + ], + "tags": { + "category": [ + "Dev", + "Prod" + ], + "department": [ + "engineering", + "sales" + ] + } + }, + "currentSpend": { + "amount": 80.89, + "unit": "USD" + }, + "notifications": { + "Actual_GreaterThan_80_Percent": { + "enabled": true, + "operator": "GreaterThan", + "threshold": 80, + "contactEmails": [ + "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/MYDEVTESTRG/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": [ + "MYDEVTESTRG" + ], + "resources": [ + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "00000000-0000-0000-0000-000000000000" + ], + "tags": { + "category": [ + "Dev", + "Prod" + ], + "department": [ + "engineering", + "sales" + ] + } + }, + "currentSpend": { + "amount": 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/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json new file mode 100644 index 000000000000..cadb45c4622d --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234", + "departmentId": "42425", + "billingPeriodName": "201804" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", + "name": "chargeSummaryId1", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", + "usageStart": "2018-04-01", + "usageEnd": "2018-04-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json new file mode 100644 index 000000000000..2e8a3bcc7a8b --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234", + "enrollmentAccountId": "42425", + "billingPeriodName": "201804" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", + "name": "chargeSummaryId1", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", + "usageStart": "2018-04-01", + "usageEnd": "2018-04-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json new file mode 100644 index 000000000000..e8c12cfe5640 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234", + "departmentId": "42425", + "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", + "name": "chargeSummaryId1", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", + "usageStart": "2018-04-01", + "usageEnd": "2018-04-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", + "name": "chargeSummaryId2", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", + "usageStart": "2018-05-01", + "usageEnd": "2018-05-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json new file mode 100644 index 000000000000..e8c12cfe5640 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234", + "departmentId": "42425", + "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", + "name": "chargeSummaryId1", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", + "usageStart": "2018-04-01", + "usageEnd": "2018-04-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", + "name": "chargeSummaryId2", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", + "usageStart": "2018-05-01", + "usageEnd": "2018-05-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json new file mode 100644 index 000000000000..e099b58ffe84 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234", + "enrollmentAccountId": "42425", + "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", + "name": "chargeSummaryId1", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", + "usageStart": "2018-04-01", + "usageEnd": "2018-04-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", + "name": "chargeSummaryId2", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", + "usageStart": "2018-05-01", + "usageEnd": "2018-05-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json new file mode 100644 index 000000000000..764fee438547 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234", + "enrollmentAccountId": "42425" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", + "name": "chargeSummaryId1", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", + "usageStart": "2018-04-01", + "usageEnd": "2018-04-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + }, + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", + "name": "chargeSummaryId2", + "type": "Microsoft.Consumption/charges", + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", + "usageStart": "2018-05-01", + "usageEnd": "2018-05-30", + "azureCharges": 5000.00, + "chargesBilledSeparately": 60.90, + "marketplaceCharges": 100.00, + "currency": "USD" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json new file mode 100644 index 000000000000..e535b54cabda --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json @@ -0,0 +1,184 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MYDEVTESTRG", + "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": [ + "MYDEVTESTRG" + ], + "resources": [ + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "00000000-0000-0000-0000-000000000000" + ], + "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/MYDEVTESTRG/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/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "00000000-0000-0000-0000-000000000000" + ], + "tags": { + "category": [ + "Dev", + "Prod" + ], + "department": [ + "engineering", + "sales" + ] + } + }, + "currentSpend": { + "amount": 80.89, + "unit": "USD" + }, + "notifications": { + "Actual_GreaterThan_80_Percent": { + "enabled": true, + "operator": "GreaterThan", + "threshold": 80, + "contactEmails": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/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/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/MYVM2", + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/Microsoft.Compute/virtualMachines/platformcloudplatformGeneric1" + ], + "meters": [ + "00000000-0000-0000-0000-000000000000" + ], + "tags": { + "category": [ + "Dev", + "Prod" + ], + "department": [ + "engineering", + "sales" + ] + } + }, + "currentSpend": { + "amount": 80.89, + "unit": "USD" + }, + "notifications": { + "Actual_GreaterThan_80_Percent": { + "enabled": true, + "operator": "GreaterThan", + "threshold": 80, + "contactEmails": [ + "johndoe@contoso.com", + "janesmith@contoso.com" + ], + "contactRoles": [ + "Contributor", + "Reader" + ], + "contactGroups": [ + "/subscriptions/{subscription-id}/resourceGroups/MYDEVTESTRG/providers/microsoft.insights/actionGroups/SampleActionGroup" + ] + } + } + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json new file mode 100644 index 000000000000..a939b1d329c1 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "MYDEVTESTRG", + "budgetName": "TestBudget" + }, + "responses": { + "200": {} + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json new file mode 100644 index 000000000000..9cfdb7ac7266 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId1", + "name": "forecastId1", + "type": "Microsoft.Consumption/forecasts", + "properties": { + "usageDate": "2018-04-01", + "grain": "Daily", + "charge": 752.000000, + "currency": "USD", + "chargeType": "Actual", + "confidenceLevels": null + } + }, + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId2", + "name": "forecastId2", + "type": "Microsoft.Consumption/forecasts", + "properties": { + "usageDate": "2018-04-02", + "grain": "Daily", + "charge": 753.809074, + "currency": "USD", + "chargeType": "Forecast", + "confidenceLevels": [ + { + "percentage": 95, + "bound": "Upper", + "value": 1165.951737 + }, + { + "percentage": 95, + "bound": "Lower", + "value": 340.753404 + } + ] + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json new file mode 100644 index 000000000000..22444d5c3a7e --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "$filter": "usagedate ge '2018-04-01' AND usagedate le '2018-04-02'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId1", + "name": "forecastId1", + "type": "Microsoft.Consumption/forecasts", + "properties": { + "usageDate": "2018-04-01", + "grain": "Daily", + "charge": 752.000000, + "currency": "USD", + "chargeType": "Actual", + "confidenceLevels": null + } + }, + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId2", + "name": "forecastId2", + "type": "Microsoft.Consumption/forecasts", + "properties": { + "usageDate": "2018-04-02", + "grain": "Daily", + "charge": 753.809074, + "currency": "USD", + "chargeType": "Forecast", + "confidenceLevels": [ + { + "percentage": 95, + "bound": "Upper", + "value": 1165.951737 + }, + { + "percentage": 95, + "bound": "Lower", + "value": 340.753404 + } + ] + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json new file mode 100644 index 000000000000..2583fd487392 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "$filter": "Grain eq 'Monthly'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId1", + "name": "forecastId1", + "type": "Microsoft.Consumption/forecasts", + "properties": { + "usageDate": "2018-04-01", + "grain": "Monthly", + "charge": 752.000000, + "currency": "USD", + "chargeType": "Actual", + "confidenceLevels": null + } + }, + { + "id": "/subscriptions/subid/providers/Microsoft.Consumption/forecasts/forecastId2", + "name": "forecastId2", + "type": "Microsoft.Consumption/forecasts", + "properties": { + "usageDate": "2018-05-01", + "grain": "Monthly", + "charge": 753.809074, + "currency": "USD", + "chargeType": "Forecast", + "confidenceLevels": [ + { + "percentage": 95, + "bound": "Upper", + "value": 1165.951737 + }, + { + "percentage": 95, + "bound": "Lower", + "value": 340.753404 + } + ] + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json new file mode 100644 index 000000000000..2ce2a7b7ff1e --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "123456" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplaceId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/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": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan1", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json new file mode 100644 index 000000000000..34c570231be0 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/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": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json new file mode 100644 index 000000000000..9e0fa3621523 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "departmentId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/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": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json new file mode 100644 index 000000000000..9e0fa3621523 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "departmentId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/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": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json new file mode 100644 index 000000000000..f98a39deb5fc --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "enrollmentAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/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": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json new file mode 100644 index 000000000000..f98a39deb5fc --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "enrollmentAccountId": "123456", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/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": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json new file mode 100644 index 000000000000..7f46e1c51c13 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json @@ -0,0 +1,84 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "managementGroupId": "managementGroupForTest" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201810/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201810", + "usageStart": "2018-10-13T00:00:00Z", + "usageEnd": "2018-10-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201810/providers/Microsoft.Consumption/marketplaces/marketplaceId2", + "name": "marketplacesId2", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account2", + "additionalProperties": "additionalProperties", + "costCenter": "Center2", + "departmentName": "Department2", + "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201810", + "usageStart": "2018-10-13T00:00:00Z", + "usageEnd": "2018-10-13T23:59:59Z", + "instanceName": "shared2", + "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared2", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "11111111-1111-1111-1111-111111111111", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "11111111-1111-1111-1111-111111111111", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "11111111-1111-1111-1111-111111111111", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json new file mode 100644 index 000000000000..d3018a82ecf2 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json @@ -0,0 +1,85 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "managementGroupId": "managementGroupForTest", + "billingPeriodName": "201808" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201808/providers/Microsoft.Consumption/marketplaces/marketplaceId1", + "name": "marketplacesId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201808", + "usageStart": "2018-08-13T00:00:00Z", + "usageEnd": "2018-08-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201808/providers/Microsoft.Consumption/marketplaces/marketplaceId2", + "name": "marketplacesId2", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account2", + "additionalProperties": "additionalProperties", + "costCenter": "Center2", + "departmentName": "Department2", + "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201810", + "usageStart": "2018-08-13T00:00:00Z", + "usageEnd": "2018-08-13T23:59:59Z", + "instanceName": "shared2", + "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared2", + "currency": "USD", + "consumedQuantity": 0.00328, + "pretaxCost": 0.67, + "isEstimated": false, + "meterId": "11111111-1111-1111-1111-111111111111", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "11111111-1111-1111-1111-111111111111", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "11111111-1111-1111-1111-111111111111", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json new file mode 100644 index 000000000000..b2dc4f276226 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/marketPlaces/marketplaceId1", + "name": "marketplaceId1", + "type": "Microsoft.Consumption/marketPlaces", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "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": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan1", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json new file mode 100644 index 000000000000..0f864e0e53d1 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "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": { + "accountName": "Account1", + "additionalProperties": "additionalProperties", + "costCenter": "Center1", + "departmentName": "Department1", + "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": "00000000-0000-0000-0000-000000000000", + "offerName": "offer1", + "resourceGroup": "TEST", + "orderNumber": "00000000-0000-0000-0000-000000000000", + "publisherName": "xyz", + "planName": "plan2", + "resourceRate": 0.24, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "azure subscription", + "unitOfMeasure": "10 Hours", + "isRecurringCharge": false + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json new file mode 100644 index 000000000000..5470ae7ce9d6 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "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", + "pricesheets": [ + { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702", + "meterId": "00000000-0000-0000-0000-000000000000", + "unitOfMeasure": "100 Hours", + "includedQuantity": 100, + "partNumber": "XX-11110", + "unitPrice": 0.00328, + "currencyCode": "EUR", + "offerId": "OfferId 1" + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json new file mode 100644 index 000000000000..901a39430faf --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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": "00000000-0000-0000-0000-000000000000", + "unitOfMeasure": "100 Hours", + "includedQuantity": 100, + "partNumber": "XX-11110", + "unitPrice": 0.00328, + "currencyCode": "EUR", + "offerId": "OfferId 1", + "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/2019-05-01/examples/PriceSheetForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetForBillingPeriod.json new file mode 100644 index 000000000000..9b1992146361 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetForBillingPeriod.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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": "00000000-0000-0000-0000-000000000000", + "unitOfMeasure": "100 Hours", + "includedQuantity": 100, + "partNumber": "XX-11110", + "unitPrice": 0.00328, + "currencyCode": "EUR", + "offerId": "OfferId 1" + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json new file mode 100644 index 000000000000..d994a1f95e0f --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "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": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "usageDate": "2017-11-29T00:00:00Z", + "skuName": "Standard_D2_v2", + "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/2019-05-01/examples/ReservationDetailsWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsWithReservationId.json new file mode 100644 index 000000000000..60032b581d06 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsWithReservationId.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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": { + "200": { + "body": { + "value": [ + { + "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": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "usageDate": "2017-11-29T00:00:00Z", + "skuName": "Standard_D2_v2", + "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/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json new file mode 100644 index 000000000000..32dc045c5b64 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json @@ -0,0 +1,52 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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-06T00:00:00Z", + "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-06T00:00:00Z", + "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&" + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json new file mode 100644 index 000000000000..4b789561cb5f --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json @@ -0,0 +1,51 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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-06T00:00:00Z", + "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-06T00:00:00Z", + "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&" + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json new file mode 100644 index 000000000000..216857632ba9 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "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/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": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "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/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json new file mode 100644 index 000000000000..44ae8d2bafa9 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "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": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "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/2019-05-01/examples/ReservationSummariesMonthly.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json new file mode 100644 index 000000000000..5389f74a410b --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "grain": "monthly" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "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": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "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/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json new file mode 100644 index 000000000000..2ebebe3cb06b --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "grain": "monthly" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "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": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "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/2019-05-01/examples/Tags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json new file mode 100644 index 000000000000..4eb754cf34d3 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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" + } + ] + } + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json new file mode 100644 index 000000000000..70e62eec0e37 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json @@ -0,0 +1,65 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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' AND tags eq 'dev:tools'", + "$top": 1 + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "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", + "meterDetails": { + "meterName": "Data Transfer Out (GB)", + "meterCategory": "Networking", + "unit": "GB", + "meterLocation": "Zone 2", + "totalIncludedQuantity": 0, + "pretaxStandardRate": 0.138, + "serviceName": "Bandwidth", + "serviceTier": "Bandwidth - Outbound Data Transfer" + }, + "subscriptionGuid": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Dummy subscription", + "accountName": "My account name", + "departmentName": "My department name", + "product": "My product name", + "consumedService": "My consumed service", + "costCenter": "Cost center 1", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West", + "additionalProperties": "{\"MyType\":\"\",\"ServiceType\":\"\",\"VMName\":\"\",\"UsageType\":\"MyUsage\"}" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json new file mode 100644 index 000000000000..251ef2df0f95 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json new file mode 100644 index 000000000000..98d8ad3de7f0 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json new file mode 100644 index 000000000000..b00b0d24b1a0 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "departmentId": "1234" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/Departments/1234/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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json new file mode 100644 index 000000000000..f6d51e0ad986 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "enrollmentAccountId": "1234" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json new file mode 100644 index 000000000000..590e515937dd --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json @@ -0,0 +1,70 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "managementGroupId": "managementGroupForTest" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201808", + "usageStart": "2018-08-13T00:00:00Z", + "usageEnd": "2018-08-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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201808", + "usageStart": "2018-08-13T00:00:00Z", + "usageEnd": "2018-08-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00120, + "billableQuantity": 0.00128, + "pretaxCost": 0.26, + "isEstimated": false, + "meterId": "11111111-1111-1111-1111-111111111111", + "partNumber": "Part Number 1", + "resourceGuid": "11111111-1111-1111-1111-111111111111", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json new file mode 100644 index 000000000000..e9e431deda95 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "$filter": "tags eq 'dev:tools'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json new file mode 100644 index 000000000000..80306d06234e --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json new file mode 100644 index 000000000000..663c7d003a25 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "billingAccountId": "1234", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json new file mode 100644 index 000000000000..5d719d82249e --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "departmentId": "1234", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/Departments/1234/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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json new file mode 100644 index 000000000000..80ef9db27ce5 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "enrollmentAccountId": "1234", + "billingPeriodName": "201702" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", + "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json new file mode 100644 index 000000000000..d58b31663afd --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json @@ -0,0 +1,71 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "managementGroupId": "managementGroupForTest", + "billingPeriodName": "201807" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201807", + "usageStart": "2018-07-13T00:00:00Z", + "usageEnd": "2018-07-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", + "partNumber": "Part Number 1", + "resourceGuid": "00000000-0000-0000-0000-000000000000", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "name": "usageDetailsId1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201807", + "usageStart": "2018-07-13T00:00:00Z", + "usageEnd": "2018-07-13T23:59:59Z", + "instanceName": "shared1", + "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", + "instanceLocation": "eastasia", + "currency": "USD", + "usageQuantity": 0.00120, + "billableQuantity": 0.00128, + "pretaxCost": 0.26, + "isEstimated": false, + "meterId": "11111111-1111-1111-1111-111111111111", + "partNumber": "Part Number 1", + "resourceGuid": "11111111-1111-1111-1111-111111111111", + "offerId": "Offer Id 1", + "chargesBilledSeparately": true, + "location": "EU West" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json new file mode 100644 index 000000000000..7e867c8f71c5 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json new file mode 100644 index 000000000000..03e57bbb91b6 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "api-version": "2019-01-01", + "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": "Azure VCAP STA - RDS Server" + }, + "properties": { + "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301", + "usageStart": "2018-03-02T00:00:00.0000000Z", + "usageEnd": "2018-03-02T23:59:59.0000000Z", + "usageQuantity": 1.11111111111, + "pretaxCost": 0, + "currency": "USD" + } + } + ] + } + } + } +} From 037ada6b6fe67c9065e7d3d23ec55206f0fa57ca Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Thu, 11 Jul 2019 20:20:01 -0700 Subject: [PATCH 02/41] Updates readme --- .../consumption/resource-manager/readme.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/specification/consumption/resource-manager/readme.md b/specification/consumption/resource-manager/readme.md index f28b7a4e49e5..47fef518ed19 100644 --- a/specification/consumption/resource-manager/readme.md +++ b/specification/consumption/resource-manager/readme.md @@ -26,18 +26,27 @@ These are the global settings for the Consumption API. ``` yaml openapi-type: arm -tag: package-preview-2019-04 +tag: package-2019-05 ``` +### Tag: package-2019-05 + +These settings apply only when `--tag=package-2019-05` is specified on the command line. + +```yaml $(tag) == 'package-2019-05' +input-file: + - Microsoft.Consumption/stable/2019-05-01/consumption.json +``` ### Tag: package-preview-2019-04 These settings apply only when `--tag=package-preview-2019-04` is specified on the command line. -```yaml $(tag) == 'package-preview-2019-04' +``` yaml $(tag) == 'package-preview-2019-04' input-file: - Microsoft.Consumption/preview/2019-04-01-preview/consumption.json ``` + ### Tag: package-preview-2018-11 These settings apply only when `--tag=package-preview-2018-11` is specified on the command line. @@ -365,4 +374,4 @@ java: output-folder: $(azure-libraries-for-java-folder)/consumption/resource-manager/v2019_01_01 regenerate-manager: true generate-interface: true -``` \ No newline at end of file +``` From 31e6fa4caef84f960e18ff060ff9dad40b71ae87 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Thu, 11 Jul 2019 20:20:04 -0700 Subject: [PATCH 03/41] Updates API version in new specs and examples --- .../stable/2019-05-01/consumption.json | 4 ++-- .../examples/AggregatedCostByManagementGroup.json | 6 +++--- .../AggregatedCostByManagementGroupFilterByDate.json | 2 +- .../AggregatedCostForBillingPeriodByManagementGroup.json | 2 +- .../2019-05-01/examples/BalancesByBillingAccount.json | 2 +- .../examples/BalancesByBillingAccountForBillingPeriod.json | 2 +- .../stable/2019-05-01/examples/Budget.json | 2 +- .../stable/2019-05-01/examples/BudgetsList.json | 2 +- .../examples/ChargesForBillingPeriodByDepartment.json | 2 +- .../ChargesForBillingPeriodByEnrollmentAccount.json | 2 +- .../2019-05-01/examples/ChargesListForDepartment.json | 2 +- .../ChargesListForDepartmentFilterByStartEndDate.json | 2 +- .../examples/ChargesListForEnrollmentAccount.json | 2 +- ...ChargesListForEnrollmentAccountFilterByStartEndDate.json | 2 +- .../stable/2019-05-01/examples/CreateOrUpdateBudget.json | 2 +- .../stable/2019-05-01/examples/DeleteBudget.json | 2 +- .../stable/2019-05-01/examples/ForecastsList.json | 2 +- .../2019-05-01/examples/ForecastsListFilterByDates.json | 2 +- .../2019-05-01/examples/ForecastsListFilterByGrain.json | 2 +- .../examples/MarketplacesByBillingAccountList.json | 2 +- .../MarketplacesByBillingAccountListForBillingPeriod.json | 2 +- .../2019-05-01/examples/MarketplacesByDepartmentList.json | 2 +- .../MarketplacesByDepartment_ListByBillingPeriod.json | 2 +- .../examples/MarketplacesByEnrollmentAccountList.json | 2 +- ...arketplacesByEnrollmentAccounts_ListByBillingPeriod.json | 2 +- .../examples/MarketplacesByManagementGroupList.json | 2 +- .../MarketplacesByManagementGroup_ListForBillingPeriod.json | 2 +- .../stable/2019-05-01/examples/MarketplacesList.json | 2 +- .../examples/MarketplacesListForBillingPeriod.json | 2 +- .../stable/2019-05-01/examples/PriceSheet.json | 2 +- .../stable/2019-05-01/examples/PriceSheetExpand.json | 2 +- .../2019-05-01/examples/PriceSheetForBillingPeriod.json | 2 +- .../stable/2019-05-01/examples/ReservationDetails.json | 2 +- .../examples/ReservationDetailsWithReservationId.json | 2 +- ...servationRecommendationsFilterByScopeLookBackPeriod.json | 2 +- .../2019-05-01/examples/ReservationRecommendationsList.json | 2 +- .../2019-05-01/examples/ReservationSummariesDaily.json | 2 +- .../ReservationSummariesDailyWithReservationId.json | 2 +- .../2019-05-01/examples/ReservationSummariesMonthly.json | 2 +- .../ReservationSummariesMonthlyWithReservationId.json | 2 +- .../stable/2019-05-01/examples/Tags.json | 2 +- .../stable/2019-05-01/examples/UsageDetailsExpand.json | 2 +- .../stable/2019-05-01/examples/UsageDetailsList.json | 2 +- .../examples/UsageDetailsListByBillingAccount.json | 2 +- .../2019-05-01/examples/UsageDetailsListByDepartment.json | 2 +- .../examples/UsageDetailsListByEnrollmentAccount.json | 2 +- .../examples/UsageDetailsListByManagementGroup.json | 2 +- .../2019-05-01/examples/UsageDetailsListFilterByTag.json | 2 +- .../examples/UsageDetailsListForBillingPeriod.json | 2 +- .../UsageDetailsListForBillingPeriodByBillingAccount.json | 2 +- .../UsageDetailsListForBillingPeriodByDepartment.json | 2 +- ...UsageDetailsListForBillingPeriodByEnrollmentAccount.json | 2 +- .../UsageDetailsListForBillingPeriodByManagementGroup.json | 2 +- .../UsageDetailsListForBillingPeriodGroupByTag.json | 2 +- .../2019-05-01/examples/UsageDetailsListGroupByTagDate.json | 2 +- 55 files changed, 58 insertions(+), 58 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 811ec94288c8..ec4f6a8ffb2c 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-01-01", + "version": "2019-05-01", "title": "ConsumptionManagementClient", "description": "Consumption management client provides access to consumption resources for Azure Enterprise Subscriptions." }, @@ -2820,7 +2820,7 @@ "in": "query", "required": true, "type": "string", - "description": "Version of the API to be used with the client request. The current version is 2019-01-01." + "description": "Version of the API to be used with the client request. The current version is 2019-05-01." }, "billingAccountIdParameter": { "name": "billingAccountId", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json index d5712997a069..9935a249ce99 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest" }, "responses": { @@ -14,7 +14,7 @@ "1caaa5a3-2b66-438e-8ab4-bce37d518c5d" ], "excludedSubscriptions": [], - "usageStart": "2019-01-01T00:00:00.0000000Z", + "usageStart": "2019-05-01T00:00:00.0000000Z", "usageEnd": "2018-10-31T00:00:00.0000000Z", "azureCharges": 250.9876, "marketplaceCharges": 150.786, @@ -30,7 +30,7 @@ "c349567d-c83a-48c9-ab0e-578c69dc97a4" ], "excludedSubscriptions": [], - "usageStart": "2019-01-01T00:00:00.0000000Z", + "usageStart": "2019-05-01T00:00:00.0000000Z", "usageEnd": "2018-10-31T00:00:00.0000000Z", "azureCharges": 150.0, "marketplaceCharges": 50.786, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json index abc1b152ae96..cf899d3abb70 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostByManagementGroupFilterByDate.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest", "$filter": "usageStart ge '2018-08-15' and properties/usageStart le '2018-08-31'" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json index 6efa54ae9c2c..bc0631163d53 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/AggregatedCostForBillingPeriodByManagementGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest", "billingPeriodName": "201807" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json index 30da2bb06bd3..661d34975d1b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "123456" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json index b4f39863717a..45b4f03410fc 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BalancesByBillingAccountForBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "123456", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json index 4320245d45da..62dd4dcbb6c8 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG", "budgetName": "TestBudget" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json index cbb9d0fbfe2f..60e0460fff92 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json index cadb45c4622d..c8765e0f18b1 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234", "departmentId": "42425", "billingPeriodName": "201804" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json index 2e8a3bcc7a8b..2f5105062914 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234", "enrollmentAccountId": "42425", "billingPeriodName": "201804" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json index e8c12cfe5640..87f3bf042b79 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234", "departmentId": "42425", "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json index e8c12cfe5640..87f3bf042b79 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234", "departmentId": "42425", "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json index e099b58ffe84..060af73a8168 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234", "enrollmentAccountId": "42425", "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json index 764fee438547..fe5db13b6a08 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234", "enrollmentAccountId": "42425" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json index e535b54cabda..864bfb2b312b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG", "budgetName": "TestBudget", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json index a939b1d329c1..85b8847d4d36 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG", "budgetName": "TestBudget" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json index 9cfdb7ac7266..de0ea04661b4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json index 22444d5c3a7e..858ff397f1ff 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByDates.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "$filter": "usagedate ge '2018-04-01' AND usagedate le '2018-04-02'" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json index 2583fd487392..bc34d29580af 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ForecastsListFilterByGrain.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "$filter": "Grain eq 'Monthly'" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json index 2ce2a7b7ff1e..64d776d1e991 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "123456" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json index 34c570231be0..eea3be9b6773 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "123456", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json index 9e0fa3621523..ebd07c0ad4a4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "departmentId": "123456", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json index 9e0fa3621523..ebd07c0ad4a4 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "departmentId": "123456", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json index f98a39deb5fc..504cc20a6887 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "enrollmentAccountId": "123456", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json index f98a39deb5fc..504cc20a6887 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "enrollmentAccountId": "123456", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json index 7f46e1c51c13..b2eaef1499a2 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json index d3018a82ecf2..b03d5614d420 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest", "billingPeriodName": "201808" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json index b2dc4f276226..dca074a674ed 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json index 0f864e0e53d1..f703c2031db2 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201801" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json index 5470ae7ce9d6..be47e0b2621a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheet.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json index 901a39430faf..f010627dcbcd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetExpand.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201801", "$expand": "meterDetails" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetForBillingPeriod.json index 9b1992146361..6d78cf22f1c9 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/PriceSheetForBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201801" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json index d994a1f95e0f..451a7d35c563 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetails.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "reservationOrderId": "00000000-0000-0000-0000-000000000000", "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsWithReservationId.json index 60032b581d06..7b4aa9510345 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsWithReservationId.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "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'" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json index 32dc045c5b64..f169b528120d 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsFilterByScopeLookBackPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "$filter": "properties/scope eq 'Single' AND properties/lookBackPeriod eq 'Last7Days'" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json index 4b789561cb5f..c0788f41b413 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json index 216857632ba9..32ea636776cf 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "reservationOrderId": "00000000-0000-0000-0000-000000000000", "grain": "daily", "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-11-20'" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json index 44ae8d2bafa9..9ff0dd5402ae 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "reservationOrderId": "00000000-0000-0000-0000-000000000000", "reservationId": "00000000-0000-0000-0000-000000000000", "grain": "daily", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json index 5389f74a410b..7756d39d93df 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "reservationOrderId": "00000000-0000-0000-0000-000000000000", "grain": "monthly" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json index 2ebebe3cb06b..fdda47ced188 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "reservationOrderId": "00000000-0000-0000-0000-000000000000", "reservationId": "00000000-0000-0000-0000-000000000000", "grain": "monthly" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json index 4eb754cf34d3..a4f141abe56a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "12345" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json index 70e62eec0e37..1236175a4c62 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702", "$expand": "meterDetails,additionalProperties", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json index 251ef2df0f95..0a62a3c8f376 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json index 98d8ad3de7f0..79fd4343e811 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json index b00b0d24b1a0..651acbaa4a46 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "departmentId": "1234" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json index f6d51e0ad986..2a9161862dfa 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "enrollmentAccountId": "1234" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json index 590e515937dd..3f6cc4577794 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json index e9e431deda95..9beaea60f449 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "$filter": "tags eq 'dev:tools'" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json index 80306d06234e..02a00e952d8f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json index 663c7d003a25..0711c05d0afe 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "billingAccountId": "1234", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json index 5d719d82249e..d5233c9bb09d 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "departmentId": "1234", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json index 80ef9db27ce5..2a689dea1110 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "enrollmentAccountId": "1234", "billingPeriodName": "201702" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json index d58b31663afd..fdfe6dcde2e3 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest", "billingPeriodName": "201807" }, diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json index 7e867c8f71c5..f1584f984b90 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "billingPeriodName": "201803", "$apply": "groupby((tags))" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json index 03e57bbb91b6..fde58200b931 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", + "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "$apply": "groupby((tags,properties/usageStart))" }, From 88ecde3c5384354bbc1051b8c00c54fde571dafe Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 13:18:48 -0700 Subject: [PATCH 04/41] Updated scope for Usage detail list Updated scope for Usage detail list --- .../stable/2019-05-01/examples/BudgetsList.json | 1 + .../stable/2019-05-01/examples/UsageDetailsList.json | 1 + .../2019-05-01/examples/UsageDetailsListFilterByTag.json | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json index 60e0460fff92..4e73986f1179 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" "resourceGroupName": "MYDEVTESTRG" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json index 0a62a3c8f376..9996b3af29bd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json @@ -1,6 +1,7 @@ { "parameters": { "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json index 9beaea60f449..4a44d3904e87 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json @@ -1,7 +1,8 @@ { "parameters": { - "api-version": "2019-05-01", + "api-version": "2019-01-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "$filter": "tags eq 'dev:tools'" }, "responses": { From faca65d5648ffa3f3569e49c65fae35bccfca5c0 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 15:17:44 -0700 Subject: [PATCH 05/41] Update UsageDetailsList.json update --- .../stable/2019-05-01/examples/UsageDetailsList.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json index 9996b3af29bd..97431d63f5d8 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", "name": "usageDetailsId1", "type": "Microsoft.Consumption/usageDetails", "tags": { @@ -17,8 +17,8 @@ "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", + "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903", + "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201903-123456789", "usageStart": "2017-02-13T00:00:00Z", "usageEnd": "2017-02-13T23:59:59Z", "instanceName": "shared1", From 1420327f868d0410437b9c811803a182fe17f5c7 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 15:23:12 -0700 Subject: [PATCH 06/41] Update UsageDetailsList.json usage detail --- .../stable/2019-05-01/examples/UsageDetailsList.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json index 97431d63f5d8..8ddc0496b317 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json @@ -1,15 +1,15 @@ { "parameters": { - "api-version": "2019-05-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "subscriptionId": "00000000-0000-0000-0000-000000000000" + "api-version": "2019-01-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/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,8 +17,8 @@ "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903", - "invoiceId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/invoices/201903-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", From db171225ec314d84814989765382522f0ba89ca0 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 15:34:05 -0700 Subject: [PATCH 07/41] Update BudgetsList.json syntax error fix --- .../stable/2019-05-01/examples/BudgetsList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json index 4e73986f1179..52ceab32378f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000" + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG" }, "responses": { From 7b45b100754c27369c2f6c978b90bb6dd1ee3c3e Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 15:44:14 -0700 Subject: [PATCH 08/41] Update UsageDetailsList.json syntax fix --- .../stable/2019-05-01/examples/UsageDetailsList.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json index 8ddc0496b317..be67b01cc0f8 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json @@ -1,7 +1,6 @@ { "parameters": { - "api-version": "2019-01-01", - "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-01-01", "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { From b94999643be867e0e6d2aad9ad4bddd55c392d27 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 15:52:11 -0700 Subject: [PATCH 09/41] fixing syntax error fixing syntax error --- .../stable/2019-05-01/examples/UsageDetailsExpand.json | 1 + .../2019-05-01/examples/UsageDetailsListForBillingPeriod.json | 1 + .../2019-05-01/examples/UsageDetailsListGroupByTagDate.json | 1 + 3 files changed, 3 insertions(+) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json index 1236175a4c62..5ec9c4a450d8 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702", "$expand": "meterDetails,additionalProperties", "$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14' AND tags eq 'dev:tools'", diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json index 02a00e952d8f..856434642cbe 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json index fde58200b931..539467a65543 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "$apply": "groupby((tags,properties/usageStart))" }, "responses": { From 40b87bfb186f7ce3d6e748267254831274ef7071 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 18:28:38 -0700 Subject: [PATCH 10/41] added scope parameter added scope parameter --- .../2019-05-01/examples/UsageDetailsListByBillingAccount.json | 1 + .../stable/2019-05-01/examples/UsageDetailsListByDepartment.json | 1 + .../2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json | 1 + .../2019-05-01/examples/UsageDetailsListByManagementGroup.json | 1 + .../examples/UsageDetailsListForBillingPeriodByDepartment.json | 1 + .../UsageDetailsListForBillingPeriodByManagementGroup.json | 1 + .../examples/UsageDetailsListForBillingPeriodGroupByTag.json | 1 + 7 files changed, 7 insertions(+) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json index 79fd4343e811..f0c2dd9c7e2e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json @@ -1,6 +1,7 @@ { "parameters": { "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "billingAccountId": "1234" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json index 651acbaa4a46..7cbbaac6ccb3 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json @@ -1,6 +1,7 @@ { "parameters": { "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "departmentId": "1234" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json index 2a9161862dfa..9c2e930084fb 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json @@ -1,6 +1,7 @@ { "parameters": { "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "enrollmentAccountId": "1234" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json index 3f6cc4577794..71474e850e27 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json @@ -1,6 +1,7 @@ { "parameters": { "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "managementGroupId": "managementGroupForTest" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json index d5233c9bb09d..6b266febd260 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "departmentId": "1234", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "billingPeriodName": "201702" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json index fdfe6dcde2e3..2c6a9187d10d 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "billingPeriodName": "201807" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json index f1584f984b90..7aceaf15e1d7 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "billingPeriodName": "201803", "$apply": "groupby((tags))" }, From a422c464a1793c6ef0158accd7f0d16515293d01 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 21:03:02 -0700 Subject: [PATCH 11/41] scope added scope added --- .../2019-05-01/examples/MarketplacesByBillingAccountList.json | 1 + .../MarketplacesByBillingAccountListForBillingPeriod.json | 1 + .../2019-05-01/examples/MarketplacesByDepartmentList.json | 3 ++- .../stable/2019-05-01/examples/MarketplacesList.json | 1 + .../2019-05-01/examples/MarketplacesListForBillingPeriod.json | 1 + .../UsageDetailsListForBillingPeriodByBillingAccount.json | 1 + .../UsageDetailsListForBillingPeriodByEnrollmentAccount.json | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json index 64d776d1e991..30ab0d7c82f3 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountList.json @@ -1,6 +1,7 @@ { "parameters": { "api-version": "2019-05-01", + "scope": "providers/Microsoft.Billing/billingAccounts/123456", "billingAccountId": "123456" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json index eea3be9b6773..13fcf90dc2a5 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByBillingAccountListForBillingPeriod.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "billingAccountId": "123456", + "scope": "providers/Microsoft.Billing/billingAccounts/123456", "billingPeriodName": "201702" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json index ebd07c0ad4a4..aebd15cfb7cc 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartmentList.json @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-05-01", "departmentId": "123456", - "billingPeriodName": "201702" + "billingPeriodName": "201702", + "scope": "providers/Microsoft.Billing/departments/123456" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json index dca074a674ed..1e7c75d91630 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesList.json @@ -1,6 +1,7 @@ { "parameters": { "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json index f703c2031db2..64cc28668831 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesListForBillingPeriod.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "billingPeriodName": "201801" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json index 0711c05d0afe..40a0d3ad4cff 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "billingAccountId": "1234", + "scope": "providers/Microsoft.Billing/BillingAccounts/1234", "billingPeriodName": "201702" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json index 2a689dea1110..190e685adce2 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json @@ -2,6 +2,7 @@ "parameters": { "api-version": "2019-05-01", "enrollmentAccountId": "1234", + "scope": "providers/Microsoft.Billing/EnrollmentAccounts/1234", "billingPeriodName": "201702" }, "responses": { From 08b2b2bf689209b21dd9a7c5c4c6d1aae3fe00ff Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 21:12:07 -0700 Subject: [PATCH 12/41] added scope added scope --- .../stable/2019-05-01/examples/BudgetsList.json | 3 ++- .../stable/2019-05-01/examples/CreateOrUpdateBudget.json | 1 + .../stable/2019-05-01/examples/DeleteBudget.json | 3 ++- .../examples/MarketplacesByDepartment_ListByBillingPeriod.json | 3 ++- .../examples/MarketplacesByEnrollmentAccountList.json | 3 ++- .../2019-05-01/examples/MarketplacesByManagementGroupList.json | 3 ++- .../MarketplacesByManagementGroup_ListForBillingPeriod.json | 3 ++- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json index 52ceab32378f..7bfb9f7b05ee 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json @@ -3,7 +3,8 @@ "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "resourceGroupName": "MYDEVTESTRG" + "resourceGroupName": "MYDEVTESTRG", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json index 864bfb2b312b..efca50bfec47 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/CreateOrUpdateBudget.json @@ -4,6 +4,7 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG", "budgetName": "TestBudget", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", "parameters": { "eTag": "\"1d34d016a593709\"", "properties": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json index 85b8847d4d36..b7033bd9c85e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/DeleteBudget.json @@ -3,7 +3,8 @@ "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG", - "budgetName": "TestBudget" + "budgetName": "TestBudget", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": {} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json index ebd07c0ad4a4..aebd15cfb7cc 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByDepartment_ListByBillingPeriod.json @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-05-01", "departmentId": "123456", - "billingPeriodName": "201702" + "billingPeriodName": "201702", + "scope": "providers/Microsoft.Billing/departments/123456" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json index 504cc20a6887..83e5b6a05111 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccountList.json @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-05-01", "enrollmentAccountId": "123456", - "billingPeriodName": "201702" + "billingPeriodName": "201702", + "scope": "providers/Microsoft.Billing/enrollmentAccounts/123456" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json index b2eaef1499a2..4827a31879e5 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroupList.json @@ -1,7 +1,8 @@ { "parameters": { "api-version": "2019-05-01", - "managementGroupId": "managementGroupForTest" + "managementGroupId": "managementGroupForTest", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json index b03d5614d420..a9d4ae3ea50f 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByManagementGroup_ListForBillingPeriod.json @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest", - "billingPeriodName": "201808" + "billingPeriodName": "201808", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { From 5cbdfba765c125bd41ee3b66c41005ae632c85b8 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 21:14:22 -0700 Subject: [PATCH 13/41] added scope added scope --- .../stable/2019-05-01/examples/BudgetsList.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json index 7bfb9f7b05ee..29d868c6b227 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/BudgetsList.json @@ -3,8 +3,7 @@ "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "resourceGroupName": "MYDEVTESTRG", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000" + "resourceGroupName": "MYDEVTESTRG" }, "responses": { "200": { From 9492159833f931b4908fded490ed551e8a11249b Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 21:19:57 -0700 Subject: [PATCH 14/41] added scope added scope --- .../examples/ChargesForBillingPeriodByDepartment.json | 3 ++- .../Microsoft.Consumption/stable/2019-05-01/examples/Tags.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json index c8765e0f18b1..d572fa968485 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByDepartment.json @@ -3,7 +3,8 @@ "api-version": "2019-05-01", "billingAccountId": "1234", "departmentId": "42425", - "billingPeriodName": "201804" + "billingPeriodName": "201804", + "scope": "providers/Microsoft.Billing/BillingAccounts/1234" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json index a4f141abe56a..04daa19fcd7b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Tags.json @@ -1,7 +1,8 @@ { "parameters": { "api-version": "2019-05-01", - "billingAccountId": "12345" + "billingAccountId": "12345", + "scope": "providers/Microsoft.CostManagement/billingAccounts/1234" }, "responses": { "200": { From c5bfb871013d76c1dda24148aa8c8f46ef78c1e8 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 21:26:24 -0700 Subject: [PATCH 15/41] Update Budget.json added scope --- .../stable/2019-05-01/examples/Budget.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json index 62dd4dcbb6c8..b5095fcf05c7 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/Budget.json @@ -3,7 +3,8 @@ "api-version": "2019-05-01", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "MYDEVTESTRG", - "budgetName": "TestBudget" + "budgetName": "TestBudget", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { From cc1f6f2525d073941c324166f27f424c625ad9f6 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 21:59:08 -0700 Subject: [PATCH 16/41] added scope added scope --- .../examples/ChargesListForDepartmentFilterByStartEndDate.json | 1 + .../ChargesListForEnrollmentAccountFilterByStartEndDate.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json index 87f3bf042b79..4355c9606151 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json @@ -3,6 +3,7 @@ "api-version": "2019-05-01", "billingAccountId": "1234", "departmentId": "42425", + "scope": "providers/Microsoft.Billing/BillingAccounts/1234", "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" }, "responses": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json index fe5db13b6a08..5b90612e44ec 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-05-01", "billingAccountId": "1234", - "enrollmentAccountId": "42425" + "enrollmentAccountId": "42425", + "scope": "providers/Microsoft.Billing/BillingAccounts/1234" }, "responses": { "200": { From 47da52012dadb98ab14228708b77c2a3572064e4 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 22:10:32 -0700 Subject: [PATCH 17/41] added scope added scope --- .../examples/ChargesForBillingPeriodByEnrollmentAccount.json | 3 ++- .../2019-05-01/examples/ChargesListForEnrollmentAccount.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json index 2f5105062914..fd70933c1bd1 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesForBillingPeriodByEnrollmentAccount.json @@ -3,7 +3,8 @@ "api-version": "2019-05-01", "billingAccountId": "1234", "enrollmentAccountId": "42425", - "billingPeriodName": "201804" + "billingPeriodName": "201804", + "scope": "providers/Microsoft.Billing/BillingAccounts/1234" }, "responses": { "200": { diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json index 060af73a8168..91b40a17fe89 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json @@ -3,6 +3,7 @@ "api-version": "2019-05-01", "billingAccountId": "1234", "enrollmentAccountId": "42425", + "scope": "providers/Microsoft.Billing/BillingAccounts/1234", "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" }, "responses": { From fa661898233edbf135d0a048090a9bfe88246987 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 22:20:39 -0700 Subject: [PATCH 18/41] added scope added scope --- .../MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json index 504cc20a6887..83e5b6a05111 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json @@ -2,7 +2,8 @@ "parameters": { "api-version": "2019-05-01", "enrollmentAccountId": "123456", - "billingPeriodName": "201702" + "billingPeriodName": "201702", + "scope": "providers/Microsoft.Billing/enrollmentAccounts/123456" }, "responses": { "200": { From de22a9cdd18a730f62ef7651e66032b9ff9fa051 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 22:41:03 -0700 Subject: [PATCH 19/41] json correction json correction --- ...EnrollmentAccountFilterByStartEndDate.json | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json index 5b90612e44ec..20cf27c58c4e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccountFilterByStartEndDate.json @@ -8,8 +8,6 @@ "responses": { "200": { "body": { - "value": [ - { "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", "name": "chargeSummaryId1", "type": "Microsoft.Consumption/charges", @@ -21,23 +19,7 @@ "chargesBilledSeparately": 60.90, "marketplaceCharges": 100.00, "currency": "USD" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", - "name": "chargeSummaryId2", - "type": "Microsoft.Consumption/charges", - "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", - "usageStart": "2018-05-01", - "usageEnd": "2018-05-30", - "azureCharges": 5000.00, - "chargesBilledSeparately": 60.90, - "marketplaceCharges": 100.00, - "currency": "USD" - } - } - ] + } } } } From 9ee8c708dea3235c1ba07b361ffd19dd0d47263b Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 22:49:05 -0700 Subject: [PATCH 20/41] syntax correction syntax correction --- ...ListForDepartmentFilterByStartEndDate.json | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json index 4355c9606151..9e93da67d972 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartmentFilterByStartEndDate.json @@ -8,9 +8,7 @@ }, "responses": { "200": { - "body": { - "value": [ - { + "body": { "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", "name": "chargeSummaryId1", "type": "Microsoft.Consumption/charges", @@ -22,23 +20,7 @@ "chargesBilledSeparately": 60.90, "marketplaceCharges": 100.00, "currency": "USD" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", - "name": "chargeSummaryId2", - "type": "Microsoft.Consumption/charges", - "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", - "usageStart": "2018-05-01", - "usageEnd": "2018-05-30", - "azureCharges": 5000.00, - "chargesBilledSeparately": 60.90, - "marketplaceCharges": 100.00, - "currency": "USD" - } - } - ] + } } } } From 0637fa761010aad7e1053d769628c453e036dc42 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Sun, 14 Jul 2019 23:56:02 -0700 Subject: [PATCH 21/41] added reservationRecommendation, RI Usage Summary and RI Usage details added reservationRecommendation, RI Usage Summary and RI Usage details --- .../stable/2019-05-01/consumption.json | 159 +++++++++++++++++- .../ReservationDetailsByBillingAccountId.json | 33 ++++ ...onRecommendationsByBillingAccountList.json | 59 +++++++ ...ionSummariesDailyWithBillingAccountId.json | 33 ++++ ...nSummariesMonthlyWithBillingAccountId.json | 32 ++++ 5 files changed, 313 insertions(+), 3 deletions(-) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsByBillingAccountId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsByBillingAccountList.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithBillingAccountId.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index ec4f6a8ffb2c..9ede51698241 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -714,7 +714,62 @@ } } }, - "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationDetails": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/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/ReservationSummariesDailyWithBillingAccountId.json" + }, + "ReservationSummariesMonthlyWithReservationId": { + "$ref": "./examples/ReservationSummariesMonthlyWithBillingAccountId.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/billingAccountIdParameter" + }, + { + "$ref": "#/parameters/grainParameter" + }, + { + "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" @@ -815,7 +870,56 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/reservationRecommendations": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/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/ReservationDetailsByBillingAccountId.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/BillingAccountNameParameter" + }, + { + "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/reservationRecommendations": { "get": { "tags": [ "ReservationRecommendations" @@ -867,7 +971,56 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/pricesheets/default": { + "/providers/Microsoft.Billing/billingAccounts/{billingPeriodId}/providers/microsoft.consumption/ReservationRecommendations": { + "get": { + "tags": [ + "ReservationRecommendations" + ], + "operationId": "ReservationRecommendations_List", + "description": "List of recommendations for purchasing reserved instances on billing account scope", + "externalDocs": { + "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" + }, + "x-ms-examples": { + "ReservationRecommendations": { + "$ref": "./examples/ReservationRecommendationsByBillingAccountList.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" + }, + { + "$ref": "#/parameters/billingAccountIdParameter" + } + ], + "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/pricesheets/default": { "get": { "tags": [ "PriceSheet" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsByBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsByBillingAccountId.json new file mode 100644 index 000000000000..a70bdf82946a --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationDetailsByBillingAccountId.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "billingAccountId": "12345", + "$filter": "properties/usageDate ge '2017-10-01' AND properties/usageDate le '2017-12-05'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationDetails/20171130", + "name": "00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Consumption/reservationDetails", + "tags": null, + "properties": { + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "usageDate": "2017-11-30T00:00:00-08:00", + "skuName": "Standard_D2s_v3", + "instanceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/sqlh1/providers/microsoft.compute/virtualmachines/sqlh1", + "totalReservedQuantity": 0, + "reservedHours": 48, + "usedHours": 0.6, + "instanceFlexibilityGroup": "DSv3 Series", + "instanceFlexibilityRatio": "1" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsByBillingAccountList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsByBillingAccountList.json new file mode 100644 index 000000000000..94354a980c63 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationRecommendationsByBillingAccountList.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "billingAccountId": "123456" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "billingAccount/123456/providers/Microsoft.Consumption/reservationRecommendations/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Consumption/reservationRecommendations", + "location": "westus", + "sku": "Standard_DS1_v2", + "properties": { + "meterId": "00000000-0000-0000-0000-000000000000", + "term": "P1Y", + "costWithNoReservedInstances": 12.0785105, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 11.4899644807748, + "netSavings": 0.588546019225182, + "firstUsageDate": "2019-07-07T00:00:00-07:00", + "scope": "Shared", + "lookBackPeriod": "Last7Days", + "instanceFlexibilityRatio": 1, + "instanceFlexibilityGroup": "DSv2 Series", + "normalizedSize": "Standard_DS1_v2", + "recommendedQuantityNormalized": 1 + } + }, + { + "id": "billingAccount/123456/providers/Microsoft.Consumption/reservationRecommendations/00000000-0000-0000-0000-000000000000", + "name": "00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Consumption/reservationRecommendations", + "location": "westus", + "sku": "Standard_DS1_v2", + "properties": { + "meterId": "00000000-0000-0000-0000-000000000000", + "term": "P1Y", + "costWithNoReservedInstances": 10.0785105, + "recommendedQuantity": 1, + "totalCostWithReservedInstances": 13.48, + "netSavings": 0.68, + "firstUsageDate": "2019-07-07T00:00:00-07:00", + "scope": "Shared", + "lookBackPeriod": "Last7Days", + "instanceFlexibilityRatio": 1, + "instanceFlexibilityGroup": "DSv2 Series", + "normalizedSize": "Standard_DS1", + "recommendedQuantityNormalized": 1.2 + } + } + ], + "nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationRecommendations?api-version=2018-03-31&$skiptoken=AQAAAA%3D%3D&" + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithBillingAccountId.json new file mode 100644 index 000000000000..f3f2fb1f11c1 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithBillingAccountId.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "billingAccountId": "12345", + "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/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20180901", + "name": "00000000-0000-0000-0000-000000000000_20180901", + "type": "Microsoft.Consumption/reservationSummaries", + "tags": null, + "properties": { + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "skuName": "Standard_B1s", + "reservedHours": 720, + "usageDate": "2018-09-01T00:00:00-07:00", + "usedHours": 0, + "minUtilizationPercentage": 0, + "avgUtilizationPercentage": 0, + "maxUtilizationPercentage": 0 + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json new file mode 100644 index 000000000000..5d58c47d406a --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithBillingAccountId.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "billingAccountId": "12345", + "grain": "monthly" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "providers/Microsoft.Capacity/reservationOrders/00000000-0000-0000-0000-000000000000/reservations/00000000-0000-0000-0000-000000000000/providers/Microsoft.Consumption/reservationSummaries/20180901", + "name": "00000000-0000-0000-0000-000000000000_20180901", + "type": "Microsoft.Consumption/reservationSummaries", + "tags": null, + "properties": { + "reservationOrderId": "00000000-0000-0000-0000-000000000000", + "reservationId": "00000000-0000-0000-0000-000000000000", + "skuName": "Standard_B1s", + "reservedHours": 720, + "usageDate": "2018-09-01T00:00:00-07:00", + "usedHours": 0, + "minUtilizationPercentage": 0, + "avgUtilizationPercentage": 0, + "maxUtilizationPercentage": 0 + } + } + ] + } + } + } +} From d6b335fc4e182d000bf3af83bb2ab3428c3e6662 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 00:01:42 -0700 Subject: [PATCH 22/41] syntax correction syntax correction --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 9ede51698241..0a53e16b91ed 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -887,7 +887,7 @@ }, "parameters": [ { - "$ref": "#/parameters/BillingAccountNameParameter" + "$ref": "#/parameters/BillingAccountIdParameter" }, { "name": "$filter", From d57b0c3443d24f1bcf5babab15047b49cfccc444 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 00:05:31 -0700 Subject: [PATCH 23/41] bug fix bug fix --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 0a53e16b91ed..f1805e827aed 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -887,7 +887,7 @@ }, "parameters": [ { - "$ref": "#/parameters/BillingAccountIdParameter" + "$ref": "#/parameters/billingAccountIdParameter" }, { "name": "$filter", From b95e7034502642bb4adb5d7e4fc44454ef19b5d6 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 00:11:11 -0700 Subject: [PATCH 24/41] bug fix bug fix --- .../stable/2019-05-01/consumption.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index f1805e827aed..77653964897a 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -661,7 +661,7 @@ "tags": [ "ReservedInstances" ], - "operationId": "ReservationsSummaries_ListByReservationOrderAndReservation", + "operationId": "ReservationsSummaries_ListByBillingAccountId", "description": "Lists the reservations summaries for daily or monthly grain.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -875,7 +875,7 @@ "tags": [ "ReservedInstances" ], - "operationId": "ReservationsDetails_ListByReservationOrder", + "operationId": "ReservationsDetails_ListByBillingAccountId", "description": "Lists the reservations details for provided date range.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -976,7 +976,7 @@ "tags": [ "ReservationRecommendations" ], - "operationId": "ReservationRecommendations_List", + "operationId": "ReservationRecommendations_ListByBillingAccountId", "description": "List of recommendations for purchasing reserved instances on billing account scope", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" From 4d48f7e06d3fa84f32966afcd0445889ddeca96c Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 00:15:36 -0700 Subject: [PATCH 25/41] bug fix bug fix --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 77653964897a..97adbe39e7af 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -971,7 +971,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingPeriodId}/providers/microsoft.consumption/ReservationRecommendations": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/microsoft.consumption/ReservationRecommendations": { "get": { "tags": [ "ReservationRecommendations" From c0f05dc814473404c5fee35680108e84486b5e02 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 00:33:34 -0700 Subject: [PATCH 26/41] bug fix bug fix --- .../stable/2019-05-01/consumption.json | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 97adbe39e7af..3080e0dcca32 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -2014,6 +2014,17 @@ "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 + }, + "instanceFlexibilityRatio": { + "description": "The instance Flexibility Ratio.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "instanceFlexibilityGroup": { + "description": "The instance Flexibility Group.", + "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.", @@ -2100,7 +2111,28 @@ "description": "The number of days of usage to look back for recommendation.", "type": "string", "readOnly": true + }, + "instanceFlexibilityRatio": { + "description": "The instance Flexibility Ratio.", + "type": "number", + "format": "decimal", + "readOnly": true + }, + "instanceFlexibilityGroup": { + "description": "The instance Flexibility Group.", + "type": "string", + "readOnly": true + }, + "normalizedSize": { + "description": "The normalized Size.", + "type": "string", + "readOnly": true }, + "recommendedQuantityNormalized": { + "description": "The recommended Quantity Normalized.", + "type": "string", + "readOnly": true + }, "meterId": { "description": "The meter id (GUID)", "type": "string", From 02e32362bdfecfc98d8ab0f00f407621ea52716f Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 00:48:02 -0700 Subject: [PATCH 27/41] bug fix bug fix --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 3080e0dcca32..d29f5ab30507 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -2125,7 +2125,8 @@ }, "normalizedSize": { "description": "The normalized Size.", - "type": "string", + "type": "number", + "format": "decimal", "readOnly": true }, "recommendedQuantityNormalized": { From 41d751bb3fb373bc746eea4a56ab900a8694f42c Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 01:08:20 -0700 Subject: [PATCH 28/41] bug fix bug fix --- .../stable/2019-05-01/consumption.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index d29f5ab30507..309ded7bb38b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -2017,8 +2017,7 @@ }, "instanceFlexibilityRatio": { "description": "The instance Flexibility Ratio.", - "type": "number", - "format": "decimal", + "type": "integer", "readOnly": true }, "instanceFlexibilityGroup": { @@ -2114,8 +2113,7 @@ }, "instanceFlexibilityRatio": { "description": "The instance Flexibility Ratio.", - "type": "number", - "format": "decimal", + "type": "integer", "readOnly": true }, "instanceFlexibilityGroup": { @@ -2131,7 +2129,7 @@ }, "recommendedQuantityNormalized": { "description": "The recommended Quantity Normalized.", - "type": "string", + "type": "integer", "readOnly": true }, "meterId": { From 9d3e764f11e726d460b55d5fab590523bc9d0b3a Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 01:17:03 -0700 Subject: [PATCH 29/41] bug fix bug fix --- .../stable/2019-05-01/consumption.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 309ded7bb38b..d837e27fc80e 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -2017,7 +2017,7 @@ }, "instanceFlexibilityRatio": { "description": "The instance Flexibility Ratio.", - "type": "integer", + "type": "string", "readOnly": true }, "instanceFlexibilityGroup": { @@ -2123,13 +2123,12 @@ }, "normalizedSize": { "description": "The normalized Size.", - "type": "number", - "format": "decimal", + "type": "string", "readOnly": true }, "recommendedQuantityNormalized": { "description": "The recommended Quantity Normalized.", - "type": "integer", + "type": "number", "readOnly": true }, "meterId": { From 63967a137067d96fe4a991386506bc9b1a55c95f Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 11:00:11 -0700 Subject: [PATCH 30/41] bug fix bug fix --- .../examples/ChargesListForDepartment.json | 44 ------------------ .../ChargesListForEnrollmentAccount.json | 45 ------------------- 2 files changed, 89 deletions(-) delete mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json delete mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json deleted file mode 100644 index 87f3bf042b79..000000000000 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForDepartment.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "parameters": { - "api-version": "2019-05-01", - "billingAccountId": "1234", - "departmentId": "42425", - "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", - "name": "chargeSummaryId1", - "type": "Microsoft.Consumption/charges", - "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", - "usageStart": "2018-04-01", - "usageEnd": "2018-04-30", - "azureCharges": 5000.00, - "chargesBilledSeparately": 60.90, - "marketplaceCharges": 100.00, - "currency": "USD" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/departments/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", - "name": "chargeSummaryId2", - "type": "Microsoft.Consumption/charges", - "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", - "usageStart": "2018-05-01", - "usageEnd": "2018-05-30", - "azureCharges": 5000.00, - "chargesBilledSeparately": 60.90, - "marketplaceCharges": 100.00, - "currency": "USD" - } - } - ] - } - } - } -} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json deleted file mode 100644 index 91b40a17fe89..000000000000 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ChargesListForEnrollmentAccount.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parameters": { - "api-version": "2019-05-01", - "billingAccountId": "1234", - "enrollmentAccountId": "42425", - "scope": "providers/Microsoft.Billing/BillingAccounts/1234", - "$filter": "usageStart eq '2018-04-01' AND usageEnd eq '2018-05-30'" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId1", - "name": "chargeSummaryId1", - "type": "Microsoft.Consumption/charges", - "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201804", - "usageStart": "2018-04-01", - "usageEnd": "2018-04-30", - "azureCharges": 5000.00, - "chargesBilledSeparately": 60.90, - "marketplaceCharges": 100.00, - "currency": "USD" - } - }, - { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/enrollmentAccounts/42425/providers/Microsoft.Consumption/charges/chargeSummaryId2", - "name": "chargeSummaryId2", - "type": "Microsoft.Consumption/charges", - "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201805", - "usageStart": "2018-05-01", - "usageEnd": "2018-05-30", - "azureCharges": 5000.00, - "chargesBilledSeparately": 60.90, - "marketplaceCharges": 100.00, - "currency": "USD" - } - } - ] - } - } - } -} From 72bd87e67c3673d600d770dc4d92b59c6df156cd Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 18:30:38 -0700 Subject: [PATCH 31/41] added additional properties added additional properties --- .../stable/2019-05-01/consumption.json | 309 +++++++++++++----- .../UsageDetailsListByMetricActualCost.json | 56 ++++ ...UsageDetailsListByMetricAmortizedCost.json | 57 ++++ .../UsageDetailsListByMetricUsage.json | 56 ++++ ...DetailsListForBillingPeriodGroupByTag.json | 45 --- .../UsageDetailsListGroupByTagDate.json | 48 --- 6 files changed, 391 insertions(+), 180 deletions(-) create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricActualCost.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricAmortizedCost.json create mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricUsage.json delete mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json delete mode 100644 specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index d837e27fc80e..6f8096c64371 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -51,17 +51,20 @@ "UsageDetailsListFilterByTag": { "$ref": "./examples/UsageDetailsListFilterByTag.json" }, - "UsageDetailsListGroupByTagDate": { - "$ref": "./examples/UsageDetailsListGroupByTagDate.json" - }, "UsageDetailsListForBillingPeriod": { "$ref": "./examples/UsageDetailsListForBillingPeriod.json" }, "UsageDetailsExpand": { "$ref": "./examples/UsageDetailsExpand.json" }, - "UsageDetailsListForBillingPeriodGroupByTag": { - "$ref": "./examples/UsageDetailsListForBillingPeriodGroupByTag.json" + "UsageDetailsListByMetricActualCost": { + "$ref": "./examples/UsageDetailsListByMetricActualCost.json" + }, + "UsageDetailsListByMetricAmortizedCost": { + "$ref": "./examples/UsageDetailsListByMetricAmortizedCost.json" + }, + "UsageDetailsListByMetricUsage": { + "$ref": "./examples/UsageDetailsListByMetricUsage.json" }, "BillingAccountUsageDetailsList": { "$ref": "./examples/UsageDetailsListByBillingAccount.json" @@ -94,14 +97,14 @@ }, { "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.", + "description": "May be used to expand the properties/additionalInfo 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, 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 (:).", + "description": "May be used to filter usageDetails by properties/resourceGroup, properties/resourceName, properties/resourceId, properties/chargeType, properties/reservationId, properties/publisherType 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 (:). PublisherType Filter accepts two values azure and marketplace and it is currently supported for Web Direct Offer Type", "in": "query", "required": false, "type": "string" @@ -123,19 +126,10 @@ "maximum": 1000 }, { - "name": "$apply", - "description": "OData apply expression to aggregate 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" }, { - "$ref": "#/parameters/apiVersionParameter" + "$ref": "#/parameters/metricParameter" } ], "responses": { @@ -661,7 +655,7 @@ "tags": [ "ReservedInstances" ], - "operationId": "ReservationsSummaries_ListByBillingAccountId", + "operationId": "ReservationsSummaries_ListByReservationOrderAndReservation", "description": "Lists the reservations summaries for daily or monthly grain.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" @@ -714,7 +708,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/reservationsummaries": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/reservationsummaries": { "get": { "tags": [ "ReservedInstances" @@ -768,8 +762,8 @@ "nextLinkName": "nextLink" } } - }, - "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationDetails": { + }, + "/providers/Microsoft.Capacity/reservationorders/{reservationOrderId}/providers/Microsoft.Consumption/reservationDetails": { "get": { "tags": [ "ReservedInstances" @@ -919,7 +913,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/reservationRecommendations": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/reservationRecommendations": { "get": { "tags": [ "ReservationRecommendations" @@ -1020,7 +1014,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/pricesheets/default": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Consumption/pricesheets/default": { "get": { "tags": [ "PriceSheet" @@ -1419,150 +1413,227 @@ "UsageDetailProperties": { "description": "The properties of the usage detail.", "properties": { - "billingPeriodId": { - "description": "The id of the billing period resource that the usage belongs to.", + "billingAccountId": { + "description": "Billing Account identifier.", "type": "string", "readOnly": true }, - "invoiceId": { - "description": "The id of the invoice resource that the usage belongs to.", + "billingAccountName": { + "description": "Billing Account Name.", "type": "string", "readOnly": true }, - "usageStart": { - "description": "The start of the date time range covered by the usage detail.", + "billingPeriodStartDate": { + "description": "The billing period start date.", "type": "string", "format": "date-time", "readOnly": true }, - "usageEnd": { - "description": "The end of the date time range covered by the usage detail.", + "billingPeriodEndDate": { + "description": "The billing period end date.", "type": "string", "format": "date-time", "readOnly": true }, - "instanceName": { - "description": "The name of the resource instance that the usage is about.", + "billingProfileId": { + "description": "Billing Profile identifier.", "type": "string", "readOnly": true }, - "instanceId": { - "description": "The uri of the resource instance that the usage is about.", + "billingProfileName": { + "description": "Billing Profile Name.", "type": "string", "readOnly": true }, - "instanceLocation": { - "description": "The location of the resource instance that the usage is about.", + "accountOwnerId": { + "description": "Account Owner Id.", "type": "string", "readOnly": true }, - "currency": { - "description": "The ISO currency in which the meter is charged, for example, USD.", + "accountName": { + "description": "Account Name.", "type": "string", "readOnly": true }, - "usageQuantity": { - "description": "The quantity of usage.", + "subscriptionId": { + "description": "Subscription guid.", + "type": "string", + "readOnly": true + }, + "subscriptionName": { + "description": "Subscription name.", + "type": "string", + "readOnly": true + }, + "date": { + "description": "Date for the usage record.", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "product": { + "description": "Product name for the consumed service or purchase. Not available for Marketplace.", + "type": "string", + "readOnly": true + }, + "partNumber": { + "description": "Part Number of the service used. Can be used to join with the price sheet. Not available for marketplace.", + "type": "string", + "readOnly": true + }, + "meterId": { + "description": "The meter id (GUID). Not available for marketplace. For reserved instance this represents the primary meter for which the reservation was purchased. For the actual VM Size for which the reservation is purchased see productOrderName.", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "meterDetails": { + "description": "The details about the meter. By default this is not populated, unless it's specified in $expand.", + "$ref": "#/definitions/MeterDetailsResponse", + "readOnly": true + }, + "quantity": { + "description": "The usage quantity.", "type": "number", "format": "decimal", "readOnly": true }, - "billableQuantity": { - "description": "The billable usage quantity.", + "effectivePrice": { + "description": "Effective Price that’s charged for the usage.", "type": "number", "format": "decimal", "readOnly": true }, - "pretaxCost": { + "cost": { "description": "The amount of cost before tax.", "type": "number", "format": "decimal", "readOnly": true }, - "isEstimated": { - "description": "The estimated usage is subject to change.", - "type": "boolean", + "unitPrice": { + "description": "Unit Price is the price applicable to you. (your EA or other contract price).", + "type": "number", + "format": "decimal", "readOnly": true }, - "meterId": { - "description": "The meter id (GUID).", + "billingCurrency": { + "description": "Billing Currency.", "type": "string", - "format": "uuid", "readOnly": true }, - "meterDetails": { - "description": "The details about the meter. By default this is not populated, unless it's specified in $expand.", - "$ref": "#/definitions/MeterDetails", + "resourceLocation": { + "description": "Resource Location.", + "type": "string", "readOnly": true }, - "subscriptionGuid": { - "description": "Subscription guid.", + "consumedService": { + "description": "Consumed service name. Name of the azure resource provider that emits the usage or was purchased. This value is not provided for marketplace usage.", "type": "string", - "format": "uuid", "readOnly": true }, - "subscriptionName": { - "description": "Subscription name.", + "resourceId": { + "description": "Azure resource manager resource identifier.", "type": "string", "readOnly": true }, - "accountName": { - "description": "Account name.", + "resourceName": { + "description": "Resource Name.", "type": "string", "readOnly": true }, - "departmentName": { - "description": "Department name.", + "serviceInfo1": { + "description": "Service Info 1.", "type": "string", "readOnly": true }, - "product": { - "description": "Product name.", + "serviceInfo2": { + "description": "Service Info 2.", "type": "string", "readOnly": true }, - "consumedService": { - "description": "Consumed service name.", + "additionalInfo": { + "description": "Additional details of this usage item. By default this is not populated, unless it's specified in $expand. Use this field to get usage line item specific details such as the actual VM Size (ServiceType) or the ratio in which the reservation discount is applied.", + "type": "string", + "readOnly": true + }, + "invoiceSection": { + "description": "Invoice Section Name.", "type": "string", "readOnly": true }, "costCenter": { - "description": "The cost center of this department if it is a department and a costcenter exists", + "description": "The cost center of this department if it is a department and a cost center is provided.", "type": "string", "readOnly": true }, - "partNumber": { - "description": "Part Number", + "resourceGroup": { + "description": "Resource Group Name.", + "type": "string", + "readOnly": true + }, + "reservationId": { + "description": "ARM resource id of the reservation. Only applies to records relevant to reservations.", "type": "string", "readOnly": true }, - "resourceGuid": { - "description": "Resource Guid", + "reservationName": { + "description": "User provided display name of the reservation. Last known name for a particular day is populated in the daily data. Only applies to records relevant to reservations.", + "type": "string", + "readOnly": true + }, + "productOrderId": { + "description": "Product Order Id. For reservations this is the Reservation Order ID.", + "type": "string", + "readOnly": true + }, + "productOrderName": { + "description": "Product Order Name. For reservations this is the SKU that was purchased.", "type": "string", "readOnly": true }, "offerId": { - "description": "Offer Id", + "description": "Offer Id. Ex: MS-AZR-0017P, MS-AZR-0148P.", "type": "string", "readOnly": true }, - "chargesBilledSeparately": { - "description": "Charges billed separately", + "isAzureCreditEligible": { + "description": "Is Azure Credit Eligible.", "type": "boolean", "readOnly": true }, - "location": { - "description": "Resource Location", + "term": { + "description": "Term (in months). 1 month for monthly recurring purchase. 12 months for a 1 year reservation. 36 months for a 3 year reservation.", "type": "string", "readOnly": true }, - "additionalProperties": { - "description": "Additional details of this usage item. By default this is not populated, unless it's specified in $expand.", + "publisherName": { + "description": "Publisher Name.", + "type": "string", + "readOnly": true + }, + "publisherType": { + "description": "Publisher Type.", + "type": "string", + "readOnly": true + }, + "planName": { + "description": "Plan Name.", + "type": "string", + "readOnly": true + }, + "chargeType": { + "description": "Indicates a charge represents credits, usage, a Marketplace purchase, a reservation fee, or a refund.", + "type": "string", + "readOnly": true + }, + "frequency": { + "description": "Indicates how frequently this charge will occur. OneTime for purchases which only happen once, Monthly for fees which recur every month, and UsageBased for charges based on how much a service is used.", "type": "string", "readOnly": true } } }, + "Marketplace": { "description": "An marketplace resource.", "type": "object", @@ -2015,12 +2086,12 @@ "type": "string", "readOnly": true }, - "instanceFlexibilityRatio": { + "instanceFlexibilityRatio": { "description": "The instance Flexibility Ratio.", "type": "string", "readOnly": true }, - "instanceFlexibilityGroup": { + "instanceFlexibilityGroup": { "description": "The instance Flexibility Group.", "type": "string", "readOnly": true @@ -2111,22 +2182,22 @@ "type": "string", "readOnly": true }, - "instanceFlexibilityRatio": { + "instanceFlexibilityRatio": { "description": "The instance Flexibility Ratio.", "type": "integer", "readOnly": true }, - "instanceFlexibilityGroup": { + "instanceFlexibilityGroup": { "description": "The instance Flexibility Group.", "type": "string", "readOnly": true }, - "normalizedSize": { + "normalizedSize": { "description": "The normalized Size.", "type": "string", "readOnly": true }, - "recommendedQuantityNormalized": { + "recommendedQuantityNormalized": { "description": "The recommended Quantity Normalized.", "type": "number", "readOnly": true @@ -2808,6 +2879,36 @@ } } }, + "MeterDetailsResponse": { + "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 + }, + "unitOfMeasure": { + "description": "The unit in which the meter consumption is charged, for example, 'Hours', 'GB', etc.", + "type": "string", + "readOnly": true + }, + "serviceFamily": { + "description": "The service family.", + "type": "string", + "readOnly": true + } + } + }, "ErrorDetails": { "description": "The details of the error.", "properties": { @@ -2967,7 +3068,7 @@ "in": "path", "required": true, "type": "string", - "description": "The scope associated with usage details operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For subscription, billing account, department, enrollment account and management group, you can also add billing period to the scope using '/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'. For e.g. to specify billing period at department scope use '/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'", + "description": "The scope associated with usage details operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For subscription, billing account, department, enrollment account and management group, you can also add billing period to the scope using '/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'. For e.g. to specify billing period at department scope use '/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'", "x-ms-parameter-location": "method", "x-ms-skip-url-encoding": true }, @@ -2976,7 +3077,7 @@ "in": "path", "required": true, "type": "string", - "description": "The scope associated with marketplace operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For subscription, billing account, department, enrollment account and ManagementGroup, you can also add billing period to the scope using '/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'. For e.g. to specify billing period at department scope use '/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'", + "description": "The scope associated with marketplace operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Billing/billingAccounts/{billingAccountId}' for Billing Account scope, '/providers/Microsoft.Billing/departments/{departmentId}' for Department scope, '/providers/Microsoft.Billing/enrollmentAccounts/{enrollmentAccountId}' for EnrollmentAccount scope and '/providers/Microsoft.Management/managementGroups/{managementGroupId}' for Management Group scope. For subscription, billing account, department, enrollment account and ManagementGroup, you can also add billing period to the scope using '/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'. For e.g. to specify billing period at department scope use '/providers/Microsoft.Billing/departments/{departmentId}/providers/Microsoft.Billing/billingPeriods/{billingPeriodName}'", "x-ms-parameter-location": "method", "x-ms-skip-url-encoding": true }, @@ -3127,6 +3228,40 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "metricParameter": { + "name": "metric", + "in": "query", + "description": "Allows to select different type of cost/usage records.", + "required": false, + "type": "string", + "x-ms-parameter-location": "method", + "enum": [ + "actualcost", + "amortizedcost", + "usage" + ], + "x-ms-enum": { + "name": "metrictype", + "modelAsString": true, + "values": [ + { + "value": "actualcost", + "description": "Actual cost data.", + "name": "ActualCostMetricType" + }, + { + "value": "amortizedcost", + "description": "Amortized cost data.", + "name": "AmortizedCostMetricType" + }, + { + "value": "usage", + "description": "Usage data.", + "name": "UsageMetricType" + } + ] + } } } } diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricActualCost.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricActualCost.json new file mode 100644 index 000000000000..53956c8f4d72 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricActualCost.json @@ -0,0 +1,56 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "metric": "actualcost", + "billingPeriodName": "201903" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Customer Name 1", + "billingPeriodStartDate": "2019-04-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-04-30T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Customer Name 1", + "accountName": "AccountName", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "SubscriptionName 1", + "date": "2019-04-09T00:00:00.0000000Z", + "product": "Product1", + "partNumber": "Part Number 1", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.000036, + "effectivePrice": 0.054693055510767, + "cost": 0.000001968949998, + "unitPrice": 5.47, + "billingCurrency": "CAD", + "resourceLocation": "uswest", + "consumedService": "Microsoft.ClassicStorage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource-Group-westus/providers/Microsoft.ClassicStorage/storageAccounts/ResourceName1", + "resourceName": "ResourceName1", + "invoiceSection": "Invoice Section 1", + "costCenter": "BAS", + "resourceGroup": "Resource-Group-westus", + "offerId": "Offer Id 1", + "isAzureCreditEligible": false, + "chargeType": "Usage" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricAmortizedCost.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricAmortizedCost.json new file mode 100644 index 000000000000..5cb0d3221d75 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricAmortizedCost.json @@ -0,0 +1,57 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "metric": "amortizedcost", + "billingPeriodName": "201903" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Customer Name 1", + "billingPeriodStartDate": "2019-04-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-04-30T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Customer Name 1", + "accountName": "AccountName", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "SubscriptionName 1", + "date": "2019-04-09T00:00:00.0000000Z", + "product": "Product1", + "partNumber": "Part Number 1", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.000036, + "effectivePrice": 0.054693055510767, + "cost": 0.000001968949998, + "unitPrice": 5.47, + "billingCurrency": "CAD", + "resourceLocation": "uswest", + "consumedService": "Microsoft.ClassicStorage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource-Group-westus/providers/Microsoft.ClassicStorage/storageAccounts/ResourceName1", + "resourceName": "ResourceName1", + "invoiceSection": "Invoice Section 1", + "costCenter": "BAS", + "resourceGroup": "Resource-Group-westus", + "offerId": "Offer Id 1", + "isAzureCreditEligible": false, + "chargeType": "Usage", + "frequency": "UsageBased" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricUsage.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricUsage.json new file mode 100644 index 000000000000..1646532866f6 --- /dev/null +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByMetricUsage.json @@ -0,0 +1,56 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "metric": "usage", + "billingPeriodName": "201903" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", + "type": "Microsoft.Consumption/usageDetails", + "tags": { + "env": "newcrp", + "dev": "tools" + }, + "properties": { + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Customer Name 1", + "billingPeriodStartDate": "2019-04-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-04-30T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Customer Name 1", + "accountName": "AccountName", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "SubscriptionName 1", + "date": "2019-04-09T00:00:00.0000000Z", + "product": "Product1", + "partNumber": "Part Number 1", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.000036, + "effectivePrice": 0.054693055510767, + "cost": 0.000001968949998, + "unitPrice": 5.47, + "billingCurrency": "CAD", + "resourceLocation": "uswest", + "consumedService": "Microsoft.ClassicStorage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource-Group-westus/providers/Microsoft.ClassicStorage/storageAccounts/ResourceName1", + "resourceName": "ResourceName1", + "invoiceSection": "Invoice Section 1", + "costCenter": "BAS", + "resourceGroup": "Resource-Group-westus", + "offerId": "Offer Id 1", + "isAzureCreditEligible": false, + "chargeType": "Usage" + } + } + ] + } + } + } +} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json deleted file mode 100644 index 7aceaf15e1d7..000000000000 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodGroupByTag.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parameters": { - "api-version": "2019-05-01", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "scope": "subscriptions/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" - } - } - ] - } - } - } -} diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json deleted file mode 100644 index 539467a65543..000000000000 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListGroupByTagDate.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parameters": { - "api-version": "2019-05-01", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "scope": "subscriptions/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": "Azure VCAP STA - RDS Server" - }, - "properties": { - "billingPeriodId": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180301", - "usageStart": "2018-03-02T00:00:00.0000000Z", - "usageEnd": "2018-03-02T23:59:59.0000000Z", - "usageQuantity": 1.11111111111, - "pretaxCost": 0, - "currency": "USD" - } - } - ] - } - } - } -} From 6695deb1d1962cb3d9ccbc56e14bf6e9eb16b35c Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 18:39:05 -0700 Subject: [PATCH 32/41] updated example json updated example json --- .../examples/UsageDetailsExpand.json | 74 +++++++------- .../2019-05-01/examples/UsageDetailsList.json | 53 ++++++---- .../UsageDetailsListByBillingAccount.json | 53 ++++++---- .../UsageDetailsListByDepartment.json | 51 ++++++---- .../UsageDetailsListByEnrollmentAccount.json | 51 ++++++---- .../UsageDetailsListByManagementGroup.json | 99 ++++++++++++------- .../examples/UsageDetailsListFilterByTag.json | 55 ++++++----- .../UsageDetailsListForBillingPeriod.json | 52 ++++++---- ...sListForBillingPeriodByBillingAccount.json | 52 ++++++---- ...tailsListForBillingPeriodByDepartment.json | 52 ++++++---- ...stForBillingPeriodByEnrollmentAccount.json | 52 ++++++---- ...ListForBillingPeriodByManagementGroup.json | 98 +++++++++++------- 12 files changed, 444 insertions(+), 298 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json index 5ec9c4a450d8..619386b1432c 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsExpand.json @@ -1,11 +1,10 @@ { "parameters": { "api-version": "2019-05-01", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "billingPeriodName": "201702", - "$expand": "meterDetails,additionalProperties", - "$filter": "properties/usageEnd ge '2018-01-14' AND properties/usageEnd le '2018-02-14' AND tags eq 'dev:tools'", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "billingPeriodName": "201903", + "$expand": "meterDetails,additionalInfo", + "$filter": "tags eq 'dev:tools'", "$top": 1 }, "responses": { @@ -13,50 +12,51 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "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, + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", + "partNumber": "Part Number 1", "meterId": "00000000-0000-0000-0000-000000000000", "meterDetails": { "meterName": "Data Transfer Out (GB)", "meterCategory": "Networking", - "unit": "GB", - "meterLocation": "Zone 2", - "totalIncludedQuantity": 0, - "pretaxStandardRate": 0.138, - "serviceName": "Bandwidth", - "serviceTier": "Bandwidth - Outbound Data Transfer" + "meterSubCategory": "ExpressRoute", + "unitOfMeasure": "GB", + "serviceFamily": "Compute" }, - "subscriptionGuid": "00000000-0000-0000-0000-000000000000", - "subscriptionName": "Dummy subscription", - "accountName": "My account name", - "departmentName": "My department name", - "product": "My product name", - "consumedService": "My consumed service", - "costCenter": "Cost center 1", - "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "quantity": 0.8234, + "effectivePrice": 0.010464556322455, + "cost": 0.000342194841184, + "unitPrice": 3.54, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West", - "additionalProperties": "{\"MyType\":\"\",\"ServiceType\":\"\",\"VMName\":\"\",\"UsageType\":\"MyUsage\"}" + "isAzureCreditEligible": false, + "chargeType": "Usage", + "frequency": "UsageBased", + "additionalInfo": "{\"MyType\":\"\",\"ServiceType\":\"\",\"VMName\":\"\",\"UsageType\":\"MyUsage\"}" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json index be67b01cc0f8..6f914eb30ac5 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsList.json @@ -1,39 +1,52 @@ { "parameters": { - "api-version": "2019-01-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000" + "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Customer Name 1", + "billingPeriodStartDate": "2019-04-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-04-30T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Customer Name 1", + "accountName": "AccountName", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "SubscriptionName 1", + "date": "2019-04-09T00:00:00.0000000Z", + "product": "Product1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.000036, + "effectivePrice": 0.054693034210767, + "cost": 0.000001980949998, + "unitPrice": 5.47, + "billingCurrency": "CAD", + "resourceLocation": "uswest", + "consumedService": "Microsoft.ClassicStorage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource-Group-westus/providers/Microsoft.ClassicStorage/storageAccounts/ResourceName1", + "resourceName": "ResourceName1", + "invoiceSection": "Invoice Section 1", + "costCenter": "BAS", + "resourceGroup": "Resource-Group-westus", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage", + "frequency": "UsageBased" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json index f0c2dd9c7e2e..8cfcd69aafdd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByBillingAccount.json @@ -1,40 +1,51 @@ { "parameters": { - "api-version": "2019-05-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "billingAccountId": "1234" + "api-version": "2019-05-01-preview", + "scope": "providers/Microsoft.Billing/BillingAccounts/1234", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.7329, + "effectivePrice": 0.000402776395232, + "cost": 0.000295194820065, + "unitPrice": 4.38, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json index 7cbbaac6ccb3..83b746be6294 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByDepartment.json @@ -1,40 +1,51 @@ { "parameters": { "api-version": "2019-05-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "departmentId": "1234" + "scope": "providers/Microsoft.Billing/Departments/1234", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.Billing/Departments/1234/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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.7329, + "effectivePrice": 0.000402776395232, + "cost": 0.000295194820065, + "unitPrice": 4.38, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json index 9c2e930084fb..19ee428df5af 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByEnrollmentAccount.json @@ -1,40 +1,51 @@ { "parameters": { "api-version": "2019-05-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "enrollmentAccountId": "1234" + "scope": "providers/Microsoft.Billing/EnrollmentAccounts/1234", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.7329, + "effectivePrice": 0.000402776395232, + "cost": 0.000295194820065, + "unitPrice": 4.38, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json index 71474e850e27..85e0d0bf2c41 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListByManagementGroup.json @@ -1,67 +1,92 @@ { "parameters": { "api-version": "2019-05-01", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "managementGroupId": "managementGroupForTest" + "managementGroupId": "managementGroupForTest", + "billingPeriodName": "201903", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201808", - "usageStart": "2018-08-13T00:00:00Z", - "usageEnd": "2018-08-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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.8234, + "effectivePrice": 0.010534556373432, + "cost": 0.000342194841184, + "unitPrice": 3.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } }, { - "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/scope/providers/Microsoft.Billing/billingPeriods/20180801/providers/Microsoft.Consumption/usageDetails/usageDetails_Id2", + "name": "usageDetails_Id2", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201808", - "usageStart": "2018-08-13T00:00:00Z", - "usageEnd": "2018-08-13T23:59:59Z", - "instanceName": "shared1", - "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", - "instanceLocation": "eastasia", - "currency": "USD", - "usageQuantity": 0.00120, - "billableQuantity": 0.00128, - "pretaxCost": 0.26, - "isEstimated": false, + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 2", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 2", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 2", + "partNumber": "Part Number 2", "meterId": "11111111-1111-1111-1111-111111111111", - "partNumber": "Part Number 1", - "resourceGuid": "11111111-1111-1111-1111-111111111111", - "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "meterDetails": null, + "quantity": 0.7329, + "effectivePrice": 0.000402776395232, + "cost": 0.000295194820065, + "unitPrice": 4.38, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 2/providers/Microsoft.Storage/storageAccounts/Resource Name 2", + "resourceName": "Resource Name 2", + "invoiceSection": "Invoice Section 2", + "costCenter": "DEV", + "resourceGroup": "Resource Group 2", + "offerId": "Offer Id 2", + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json index 4a44d3904e87..4eaa20890fd1 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListFilterByTag.json @@ -1,40 +1,51 @@ { "parameters": { - "api-version": "2019-01-01", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "$filter": "tags eq 'dev:tools'" + "api-version": "2019-05-01", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "$filter": "tags eq 'dev:tools'", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.8234, + "effectivePrice": 0.010534556373432, + "cost": 0.000342194841184, + "unitPrice": 3.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json index 856434642cbe..359761c4d338 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriod.json @@ -1,41 +1,51 @@ { "parameters": { "api-version": "2019-05-01", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "billingPeriodName": "201702" + "scope": "subscriptions/00000000-0000-0000-0000-000000000000", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.8234, + "effectivePrice": 0.010534556373432, + "cost": 0.000342194841184, + "unitPrice": 3.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json index 40a0d3ad4cff..6af55a086805 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByBillingAccount.json @@ -1,41 +1,51 @@ { "parameters": { "api-version": "2019-05-01", - "billingAccountId": "1234", - "scope": "providers/Microsoft.Billing/BillingAccounts/1234", - "billingPeriodName": "201702" + "scope": "providers/Microsoft.Billing/BillingAccounts/1234", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/BillingAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.Billing/BillingAccounts/1234/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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.8234, + "effectivePrice": 0.010534556373432, + "cost": 0.000342194841184, + "unitPrice": 3.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json index 6b266febd260..ad785e54ff58 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByDepartment.json @@ -1,41 +1,51 @@ { "parameters": { "api-version": "2019-05-01", - "departmentId": "1234", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "billingPeriodName": "201702" + "scope": "providers/Microsoft.Billing/Departments/1234", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/Departments/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.Billing/Departments/1234/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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.8234, + "effectivePrice": 0.010534556373432, + "cost": 0.000342194841184, + "unitPrice": 3.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json index 190e685adce2..b40461c9561d 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByEnrollmentAccount.json @@ -1,41 +1,51 @@ { "parameters": { "api-version": "2019-05-01", - "enrollmentAccountId": "1234", - "scope": "providers/Microsoft.Billing/EnrollmentAccounts/1234", - "billingPeriodName": "201702" + "scope": "providers/Microsoft.Billing/EnrollmentAccounts/1234", + "billingPeriodName": "201903" }, "responses": { "200": { "body": { "value": [ { - "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/providers/Microsoft.Billing/billingPeriods/201702", - "invoiceId": "/providers/Microsoft.Billing/EnrollmentAccounts/1234/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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.8234, + "effectivePrice": 0.010534556373432, + "cost": 0.000342194841184, + "unitPrice": 3.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } } ] diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json index 2c6a9187d10d..3a938a094870 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/UsageDetailsListForBillingPeriodByManagementGroup.json @@ -2,67 +2,91 @@ "parameters": { "api-version": "2019-05-01", "managementGroupId": "managementGroupForTest", - "scope": "subscriptions/00000000-0000-0000-0000-000000000000", - "billingPeriodName": "201807" + "billingPeriodName": "201903", + "scope": "subscriptions/00000000-0000-0000-0000-000000000000" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201903/providers/Microsoft.Consumption/usageDetails/usageDetails_Id1", + "name": "usageDetails_Id1", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Billing/billingPeriods/201807", - "usageStart": "2018-07-13T00:00:00Z", - "usageEnd": "2018-07-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", + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 1", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 1", + "accountName": "Account Name 1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 1", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 1", "partNumber": "Part Number 1", - "resourceGuid": "00000000-0000-0000-0000-000000000000", + "meterId": "00000000-0000-0000-0000-000000000000", + "meterDetails": null, + "quantity": 0.8234, + "effectivePrice": 0.010534556373432, + "cost": 0.000342194841184, + "unitPrice": 3.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 1/providers/Microsoft.Storage/storageAccounts/Resource Name 1", + "resourceName": "Resource Name 1", + "invoiceSection": "Invoice Section 1", + "costCenter": "DEV", + "resourceGroup": "Resource Group 1", "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "isAzureCreditEligible": false, + "chargeType": "Usage" } }, { - "id": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/20180701/providers/Microsoft.Consumption/usageDetails/usageDetailsId1", - "name": "usageDetailsId1", + "id": "/scope/providers/Microsoft.Billing/billingPeriods/billingPeriodName/providers/Microsoft.Consumption/usageDetails/usageDetails_Id2", + "name": "usageDetails_Id2", "type": "Microsoft.Consumption/usageDetails", "tags": { "env": "newcrp", "dev": "tools" }, "properties": { - "billingPeriodId": "/subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Billing/billingPeriods/201807", - "usageStart": "2018-07-13T00:00:00Z", - "usageEnd": "2018-07-13T23:59:59Z", - "instanceName": "shared1", - "instanceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/Default-Web-eastasia/providers/Microsoft.Web/sites/shared1", - "instanceLocation": "eastasia", - "currency": "USD", - "usageQuantity": 0.00120, - "billableQuantity": 0.00128, - "pretaxCost": 0.26, - "isEstimated": false, + "billingAccountId": "xxxxxxxx", + "billingAccountName": "Account Name 2", + "billingPeriodStartDate": "2019-03-01T00:00:00.0000000Z", + "billingPeriodEndDate": "2019-03-31T00:00:00.0000000Z", + "billingProfileId": "xxxxxxxx", + "billingProfileName": "Account Name 2", + "accountName": "Account Name 2", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "subscriptionName": "Subscription Name 2", + "date": "2019-03-30T00:00:00.0000000Z", + "product": "Product Name 2", + "partNumber": "Part Number 2", "meterId": "11111111-1111-1111-1111-111111111111", - "partNumber": "Part Number 1", - "resourceGuid": "11111111-1111-1111-1111-111111111111", - "offerId": "Offer Id 1", - "chargesBilledSeparately": true, - "location": "EU West" + "meterDetails": null, + "quantity": 0.4759, + "effectivePrice": 0.073488920944598, + "cost": 0.000821821271948, + "unitPrice": 5.74, + "billingCurrency": "CAD", + "resourceLocation": "USEast", + "consumedService": "Microsoft.Storage", + "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Resource Group 2/providers/Microsoft.Storage/storageAccounts/Resource Name 2", + "resourceName": "Resource Name 2", + "invoiceSection": "Invoice Section 2", + "costCenter": "DEV", + "resourceGroup": "Resource Group 2", + "offerId": "Offer Id 2", + "isAzureCreditEligible": false, + "chargeType": "UnusedReservation" } } ] From 38927b7f47fba937c596e99ace760ab684ff0766 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 18:42:16 -0700 Subject: [PATCH 33/41] bug fix bug fix --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 6f8096c64371..62362f5081e1 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -713,7 +713,7 @@ "tags": [ "ReservedInstances" ], - "operationId": "ReservationsSummaries_ListByReservationOrderAndReservation", + "operationId": "ReservationsSummaries_ListByBillingAccountId", "description": "Lists the reservations summaries for daily or monthly grain.", "externalDocs": { "url": "https://docs.microsoft.com/en-us/rest/api/consumption/" From e8b25d3c71cb04c9964e8c94f525f0e95e6af20d Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 19:22:15 -0700 Subject: [PATCH 34/41] Update specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json Co-Authored-By: Nick Schonning --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 62362f5081e1..95035ba70282 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -864,7 +864,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/reservationdetails": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/reservationDetails": { "get": { "tags": [ "ReservedInstances" @@ -1499,7 +1499,7 @@ "readOnly": true }, "effectivePrice": { - "description": "Effective Price that’s charged for the usage.", + "description": "Effective Price thatÂ’s charged for the usage.", "type": "number", "format": "decimal", "readOnly": true From 1f03a59cf4e7f6f086849c23ac97918cb270dbda Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 19:23:04 -0700 Subject: [PATCH 35/41] Update specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json Co-Authored-By: Nick Schonning --- .../stable/2019-05-01/examples/ReservationSummariesMonthly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json index 7756d39d93df..6ad998620c4b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json @@ -11,7 +11,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" From 7774db3615d431a9e298cc02a33f02970dd2e0b2 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 19:23:51 -0700 Subject: [PATCH 36/41] Update specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json Co-Authored-By: Nick Schonning --- .../examples/ReservationSummariesDailyWithReservationId.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json index 9ff0dd5402ae..baa406ca7f38 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json @@ -13,7 +13,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" From 3ace3316de884c9408dffd601ce4b97438ea7c21 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 19:24:16 -0700 Subject: [PATCH 37/41] Update specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json Co-Authored-By: Nick Schonning --- .../examples/ReservationSummariesMonthlyWithReservationId.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json index fdda47ced188..55a214dae0cd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json @@ -12,7 +12,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" From b4ed81a712ea9f61906b9a35895d534c489fdc93 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 19:24:54 -0700 Subject: [PATCH 38/41] Update specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json Co-Authored-By: Nick Schonning --- .../stable/2019-05-01/examples/ReservationSummariesDaily.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json index 32ea636776cf..ea44229b7720 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json @@ -12,7 +12,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" From 0708eece9aec70eee796cca74f3baea0f3c3a988 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 19:43:44 -0700 Subject: [PATCH 39/41] bug fix bug fix --- .../stable/2019-05-01/examples/ReservationSummariesDaily.json | 2 +- .../examples/ReservationSummariesDailyWithReservationId.json | 2 +- .../stable/2019-05-01/examples/ReservationSummariesMonthly.json | 2 +- .../examples/ReservationSummariesMonthlyWithReservationId.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json index 32ea636776cf..ea44229b7720 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDaily.json @@ -12,7 +12,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json index 9ff0dd5402ae..baa406ca7f38 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesDailyWithReservationId.json @@ -13,7 +13,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json index 7756d39d93df..6ad998620c4b 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthly.json @@ -11,7 +11,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json index fdda47ced188..55a214dae0cd 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/examples/ReservationSummariesMonthlyWithReservationId.json @@ -12,7 +12,7 @@ { "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", + "type": "Microsoft.Consumption/reservationSummaries", "tags": { "env": "newcrp", "dev": "tools" From 9c70c56b1b93c380c373b3274a1ef947bf2d4a04 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 20:01:58 -0700 Subject: [PATCH 40/41] bug fix bug fix --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index 95035ba70282..b2bfdd38e954 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -1499,7 +1499,7 @@ "readOnly": true }, "effectivePrice": { - "description": "Effective Price thatÂ’s charged for the usage.", + "description": "Effective Price that’s charged for the usage.", "type": "number", "format": "decimal", "readOnly": true @@ -1611,7 +1611,7 @@ "type": "string", "readOnly": true }, - "publisherType": { + "publisherType": { "description": "Publisher Type.", "type": "string", "readOnly": true From d04e302c85bdffe4cb2c5f966faef6fa1df32921 Mon Sep 17 00:00:00 2001 From: santoshsinha100 <45053048+santoshsinha100@users.noreply.github.com> Date: Mon, 15 Jul 2019 20:20:44 -0700 Subject: [PATCH 41/41] Bug fix Bug fix --- .../Microsoft.Consumption/stable/2019-05-01/consumption.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json index b2bfdd38e954..9a2dc9a3be77 100644 --- a/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json +++ b/specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-05-01/consumption.json @@ -708,7 +708,7 @@ } } }, - "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/reservationsummaries": { + "/providers/Microsoft.Billing/billingAccounts/{billingAccountId}/providers/Microsoft.Consumption/reservationSummaries": { "get": { "tags": [ "ReservedInstances"