Adding new type for forecast and usage - preview (#4253)

* Cost Analysis Forecast support Preview version * Foreacast and usage examples - Preview * Correcting columns from rows- Forecast 2018-12-01-preview * Adding new type for forecast and usage - preview
Azure · Oct 17, 2018 · fc9b3f1 · fc9b3f1
1 parent 8ab7715
commit fc9b3f1
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 28 deletions.
diff --git a/.../resource-manager/Microsoft.CostManagement/preview/2018-12-01-preview/costmanagement.json b/.../resource-manager/Microsoft.CostManagement/preview/2018-12-01-preview/costmanagement.json
@@ -958,11 +958,12 @@
       "description": "The definition of a report config.",
       "properties": {
         "type": {
-          "description": "The type of the report.",
+          "description": "The type of the report. Usage represents actual usage, forecast represents forecasted data and UsageAndForecast represents both usage and forecasted data. Actual usage and forecasted data can be differentiated based on dates.",
           "type": "string",
           "enum": [
             "Usage",
-            "Forecast"
+            "Forecast",
+            "UsageAndForecast"
           ],
           "x-ms-enum": {
             "name": "ReportType",

diff --git a/...anagement/preview/2018-12-01-preview/examples/BillingAccountDimensionsListWithFilter.json b/...anagement/preview/2018-12-01-preview/examples/BillingAccountDimensionsListWithFilter.json
@@ -29,7 +29,7 @@
                 "description": "Resource Id",
                 "filterEnabled": true,
                 "groupingEnabled": true,
-                "nextLink": "http://management.azure.com/ccmapi/providers/Microsoft.Billing/billingAccounts/100/providers/Microsoft.Consumption/Dimensions?$filter=properties/category eq 'resourceId'&$top=5&api-version=2018-12-31-preview&$expand=properties/data&$skiptoken=AQAAAA%3D%3D"
+                "nextLink": "http://management.azure.com/ccmapi/providers/Microsoft.Billing/billingAccounts/100/providers/Microsoft.Consumption/Dimensions?$filter=properties/category eq 'resourceId'&$top=5&api-version=2018-12-01-preview&$expand=properties/data&$skiptoken=AQAAAA%3D%3D"
             }
         }
         ]

diff --git a/...ger/Microsoft.CostManagement/preview/2018-12-01-preview/examples/BillingAccountQuery.json b/...ger/Microsoft.CostManagement/preview/2018-12-01-preview/examples/BillingAccountQuery.json
@@ -3,7 +3,7 @@
     "api-version": "2018-12-01-preview",
     "billingAccountId": "70664866",
     "parameters":{
-      "type": "Usage",
+      "type": "UsageAndForecast",
       "timeframe": "Custom",
       "timePeriod": {
         "from": "2018-10-01T00:00:00.000Z",
@@ -62,7 +62,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-31&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...osoft.CostManagement/preview/2018-12-01-preview/examples/BillingAccountQueryForecast.json b/...osoft.CostManagement/preview/2018-12-01-preview/examples/BillingAccountQueryForecast.json
@@ -62,7 +62,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-31&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [                          
                 {
                   "name": "UsageDate",

diff --git a/....CostManagement/preview/2018-12-01-preview/examples/BillingAccountQueryGroupingUsage.json b/....CostManagement/preview/2018-12-01-preview/examples/BillingAccountQueryGroupingUsage.json
@@ -35,7 +35,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...icrosoft.CostManagement/preview/2018-12-01-preview/examples/BillingAccountQueryUsage.json b/...icrosoft.CostManagement/preview/2018-12-01-preview/examples/BillingAccountQueryUsage.json
@@ -62,7 +62,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-31&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...ostManagement/preview/2018-12-01-preview/examples/DepartmentDimensionsListWithFilter.json b/...ostManagement/preview/2018-12-01-preview/examples/DepartmentDimensionsListWithFilter.json
@@ -30,7 +30,7 @@
                 "description": "Resource Id",
                 "filterEnabled": true,
                 "groupingEnabled": true,
-                "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/100/departments/123/providers/Microsoft.Consumption/Dimensions?$filter=properties/category eq 'resourceId'&$top=5&api-version=2018-12-31-preview&$expand=properties/data&$skiptoken=AQAAAA%3D%3D"
+                "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/100/departments/123/providers/Microsoft.Consumption/Dimensions?$filter=properties/category eq 'resourceId'&$top=5&api-version=2018-12-01-preview&$expand=properties/data&$skiptoken=AQAAAA%3D%3D"
             }
         }
         ]

diff --git a/...manager/Microsoft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQuery.json b/...manager/Microsoft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQuery.json
@@ -63,7 +63,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...Microsoft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQueryForecast.json b/...Microsoft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQueryForecast.json
@@ -63,7 +63,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [                          
                 {
                   "name": "UsageDate",

diff --git a/...soft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQueryGroupingUsage.json b/...soft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQueryGroupingUsage.json
@@ -36,7 +36,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...er/Microsoft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQueryUsage.json b/...er/Microsoft.CostManagement/preview/2018-12-01-preview/examples/DepartmentQueryUsage.json
@@ -63,7 +63,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/departments/123/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...gement/preview/2018-12-01-preview/examples/EnrollmentAccountDimensionsListWithFilter.json b/...gement/preview/2018-12-01-preview/examples/EnrollmentAccountDimensionsListWithFilter.json
@@ -30,7 +30,7 @@
                 "description": "Resource Id",
                 "filterEnabled": true,
                 "groupingEnabled": true,
-                "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456/providers/Microsoft.Consumption/Dimensions?$filter=properties/category eq 'resourceId'&$top=5&api-version=2018-12-31-preview&$expand=properties/data&$skiptoken=AQAAAA%3D%3D"
+                "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/100/enrollmentAccounts/456/providers/Microsoft.Consumption/Dimensions?$filter=properties/category eq 'resourceId'&$top=5&api-version=2018-12-01-preview&$expand=properties/data&$skiptoken=AQAAAA%3D%3D"
             }
         }
         ]

diff --git a/.../Microsoft.CostManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQuery.json b/.../Microsoft.CostManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQuery.json
@@ -50,7 +50,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...ft.CostManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQueryForecast.json b/...ft.CostManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQueryForecast.json
@@ -50,7 +50,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [                      
                 {
                   "name": "UsageDate",

diff --git a/...stManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQueryGroupingUsage.json b/...stManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQueryGroupingUsage.json
@@ -41,7 +41,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...osoft.CostManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQueryUsage.json b/...osoft.CostManagement/preview/2018-12-01-preview/examples/EnrollmentAccountQueryUsage.json
@@ -50,7 +50,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Billing/billingAccounts/70664866/enrollmentAccounts/456/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...er/Microsoft.CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQuery.json b/...er/Microsoft.CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQuery.json
@@ -49,7 +49,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...soft.CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQueryForecast.json b/...soft.CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQueryForecast.json
@@ -49,7 +49,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [                         
                 {
                   "name": "UsageDate",

diff --git a/...CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQueryGroupingUsage.json b/...CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQueryGroupingUsage.json
@@ -35,7 +35,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...crosoft.CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQueryUsage.json b/...crosoft.CostManagement/preview/2018-12-01-preview/examples/ManagementGroupQueryUsage.json
@@ -49,7 +49,7 @@
             "name": "ad67fd91-c131-4bda-9ba9-7187ecb1cebd",
             "type": "microsoft.costmanagement/Query",
             "properties": {
-              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-31-preview&$skiptoken=AQAAAA%3D%3D",
+              "nextLink": "https://management.azure.com/providers/Microsoft.Management/managementGroups/MyMgId/providers/Microsoft.CostManagement/Query?api-version=2018-12-01-preview&$skiptoken=AQAAAA%3D%3D",
               "columns": [
                 {
                   "name": "PreTaxCost",

diff --git a/...osoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupDimensionsList.json b/...osoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupDimensionsList.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-31",
+    "api-version": "2018-12-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "system.orlando",
     "$expand": "properties/data",

diff --git a/...ager/Microsoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupQuery.json b/...ager/Microsoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupQuery.json
@@ -1,10 +1,10 @@
 {
   "parameters": {
-    "api-version": "2018-08-31",
+    "api-version": "2018-12-01-preview",
     "subscriptionId": "55312978-ba1b-415c-9304-c4b9c43c0481",
     "resourceGroupName": "ScreenSharingTest-peer",
     "parameters":{
-      "type": "Usage",
+      "type": "UsageAndForecast",
       "timeframe": "Custom",
       "timePeriod": {
         "from": "2018-10-01T00:00:00.000Z",

diff --git a/...rosoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupQueryForecast.json b/...rosoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupQueryForecast.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-31",
+    "api-version": "2018-12-01-preview",
     "subscriptionId": "55312978-ba1b-415c-9304-c4b9c43c0481",
     "resourceGroupName": "ScreenSharingTest-peer",
     "parameters":{

diff --git a/...Microsoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupQueryUsage.json b/...Microsoft.CostManagement/preview/2018-12-01-preview/examples/ResourceGroupQueryUsage.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "api-version": "2018-08-31",
+    "api-version": "2018-12-01-preview",
     "subscriptionId": "55312978-ba1b-415c-9304-c4b9c43c0481",
     "resourceGroupName": "ScreenSharingTest-peer",
     "parameters":{

diff --git a/...nager/Microsoft.CostManagement/preview/2018-12-01-preview/examples/SubscriptionQuery.json b/...nager/Microsoft.CostManagement/preview/2018-12-01-preview/examples/SubscriptionQuery.json
@@ -3,7 +3,7 @@
     "api-version": "2018-12-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "parameters":{
-      "type": "Usage",
+      "type": "UsageAndForecast",
       "timeframe": "Custom",
       "timePeriod": {
         "from": "2018-10-01T00:00:00.000Z",