From 8f35018f0f089e7453a48d7dee23bf677e037bb1 Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Thu, 15 Apr 2021 15:17:34 -0700 Subject: [PATCH 01/10] Add dividePerInstance property to the autoscale metric trigger --- .../Microsoft.Insights/stable/2015-04-01/autoscale_API.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json index 5641244c5c51..4029ceb5d841 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json @@ -453,6 +453,10 @@ "$ref": "#/definitions/ScaleRuleMetricDimension" }, "description": "List of dimension conditions. For example: [{\"DimensionName\":\"AppName\",\"Operator\":\"Equals\",\"Values\":[\"App1\"]},{\"DimensionName\":\"Deployment\",\"Operator\":\"Equals\",\"Values\":[\"default\"]}]." + }, + "dividePerInstance": { + "type": "boolean", + "description": "a value indicating whether metric should divide per instance." } }, "description": "The trigger that results in a scaling action." From 897525f65d28c01086a80f0cc16d423e3c90153a Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Fri, 16 Apr 2021 10:17:29 -0700 Subject: [PATCH 02/10] Update examples for autoscale to include 'dividePerInstance' --- .../createOrUpdateAutoscaleSetting.json | 36 ++++++++++++------- .../examples/getAutoscaleSetting.json | 12 ++++--- .../examples/listAutoscaleSetting.json | 12 ++++--- .../listAutoscaleSettingBySubscription.json | 12 ++++--- .../examples/patchAutoscaleSetting.json | 24 ++++++++----- 5 files changed, 64 insertions(+), 32 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json index 4a429d060c9f..13f482075b58 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json @@ -26,7 +26,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -44,7 +45,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -77,7 +79,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -95,7 +98,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -176,7 +180,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -194,7 +199,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -227,7 +233,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -245,7 +252,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -326,7 +334,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -344,7 +353,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -377,7 +387,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -395,7 +406,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json index 940fb7184382..63e50e807e84 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json @@ -35,7 +35,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -53,7 +54,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -86,7 +88,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -104,7 +107,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json index 70ba238c9364..b7a23e2f0564 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json @@ -36,7 +36,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -54,7 +55,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -87,7 +89,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -105,7 +108,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json index dddfc3df50e1..08e0afd69911 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json @@ -35,7 +35,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -53,7 +54,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -86,7 +88,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -104,7 +107,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json index 3c80bd7a509f..80f4b1fa034a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json @@ -27,7 +27,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -45,7 +46,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -78,7 +80,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -96,7 +99,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -177,7 +181,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -195,7 +200,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", @@ -228,7 +234,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 10.0 + "threshold": 10.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Increase", @@ -246,7 +253,8 @@ "timeWindow": "PT5M", "timeAggregation": "Average", "operator": "GreaterThan", - "threshold": 15.0 + "threshold": 15.0, + "dividePerInstance": true }, "scaleAction": { "direction": "Decrease", From 01a28b8feb8733d6e02d060edcda52b05c2bb0e4 Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Mon, 19 Apr 2021 09:56:03 -0700 Subject: [PATCH 03/10] Update examples for correctness --- .../createOrUpdateAutoscaleSetting.json | 24 +++++++++---------- .../examples/getAutoscaleSetting.json | 8 +++---- .../listAutoscaleSettingBySubscription.json | 8 +++---- .../examples/patchAutoscaleSetting.json | 16 ++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json index 13f482075b58..b2986cba1e4f 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/createOrUpdateAutoscaleSetting.json @@ -27,7 +27,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -46,7 +46,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -80,7 +80,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -99,7 +99,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -181,7 +181,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -200,7 +200,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -234,7 +234,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -253,7 +253,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -335,7 +335,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -354,7 +354,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -388,7 +388,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -407,7 +407,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json index 63e50e807e84..fd1593a3f637 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/getAutoscaleSetting.json @@ -36,7 +36,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -55,7 +55,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -89,7 +89,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -108,7 +108,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json index 08e0afd69911..06a7b1f00ebe 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json @@ -36,7 +36,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -55,7 +55,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -89,7 +89,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -108,7 +108,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json index 80f4b1fa034a..bee8692a13dc 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/patchAutoscaleSetting.json @@ -28,7 +28,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -47,7 +47,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -81,7 +81,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -100,7 +100,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -182,7 +182,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -201,7 +201,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -235,7 +235,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -254,7 +254,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", From adb5d8ec6f125d28fcc1687c4da4dd16e0c8b62b Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Mon, 19 Apr 2021 14:21:34 -0700 Subject: [PATCH 04/10] update example for correctness --- .../stable/2015-04-01/examples/listAutoscaleSetting.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json index b7a23e2f0564..c5902cd536b9 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/examples/listAutoscaleSetting.json @@ -37,7 +37,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -56,7 +56,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", @@ -90,7 +90,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 10.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Increase", @@ -109,7 +109,7 @@ "timeAggregation": "Average", "operator": "GreaterThan", "threshold": 15.0, - "dividePerInstance": true + "dividePerInstance": false }, "scaleAction": { "direction": "Decrease", From 8a0b264f0a2a042702feb5839e263b6c17fa9dda Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Mon, 10 May 2021 11:03:47 -0700 Subject: [PATCH 05/10] swagger corrections --- .../diagnosticsSettingsCategories_API.json | 4 +- .../diagnosticsSettings_API.json | 4 +- .../stable/2014-04-01/autoscale_API.json | 886 ++++++++++++++++++ .../createOrUpdateAutoscaleSetting.json | 451 +++++++++ .../examples/deleteAutoscaleSetting.json | 12 + .../examples/getAutoscaleSetting.json | 160 ++++ .../examples/listAutoscaleSetting.json | 164 ++++ .../listAutoscaleSettingBySubscription.json | 163 ++++ .../examples/patchAutoscaleSetting.json | 302 ++++++ .../stable/2015-04-01/activityLogs_API.json | 2 +- .../stable/2015-04-01/autoscale_API.json | 26 +- .../2015-04-01/eventCategories_API.json | 2 +- .../stable/2015-04-01/operations_API.json | 2 +- .../2015-04-01/tenantActivityLogs_API.json | 2 +- .../stable/2016-03-01/logProfiles_API.json | 4 +- .../monitor/resource-manager/readme.md | 11 + 16 files changed, 2178 insertions(+), 17 deletions(-) create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/createOrUpdateAutoscaleSetting.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/deleteAutoscaleSetting.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/getAutoscaleSetting.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSetting.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSettingBySubscription.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/patchAutoscaleSetting.json diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json index f45dd867b275..c2ec100a8bfd 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories/{name}": { + "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories/{name}": { "get": { "tags": [ "DiagnosticSettingsCategories" @@ -75,7 +75,7 @@ } } }, - "/{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories": { + "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories": { "get": { "tags": [ "DiagnosticSettingsCategories" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json index 79337a4531f3..8c17d69446e6 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/{resourceUri}/providers/microsoft.insights/diagnosticSettings/{name}": { + "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettings/{name}": { "get": { "tags": [ "DiagnosticSettings" @@ -158,7 +158,7 @@ } } }, - "/{resourceUri}/providers/microsoft.insights/diagnosticSettings": { + "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettings": { "get": { "tags": [ "DiagnosticSettings" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json new file mode 100644 index 000000000000..197c66c827b0 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json @@ -0,0 +1,886 @@ +{ + "swagger": "2.0", + "info": { + "title": "MonitorManagementClient", + "x-ms-code-generation-settings": { + "name": "MonitorManagementClient" + }, + "version": "2014-04-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings": { + "get": { + "description": "Lists the autoscale settings for a resource group", + "tags": [ + "AutoscaleSettings" + ], + "operationId": "AutoscaleSettings_ListByResourceGroup", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Successful request for a list of autoscale settings", + "schema": { + "$ref": "#/definitions/AutoscaleSettingResourceCollection" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List autoscale settings": { + "$ref": "./examples/listAutoscaleSetting.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings/{autoscaleSettingName}": { + "put": { + "description": "Creates or updates an autoscale setting.", + "tags": [ + "AutoscaleSettings" + ], + "operationId": "AutoscaleSettings_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AutoscaleSettingNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/AutoscaleSettingResource" + }, + "description": "Parameters supplied to the operation." + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Successful request to create or update an autoscale setting", + "schema": { + "$ref": "#/definitions/AutoscaleSettingResource" + } + }, + "201": { + "description": "Created autoscale setting", + "schema": { + "$ref": "#/definitions/AutoscaleSettingResource" + } + } + }, + "x-ms-examples": { + "Create or update an autoscale setting": { + "$ref": "./examples/createOrUpdateAutoscaleSetting.json" + } + } + }, + "delete": { + "description": "Deletes and autoscale setting", + "tags": [ + "AutoscaleSettings" + ], + "operationId": "AutoscaleSettings_Delete", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AutoscaleSettingNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Successful request to delete an autoscale setting" + }, + "204": { + "description": "No content: Successful request to delete an autoscale setting, but the response is intentionally empty" + } + }, + "x-ms-examples": { + "Delete an autoscale setting": { + "$ref": "./examples/deleteAutoscaleSetting.json" + } + } + }, + "get": { + "description": "Gets an autoscale setting", + "tags": [ + "AutoscaleSettings" + ], + "operationId": "AutoscaleSettings_Get", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AutoscaleSettingNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Successful request to get one autoscale setting", + "schema": { + "$ref": "#/definitions/AutoscaleSettingResource" + } + } + }, + "x-ms-examples": { + "Get an autoscale setting": { + "$ref": "./examples/getAutoscaleSetting.json" + } + } + }, + "patch": { + "description": "Updates an existing AutoscaleSettingsResource. To update other fields use the CreateOrUpdate method.", + "operationId": "AutoscaleSettings_Update", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AutoscaleSettingNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "autoscaleSettingResource", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/AutoscaleSettingResourcePatch" + }, + "description": "Parameters supplied to the operation." + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "An existing autoscale setting resource was successfully updated.", + "schema": { + "$ref": "#/definitions/AutoscaleSettingResource" + } + } + }, + "x-ms-examples": { + "Patch an autoscale setting": { + "$ref": "./examples/patchAutoscaleSetting.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Insights/autoscalesettings": { + "get": { + "description": "Lists the autoscale settings for a subscription", + "tags": [ + "AutoscaleSettings" + ], + "operationId": "AutoscaleSettings_ListBySubscription", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "Successful request for a list of autoscale settings", + "schema": { + "$ref": "#/definitions/AutoscaleSettingResourceCollection" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List autoscale settings": { + "$ref": "./examples/listAutoscaleSettingBySubscription.json" + } + } + } + } + }, + "definitions": { + "Resource": { + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "Azure resource Id" + }, + "name": { + "type": "string", + "readOnly": true, + "description": "Azure resource name" + }, + "type": { + "type": "string", + "readOnly": true, + "description": "Azure resource type" + }, + "location": { + "type": "string", + "description": "Resource location", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "tags": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } + }, + "required": [ + "location" + ], + "x-ms-azure-resource": true, + "description": "An azure resource object" + }, + "ScaleCapacity": { + "required": [ + "minimum", + "maximum", + "default" + ], + "properties": { + "minimum": { + "type": "string", + "description": "the minimum number of instances for the resource." + }, + "maximum": { + "type": "string", + "description": "the maximum number of instances for the resource. The actual maximum number of instances is limited by the cores that are available in the subscription." + }, + "default": { + "type": "string", + "description": "the number of instances that will be set if metrics are not available for evaluation. The default is only used if the current instance count is lower than the default." + } + }, + "description": "The number of instances that can be used during this profile." + }, + "MetricTrigger": { + "required": [ + "metricName", + "metricResourceUri", + "timeGrain", + "statistic", + "timeWindow", + "timeAggregation", + "operator", + "threshold" + ], + "properties": { + "metricName": { + "type": "string", + "description": "the name of the metric that defines what the rule monitors." + }, + "metricNamespace": { + "type": "string", + "description": "the namespace of the metric that defines what the rule monitors." + }, + "metricResourceUri": { + "type": "string", + "description": "the resource identifier of the resource the rule monitors." + }, + "metricResourceLocation": { + "type": "string", + "description": "the location of the resource the rule monitors." + }, + "timeGrain": { + "type": "string", + "format": "duration", + "description": "the granularity of metrics the rule monitors. Must be one of the predefined values returned from metric definitions for the metric. Must be between 12 hours and 1 minute." + }, + "statistic": { + "type": "string", + "description": "the metric statistic type. How the metrics from multiple instances are combined.", + "enum": [ + "Average", + "Min", + "Max", + "Sum", + "Count" + ], + "x-ms-enum": { + "name": "MetricStatisticType", + "modelAsString": false + } + }, + "timeWindow": { + "type": "string", + "format": "duration", + "description": "the range of time in which instance data is collected. This value must be greater than the delay in metric collection, which can vary from resource-to-resource. Must be between 12 hours and 5 minutes." + }, + "timeAggregation": { + "type": "string", + "description": "time aggregation type. How the data that is collected should be combined over time. The default value is Average.", + "enum": [ + "Average", + "Minimum", + "Maximum", + "Total", + "Count", + "Last" + ], + "x-ms-enum": { + "name": "TimeAggregationType", + "modelAsString": false + } + }, + "operator": { + "type": "string", + "description": "the operator that is used to compare the metric data and the threshold.", + "enum": [ + "Equals", + "NotEquals", + "GreaterThan", + "GreaterThanOrEqual", + "LessThan", + "LessThanOrEqual" + ], + "x-ms-enum": { + "name": "ComparisonOperationType", + "modelAsString": false + } + }, + "threshold": { + "type": "number", + "format": "double", + "description": "the threshold of the metric that triggers the scale action." + }, + "dimensions": { + "type": "array", + "items": { + "$ref": "#/definitions/ScaleRuleMetricDimension" + }, + "description": "List of dimension conditions. For example: [{\"DimensionName\":\"AppName\",\"Operator\":\"Equals\",\"Values\":[\"App1\"]},{\"DimensionName\":\"Deployment\",\"Operator\":\"Equals\",\"Values\":[\"default\"]}]." + }, + "dividePerInstance": { + "type": "boolean", + "description": "a value indicating whether metric should divide per instance." + } + }, + "description": "The trigger that results in a scaling action." + }, + "ScaleAction": { + "required": [ + "direction", + "type", + "cooldown" + ], + "properties": { + "direction": { + "type": "string", + "description": "the scale direction. Whether the scaling action increases or decreases the number of instances.", + "enum": [ + "None", + "Increase", + "Decrease" + ], + "x-ms-enum": { + "name": "ScaleDirection", + "modelAsString": false + } + }, + "type": { + "type": "string", + "description": "the type of action that should occur when the scale rule fires.", + "enum": [ + "ChangeCount", + "PercentChangeCount", + "ExactCount", + "ServiceAllowedNextValue" + ], + "x-ms-enum": { + "name": "ScaleType", + "modelAsString": false + } + }, + "value": { + "type": "string", + "description": "the number of instances that are involved in the scaling action. This value must be 1 or greater. The default value is 1.", + "default": "1" + }, + "cooldown": { + "type": "string", + "format": "duration", + "description": "the amount of time to wait since the last scaling action before this action occurs. It must be between 1 week and 1 minute in ISO 8601 format." + } + }, + "description": "The parameters for the scaling action." + }, + "ScaleRule": { + "required": [ + "scaleAction", + "metricTrigger" + ], + "properties": { + "metricTrigger": { + "$ref": "#/definitions/MetricTrigger", + "description": "the trigger that results in a scaling action." + }, + "scaleAction": { + "$ref": "#/definitions/ScaleAction", + "description": "the parameters for the scaling action." + } + }, + "description": "A rule that provide the triggers and parameters for the scaling action." + }, + "TimeWindow": { + "properties": { + "timeZone": { + "type": "string", + "description": "the timezone of the start and end times for the profile. Some examples of valid time zones are: Dateline Standard Time, UTC-11, Hawaiian Standard Time, Alaskan Standard Time, Pacific Standard Time (Mexico), Pacific Standard Time, US Mountain Standard Time, Mountain Standard Time (Mexico), Mountain Standard Time, Central America Standard Time, Central Standard Time, Central Standard Time (Mexico), Canada Central Standard Time, SA Pacific Standard Time, Eastern Standard Time, US Eastern Standard Time, Venezuela Standard Time, Paraguay Standard Time, Atlantic Standard Time, Central Brazilian Standard Time, SA Western Standard Time, Pacific SA Standard Time, Newfoundland Standard Time, E. South America Standard Time, Argentina Standard Time, SA Eastern Standard Time, Greenland Standard Time, Montevideo Standard Time, Bahia Standard Time, UTC-02, Mid-Atlantic Standard Time, Azores Standard Time, Cape Verde Standard Time, Morocco Standard Time, UTC, GMT Standard Time, Greenwich Standard Time, W. Europe Standard Time, Central Europe Standard Time, Romance Standard Time, Central European Standard Time, W. Central Africa Standard Time, Namibia Standard Time, Jordan Standard Time, GTB Standard Time, Middle East Standard Time, Egypt Standard Time, Syria Standard Time, E. Europe Standard Time, South Africa Standard Time, FLE Standard Time, Turkey Standard Time, Israel Standard Time, Kaliningrad Standard Time, Libya Standard Time, Arabic Standard Time, Arab Standard Time, Belarus Standard Time, Russian Standard Time, E. Africa Standard Time, Iran Standard Time, Arabian Standard Time, Azerbaijan Standard Time, Russia Time Zone 3, Mauritius Standard Time, Georgian Standard Time, Caucasus Standard Time, Afghanistan Standard Time, West Asia Standard Time, Ekaterinburg Standard Time, Pakistan Standard Time, India Standard Time, Sri Lanka Standard Time, Nepal Standard Time, Central Asia Standard Time, Bangladesh Standard Time, N. Central Asia Standard Time, Myanmar Standard Time, SE Asia Standard Time, North Asia Standard Time, China Standard Time, North Asia East Standard Time, Singapore Standard Time, W. Australia Standard Time, Taipei Standard Time, Ulaanbaatar Standard Time, Tokyo Standard Time, Korea Standard Time, Yakutsk Standard Time, Cen. Australia Standard Time, AUS Central Standard Time, E. Australia Standard Time, AUS Eastern Standard Time, West Pacific Standard Time, Tasmania Standard Time, Magadan Standard Time, Vladivostok Standard Time, Russia Time Zone 10, Central Pacific Standard Time, Russia Time Zone 11, New Zealand Standard Time, UTC+12, Fiji Standard Time, Kamchatka Standard Time, Tonga Standard Time, Samoa Standard Time, Line Islands Standard Time" + }, + "start": { + "type": "string", + "format": "date-time", + "description": "the start time for the profile in ISO 8601 format." + }, + "end": { + "type": "string", + "format": "date-time", + "description": "the end time for the profile in ISO 8601 format." + } + }, + "required": [ + "start", + "end" + ], + "description": "A specific date-time for the profile." + }, + "RecurrentSchedule": { + "required": [ + "timeZone", + "days", + "hours", + "minutes" + ], + "properties": { + "timeZone": { + "type": "string", + "description": "the timezone for the hours of the profile. Some examples of valid time zones are: Dateline Standard Time, UTC-11, Hawaiian Standard Time, Alaskan Standard Time, Pacific Standard Time (Mexico), Pacific Standard Time, US Mountain Standard Time, Mountain Standard Time (Mexico), Mountain Standard Time, Central America Standard Time, Central Standard Time, Central Standard Time (Mexico), Canada Central Standard Time, SA Pacific Standard Time, Eastern Standard Time, US Eastern Standard Time, Venezuela Standard Time, Paraguay Standard Time, Atlantic Standard Time, Central Brazilian Standard Time, SA Western Standard Time, Pacific SA Standard Time, Newfoundland Standard Time, E. South America Standard Time, Argentina Standard Time, SA Eastern Standard Time, Greenland Standard Time, Montevideo Standard Time, Bahia Standard Time, UTC-02, Mid-Atlantic Standard Time, Azores Standard Time, Cape Verde Standard Time, Morocco Standard Time, UTC, GMT Standard Time, Greenwich Standard Time, W. Europe Standard Time, Central Europe Standard Time, Romance Standard Time, Central European Standard Time, W. Central Africa Standard Time, Namibia Standard Time, Jordan Standard Time, GTB Standard Time, Middle East Standard Time, Egypt Standard Time, Syria Standard Time, E. Europe Standard Time, South Africa Standard Time, FLE Standard Time, Turkey Standard Time, Israel Standard Time, Kaliningrad Standard Time, Libya Standard Time, Arabic Standard Time, Arab Standard Time, Belarus Standard Time, Russian Standard Time, E. Africa Standard Time, Iran Standard Time, Arabian Standard Time, Azerbaijan Standard Time, Russia Time Zone 3, Mauritius Standard Time, Georgian Standard Time, Caucasus Standard Time, Afghanistan Standard Time, West Asia Standard Time, Ekaterinburg Standard Time, Pakistan Standard Time, India Standard Time, Sri Lanka Standard Time, Nepal Standard Time, Central Asia Standard Time, Bangladesh Standard Time, N. Central Asia Standard Time, Myanmar Standard Time, SE Asia Standard Time, North Asia Standard Time, China Standard Time, North Asia East Standard Time, Singapore Standard Time, W. Australia Standard Time, Taipei Standard Time, Ulaanbaatar Standard Time, Tokyo Standard Time, Korea Standard Time, Yakutsk Standard Time, Cen. Australia Standard Time, AUS Central Standard Time, E. Australia Standard Time, AUS Eastern Standard Time, West Pacific Standard Time, Tasmania Standard Time, Magadan Standard Time, Vladivostok Standard Time, Russia Time Zone 10, Central Pacific Standard Time, Russia Time Zone 11, New Zealand Standard Time, UTC+12, Fiji Standard Time, Kamchatka Standard Time, Tonga Standard Time, Samoa Standard Time, Line Islands Standard Time" + }, + "days": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the collection of days that the profile takes effect on. Possible values are Sunday through Saturday." + }, + "hours": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + }, + "description": "A collection of hours that the profile takes effect on. Values supported are 0 to 23 on the 24-hour clock (AM/PM times are not supported)." + }, + "minutes": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + }, + "description": "A collection of minutes at which the profile takes effect at." + } + }, + "description": "The scheduling constraints for when the profile begins." + }, + "Recurrence": { + "required": [ + "frequency", + "schedule" + ], + "properties": { + "frequency": { + "type": "string", + "description": "the recurrence frequency. How often the schedule profile should take effect. This value must be Week, meaning each week will have the same set of profiles. For example, to set a daily schedule, set **schedule** to every day of the week. The frequency property specifies that the schedule is repeated weekly.", + "enum": [ + "None", + "Second", + "Minute", + "Hour", + "Day", + "Week", + "Month", + "Year" + ], + "x-ms-enum": { + "name": "RecurrenceFrequency", + "modelAsString": false + } + }, + "schedule": { + "$ref": "#/definitions/RecurrentSchedule", + "description": "the scheduling constraints for when the profile begins." + } + }, + "description": "The repeating times at which this profile begins. This element is not used if the FixedDate element is used." + }, + "AutoscaleProfile": { + "required": [ + "rules", + "name", + "capacity" + ], + "properties": { + "name": { + "type": "string", + "description": "the name of the profile." + }, + "capacity": { + "$ref": "#/definitions/ScaleCapacity", + "description": "the number of instances that can be used during this profile." + }, + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/ScaleRule" + }, + "description": "the collection of rules that provide the triggers and parameters for the scaling action. A maximum of 10 rules can be specified." + }, + "fixedDate": { + "$ref": "#/definitions/TimeWindow", + "description": "the specific date-time for the profile. This element is not used if the Recurrence element is used." + }, + "recurrence": { + "$ref": "#/definitions/Recurrence", + "description": "the repeating times at which this profile begins. This element is not used if the FixedDate element is used." + } + }, + "description": "Autoscale profile." + }, + "EmailNotification": { + "properties": { + "sendToSubscriptionAdministrator": { + "type": "boolean", + "description": "a value indicating whether to send email to subscription administrator.", + "default": "false" + }, + "sendToSubscriptionCoAdministrators": { + "type": "boolean", + "description": "a value indicating whether to send email to subscription co-administrators.", + "default": "false" + }, + "customEmails": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the custom e-mails list. This value can be null or empty, in which case this attribute will be ignored." + } + }, + "description": "Email notification of an autoscale event." + }, + "WebhookNotification": { + "properties": { + "serviceUri": { + "type": "string", + "description": "the service address to receive the notification." + }, + "properties": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "a property bag of settings. This value can be empty." + } + }, + "description": "Webhook notification of an autoscale event." + }, + "AutoscaleNotification": { + "required": [ + "operation" + ], + "properties": { + "operation": { + "type": "string", + "description": "the operation associated with the notification and its value must be \"scale\"", + "enum": [ + "Scale" + ], + "x-ms-enum": { + "name": "OperationType", + "modelAsString": false + } + }, + "email": { + "$ref": "#/definitions/EmailNotification", + "description": "the email notification." + }, + "webhooks": { + "type": "array", + "items": { + "$ref": "#/definitions/WebhookNotification" + }, + "description": "the collection of webhook notifications." + } + }, + "description": "Autoscale notification." + }, + "AutoscaleSetting": { + "required": [ + "profiles" + ], + "properties": { + "profiles": { + "type": "array", + "maxItems": 20, + "items": { + "$ref": "#/definitions/AutoscaleProfile" + }, + "description": "the collection of automatic scaling profiles that specify different scaling parameters for different time periods. A maximum of 20 profiles can be specified." + }, + "notifications": { + "type": "array", + "items": { + "$ref": "#/definitions/AutoscaleNotification" + }, + "description": "the collection of notifications." + }, + "enabled": { + "type": "boolean", + "description": "the enabled flag. Specifies whether automatic scaling is enabled for the resource. The default value is 'true'.", + "default": true + }, + "name": { + "type": "string", + "description": "the name of the autoscale setting." + }, + "targetResourceUri": { + "type": "string", + "description": "the resource identifier of the resource that the autoscale setting should be added to." + }, + "targetResourceLocation": { + "type": "string", + "description": "the location of the resource that the autoscale setting should be added to." + } + }, + "description": "A setting that contains all of the configuration for the automatic scaling of a resource." + }, + "AutoscaleSettingResource": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/AutoscaleSetting", + "description": "The autoscale setting of the resource." + } + }, + "description": "The autoscale setting resource." + }, + "AutoscaleSettingResourcePatch": { + "description": "The autoscale setting object for patch operations.", + "properties": { + "tags": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/AutoscaleSetting", + "description": "The autoscale setting properties of the update operation." + } + } + }, + "AutoscaleSettingResourceCollection": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/AutoscaleSettingResource" + }, + "description": "the values for the autoscale setting resources." + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of results." + } + }, + "required": [ + "value" + ], + "description": "Represents a collection of autoscale setting resources." + }, + "ErrorResponse": { + "description": "Describes the format of Error response.", + "type": "object", + "properties": { + "code": { + "description": "Error code", + "type": "string" + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string" + } + } + }, + "ScaleRuleMetricDimension": { + "required": [ + "DimensionName", + "Operator", + "Values" + ], + "properties": { + "DimensionName": { + "type": "string", + "description": "Name of the dimension." + }, + "Operator": { + "type": "string", + "description": "the dimension operator. Only 'Equals' and 'NotEquals' are supported. 'Equals' being equal to any of the values. 'NotEquals' being not equal to all of the values", + "enum": [ + "Equals", + "NotEquals" + ], + "x-ms-enum": { + "name": "ScaleRuleMetricDimensionOperationType", + "modelAsString": true + } + }, + "Values": { + "type": "array", + "items": { + "type": "string" + }, + "description": "list of dimension values. For example: [\"App1\",\"App2\"]." + } + }, + "description": "Specifies an auto scale rule metric dimension." + } + }, + "parameters": { + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "AutoscaleSettingNameParameter": { + "name": "autoscaleSettingName", + "in": "path", + "required": true, + "type": "string", + "description": "The autoscale setting name.", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/createOrUpdateAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/createOrUpdateAutoscaleSetting.json new file mode 100644 index 000000000000..7a292aee831d --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/createOrUpdateAutoscaleSetting.json @@ -0,0 +1,451 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "resourceGroupName": "TestingMetricsScaleSet", + "autoscaleSettingName": "MySetting", + "api-version": "2014-04-01", + "parameters": { + "location": "West US", + "tags": {}, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Insights/autoscalesettings/MySetting", + "name": "MySetting", + "type": "Microsoft.Insights/autoscaleSettings", + "location": "West US", + "tags": { + "$type": "Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage" + }, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "name": "MySetting", + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + }, + "201": { + "headers": {}, + "body": { + "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/microsoft.insights/autoscalesettings/MySetting", + "name": "MySetting", + "type": "Microsoft.Insights/autoscaleSettings", + "location": "West US", + "tags": { + "$type": "Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage" + }, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "name": "MySetting", + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/deleteAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/deleteAutoscaleSetting.json new file mode 100644 index 000000000000..ab7fa641110a --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/deleteAutoscaleSetting.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "resourceGroupName": "TestingMetricsScaleSet", + "autoscaleSettingName": "MySetting", + "api-version": "2014-04-01" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/getAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/getAutoscaleSetting.json new file mode 100644 index 000000000000..16de6185ce23 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/getAutoscaleSetting.json @@ -0,0 +1,160 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "resourceGroupName": "TestingMetricsScaleSet", + "autoscaleSettingName": "MySetting", + "api-version": "2014-04-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/microsoft.insights/autoscalesettings/MySetting", + "name": "MySetting", + "type": "Microsoft.Insights/autoscaleSettings", + "location": "West US", + "tags": { + "$type": "Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage" + }, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "name": "MySetting", + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSetting.json new file mode 100644 index 000000000000..55a9bfda2f7c --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSetting.json @@ -0,0 +1,164 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "resourceGroupName": "TestingMetricsScaleSet", + "api-version": "2014-04-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/microsoft.insights/autoscalesettings/MySetting", + "name": "MySetting", + "type": "Microsoft.Insights/autoscaleSettings", + "location": "West US", + "tags": { + "$type": "Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage" + }, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "name": "MySetting", + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + ], + "nextLink": "https://management.azure.com/########-####-####-####-############$skiptoken=######" + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSettingBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSettingBySubscription.json new file mode 100644 index 000000000000..3f6eedc2bf5d --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/listAutoscaleSettingBySubscription.json @@ -0,0 +1,163 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "api-version": "2014-04-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/microsoft.insights/autoscalesettings/MySetting", + "name": "MySetting", + "type": "Microsoft.Insights/autoscaleSettings", + "location": "West US", + "tags": { + "$type": "Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage" + }, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "name": "MySetting", + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + ], + "nextLink": "https://management.azure.com/########-####-####-####-############$skiptoken=######" + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/patchAutoscaleSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/patchAutoscaleSetting.json new file mode 100644 index 000000000000..b33374520e7f --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/examples/patchAutoscaleSetting.json @@ -0,0 +1,302 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "resourceGroupName": "TestingMetricsScaleSet", + "autoscaleSettingName": "MySetting", + "api-version": "2014-04-01", + "autoscaleSettingResource": { + "tags": { + "$type": "Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary" + }, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/microsoft.insights/autoscalesettings/MySetting", + "name": "MySetting", + "type": "Microsoft.Insights/autoscaleSettings", + "location": "West US", + "tags": { + "$type": "Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary" + }, + "properties": { + "profiles": [ + { + "name": "adios", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "fixedDate": { + "timeZone": "UTC", + "start": "2015-03-05T14:00:00Z", + "end": "2015-03-05T14:30:00Z" + } + }, + { + "name": "saludos", + "capacity": { + "minimum": "1", + "maximum": "10", + "default": "1" + }, + "rules": [ + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT1M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 10.0 + }, + "scaleAction": { + "direction": "Increase", + "type": "ChangeCount", + "value": "1", + "cooldown": "PT5M" + } + }, + { + "metricTrigger": { + "metricName": "Percentage CPU", + "metricResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "timeGrain": "PT2M", + "statistic": "Average", + "timeWindow": "PT5M", + "timeAggregation": "Average", + "operator": "GreaterThan", + "threshold": 15.0 + }, + "scaleAction": { + "direction": "Decrease", + "type": "ChangeCount", + "value": "2", + "cooldown": "PT6M" + } + } + ], + "recurrence": { + "frequency": "Week", + "schedule": { + "timeZone": "UTC", + "days": [ + "1" + ], + "hours": [ + 5 + ], + "minutes": [ + 15 + ] + } + } + } + ], + "enabled": true, + "name": "MySetting", + "targetResourceUri": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/TestingMetricsScaleSet/providers/Microsoft.Compute/virtualMachineScaleSets/testingsc", + "notifications": [ + { + "operation": "Scale", + "email": { + "sendToSubscriptionAdministrator": true, + "sendToSubscriptionCoAdministrators": true, + "customEmails": [ + "gu@ms.com", + "ge@ns.net" + ] + }, + "webhooks": [ + { + "serviceUri": "http://myservice.com", + "properties": {} + } + ] + } + ] + } + } + } + } +} diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/activityLogs_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/activityLogs_API.json index dc48b4c7fa06..5e645cee8e67 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/activityLogs_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/activityLogs_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/providers/microsoft.insights/eventtypes/management/values": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Insights/eventtypes/management/values": { "get": { "tags": [ "ActivityLogs" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json index 4029ceb5d841..230c33274717 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/autoscalesettings": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings": { "get": { "description": "Lists the autoscale settings for a resource group", "tags": [ @@ -78,7 +78,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/autoscalesettings/{autoscaleSettingName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings/{autoscaleSettingName}": { "put": { "description": "Creates or updates an autoscale setting.", "tags": [ @@ -261,7 +261,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/microsoft.insights/autoscalesettings": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Insights/autoscalesettings": { "get": { "description": "Lists the autoscale settings for a subscription", "tags": [ @@ -386,6 +386,10 @@ "type": "string", "description": "the resource identifier of the resource the rule monitors." }, + "metricResourceLocation": { + "type": "string", + "description": "the location of the resource the rule monitors." + }, "timeGrain": { "type": "string", "format": "duration", @@ -398,7 +402,8 @@ "Average", "Min", "Max", - "Sum" + "Sum", + "Count" ], "x-ms-enum": { "name": "MetricStatisticType", @@ -487,7 +492,8 @@ "enum": [ "ChangeCount", "PercentChangeCount", - "ExactCount" + "ExactCount", + "ServiceAllowedNextValue" ], "x-ms-enum": { "name": "ScaleType", @@ -653,11 +659,13 @@ "properties": { "sendToSubscriptionAdministrator": { "type": "boolean", - "description": "a value indicating whether to send email to subscription administrator." + "description": "a value indicating whether to send email to subscription administrator.", + "default": "false" }, "sendToSubscriptionCoAdministrators": { "type": "boolean", - "description": "a value indicating whether to send email to subscription co-administrators." + "description": "a value indicating whether to send email to subscription co-administrators.", + "default": "false" }, "customEmails": { "type": "array", @@ -747,6 +755,10 @@ "targetResourceUri": { "type": "string", "description": "the resource identifier of the resource that the autoscale setting should be added to." + }, + "targetResourceLocation": { + "type": "string", + "description": "the location of the resource that the autoscale setting should be added to." } }, "description": "A setting that contains all of the configuration for the automatic scaling of a resource." diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/eventCategories_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/eventCategories_API.json index cfacfc35653f..564bd12e9d0b 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/eventCategories_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/eventCategories_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/providers/microsoft.insights/eventcategories": { + "/providers/Microsoft.Insights/eventcategories": { "get": { "tags": [ "EventCategories" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/operations_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/operations_API.json index 0a54dc2eae66..a05bca3254d1 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/operations_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/operations_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/providers/microsoft.insights/operations": { + "/providers/Microsoft.Insights/operations": { "get": { "tags": [ "Operations" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json index 8c2c24624270..de44ec195bb7 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/providers/microsoft.insights/eventtypes/management/values": { + "/providers/Microsoft.Insights/eventtypes/management/values": { "get": { "tags": [ "TenantActivityLogs" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2016-03-01/logProfiles_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2016-03-01/logProfiles_API.json index da57ac850e46..dd7c6175f17a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2016-03-01/logProfiles_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2016-03-01/logProfiles_API.json @@ -36,7 +36,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/providers/microsoft.insights/logprofiles/{logProfileName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Insights/logprofiles/{logProfileName}": { "delete": { "tags": [ "LogProfiles" @@ -186,7 +186,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/microsoft.insights/logprofiles": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Insights/logprofiles": { "get": { "tags": [ "LogProfiles" diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index e1ba0a364278..88b7457f80e3 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -540,6 +540,7 @@ These settings apply only when `--tag=package-2015-07-01-only` is specified on t input-file: - Microsoft.Insights/stable/2015-07-01/serviceDiagnosticsSettings_API.json - Microsoft.Insights/stable/2014-04-01/alertRules_API.json +- Microsoft.Insights/stable/2014-04-01/autoscale_API.json ``` ### Tag: package-2015-04-01-only @@ -556,6 +557,16 @@ input-file: - Microsoft.Insights/stable/2014-04-01/alertRules_API.json ``` +### Tag: package-2014-04-01-only + +These settings apply only when `--tag=package-2014-04-01-only` is specified on the command line. + +``` yaml $(tag) == 'package-2014-04-01-only' +input-file: +- Microsoft.Insights/stable/2014-04-01/alertRules_API.json +- Microsoft.Insights/stable/2014-04-01/autoscale_API.json +``` + --- # Code Generation From 14191f61a9364a922ea2ee760be75c3229ea79ec Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Mon, 10 May 2021 11:09:37 -0700 Subject: [PATCH 06/10] remove entry from wrong tag --- specification/monitor/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 88b7457f80e3..5ea036e71a4e 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -540,7 +540,6 @@ These settings apply only when `--tag=package-2015-07-01-only` is specified on t input-file: - Microsoft.Insights/stable/2015-07-01/serviceDiagnosticsSettings_API.json - Microsoft.Insights/stable/2014-04-01/alertRules_API.json -- Microsoft.Insights/stable/2014-04-01/autoscale_API.json ``` ### Tag: package-2015-04-01-only From 571079c621f1340347b4cefbcef263d5a5f8b795 Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Mon, 10 May 2021 13:44:29 -0700 Subject: [PATCH 07/10] fix boolean as string validation error --- .../Microsoft.Insights/stable/2015-04-01/autoscale_API.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json index 230c33274717..9d8575d0e87c 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/autoscale_API.json @@ -660,12 +660,12 @@ "sendToSubscriptionAdministrator": { "type": "boolean", "description": "a value indicating whether to send email to subscription administrator.", - "default": "false" + "default": false }, "sendToSubscriptionCoAdministrators": { "type": "boolean", "description": "a value indicating whether to send email to subscription co-administrators.", - "default": "false" + "default": false }, "customEmails": { "type": "array", From a3cd7d56f965a421efdf853bc24b1508a1a79422 Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Tue, 11 May 2021 13:34:36 -0700 Subject: [PATCH 08/10] validation fix --- .../Microsoft.Insights/stable/2014-04-01/autoscale_API.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json index 197c66c827b0..e1d03b11ea28 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2014-04-01/autoscale_API.json @@ -660,12 +660,12 @@ "sendToSubscriptionAdministrator": { "type": "boolean", "description": "a value indicating whether to send email to subscription administrator.", - "default": "false" + "default": false }, "sendToSubscriptionCoAdministrators": { "type": "boolean", "description": "a value indicating whether to send email to subscription co-administrators.", - "default": "false" + "default": false }, "customEmails": { "type": "array", From 29731d231b726305ca165595b49c9b5341c38e96 Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Tue, 22 Jun 2021 10:58:54 -0700 Subject: [PATCH 09/10] added missing lifter changes --- .../preview/2021-05-01-preview/diagnosticsSettings_API.json | 4 ++++ .../examples/createOrUpdateDiagnosticSetting.json | 2 ++ .../createOrUpdateManagementGroupDiagnosticSetting.json | 2 ++ .../examples/createOrUpdateSubscriptionDiagnosticSetting.json | 2 ++ .../2021-05-01-preview/examples/getDiagnosticSetting.json | 1 + .../examples/getManagementGroupDiagnosticSetting.json | 1 + .../examples/getSubscriptionDiagnosticSetting.json | 1 + .../2021-05-01-preview/examples/listDiagnosticSettings.json | 1 + .../examples/listManagementGroupDiagnosticSettings.json | 1 + .../examples/listSubscriptionDiagnosticSettings.json | 1 + .../managementGroupDiagnosticSettings_API.json | 4 ++++ .../subscriptionDiagnosticsSettings_API.json | 4 ++++ 12 files changed, 24 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json index 822adfa7fb76..5489b5fb0239 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json @@ -307,6 +307,10 @@ "type": "string", "description": "The full ARM resource ID of the Log Analytics workspace to which you would like to send Diagnostic Logs. Example: /subscriptions/4b9e8510-67ab-4e9a-95a9-e2f1e570ea9c/resourceGroups/insights-integration/providers/Microsoft.OperationalInsights/workspaces/viruela2" }, + "marketplacePartnerId": { + "type": "string", + "description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs." + }, "logAnalyticsDestinationType": { "type": "string", "description": "A string indicating whether the export to Log Analytics should use the default destination type, i.e. AzureDiagnostics, or use a destination type constructed as follows: _. Possible values are: Dedicated and null (null is default.)" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateDiagnosticSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateDiagnosticSetting.json index 7259c54f1267..1022a325dc80 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateDiagnosticSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateDiagnosticSetting.json @@ -9,6 +9,7 @@ "workspaceId": "", "eventHubAuthorizationRuleId": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", "eventHubName": "myeventhub", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "metrics": [ { "category": "WorkflowMetrics", @@ -45,6 +46,7 @@ "workspaceId": "", "eventHubAuthorizationRuleId": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", "eventHubName": "myeventhub", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "metrics": [ { "category": "WorkflowMetrics", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateManagementGroupDiagnosticSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateManagementGroupDiagnosticSetting.json index 752076380c4e..f961d14f7cb4 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateManagementGroupDiagnosticSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateManagementGroupDiagnosticSetting.json @@ -9,6 +9,7 @@ "workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", "eventHubName": "myeventhub", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", @@ -29,6 +30,7 @@ "storageAccountId": "/subscriptions/bfaef57f-297e-4210-bfe5-27c18cc671f7/resourceGroups/FuncAppRunners/providers/Microsoft.Storage/storageAccounts/testpersonalb6a5", "workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateSubscriptionDiagnosticSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateSubscriptionDiagnosticSetting.json index d629b073eec0..b89c868e139d 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateSubscriptionDiagnosticSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateSubscriptionDiagnosticSetting.json @@ -9,6 +9,7 @@ "workspaceId": "", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", "eventHubName": "myeventhub", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", @@ -29,6 +30,7 @@ "storageAccountId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1", "workspaceId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.OperationalInsights/workspaces/test1", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getDiagnosticSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getDiagnosticSetting.json index 8178a3b8aea4..d7df66a37f98 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getDiagnosticSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getDiagnosticSetting.json @@ -15,6 +15,7 @@ "storageAccountId": "/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1", "workspaceId": "", "eventHubAuthorizationRuleId": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "metrics": [ { "category": "WorkflowMetrics", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getManagementGroupDiagnosticSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getManagementGroupDiagnosticSetting.json index 7ef8c7ba66ea..79c5ccbe2bfe 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getManagementGroupDiagnosticSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getManagementGroupDiagnosticSetting.json @@ -15,6 +15,7 @@ "storageAccountId": "/subscriptions/bfaef57f-297e-4210-bfe5-27c18cc671f7/resourceGroups/FuncAppRunners/providers/Microsoft.Storage/storageAccounts/testpersonalb6a5", "workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getSubscriptionDiagnosticSetting.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getSubscriptionDiagnosticSetting.json index 4c206d585d0b..3b43082b6a16 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getSubscriptionDiagnosticSetting.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getSubscriptionDiagnosticSetting.json @@ -15,6 +15,7 @@ "storageAccountId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1", "workspaceId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.OperationalInsights/workspaces/test1", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listDiagnosticSettings.json index 2e3889fabe01..4c2174d3335c 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listDiagnosticSettings.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listDiagnosticSettings.json @@ -16,6 +16,7 @@ "storageAccountId": "/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1", "eventHubAuthorizationRuleId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/andy1101/providers/Microsoft.EventHub/namespaces/andy1101/authorizationrules/RootManageSharedAccessKey", "workspaceId": "", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "metrics": [ { "category": "WorkflowMetrics", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listManagementGroupDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listManagementGroupDiagnosticSettings.json index 2634c3f71104..c57dda49002c 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listManagementGroupDiagnosticSettings.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listManagementGroupDiagnosticSettings.json @@ -16,6 +16,7 @@ "storageAccountId": "/subscriptions/bfaef57f-297e-4210-bfe5-27c18cc671f7/resourceGroups/FuncAppRunners/providers/Microsoft.Storage/storageAccounts/testpersonalb6a5", "workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listSubscriptionDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listSubscriptionDiagnosticSettings.json index c5fe82116cf9..257da7f88c47 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listSubscriptionDiagnosticSettings.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/listSubscriptionDiagnosticSettings.json @@ -16,6 +16,7 @@ "storageAccountId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1", "workspaceId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.OperationalInsights/workspaces/test1", "eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule", + "marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1", "logs": [ { "categoryGroup": "allLogs", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/managementGroupDiagnosticSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/managementGroupDiagnosticSettings_API.json index 9b80bdfbcf1d..f71244209936 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/managementGroupDiagnosticSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/managementGroupDiagnosticSettings_API.json @@ -249,6 +249,10 @@ "workspaceId": { "type": "string", "description": "The full ARM resource ID of the Log Analytics workspace to which you would like to send Diagnostic Logs. Example: /subscriptions/4b9e8510-67ab-4e9a-95a9-e2f1e570ea9c/resourceGroups/insights-integration/providers/Microsoft.OperationalInsights/workspaces/viruela2" + }, + "marketplacePartnerId": { + "type": "string", + "description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs." } }, "description": "The management group diagnostic settings." diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/subscriptionDiagnosticsSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/subscriptionDiagnosticsSettings_API.json index 25ec019e392b..7d0532a7a0f4 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/subscriptionDiagnosticsSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2021-05-01-preview/subscriptionDiagnosticsSettings_API.json @@ -249,6 +249,10 @@ "workspaceId": { "type": "string", "description": "The full ARM resource ID of the Log Analytics workspace to which you would like to send Diagnostic Logs. Example: /subscriptions/4b9e8510-67ab-4e9a-95a9-e2f1e570ea9c/resourceGroups/insights-integration/providers/Microsoft.OperationalInsights/workspaces/viruela2" + }, + "marketplacePartnerId": { + "type": "string", + "description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs." } }, "description": "The subscription diagnostic settings." From 4f20abacd04e13ff361d05d20066b64f3d30c4b3 Mon Sep 17 00:00:00 2001 From: LeoVannelli Date: Wed, 30 Jun 2021 10:38:51 -0700 Subject: [PATCH 10/10] add recommended linter suppression --- specification/monitor/resource-manager/readme.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 3a6a5d95b80f..2ab5a75b5cc3 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -739,6 +739,15 @@ directive: - suppress: DefaultErrorResponseSchema from: metricDefinitions_API.json reason: 'Updating the error response to the new format would be a breaking change.' + - suppress: OperationsAPIImplementation + from: subscriptionDiagnosticsSettings_API.json + where: $.paths + reason: 'Operations API is defined in a separate swagger spec for Microsoft.Insights namespace (https://github.com/Azure/azure-rest-api-specs/blob/master/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/operations_API.json)' + - suppress: OperationsAPIImplementation + from: autoscale_API.json + where: $.paths + reason: 'Operations API is defined in a separate swagger spec for Microsoft.Insights namespace (https://github.com/Azure/azure-rest-api-specs/blob/master/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/operations_API.json)' + ``` ``` yaml $(go) || $(csharp) || $(validation) || $(typescript)