From 00a5689e14e49f0c822c7e5a9807982ec2ecda45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Calder=C3=B3n=5FMeza?= Date: Wed, 7 Feb 2018 10:35:44 -0800 Subject: [PATCH 1/7] [Monitor] Make all attributes of EventData class readonly (#2254) --- .../stable/2015-04-01/activityLogs_API.json | 25 ++++++++++++++++++- .../2015-04-01/tenantActivityLogs_API.json | 25 ++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) 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 5da3a86792fe..016d1aa9f4e8 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 @@ -216,12 +216,13 @@ "description": "The Http request info." }, "EventData": { - "required": [ "level", "eventTimestamp", "submissionTimestamp" ], "properties": { "authorization": { + "readOnly": true, "$ref": "#/definitions/SenderAuthorization" }, "claims": { + "readOnly": true, "type": "object", "additionalProperties": { "type": "string" @@ -229,38 +230,47 @@ "description": "key value pairs to identify ARM permissions." }, "caller": { + "readOnly": true, "type": "string", "description": "the email address of the user who has performed the operation, the UPN claim or SPN claim based on availability." }, "description": { + "readOnly": true, "type": "string", "description": "the description of the event." }, "id": { + "readOnly": true, "type": "string", "description": "the Id of this event as required by ARM for RBAC. It contains the EventDataID and a timestamp information." }, "eventDataId": { + "readOnly": true, "type": "string", "description": "the event data Id. This is a unique identifier for an event." }, "correlationId": { + "readOnly": true, "type": "string", "description": "the correlation Id, usually a GUID in the string format. The correlation Id is shared among the events that belong to the same uber operation." }, "eventName": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the event name. This value should not be confused with OperationName. For practical purposes, OperationName might be more appealing to end users." }, "category": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the event category." }, "httpRequest": { + "readOnly": true, "$ref": "#/definitions/HttpRequestInfo", "description": "the HTTP request info. Usually includes the 'clientRequestId', 'clientIpAddress' (IP address of the user who initiated the event) and 'method' (HTTP method e.g. PUT)." }, "level": { + "readOnly": true, "type": "string", "description": "the event level", "enum": [ @@ -276,6 +286,7 @@ } }, "resourceGroupName": { + "readOnly": true, "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790546.aspx" }, @@ -283,6 +294,7 @@ "description": "the resource group name of the impacted resource." }, "resourceProviderName": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790572.aspx" @@ -290,6 +302,7 @@ "description": "the resource provider name of the impacted resource." }, "resourceId": { + "readOnly": true, "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790569.aspx" }, @@ -297,6 +310,7 @@ "description": "the resource uri that uniquely identifies the resource that caused this event." }, "resourceType": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790569.aspx" @@ -304,14 +318,17 @@ "description": "the resource type" }, "operationId": { + "readOnly": true, "type": "string", "description": "It is usually a GUID shared among the events corresponding to single operation. This value should not be confused with EventName." }, "operationName": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the operation name." }, "properties": { + "readOnly": true, "type": "object", "additionalProperties": { "type": "string" @@ -319,28 +336,34 @@ "description": "the set of pairs (usually a Dictionary) that includes details about the event." }, "status": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "a string describing the status of the operation. Some typical values are: Started, In progress, Succeeded, Failed, Resolved." }, "subStatus": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the event sub status. Most of the time, when included, this captures the HTTP status code of the REST call. Common values are: OK (HTTP Status Code: 200), Created (HTTP Status Code: 201), Accepted (HTTP Status Code: 202), No Content (HTTP Status Code: 204), Bad Request(HTTP Status Code: 400), Not Found (HTTP Status Code: 404), Conflict (HTTP Status Code: 409), Internal Server Error (HTTP Status Code: 500), Service Unavailable (HTTP Status Code:503), Gateway Timeout (HTTP Status Code: 504)" }, "eventTimestamp": { + "readOnly": true, "type": "string", "format": "date-time", "description": "the timestamp of when the event was generated by the Azure service processing the request corresponding the event. It in ISO 8601 format." }, "submissionTimestamp": { + "readOnly": true, "type": "string", "format": "date-time", "description": "the timestamp of when the event became available for querying via this API. It is in ISO 8601 format. This value should not be confused eventTimestamp. As there might be a delay between the occurrence time of the event, and the time that the event is submitted to the Azure logging infrastructure." }, "subscriptionId": { + "readOnly": true, "type": "string", "description": "the Azure subscription Id usually a GUID." }, "tenantId": { + "readOnly": true, "type": "string", "description": "the Azure tenant Id" } 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 2005cb344643..b5de6e1a953d 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 @@ -213,12 +213,13 @@ "description": "The Http request info." }, "EventData": { - "required": [ "level", "eventTimestamp", "submissionTimestamp" ], "properties": { "authorization": { + "readOnly": true, "$ref": "#/definitions/SenderAuthorization" }, "claims": { + "readOnly": true, "type": "object", "additionalProperties": { "type": "string" @@ -226,38 +227,47 @@ "description": "key value pairs to identify ARM permissions." }, "caller": { + "readOnly": true, "type": "string", "description": "the email address of the user who has performed the operation, the UPN claim or SPN claim based on availability." }, "description": { + "readOnly": true, "type": "string", "description": "the description of the event." }, "id": { + "readOnly": true, "type": "string", "description": "the Id of this event as required by ARM for RBAC. It contains the EventDataID and a timestamp information." }, "eventDataId": { + "readOnly": true, "type": "string", "description": "the event data Id. This is a unique identifier for an event." }, "correlationId": { + "readOnly": true, "type": "string", "description": "the correlation Id, usually a GUID in the string format. The correlation Id is shared among the events that belong to the same uber operation." }, "eventName": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the event name. This value should not be confused with OperationName. For practical purposes, OperationName might be more appealing to end users." }, "category": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the event category." }, "httpRequest": { + "readOnly": true, "$ref": "#/definitions/HttpRequestInfo", "description": "the HTTP request info. Usually includes the 'clientRequestId', 'clientIpAddress' (IP address of the user who initiated the event) and 'method' (HTTP method e.g. PUT)." }, "level": { + "readOnly": true, "type": "string", "description": "the event level", "enum": [ @@ -273,6 +283,7 @@ } }, "resourceGroupName": { + "readOnly": true, "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790546.aspx" }, @@ -280,6 +291,7 @@ "description": "the resource group name of the impacted resource." }, "resourceProviderName": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790572.aspx" @@ -287,6 +299,7 @@ "description": "the resource provider name of the impacted resource." }, "resourceId": { + "readOnly": true, "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790569.aspx" }, @@ -294,6 +307,7 @@ "description": "the resource uri that uniquely identifies the resource that caused this event." }, "resourceType": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "externalDocs": { "url": "http://msdn.microsoft.com/en-us/library/azure/dn790569.aspx" @@ -301,14 +315,17 @@ "description": "the resource type" }, "operationId": { + "readOnly": true, "type": "string", "description": "It is usually a GUID shared among the events corresponding to single operation. This value should not be confused with EventName." }, "operationName": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the operation name." }, "properties": { + "readOnly": true, "type": "object", "additionalProperties": { "type": "string" @@ -316,28 +333,34 @@ "description": "the set of pairs (usually a Dictionary) that includes details about the event." }, "status": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "a string describing the status of the operation. Some typical values are: Started, In progress, Succeeded, Failed, Resolved." }, "subStatus": { + "readOnly": true, "$ref": "#/definitions/LocalizableString", "description": "the event sub status. Most of the time, when included, this captures the HTTP status code of the REST call. Common values are: OK (HTTP Status Code: 200), Created (HTTP Status Code: 201), Accepted (HTTP Status Code: 202), No Content (HTTP Status Code: 204), Bad Request(HTTP Status Code: 400), Not Found (HTTP Status Code: 404), Conflict (HTTP Status Code: 409), Internal Server Error (HTTP Status Code: 500), Service Unavailable (HTTP Status Code:503), Gateway Timeout (HTTP Status Code: 504)" }, "eventTimestamp": { + "readOnly": true, "type": "string", "format": "date-time", "description": "the timestamp of when the event was generated by the Azure service processing the request corresponding the event. It in ISO 8601 format." }, "submissionTimestamp": { + "readOnly": true, "type": "string", "format": "date-time", "description": "the timestamp of when the event became available for querying via this API. It is in ISO 8601 format. This value should not be confused eventTimestamp. As there might be a delay between the occurrence time of the event, and the time that the event is submitted to the Azure logging infrastructure." }, "subscriptionId": { + "readOnly": true, "type": "string", "description": "the Azure subscription Id usually a GUID." }, "tenantId": { + "readOnly": true, "type": "string", "description": "the Azure tenant Id" } From 067e5a9fee3acee4afed33296cadde18b73a3f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Calder=C3=B3n=5FMeza?= Date: Wed, 28 Feb 2018 17:36:35 -0800 Subject: [PATCH 2/7] [Monitor] Fixing issue with metricnamespace specification as client level argument #2565 --- .../stable/2018-01-01/metricDefinitions_API.json | 5 +++-- .../microsoft.insights/stable/2018-01-01/metrics_API.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metricDefinitions_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metricDefinitions_API.json index 4ce7202cc364..a497924351d5 100644 --- a/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metricDefinitions_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metricDefinitions_API.json @@ -242,12 +242,13 @@ "x-ms-parameter-location": "method", "x-ms-skip-url-encoding": true }, - "MetricNamespaceParameter": { + "MetricNamespaceParameter": { "name": "metricnamespace", "in": "query", "required": false, "type": "string", - "description": "Metric namespace to query metric definitions for." + "description": "Metric namespace to query metric definitions for.", + "x-ms-parameter-location": "method" } } } \ No newline at end of file diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json index acfc986094db..85f933cb038c 100644 --- a/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json @@ -372,12 +372,13 @@ "type": "string", "description": "Client Api Version." }, - "MetricNamespaceParameter": { + "MetricNamespaceParameter": { "name": "metricnamespace", "in": "query", "required": false, "type": "string", - "description": "Metric namespace to query metric definitions for." + "description": "Metric namespace to query metric definitions for.", + "x-ms-parameter-location": "method" } } } \ No newline at end of file From 189d112e0d578ff72b4e4531174f8d3c80c0b2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Calder=C3=B3n=5FMeza?= Date: Wed, 14 Mar 2018 14:46:24 -0700 Subject: [PATCH 3/7] [Monitor] Fixing incorrect specification of top parameter for Metrics API (#2655) --- .../microsoft.insights/stable/2018-01-01/metrics_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json index ae8bf47b7f85..415950a31efc 100644 --- a/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-01-01/metrics_API.json @@ -336,7 +336,7 @@ "name": "top", "in": "query", "required": false, - "type": "number", + "type": "integer", "format": "int32", "description": "The maximum number of records to retrieve.\nValid only if $filter is specified.\nDefaults to 10.", "x-ms-parameter-location": "method" From 4afd2b6cd7da03f1f623144e33df0c923c56ba05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Calder=C3=B3n=5FMeza?= Date: Wed, 20 Jun 2018 23:25:03 -0700 Subject: [PATCH 4/7] Add two missing "by subscription" operations. --- .../stable/2015-04-01/autoscale_API.json | 174 ++++++++++++++++++ .../listAutoscaleSettingBySubscription.json | 146 +++++++++++++++ .../stable/2016-03-01/alertRules_API.json | 102 ++++++++++ .../examples/listAlertRuleBySubscription.json | 80 ++++++++ 4 files changed, 502 insertions(+) create mode 100644 specification/monitor/resource-manager/microsoft.insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json create mode 100644 specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/examples/listAlertRuleBySubscription.json 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 598d6defb9df..25788c300d87 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 @@ -834,6 +834,180 @@ "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": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/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" + }, + "examples": { + "application/json": { + "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=######" + } + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List autoscale settings": { "$ref": "./examples/listAutoscaleSettingBySubscription.json" } + } + } } }, "definitions": { 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 new file mode 100644 index 000000000000..134f3ed6bb91 --- /dev/null +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2015-04-01/examples/listAutoscaleSettingBySubscription.json @@ -0,0 +1,146 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "api-version": "2015-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=######" + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json index 91a8f5860eae..caffa7abc6ca 100644 --- a/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json @@ -459,6 +459,108 @@ "List alert rules": { "$ref": "./examples/listAlertRule.json" } } } + }, + "/subscriptions/{subscriptionId}/providers/microsoft.insights/alertrules": { + "get": { + "tags": [ + "AlertRules" + ], + "operationId": "AlertRules_ListBySusbscription", + "description": "List the alert rules within a subscription.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Successful request for a list of alert rules", + "schema": { + "$ref": "#/definitions/AlertRuleResourceCollection" + }, + "examples": { + "application/json": { + "value": [ + { + "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/{ruleName}", + "name":"{ruleName}", + "type":"Microsoft.Insights/alertRules", + "location":"West US", + "tags": { + "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" + }, + "properties": { + "name":"{ruleName}", + "description":"Pura Vida", + "isEnabled":true, + "condition": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", + "dataSource": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", + "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", + "metricName":"Requests" + }, + "operator":"GreaterThan", + "threshold":2.0, + "windowSize":"PT5M", + "timeAggregation":"Total" + }, + "lastUpdatedTime":"2016-11-10T21:04:39.0005255Z", + "actions": [ + { + "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleEmailAction", + "sendToServiceOwners":true, + "customEmails": [ + "gu@ms.com", + "su@ms.net" + ] + } + ] + } + }, + { + "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin0", + "name":"chiricutin0", + "type":"Microsoft.Insights/alertRules", + "location":"West US", + "tags": { + "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" + }, + "properties": { + "name":"chiricutin0", + "description":"Pura Vida 0", + "isEnabled":true, + "condition": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", + "dataSource": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", + "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", + "metricName":"Requests" + }, + "operator":"GreaterThan", + "threshold":2.0, + "windowSize":"PT5M", + "timeAggregation":"Total" + }, + "lastUpdatedTime":"2016-11-10T21:04:39.1082596Z", + "actions":[] + } + } + ] + } + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + }, + "x-ms-examples": { + "List alert rules": { "$ref": "./examples/listAlertRuleBySubscription.json" } + } + } } }, "definitions": { diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/examples/listAlertRuleBySubscription.json b/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/examples/listAlertRuleBySubscription.json new file mode 100644 index 000000000000..bd048421d8cc --- /dev/null +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/examples/listAlertRuleBySubscription.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3", + "api-version": "2016-03-01" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/myRuleName", + "name":"myRuleName", + "type":"Microsoft.Insights/alertRules", + "location":"West US", + "tags": { + "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" + }, + "properties": { + "name":"myRuleName", + "description":"Pura Vida", + "isEnabled":true, + "condition": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", + "dataSource": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", + "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", + "metricName":"Requests" + }, + "operator":"GreaterThan", + "threshold":2.0, + "windowSize":"PT5M", + "timeAggregation":"Total" + }, + "lastUpdatedTime":"2016-11-10T21:04:39.0005255Z", + "actions": [ + { + "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleEmailAction", + "sendToServiceOwners":true, + "customEmails": [ + "gu@ms.com", + "su@ms.net" + ] + } + ] + } + }, + { + "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin0", + "name":"chiricutin0", + "type":"Microsoft.Insights/alertRules", + "location":"West US", + "tags": { + "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" + }, + "properties": { + "name":"chiricutin0", + "description":"Pura Vida 0", + "isEnabled":true, + "condition": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", + "dataSource": { + "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", + "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", + "metricName":"Requests" + }, + "operator":"GreaterThan", + "threshold":2.0, + "windowSize":"PT5M", + "timeAggregation":"Total" + }, + "lastUpdatedTime":"2016-11-10T21:04:39.1082596Z", + "actions":[] + } + } + ] + } + } + } +} \ No newline at end of file From 840fcf1cde3e9644d365599339033b58288ad7e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Calder=C3=B3n=5FMeza?= Date: Thu, 21 Jun 2018 16:11:18 -0700 Subject: [PATCH 5/7] Remove "examples" nodes as requested since they are not used anymore. Adding documentation to reduce number of warnings in validation. --- .../diagnosticsSettingsCategories_API.json | 42 +- .../diagnosticsSettings_API.json | 109 +-- .../2017-11-01-preview/baseline_API.json | 42 - .../calculateBaseline_API.json | 33 - .../stable/2015-04-01/activityLogs_API.json | 77 +- .../stable/2015-04-01/autoscale_API.json | 721 ------------------ .../2015-04-01/tenantActivityLogs_API.json | 77 +- .../stable/2016-03-01/alertRules_API.json | 294 +------ .../stable/2016-03-01/logProfiles_API.json | 50 -- .../stable/2018-03-01/metricAlert_API.json | 302 +------- .../2018-04-16/scheduledQueryRule_API.json | 9 +- 11 files changed, 23 insertions(+), 1733 deletions(-) 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 176ea80dbd94..7e157fe7d64c 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 @@ -65,19 +65,6 @@ "description": "Successful request to get more information about diagnostic setting category", "schema": { "$ref": "#/definitions/DiagnosticSettingsCategoryResource" - }, - "examples": { - "application/json": - { - "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/providers/microsoft.insights/diagnosticSettingsCategories/WorkflowRuntime", - "type":"microsoft.insights/diagnosticSettingsCategories", - "name":"WorkflowRuntime", - "location":"eastus", - "tags":null, - "properties": { - "categoryType":"Logs" - } - } } } }, @@ -114,32 +101,6 @@ "description": "Successful request to get more information about diagnostic setting category", "schema": { "$ref": "#/definitions/DiagnosticSettingsCategoryResourceCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/providers/microsoft.insights/diagnosticSettingsCategories/WorkflowRuntime", - "type":"microsoft.insights/diagnosticSettingsCategories", - "name":"WorkflowRuntime", - "location":"eastus", - "tags":null, - "properties": { - "categoryType":"Logs" - } - }, - { - "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/providers/microsoft.insights/diagnosticSettingsCategories/WorkflowMetric", - "type":"microsoft.insights/diagnosticSettingsCategories", - "name":"WorkflowMetric", - "location":"eastus", - "tags":null, - "properties": { - "categoryType":"Metrics" - } - } - ] - } } } }, @@ -197,7 +158,8 @@ "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/DiagnosticSettingsCategory" + "$ref": "#/definitions/DiagnosticSettingsCategory", + "description": "The properties of a Diagnostic Settings Category." } }, "description": "The diagnostic settings category resource." 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 080b2b9bf56d..e3c71047a62b 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 @@ -65,40 +65,6 @@ "description": "Successful request to get more information about diagnostic setting", "schema": { "$ref": "#/definitions/DiagnosticSettingsResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/diagnosticSettings/mysetting", - "type":"microsoft.logic/workflows", - "name":"mysetting", - "location":"eastus", - "tags":null, - "properties": { - "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":"", - "metrics": [ - { - "category":"WorkflowMetrics", - "enabled":true, - "retentionPolicy": { - "enabled":false, - "days":0 - } - } - ], - "logs": [ - { - "category":"WorkflowRuntime", - "enabled":true, - "retentionPolicy": { - "enabled":false, - "days":0 - } - } - ] - } - } } } }, @@ -145,40 +111,6 @@ "description": "Successful request to create a diagnostic setting", "schema": { "$ref": "#/definitions/DiagnosticSettingsResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/diagnosticSettings/mysetting", - "type":"microsoft.logic/workflows", - "name":"mysetting", - "location":"eastus", - "tags":null, - "properties": { - "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":"", - "metrics": [ - { - "category":"WorkflowMetrics", - "enabled":true, - "retentionPolicy": { - "enabled":false, - "days":0 - } - } - ], - "logs": [ - { - "category":"WorkflowRuntime", - "enabled":true, - "retentionPolicy": { - "enabled":false, - "days":0 - } - } - ] - } - } } } }, @@ -252,44 +184,6 @@ "description": "Successful request to get more information about diagnostic setting", "schema": { "$ref": "#/definitions/DiagnosticSettingsResourceCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "id":"/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6/diagnosticSettings/mysetting", - "type":"microsoft.logic/workflows", - "name":"mysetting", - "location":"eastus", - "tags":null, - "properties": { - "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":"", - "metrics": [ - { - "category":"WorkflowMetrics", - "enabled":true, - "retentionPolicy": { - "enabled":false, - "days":0 - } - } - ], - "logs": [ - { - "category":"WorkflowRuntime", - "enabled":true, - "retentionPolicy": { - "enabled":false, - "days":0 - } - } - ] - } - } - ] - } } } }, @@ -425,7 +319,8 @@ "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/DiagnosticSettings" + "$ref": "#/definitions/DiagnosticSettings", + "description": "Properties of a Diagnostic Settings Resource." } }, "description": "The diagnostic setting resource." diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/baseline_API.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/baseline_API.json index fadcfa344ccc..003d8a45ad34 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/baseline_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/baseline_API.json @@ -80,48 +80,6 @@ "description": "Successful request to get the list of metric values.", "schema": { "$ref": "#/definitions/BaselineResponse" - }, - "examples": { - "application/json": { - "id": "/subscriptions/b368ca2f-e298-46b7-b0ab-012281956afa/resourceGroups/vms/providers/Microsoft.Compute/virtualMachines/vm1/providers/Microsoft.Insights/baseline/PercentageCpu", - "type": "Microsoft.Insights/baseline", - "name": { - "value": "PercentageCpu" - }, - "properties": { - "timespan": "2017-04-14T02:20:00Z/2017-04-14T04:20:00Z", - "aggregation": "Average", - "interval": "PT1H", - "timestamps": [ - "2017-04-14T02:20:00Z", - "2017-04-14T03:20:00Z" - ], - "baseline": [ - { - "sensitivity": "Low", - "lowThresholds": [ - 30.0, - 31.1 - ], - "highThresholds": [ - 90.3453, - 91.3453 - ] - }, - { - "sensitivity": "Medium", - "lowThresholds": [ - 50.0, - 51.1 - ], - "highThresholds": [ - 70.3453, - 71.3453 - ] - } - ] - } - } } } }, diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/calculateBaseline_API.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/calculateBaseline_API.json index 4720f7a4c3a9..57463504ac45 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/calculateBaseline_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-11-01-preview/calculateBaseline_API.json @@ -71,39 +71,6 @@ "description": "Successful request to get the list of metric values.", "schema": { "$ref": "#/definitions/CalculateBaselineResponse" - }, - "examples": { - "application/json": { - "type": "Microsoft.Insights/calculatebaseline", - "timestamps": [ - "2017-04-14T02:20:00Z", - "2017-04-14T03:20:00Z" - ], - "baseline": [ - { - "sensitivity": "Low", - "lowThresholds": [ - 30.0, - 31.1 - ], - "highThresholds": [ - 90.3453, - 91.3453 - ] - }, - { - "sensitivity": "Medium", - "lowThresholds": [ - 50.0, - 51.1 - ], - "highThresholds": [ - 70.3453, - 71.3453 - ] - } - ] - } } } }, 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 016d1aa9f4e8..cccfc164c41b 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 @@ -72,80 +72,6 @@ "description": "Successful request to get a page of events in the activity logs", "schema": { "$ref": "#/definitions/EventDataCollection" - }, - "examples": { - "application/json": { - "value": [ { - "authorization": { - "action": "microsoft.support/supporttickets/write", - "role": "Subscription Admin", - "scope": "/subscriptions/089bd33f-d4ec-47fe-8ba5-0753aa5c5b33/resourceGroups/MSSupportGroup/providers/microsoft.support/supporttickets/115012112305841" - }, - "caller": "admin@contoso.com", - "claims": { - "aud": "https://management.core.windows.net/", - "iss": "https://sts.windows.net/72f988bf-86f1-41af-91ab-2d7cd011db47/", - "iat": "1421876371", - "nbf": "1421876371", - "exp": "1421880271", - "ver": "1.0", - "http://schemas.microsoft.com/identity/claims/tenantid": "1e8d8218-c5e7-4578-9acc-9abbd5d23315 ", - "http://schemas.microsoft.com/claims/authnmethodsreferences": "pwd", - "http://schemas.microsoft.com/identity/claims/objectidentifier": "2468adf0-8211-44e3-95xq-85137af64708", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn": "admin@contoso.com", - "puid": "20030000801A118C", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier": "9vckmEGF7zDKk1YzIY8k0t1_EAPaXoeHyPRn6f413zM", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname": "John", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname": "Smith", - "name": "John Smith", - "groups": "cacfe77c-e058-4712-83qw-f9b08849fd60,7f71d11d-4c41-4b23-99d2-d32ce7aa621c,31522864-0578-4ea0-9gdc-e66cc564d18c", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": " admin@contoso.com", - "appid": "c44b4083-3bq0-49c1-b47d-974e53cbdf3c", - "appidacr": "2", - "http://schemas.microsoft.com/identity/claims/scope": "user_impersonation", - "http://schemas.microsoft.com/claims/authnclassreference": "1" - }, - "correlationId": "1e121103-0ba6-4300-ac9d-952bb5d0c80f", - "description": "", - "eventDataId": "44ade6b4-3813-45e6-ae27-7420a95fa2f8", - "eventName": { - "value": "EndRequest", - "localizedValue": "End request" - }, - "httpRequest": { - "clientRequestId": "27003b25-91d3-418f-8eb1-29e537dcb249", - "clientIpAddress": "192.168.35.115", - "method": "PUT" - }, - "id": "/subscriptions/089bd33f-d4ec-47fe-8ba5-0753aa5c5b33/resourceGroups/MSSupportGroup/providers/microsoft.support/supporttickets/115012112305841/events/44ade6b4-3813-45e6-ae27-7420a95fa2f8/ticks/635574752669792776", - "level": "Informational", - "resourceGroupName": "MSSupportGroup", - "resourceProviderName": { - "value": "microsoft.support", - "localizedValue": "microsoft.support" - }, - "operationId": "1e121103-0ba6-4300-ac9d-952bb5d0c80f", - "operationName": { - "value": "microsoft.support/supporttickets/write", - "localizedValue": "microsoft.support/supporttickets/write" - }, - "properties": { - "statusCode": "Created" - }, - "status": { - "value": "Succeeded", - "localizedValue": "Succeeded" - }, - "subStatus": { - "value": "Created", - "localizedValue": "Created (HTTP Status Code: 201)" - }, - "eventTimestamp": "2015-01-21T22:14:26.9792776Z", - "submissionTimestamp": "2015-01-21T22:14:39.9936304Z", - "subscriptionId": "089bd33f-d4ec-47fe-8ba5-0753aa5c5b33" - } ], - "nextLink": "https://management.azure.com/########-####-####-####-############$skiptoken=######" - } } } }, @@ -219,7 +145,8 @@ "properties": { "authorization": { "readOnly": true, - "$ref": "#/definitions/SenderAuthorization" + "$ref": "#/definitions/SenderAuthorization", + "description": "The sender authorization information." }, "claims": { "readOnly": true, 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 25788c300d87..01cb7639eb8e 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 @@ -65,143 +65,6 @@ "description": "Successful request for a list of autoscale settings", "schema": { "$ref": "#/definitions/AutoscaleSettingResourceCollection" - }, - "examples": { - "application/json": { - "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=######" - } } } }, @@ -254,310 +117,12 @@ "description": "Successful request to create or update an autoscale setting", "schema": { "$ref": "#/definitions/AutoscaleSettingResource" - }, - "examples": { - "application/json": { - "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": { "description": "Created autoscale setting", "schema": { "$ref": "#/definitions/AutoscaleSettingResource" - }, - "examples": { - "application/json": { - "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":{} - } - ] - } - ] - } - } } } }, @@ -634,155 +199,6 @@ "description": "Successful request to get one autoscale setting", "schema": { "$ref": "#/definitions/AutoscaleSettingResource" - }, - "examples": { - "application/json": { - "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":{} - } - ] - } - ] - } - } } } }, @@ -861,143 +277,6 @@ "description": "Successful request for a list of autoscale settings", "schema": { "$ref": "#/definitions/AutoscaleSettingResourceCollection" - }, - "examples": { - "application/json": { - "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/2015-04-01/tenantActivityLogs_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2015-04-01/tenantActivityLogs_API.json index b5de6e1a953d..3a4bbdb55dc4 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 @@ -69,80 +69,6 @@ "description": "Successful request to get a page of events in the tenant activity logs", "schema": { "$ref": "#/definitions/EventDataCollection" - }, - "examples": { - "application/json": { - "value": [ { - "authorization": { - "action": "microsoft.support/supporttickets/write", - "role": "Subscription Admin", - "scope": "/subscriptions/089bd33f-d4ec-47fe-8ba5-0753aa5c5b33/resourceGroups/MSSupportGroup/providers/microsoft.support/supporttickets/115012112305841" - }, - "caller": "admin@contoso.com", - "claims": { - "aud": "https://management.core.windows.net/", - "iss": "https://sts.windows.net/72f988bf-86f1-41af-91ab-2d7cd011db47/", - "iat": "1421876371", - "nbf": "1421876371", - "exp": "1421880271", - "ver": "1.0", - "http://schemas.microsoft.com/identity/claims/tenantid": "1e8d8218-c5e7-4578-9acc-9abbd5d23315 ", - "http://schemas.microsoft.com/claims/authnmethodsreferences": "pwd", - "http://schemas.microsoft.com/identity/claims/objectidentifier": "2468adf0-8211-44e3-95xq-85137af64708", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn": "admin@contoso.com", - "puid": "20030000801A118C", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier": "9vckmEGF7zDKk1YzIY8k0t1_EAPaXoeHyPRn6f413zM", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname": "John", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname": "Smith", - "name": "John Smith", - "groups": "cacfe77c-e058-4712-83qw-f9b08849fd60,7f71d11d-4c41-4b23-99d2-d32ce7aa621c,31522864-0578-4ea0-9gdc-e66cc564d18c", - "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": " admin@contoso.com", - "appid": "c44b4083-3bq0-49c1-b47d-974e53cbdf3c", - "appidacr": "2", - "http://schemas.microsoft.com/identity/claims/scope": "user_impersonation", - "http://schemas.microsoft.com/claims/authnclassreference": "1" - }, - "correlationId": "1e121103-0ba6-4300-ac9d-952bb5d0c80f", - "description": "", - "eventDataId": "44ade6b4-3813-45e6-ae27-7420a95fa2f8", - "eventName": { - "value": "EndRequest", - "localizedValue": "End request" - }, - "httpRequest": { - "clientRequestId": "27003b25-91d3-418f-8eb1-29e537dcb249", - "clientIpAddress": "192.168.35.115", - "method": "PUT" - }, - "id": "/subscriptions/089bd33f-d4ec-47fe-8ba5-0753aa5c5b33/resourceGroups/MSSupportGroup/providers/microsoft.support/supporttickets/115012112305841/events/44ade6b4-3813-45e6-ae27-7420a95fa2f8/ticks/635574752669792776", - "level": "Informational", - "resourceGroupName": "MSSupportGroup", - "resourceProviderName": { - "value": "microsoft.support", - "localizedValue": "microsoft.support" - }, - "operationId": "1e121103-0ba6-4300-ac9d-952bb5d0c80f", - "operationName": { - "value": "microsoft.support/supporttickets/write", - "localizedValue": "microsoft.support/supporttickets/write" - }, - "properties": { - "statusCode": "Created" - }, - "status": { - "value": "Succeeded", - "localizedValue": "Succeeded" - }, - "subStatus": { - "value": "Created", - "localizedValue": "Created (HTTP Status Code: 201)" - }, - "eventTimestamp": "2015-01-21T22:14:26.9792776Z", - "submissionTimestamp": "2015-01-21T22:14:39.9936304Z", - "subscriptionId": "089bd33f-d4ec-47fe-8ba5-0753aa5c5b33" - } ], - "nextLink": "https://management.azure.com/########-####-####-####-############$skiptoken=######" - } } } }, @@ -216,7 +142,8 @@ "properties": { "authorization": { "readOnly": true, - "$ref": "#/definitions/SenderAuthorization" + "$ref": "#/definitions/SenderAuthorization", + "description": "The sender authorization information." }, "claims": { "readOnly": true, diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json index caffa7abc6ca..c7d1732feece 100644 --- a/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2016-03-01/alertRules_API.json @@ -77,72 +77,12 @@ "description": "Successful request to update an alert rule", "schema": { "$ref": "#/definitions/AlertRuleResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin", - "name":"chiricutin", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" - }, - "properties": { - "name":"chiricutin", - "description":"Pura Vida", - "isEnabled":true, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":3.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-23T21:23:52.0221265Z", - "actions":[] - } - } } }, "201": { "description": "Created alert rule", "schema": { "$ref": "#/definitions/AlertRuleResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin", - "name":"chiricutin", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" - }, - "properties": { - "name":"chiricutin", - "description":"Pura Vida", - "isEnabled":true, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":2.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-23T21:21:40.3097118Z", - "actions":[] - } - } } } }, @@ -207,36 +147,6 @@ "description": "Successful request to get an alert rule", "schema": { "$ref": "#/definitions/AlertRuleResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin0", - "name":"chiricutin0", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" - }, - "properties": { - "name":"chiricutin0", - "description":"Pura Vida 0", - "isEnabled":true, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":2.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-10T21:04:39.1082596Z", - "actions":[] - } - } } } }, @@ -281,72 +191,12 @@ "description": "Successful request to update an alert rule", "schema": { "$ref": "#/definitions/AlertRuleResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin", - "name":"chiricutin", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest2":"Resource" - }, - "properties": { - "name":"chiricutin", - "description":"Pura Vida", - "isEnabled":false, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":3.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-23T21:23:52.0221265Z", - "actions":[] - } - } } }, "201": { "description": "Successful request to update an alert rule that resulted in a creation of the alert rule", "schema": { "$ref": "#/definitions/AlertRuleResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin", - "name":"chiricutin", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest2":"Resource" - }, - "properties": { - "name":"chiricutin", - "description":"Pura Vida", - "isEnabled":false, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":3.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-23T21:23:52.0221265Z", - "actions":[] - } - } } } }, @@ -378,77 +228,6 @@ "description": "Successful request for a list of alert rules", "schema": { "$ref": "#/definitions/AlertRuleResourceCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/{ruleName}", - "name":"{ruleName}", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" - }, - "properties": { - "name":"{ruleName}", - "description":"Pura Vida", - "isEnabled":true, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":2.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-10T21:04:39.0005255Z", - "actions": [ - { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleEmailAction", - "sendToServiceOwners":true, - "customEmails": [ - "gu@ms.com", - "su@ms.net" - ] - } - ] - } - }, - { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin0", - "name":"chiricutin0", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" - }, - "properties": { - "name":"chiricutin0", - "description":"Pura Vida 0", - "isEnabled":true, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":2.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-10T21:04:39.1082596Z", - "actions":[] - } - } - ] - } } } }, @@ -465,7 +244,7 @@ "tags": [ "AlertRules" ], - "operationId": "AlertRules_ListBySusbscription", + "operationId": "AlertRules_ListBySubscription", "description": "List the alert rules within a subscription.", "parameters": [ { @@ -480,77 +259,6 @@ "description": "Successful request for a list of alert rules", "schema": { "$ref": "#/definitions/AlertRuleResourceCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/{ruleName}", - "name":"{ruleName}", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" - }, - "properties": { - "name":"{ruleName}", - "description":"Pura Vida", - "isEnabled":true, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":2.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-10T21:04:39.0005255Z", - "actions": [ - { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleEmailAction", - "sendToServiceOwners":true, - "customEmails": [ - "gu@ms.com", - "su@ms.net" - ] - } - ] - } - }, - { - "id":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/alertrules/chiricutin0", - "name":"chiricutin0", - "type":"Microsoft.Insights/alertRules", - "location":"West US", - "tags": { - "$type":"Microsoft.WindowsAzure.Management.Common.Storage.CasePreservedDictionary, Microsoft.WindowsAzure.Management.Common.Storage","hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest":"Resource" - }, - "properties": { - "name":"chiricutin0", - "description":"Pura Vida 0", - "isEnabled":true, - "condition": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition", - "dataSource": { - "odata.type":"Microsoft.Azure.Management.Insights.Models.RuleMetricDataSource", - "resourceUri":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest", - "metricName":"Requests" - }, - "operator":"GreaterThan", - "threshold":2.0, - "windowSize":"PT5M", - "timeAggregation":"Total" - }, - "lastUpdatedTime":"2016-11-10T21:04:39.1082596Z", - "actions":[] - } - } - ] - } } } }, 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 18d1866bf8c4..b7a79b53ef2c 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 @@ -91,31 +91,6 @@ "description": "Successful request to get more information about a log profile.", "schema": { "$ref": "#/definitions/LogProfileResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/providers/microsoft.insights/logprofiles/default", - "type":"", - "name":"default", - "location":"", - "tags":null, - "properties": { - "storageAccountId":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/JohnKemTest/providers/Microsoft.Storage/storageAccounts/johnkemtest8162", - "serviceBusRuleId":"", - "locations": [ - "global" - ], - "categories": [ - "Delete", - "Write", - "Action" - ], - "retentionPolicy": { - "enabled":true, - "days":3 - } - } - } } } }, @@ -154,31 +129,6 @@ "description": "Successful request to create or update a log profile", "schema": { "$ref": "#/definitions/LogProfileResource" - }, - "examples": { - "application/json": { - "id":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/providers/microsoft.insights/logprofiles/default", - "type":"", - "name":"default", - "location":"", - "tags":null, - "properties": { - "storageAccountId":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/JohnKemTest/providers/Microsoft.Storage/storageAccounts/johnkemtest8162", - "serviceBusRuleId":"", - "locations":[ - "global" - ], - "categories": [ - "Delete", - "Write", - "Action" - ], - "retentionPolicy": { - "enabled":true, - "days":3 - } - } - } } } }, diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json index 01accc33987d..f5c2f75fa805 100644 --- a/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json @@ -45,58 +45,6 @@ "description": "Successful request for a list of metric alerts", "schema": { "$ref": "#/definitions/MetricAlertResourceCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "location": "global", - "tags": { - "key1": "value1", - "key2": "value2" - }, - "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourcegroups/test/providers/microsoft.insights/metricalerts/storageTest", - "name": "storageTest", - "properties": { - "description": "This is the description of the xstore multidim rule1", - "severity": 3, - "enabled": true, - "scopes": [ - "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/testmultidim/blobServices/default" - ], - "evaluationFrequency": "PT1M", - "windowSize": "PT15M", - "criteria": { - "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria", - "allOf": [ - { - "name": "HowManyBytes", - "metricName": "BlobCapacity", - "dimensions": [ - { - "name": "BlobType", - "operator": "Include", - "values": [ - "BlockBlob", - "PageBlob" - ] - } - ], - "operator": "GreaterThanOrEqual", - "threshold": 5.0, - "timeAggregation": "Maximum" - } - ] - }, - "actions": [ - { - "actionGroupId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/test/providers/microsoft.insights/actionGroups/testActionGroup" - } - ] - } - } - ] - } } }, "default": { @@ -127,58 +75,6 @@ "description": "Successful request for a list of metric alerts", "schema": { "$ref": "#/definitions/MetricAlertResourceCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "location": "global", - "tags": { - "key1": "value1", - "key2": "value2" - }, - "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourcegroups/test/providers/microsoft.insights/metricalerts/storageTest", - "name": "storageTest", - "properties": { - "description": "This is the description of the xstore multidim rule1", - "severity": 3, - "enabled": true, - "scopes": [ - "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/testmultidim/blobServices/default" - ], - "evaluationFrequency": "PT1M", - "windowSize": "PT15M", - "criteria": { - "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria", - "allOf": [ - { - "name": "HowManyBytes", - "metricName": "BlobCapacity", - "dimensions": [ - { - "name": "BlobType", - "operator": "Include", - "values": [ - "BlockBlob", - "PageBlob" - ] - } - ], - "operator": "GreaterThanOrEqual", - "threshold": 5.0, - "timeAggregation": "Maximum" - } - ] - }, - "actions": [ - { - "actionGroupId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/test/providers/microsoft.insights/actionGroups/testActionGroup" - } - ] - } - } - ] - } } }, "default": { @@ -210,54 +106,6 @@ "description": "Successful request for a list of metric alerts", "schema": { "$ref": "#/definitions/MetricAlertResource" - }, - "examples": { - "application/json": { - "location": "global", - "tags": { - "key1": "value1", - "key2": "value2" - }, - "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourcegroups/test/providers/microsoft.insights/metricalerts/storageTest", - "name": "storageTest", - "properties": { - "description": "This is the description of the xstore multidim rule1", - "severity": 3, - "enabled": true, - "scopes": [ - "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/test/providers/Microsoft.Storage/storageAccounts/testmultidim/blobServices/default" - ], - "evaluationFrequency": "PT1M", - "windowSize": "PT15M", - "criteria": { - "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria", - "allOf": [ - { - "name": "HowManyBytes", - "metricName": "BlobCapacity", - "dimensions": [ - { - "name": "BlobType", - "operator": "Include", - "values": [ - "BlockBlob", - "PageBlob" - ] - } - ], - "operator": "GreaterThanOrEqual", - "threshold": 5.0, - "timeAggregation": "Maximum" - } - ] - }, - "actions": [ - { - "actionGroupId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/test/providers/microsoft.insights/actionGroups/testActionGroup" - } - ] - } - } } }, "default": { @@ -293,57 +141,6 @@ "description": "OK", "schema": { "$ref": "#/definitions/MetricAlertResource" - }, - "examples": { - "application/json": { - "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/metricalerts/chiricutin", - "name": "chiricutin", - "type": "Microsoft.Insights/metricalerts", - "location": "West US", - "tags": { - "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest": "Resource" - }, - "properties": { - "description": "This is the description of the rule1", - "severity": 0, - "enabled": true, - "scopes": [ - "/subscriptions/3b7f8a43-4372-4be1-9853-9e51f243d9be/resourceGroups/test/providers/Microsoft.Compute/virtualMachines/testVmLin" - ], - "evaluationFrequency": "Pt1m", - "windowSize": "Pt15m", - "criteria": { - "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria", - "allOf": [ - { - "name": "High_CPU_80", - "metricName": "Percentage CPU", - "dimensions": [], - "operator": "GreaterThan", - "threshold": 80.50, - "timeAggregation": "Total" - }, - { - "name": "High_Disk_50", - "metricName": "Disk Write Operations/Sec", - "dimensions": [], - "operator": "GreaterThanOrEqual", - "threshold": 0.55, - "timeAggregation": "Maximum" - } - ] - }, - "actions": [ - { - "actionGroupId": "/subscriptions/3b7f8a43-4372-4be1-9853-9e51f243d9be/resourceGroups/test/providers/microsoft.insights/actionGroups/TestActionGroup", - "webhookProperties": { - "key01": "value01", - "key02": "value02" - } - } - ] - } - } } }, "default": { @@ -379,57 +176,6 @@ "description": "OK", "schema": { "$ref": "#/definitions/MetricAlertResource" - }, - "examples": { - "application/json": { - "id": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/microsoft.insights/metricalerts/chiricutin", - "name": "chiricutin", - "type": "Microsoft.Insights/metricalerts", - "location": "global", - "tags": { - "hidden-link:/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/Rac46PostSwapRG/providers/Microsoft.Web/sites/leoalerttest": "Resource" - }, - "properties": { - "description": "This is the description of the rule1", - "severity": 0, - "enabled": true, - "scopes": [ - "/subscriptions/3b7f8a43-4372-4be1-9853-9e51f243d9be/resourceGroups/test/providers/Microsoft.Compute/virtualMachines/testVmLin" - ], - "evaluationFrequency": "Pt1m", - "windowSize": "Pt15m", - "criteria": { - "odata.type": "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria", - "allOf": [ - { - "name": "High_CPU_80", - "metricName": "Percentage CPU", - "dimensions": [], - "operator": "GreaterThan", - "threshold": 80.50, - "timeAggregation": "Total" - }, - { - "name": "High_Disk_50", - "metricName": "Disk Write Operations/Sec", - "dimensions": [], - "operator": "GreaterThanOrEqual", - "threshold": 0.55, - "timeAggregation": "Maximum" - } - ] - }, - "actions": [ - { - "actionGroupId": "/subscriptions/3b7f8a43-4372-4be1-9853-9e51f243d9be/resourceGroups/test/providers/microsoft.insights/actionGroups/TestActionGroup", - "webhookProperties": { - "key01": "value01", - "key02": "value02" - } - } - ] - } - } } }, "default": { @@ -480,24 +226,6 @@ "description": "Successful request for a list of metric alerts", "schema": { "$ref": "#/definitions/MetricAlertStatusCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "id": "/subscriptions/009f6022-67ec-423e-9aa7-691182870588/resourceGroups/EastUs/providers/microsoft.insights/metricAlerts/LeoAlert_custom1", - "name": "cmVzb3VyY2VJZD0vc3Vic2NyaXB0aW9ucy8xNGRkZjBjNS03N2M1LTRiNTMtODRmNi1lMWZhNDNhZDY4ZjcvcmVzb3VyY2VHcm91cHMvZ2lndGVzdC9wcm92aWRlcnMvTWljcm9zb2Z0LkNvbXB1dGUvdmlydHVhbE1hY2hpbmVzL2dpZ3dhZG1l", - "type": "Microsoft.Insights/metricAlerts/status", - "properties": { - "dimensions": { - "resourceId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/gigtest/providers/Microsoft.Compute/virtualMachines/gigwadme" - }, - "status": "Healthy", - "timestamp": "2018-01-17T20:17:25.6293237Z" - } - } - ] - } } }, "default": { @@ -527,24 +255,6 @@ "description": "Successful request for a list of metric alerts", "schema": { "$ref": "#/definitions/MetricAlertStatusCollection" - }, - "examples": { - "application/json": { - "value": [ - { - "id": "/subscriptions/009f6022-67ec-423e-9aa7-691182870588/resourceGroups/EastUs/providers/microsoft.insights/metricAlerts/LeoAlert_custom1", - "name": "cmVzb3VyY2VJZD0vc3Vic2NyaXB0aW9ucy8xNGRkZjBjNS03N2M1LTRiNTMtODRmNi1lMWZhNDNhZDY4ZjcvcmVzb3VyY2VHcm91cHMvZ2lndGVzdC9wcm92aWRlcnMvTWljcm9zb2Z0LkNvbXB1dGUvdmlydHVhbE1hY2hpbmVzL2dpZ3dhZG1l", - "type": "Microsoft.Insights/metricAlerts/status", - "properties": { - "dimensions": { - "resourceId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/gigtest/providers/Microsoft.Compute/virtualMachines/gigwadme" - }, - "status": "Healthy", - "timestamp": "2018-01-17T20:17:25.6293237Z" - } - } - ] - } } }, "default": { @@ -609,7 +319,8 @@ "additionalProperties": { "type": "string", "description": "the dictionary of custom properties to include with the post operation. These data are appended to the webhook payload." - } + }, + "description": "The properties of a webhook object." } } }, @@ -742,7 +453,8 @@ "type": "object", "additionalProperties": { "type": "string" - } + }, + "description": "An object describing the type of the dimensions." }, "status": { "type": "string", @@ -879,7 +591,8 @@ }, "description": "List of dimension conditions." } - } + }, + "description": "Criterion to filter metrics." }, "MetricDimension": { "required": [ @@ -903,7 +616,8 @@ }, "description": "list of dimension values." } - } + }, + "description": "Specifies a metric dimension." } }, "parameters": { 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 b64239742df5..bf4d35055dd2 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 @@ -476,7 +476,8 @@ }, "threshold": { "format": "double", - "type": "number" + "type": "number", + "description": "The threshold of the metric trigger." }, "metricTriggerType": { "$ref": "#/definitions/MetricTriggerType", @@ -486,7 +487,8 @@ "type": "string", "description": "Evaluation of metric on a particular column" } - } + }, + "description": "A log metrics trigger descriptor." }, "ConditionalOperator": { "type": "string", @@ -626,7 +628,8 @@ }, "required": [ "odata.type" - ] + ], + "description": "Action descriptor." }, "AlertingAction": { "description": "Specifiy action need to be taken when rule type is Alert", From 8e22a0641dc1ac873b046bdbdc934ad5525cb814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Calder=C3=B3n=5FMeza?= Date: Thu, 21 Jun 2018 18:00:02 -0700 Subject: [PATCH 6/7] Add the serviceBusRuleId back into the DiagnosticSetting resource spec. --- .../preview/2017-05-01-preview/diagnosticsSettings_API.json | 4 ++++ 1 file changed, 4 insertions(+) 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 e3c71047a62b..79f598ce5f07 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 @@ -280,6 +280,10 @@ "type": "string", "description": "The resource ID of the storage account to which you would like to send Diagnostic Logs." }, + "serviceBusRuleId": { + "type": "string", + "description": "The service bus rule Id of the diagnostic setting. This is here to maintain backwards compatibility." + }, "eventHubAuthorizationRuleId": { "type": "string", "description": "The resource Id for the event hub authorization rule." From cc4855d30f69ec15307c584a6d7d6bf7f18a468e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Calder=C3=B3n=5FMeza?= Date: Fri, 22 Jun 2018 17:00:29 -0700 Subject: [PATCH 7/7] Fix some issues with the examples --- .../examples/createOrUpdateDiagnosticSetting.json | 2 +- .../2017-05-01-preview/examples/deleteDiagnosticSetting.json | 2 +- .../2017-05-01-preview/examples/getDiagnosticSetting.json | 2 +- .../examples/getDiagnosticSettingsCategory.json | 2 +- .../2017-05-01-preview/examples/listDiagnosticSettings.json | 2 +- .../examples/listDiagnosticSettingsCategories.json | 2 +- .../microsoft.insights/stable/2018-03-01/metricAlert_API.json | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/createOrUpdateDiagnosticSetting.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/createOrUpdateDiagnosticSetting.json index c5fb7418762a..8335a4ec33e1 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/createOrUpdateDiagnosticSetting.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/createOrUpdateDiagnosticSetting.json @@ -1,6 +1,6 @@ { "parameters": { - "resourceUri": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", + "resourceUri": "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", "name": "mysetting", "api-version": "2017-05-01-preview", "parameters": { diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/deleteDiagnosticSetting.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/deleteDiagnosticSetting.json index cfac0670258c..c7468e7ff795 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/deleteDiagnosticSetting.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/deleteDiagnosticSetting.json @@ -1,6 +1,6 @@ { "parameters" : { - "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", + "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", "name": "mysetting", "api-version" : "2017-05-01-preview" }, diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSetting.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSetting.json index 60b2c10c802b..03603e23f20d 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSetting.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSetting.json @@ -1,6 +1,6 @@ { "parameters" : { - "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", + "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", "name": "mysetting", "api-version" : "2017-05-01-preview" }, diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSettingsCategory.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSettingsCategory.json index 88b1e7c4ffaa..c8d94c67c36f 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSettingsCategory.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/getDiagnosticSettingsCategory.json @@ -1,6 +1,6 @@ { "parameters" : { - "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", + "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", "name": "WorkflowRuntime", "api-version" : "2017-05-01-preview" }, diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettings.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettings.json index 98009ba4687c..3a54aca66177 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettings.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettings.json @@ -1,6 +1,6 @@ { "parameters" : { - "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", + "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", "api-version" : "2017-05-01-preview" }, "responses" : { diff --git a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettingsCategories.json b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettingsCategories.json index 3ae589ec215f..2b915de05f31 100644 --- a/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettingsCategories.json +++ b/specification/monitor/resource-manager/microsoft.insights/preview/2017-05-01-preview/examples/listDiagnosticSettingsCategories.json @@ -1,6 +1,6 @@ { "parameters" : { - "resourceUri" : "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", + "resourceUri" : "subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6", "api-version" : "2017-05-01-preview" }, "responses" : { diff --git a/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json b/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json index f5c2f75fa805..3bed1aba4066 100644 --- a/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json +++ b/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json @@ -498,8 +498,7 @@ "properties": { "odata.type": { "enum": [ - "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria", - "Microsoft.Azure.Monitor.DefaultCriteria" + "Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria" ], "x-ms-enum": { "name": "odatatype",