From 1ac23572a00de49b9dc9539148a90a6138288397 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Wed, 2 Dec 2020 12:01:04 +0200 Subject: [PATCH 01/20] Update scheduledQueryRule_API.json Fixed Error contract to fit the real structure --- .../2018-04-16/scheduledQueryRule_API.json | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index e39dca56bcb6..639cdce060a5 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -68,7 +68,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorContract" } }, "200": { @@ -120,7 +120,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorContract" } }, "200": { @@ -169,7 +169,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorContract" } }, "200": { @@ -209,7 +209,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorContract" } }, "200": { @@ -248,7 +248,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorContract" } }, "200": { @@ -294,7 +294,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorContract" } }, "200": { @@ -765,6 +765,16 @@ "criteria" ] }, + "ErrorContract": { + "description": "Describes the format of Error response.", + "type": "object", + "properties": { + "error": { + "description": "The error details.", + "$ref": "#/definitions/ErrorResponse" + } + } + }, "ErrorResponse": { "description": "Describes the format of Error response.", "type": "object", From 4b14a00ac951f20471b5f9c1eaac782beffa0253 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 6 Dec 2020 09:14:56 +0200 Subject: [PATCH 02/20] Update createOrUpdateScheduledQueryRules.json Removed readonly properties from example parameters --- .../2018-04-16/examples/createOrUpdateScheduledQueryRules.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json index da4ba2df9eb5..e2f6329cab91 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json @@ -10,8 +10,6 @@ "properties": { "description": "log alert description", "enabled": "true", - "lastUpdatedTime": "2017-06-23T21:23:52.0221265Z", - "provisioningState": "Succeeded", "source": { "query": "Heartbeat | summarize AggregatedValue = count() by bin(TimeGenerated, 5m)", "dataSourceId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.OperationalInsights/workspaces/sampleWorkspace", From be58c304b15fd37e8e256525501c31b1afaf41a4 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 6 Dec 2020 09:34:17 +0200 Subject: [PATCH 03/20] Update scheduledQueryRule_API.json Added property "displayName" to the structure --- .../stable/2018-04-16/scheduledQueryRule_API.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index 639cdce060a5..092e47a7bd7e 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -575,6 +575,10 @@ "type": "string", "description": "The description of the Log Search rule." }, + "displayName": { + "type": "string", + "description": "The displayName of the alert rule" + }, "enabled": { "type": "string", "description": "The flag which indicates whether the Log Search rule is enabled. Value should be true or false", From e6fae4773de5c0bbe0f2dd767bac83ed4f3e2228 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 6 Dec 2020 13:44:43 +0200 Subject: [PATCH 04/20] Fix to item ; https://portal.azure-devex-tools.com/amekpis/correctness/detail?errorId=A596EA9C-C8E9-4A72-90FE-4689DFCBA3F6 Fix to item ; https://portal.azure-devex-tools.com/amekpis/correctness/detail?errorId=A596EA9C-C8E9-4A72-90FE-4689DFCBA3F6 --- .../2020-05-01-preview/scheduledQueryRule_API.json | 10 ++++++++++ .../stable/2018-04-16/scheduledQueryRule_API.json | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json index 6d30d3fa0ac5..23de814c958f 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json @@ -405,6 +405,16 @@ "properties" ], "properties": { + "kind" :{ + "type": "string", + "readOnly": true, + "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value." + }, + "etag" :{ + "type": "string", + "readOnly": true, + "description" : "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/ScheduledQueryRuleProperties", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index e39dca56bcb6..ef72e038fe9a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -347,6 +347,16 @@ "type": "string" }, "description": "Resource tags" + }, + "kind" :{ + "type": "string", + "readOnly": true, + "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value." + }, + "etag" :{ + "type": "string", + "readOnly": true, + "description" : "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " } }, "required": [ @@ -524,6 +534,7 @@ "LessThan", "Equal" ], + "default" : "GreaterThanOrEqual", "x-ms-enum": { "name": "ConditionalOperator", "modelAsString": true @@ -536,6 +547,7 @@ "Consecutive", "Total" ], + "default" : "Consecutive", "x-ms-enum": { "name": "metricTriggerType", "modelAsString": true From 2e8067a56820613afbe00fafe1995a9f21a4bec5 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 6 Dec 2020 14:09:53 +0200 Subject: [PATCH 05/20] added display name to the new API version --- .../preview/2020-05-01-preview/scheduledQueryRule_API.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json index 6d30d3fa0ac5..0d89001c29f9 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json @@ -333,6 +333,10 @@ "type": "string", "description": "The description of the scheduled query rule." }, + "displayName": { + "type": "string", + "description": "The displayName of the alert rule" + }, "severity": { "type": "number", "description": "Severity of the alert. Should be an integer between [0-4]. Value of 0 is severest", From c6189e58749e038126fa5da57216c04828f5ec88 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 6 Dec 2020 14:12:31 +0200 Subject: [PATCH 06/20] Fixed descriptions --- .../preview/2020-05-01-preview/scheduledQueryRule_API.json | 2 +- .../stable/2018-04-16/scheduledQueryRule_API.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json index 0d89001c29f9..9b7bd584cd29 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json @@ -335,7 +335,7 @@ }, "displayName": { "type": "string", - "description": "The displayName of the alert rule" + "description": "The display name of the alert rule" }, "severity": { "type": "number", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index 092e47a7bd7e..f8072f5581af 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -577,7 +577,7 @@ }, "displayName": { "type": "string", - "description": "The displayName of the alert rule" + "description": "The display name of the alert rule" }, "enabled": { "type": "string", From d23f09ea03dec79a81a58dee29b96f46697ad78a Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 6 Dec 2020 14:31:19 +0200 Subject: [PATCH 07/20] Added OverrideQueryTimeRange to Swagger on new API version --- .../preview/2020-05-01-preview/scheduledQueryRule_API.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json index 9b7bd584cd29..3994f0252e93 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json @@ -353,7 +353,7 @@ } }, "enabled": { - "type": "boolean", + "type": "string", "description": "The flag which indicates whether this scheduled query rule is enabled. Value should be true or false" }, "scopes": { @@ -373,6 +373,11 @@ "format": "duration", "description": "The period of time (in ISO 8601 duration format) on which the Alert query will be executed (bin size)." }, + "OverrideQueryTimeRange": { + "type": "string", + "format": "duration", + "description": "If specified then overrides the query time range (default is WindowSize*NumberOfEvaluationPeriods)" + }, "targetResourceTypes": { "type": "array", "items": { From ca0910fb8a2cf4b04f9c9168017d3c6bc77c7f41 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 6 Dec 2020 18:16:53 +0200 Subject: [PATCH 08/20] returned enabled property back to bool --- .../preview/2020-05-01-preview/scheduledQueryRule_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json index 3994f0252e93..860f8bb49898 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json @@ -353,7 +353,7 @@ } }, "enabled": { - "type": "string", + "type": "boolean", "description": "The flag which indicates whether this scheduled query rule is enabled. Value should be true or false" }, "scopes": { From 504c2051da44450c2e794b49b983af64551a2358 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Mon, 7 Dec 2020 14:34:01 +0200 Subject: [PATCH 09/20] Update scheduledQueryRule_API.json Added missing enum values to ConditionalOperator property --- .../stable/2018-04-16/scheduledQueryRule_API.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index 9c38b26525b5..b138fa7a460b 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -530,6 +530,8 @@ "ConditionalOperator": { "type": "string", "enum": [ + "GreaterThanOrEqual", + "LessThanOrEqual", "GreaterThan", "LessThan", "Equal" From 98e27ba2cc23296636bd5ffbc8ebe74d2c4913d1 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Mon, 7 Dec 2020 16:22:47 +0200 Subject: [PATCH 10/20] Update scheduledQueryRule_API.json Aligned RP name to pascal format --- .../stable/2018-04-16/scheduledQueryRule_API.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index b138fa7a460b..bba681d43096 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules/{ruleName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules/{ruleName}": { "put": { "description": "Creates or updates an log search rule.", "tags": [ @@ -226,7 +226,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/microsoft.insights/scheduledQueryRules": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Insights/scheduledQueryRules": { "get": { "tags": [ "scheduledQueryRules" @@ -269,7 +269,7 @@ "x-ms-odata": "#/definitions/LogSearchRuleResource" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules": { "get": { "tags": [ "scheduledQueryRules" From efea44f04ebe81c54c81c27ff28a402835704265 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Tue, 8 Dec 2020 17:04:37 +0200 Subject: [PATCH 11/20] revert lindent correvction to avoid breaking chnage --- .../stable/2018-04-16/scheduledQueryRule_API.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index bba681d43096..b138fa7a460b 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules/{ruleName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules/{ruleName}": { "put": { "description": "Creates or updates an log search rule.", "tags": [ @@ -226,7 +226,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Insights/scheduledQueryRules": { + "/subscriptions/{subscriptionId}/providers/microsoft.insights/scheduledQueryRules": { "get": { "tags": [ "scheduledQueryRules" @@ -269,7 +269,7 @@ "x-ms-odata": "#/definitions/LogSearchRuleResource" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules": { "get": { "tags": [ "scheduledQueryRules" From 6d579df4f256a731c383d4025577c55cd763d0d9 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Thu, 31 Dec 2020 13:27:51 +0200 Subject: [PATCH 12/20] run prettier and fixed SubscriptionIdParameter --- .../subscriptionDiagnosticsSettings_API.json | 4 +--- .../2020-05-01-preview/scheduledQueryRule_API.json | 6 +++--- .../stable/2018-04-16/scheduledQueryRule_API.json | 10 +++++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json index 06da44d826a0..af80b7dcf32f 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json @@ -325,9 +325,7 @@ "in": "path", "required": true, "type": "string", - "description": "The subscription id.", - "x-ms-parameter-location": "method", - "x-ms-skip-url-encoding": true + "description": "The Azure subscription Id." }, "NameParameter": { "name": "name", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json index fcdebcf241a2..2b4f4bd066f9 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2020-05-01-preview/scheduledQueryRule_API.json @@ -414,15 +414,15 @@ "properties" ], "properties": { - "kind" :{ + "kind": { "type": "string", "readOnly": true, "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value." }, - "etag" :{ + "etag": { "type": "string", "readOnly": true, - "description" : "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " + "description": "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " }, "properties": { "x-ms-client-flatten": true, diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json index b138fa7a460b..8888198ad002 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json @@ -348,15 +348,15 @@ }, "description": "Resource tags" }, - "kind" :{ + "kind": { "type": "string", "readOnly": true, "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type; e.g. ApiApps are a kind of Microsoft.Web/sites type. If supported, the resource provider must validate and persist this value." }, - "etag" :{ + "etag": { "type": "string", "readOnly": true, - "description" : "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " + "description": "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention. Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. " } }, "required": [ @@ -536,7 +536,7 @@ "LessThan", "Equal" ], - "default" : "GreaterThanOrEqual", + "default": "GreaterThanOrEqual", "x-ms-enum": { "name": "ConditionalOperator", "modelAsString": true @@ -549,7 +549,7 @@ "Consecutive", "Total" ], - "default" : "Consecutive", + "default": "Consecutive", "x-ms-enum": { "name": "metricTriggerType", "modelAsString": true From 088cea02d85c82347090b086b85cc6568e2b4260 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Mon, 11 Jan 2021 11:13:12 +0200 Subject: [PATCH 13/20] revert subscripton id to the former description --- .../2017-05-01-preview/subscriptionDiagnosticsSettings_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json index af80b7dcf32f..b4785b62d0c7 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json @@ -325,7 +325,7 @@ "in": "path", "required": true, "type": "string", - "description": "The Azure subscription Id." + "description": "The subscription Id." }, "NameParameter": { "name": "name", From 5e18e0e12491b4d6fb2e4256115e422193bdc237 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 17 Jan 2021 12:07:42 +0200 Subject: [PATCH 14/20] aligned diagnosticSettings with master --- .../subscriptionDiagnosticsSettings_API.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json index c5e14ad1e5ad..1c23ffa735b1 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2017-05-01-preview/subscriptionDiagnosticsSettings_API.json @@ -313,20 +313,6 @@ } }, "parameters": { - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." - }, - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The subscription Id." - }, "NameParameter": { "name": "name", "in": "path", From 00ccd7c74189f195be565b6e5d3a6f8ccbf7746f Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Wed, 20 Jan 2021 17:02:21 +0200 Subject: [PATCH 15/20] removed locaiton from example --- .../2018-04-16/examples/createOrUpdateScheduledQueryRules.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json index e2f6329cab91..cf091c655723 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json @@ -5,7 +5,6 @@ "ruleName": "logalertfoo", "api-version": "2018-04-16", "parameters": { - "location": "eastus", "tags": {}, "properties": { "description": "log alert description", From 527c5dbbe5bff75dd33dbcb344425f8c18dd6f4a Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Sun, 24 Jan 2021 10:57:30 +0200 Subject: [PATCH 16/20] returned location to example --- .../2018-04-16/examples/createOrUpdateScheduledQueryRules.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json index cf091c655723..e2f6329cab91 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2018-04-16/examples/createOrUpdateScheduledQueryRules.json @@ -5,6 +5,7 @@ "ruleName": "logalertfoo", "api-version": "2018-04-16", "parameters": { + "location": "eastus", "tags": {}, "properties": { "description": "log alert description", From 0395af7fad0d79bd3f8b3ceaf5578d472f52b696 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Mon, 25 Jan 2021 08:39:08 +0200 Subject: [PATCH 17/20] supress false alaram OBJECT_ADDITIONAL_PROPERTIES error --- specification/monitor/resource-manager/readme.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index cb086f714bea..f3fa8fb05dbb 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -599,6 +599,13 @@ directive: - suppress: R4007 from: metricBaselines_API.json reason: 'Updating the error response to the new format would be a breaking change.' + -from : scheduledQueryRule_API.json + where: + - $..paths["/stable/2018-04-16/scheduledQueryRule_API.json"] + from : scheduledQueryRule_API.json + suppress: + - OBJECT_ADDITIONAL_PROPERTIES + reason: "false alarm" ``` ### Tag: profile-hybrid-2019-03-01 From e541ec84ce4319c543473fa9262a3d7666f6eed4 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Mon, 25 Jan 2021 08:41:27 +0200 Subject: [PATCH 18/20] fix suppression --- 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 f3fa8fb05dbb..ee97110ad5ca 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -602,7 +602,6 @@ directive: -from : scheduledQueryRule_API.json where: - $..paths["/stable/2018-04-16/scheduledQueryRule_API.json"] - from : scheduledQueryRule_API.json suppress: - OBJECT_ADDITIONAL_PROPERTIES reason: "false alarm" From cd57300e7a17dd2f89717eda042e031386f9569d Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Mon, 25 Jan 2021 09:04:21 +0200 Subject: [PATCH 19/20] fix merge conflict --- specification/monitor/resource-manager/readme.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index ee97110ad5ca..022f624d7da2 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -605,6 +605,17 @@ directive: suppress: - OBJECT_ADDITIONAL_PROPERTIES reason: "false alarm" + - suppress: R4007 + from: alertRules_API.json + reason: 'Updating the error response to the new format would be a breaking change.' + - suppress: OBJECT_ADDITIONAL_PROPERTIES + from: alertRules_API.json + where: $.definitions.AlertRuleResource + reason: 'Action is expected to receive a subclass of Resource' + - suppress: OBJECT_ADDITIONAL_PROPERTIES + from: metricAlert_API.json + where: $.definitions.MetricAlertResource + reason: 'Action is expected to receive a subclass of Resource' ``` ### Tag: profile-hybrid-2019-03-01 From 39fb8a0426325212b94a74bfa898b037862ff973 Mon Sep 17 00:00:00 2001 From: Adi Klinger Date: Mon, 25 Jan 2021 09:38:22 +0200 Subject: [PATCH 20/20] removed where clause --- specification/monitor/resource-manager/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index d9570a152e60..a8ad386d03f9 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -613,8 +613,6 @@ directive: where: $.definitions.MetricAlertResource reason: 'Action is expected to receive a subclass of Resource' - from : scheduledQueryRule_API.json - where: - - $..paths["/stable/2018-04-16/scheduledQueryRule_API.json"] suppress: - OBJECT_ADDITIONAL_PROPERTIES reason: "false alarm"