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 b021b89a2571..36545c1f2e3f 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 display name of the alert rule" + }, "severity": { "type": "number", "description": "Severity of the alert. Should be an integer between [0-4]. Value of 0 is severest", @@ -369,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": { @@ -405,6 +414,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/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", 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 a7815e44b0e8..ca1aa08958b6 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": { @@ -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": [ @@ -520,10 +530,13 @@ "ConditionalOperator": { "type": "string", "enum": [ + "GreaterThanOrEqual", + "LessThanOrEqual", "GreaterThan", "LessThan", "Equal" ], + "default": "GreaterThanOrEqual", "x-ms-enum": { "name": "ConditionalOperator", "modelAsString": true @@ -536,6 +549,7 @@ "Consecutive", "Total" ], + "default": "Consecutive", "x-ms-enum": { "name": "metricTriggerType", "modelAsString": true @@ -575,6 +589,10 @@ "type": "string", "description": "The description of the Log Search rule." }, + "displayName": { + "type": "string", + "description": "The display name 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", @@ -765,6 +783,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", diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 9832b3a3505c..a8ad386d03f9 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -612,6 +612,10 @@ directive: from: metricAlert_API.json where: $.definitions.MetricAlertResource reason: 'Action is expected to receive a subclass of Resource' + - from : scheduledQueryRule_API.json + suppress: + - OBJECT_ADDITIONAL_PROPERTIES + reason: "false alarm" ``` ### Tag: profile-hybrid-2019-03-01