From cf1c6c677e287577df0a91ff95b80e43291db42e Mon Sep 17 00:00:00 2001 From: Tomasz Milos Date: Tue, 9 Mar 2021 02:28:31 +0100 Subject: [PATCH] [Hub Generated] Review request for Microsoft.Insights to clean up 2019-11-01-preview (under "window to fix broken") (#13139) * [Monitor] Cleanup DataCollectionRules 2019-11-01-preview (under window to fix broken) * [Monitor] Cleanup DataCollectionRules 2019-11-01-preview - removed unused defs --- .../dataCollectionRuleAssociations_API.json | 132 +------ .../dataCollectionRules_API.json | 329 +++--------------- .../examples/DataCollectionRulesCreate.json | 16 +- .../examples/DataCollectionRulesGet.json | 6 +- ...ataCollectionRulesListByResourceGroup.json | 10 +- ...DataCollectionRulesListBySubscription.json | 10 +- .../examples/DataCollectionRulesUpdate.json | 6 +- 7 files changed, 79 insertions(+), 430 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRuleAssociations_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRuleAssociations_API.json index b2f970c02d4c..7aba75e971a1 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRuleAssociations_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRuleAssociations_API.json @@ -47,7 +47,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -76,7 +76,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -95,7 +95,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -140,7 +140,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -197,7 +197,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -237,7 +237,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -252,14 +252,10 @@ "definitions": { "DataCollectionRuleAssociation": { "description": "Definition of association of a data collection rule with a monitored Azure resource.", - "required": [ - "dataCollectionRuleId" - ], "type": "object", "properties": { "description": { "description": "Description of the association.", - "maxLength": 256, "type": "string" }, "dataCollectionRuleId": { @@ -291,9 +287,6 @@ }, "DataCollectionRuleAssociationProxyOnlyResource": { "description": "Definition of generic ARM proxy resource.", - "required": [ - "properties" - ], "type": "object", "properties": { "properties": { @@ -362,112 +355,15 @@ "type": "string" } } - }, - "ErrorAdditionalInfo": { - "description": "Additional information for common error response.", - "type": "object", - "properties": { - "type": { - "description": "The additional info type.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "info": { - "description": "The additional info.", - "type": "object", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, - "ErrorDetails": { - "description": "Common error details.", - "type": "object", - "properties": { - "code": { - "description": "Error code which can be used to programmatically identify the class of error.", - "type": "string", - "readOnly": true, - "example": "BadArgument", - "x-ms-mutability": [ - "read" - ] - }, - "message": { - "description": "Describes the error in detail and provides debugging information.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "target": { - "description": "The target of the particular error (for example, the name of the property in error).", - "type": "string", - "readOnly": true, - "example": "properties.provisioningState", - "x-ms-mutability": [ - "read" - ] - }, - "details": { - "description": "Additional nested error detail objects.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDetails" - }, - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "additionalInfo": { - "description": "Additional error information.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorAdditionalInfo" - }, - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, - "ErrorResponse": { - "description": "Common error response.", - "type": "object", - "properties": { - "error": { - "description": "Error details.", - "allOf": [ - { - "$ref": "#/definitions/ErrorDetails" - } - ], - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } } }, "parameters": { "AssociationNameParameter": { "in": "path", "name": "associationName", - "description": "The name of the association.", + "description": "The name of the association. The name is case insensitive.", "required": true, "type": "string", - "maxLength": 64, - "minLength": 1, - "pattern": "^[-\\w\\._\\(\\)]+$", "x-ms-parameter-location": "method" }, "DataCollectionRuleNameParameter": { @@ -476,20 +372,6 @@ "description": "The name of the data collection rule. The name is case insensitive.", "required": true, "type": "string", - "maxLength": 64, - "minLength": 1, - "pattern": "^[-\\w\\._\\(\\)]+$", - "x-ms-parameter-location": "method" - }, - "ResourceGroupNameParameter": { - "in": "path", - "name": "resourceGroupName", - "description": "The name of the resource group. The name is case insensitive.", - "required": true, - "type": "string", - "maxLength": 90, - "minLength": 1, - "pattern": "^[-\\w\\._\\(\\)]+$", "x-ms-parameter-location": "method" }, "ResourceUriParameter": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRules_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRules_API.json index 368c0c94a735..ee1120b4af5e 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRules_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/dataCollectionRules_API.json @@ -34,7 +34,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" @@ -50,7 +50,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -92,7 +92,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -121,7 +121,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -140,7 +140,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -167,7 +167,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -200,7 +200,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -227,7 +227,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -254,7 +254,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -278,7 +278,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -297,7 +297,7 @@ "default": { "description": "Error", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -312,19 +312,10 @@ "definitions": { "PerfCounterDataSource": { "description": "Definition of which performance counters will be collected and how they will be collected by this data collection rule.\r\nCollected from both Windows and Linux machines where the counter is present.", - "required": [ - "counterSpecifiers", - "name", - "samplingFrequencyInSeconds", - "scheduledTransferPeriod", - "streams" - ], "type": "object", "properties": { "streams": { "description": "List of streams that this data source will be sent to.\r\nA stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.", - "maxLength": 10, - "minLength": 1, "type": "array", "items": { "enum": [ @@ -338,34 +329,14 @@ } } }, - "scheduledTransferPeriod": { - "description": "The interval between data uploads (scheduled transfers), rounded up to the nearest minute.", - "enum": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT60M" - ], - "type": "string", - "example": "PT1M", - "x-ms-enum": { - "name": "KnownPerfCounterDataSourceScheduledTransferPeriod", - "modelAsString": true - } - }, "samplingFrequencyInSeconds": { "format": "int32", "description": "The number of seconds between consecutive counter measurements (samples).", - "maximum": 30, - "minimum": 1, "type": "integer", "example": 15 }, "counterSpecifiers": { "description": "A list of specifier names of the performance counters you want to collect.\r\nUse a wildcard (*) to collect a counter for all instances.\r\nTo get a list of performance counters on Windows, run the command 'typeperf'.", - "maxLength": 100, - "minLength": 1, "type": "array", "items": { "type": "string" @@ -373,9 +344,6 @@ }, "name": { "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule.", - "maxLength": 32, - "minLength": 0, - "pattern": "^[-\\w\\._\\(\\)]+$", "type": "string", "example": "myDataSource1" } @@ -383,18 +351,10 @@ }, "WindowsEventLogDataSource": { "description": "Definition of which Windows Event Log events will be collected and how they will be collected.\r\nOnly collected from Windows machines.", - "required": [ - "name", - "scheduledTransferPeriod", - "streams", - "xPathQueries" - ], "type": "object", "properties": { "streams": { "description": "List of streams that this data source will be sent to.\r\nA stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.", - "maxLength": 10, - "minLength": 1, "type": "array", "items": { "enum": [ @@ -408,26 +368,8 @@ } } }, - "scheduledTransferPeriod": { - "description": "The interval between data uploads (scheduled transfers), rounded up to the nearest minute.", - "enum": [ - "PT1M", - "PT5M", - "PT15M", - "PT30M", - "PT60M" - ], - "type": "string", - "example": "PT5M", - "x-ms-enum": { - "name": "KnownWindowsEventLogDataSourceScheduledTransferPeriod", - "modelAsString": true - } - }, "xPathQueries": { "description": "A list of Windows Event Log queries in XPATH format.", - "maxLength": 100, - "minLength": 1, "type": "array", "items": { "type": "string" @@ -435,9 +377,6 @@ }, "name": { "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule.", - "maxLength": 32, - "minLength": 0, - "pattern": "^[-\\w\\._\\(\\)]+$", "type": "string", "example": "myDataSource1" } @@ -445,17 +384,10 @@ }, "SyslogDataSource": { "description": "Definition of which syslog data will be collected and how it will be collected.\r\nOnly collected from Linux machines.", - "required": [ - "facilityNames", - "name", - "streams" - ], "type": "object", "properties": { "streams": { "description": "List of streams that this data source will be sent to.\r\nA stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.", - "maxLength": 10, - "minLength": 1, "type": "array", "items": { "enum": [ @@ -470,8 +402,6 @@ }, "facilityNames": { "description": "The list of facility names.", - "maxLength": 20, - "minLength": 1, "type": "array", "items": { "enum": [ @@ -486,7 +416,7 @@ "news", "syslog", "user", - "UUCP", + "uucp", "local0", "local1", "local2", @@ -494,7 +424,8 @@ "local4", "local5", "local6", - "local7" + "local7", + "*" ], "type": "string", "x-ms-enum": { @@ -505,8 +436,6 @@ }, "logLevels": { "description": "The log levels to collect.", - "maxLength": 10, - "minLength": 1, "type": "array", "items": { "enum": [ @@ -517,7 +446,8 @@ "Error", "Critical", "Alert", - "Emergency" + "Emergency", + "*" ], "type": "string", "x-ms-enum": { @@ -528,9 +458,6 @@ }, "name": { "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule.", - "maxLength": 32, - "minLength": 0, - "pattern": "^[-\\w\\._\\(\\)]+$", "type": "string", "example": "myDataSource1" } @@ -539,37 +466,18 @@ "ExtensionDataSource": { "description": "Definition of which data will be collected from a separate VM extension that integrates with the Azure Monitor Agent.\r\nCollected from either Windows and Linux machines, depending on which extension is defined.", "required": [ - "extensionName", - "name", - "streams" + "extensionName" ], "type": "object", "properties": { "streams": { "description": "List of streams that this data source will be sent to.\r\nA stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.", - "maxLength": 10, - "minLength": 1, "type": "array", "items": { "enum": [ - "Microsoft-AntiMalwareStatus", - "Microsoft-Auditd", - "Microsoft-CISCOASA", - "Microsoft-CommonSecurityLog", - "Microsoft-ComputerGroup", "Microsoft-Event", - "Microsoft-FirewallLog", - "Microsoft-HealthStateChange", - "Microsoft-Heartbeat", "Microsoft-InsightsMetrics", - "Microsoft-OperationLog", "Microsoft-Perf", - "Microsoft-ProcessInvestigator", - "Microsoft-ProtectionStatus", - "Microsoft-RomeDetectionEvent", - "Microsoft-SecurityBaseline", - "Microsoft-SecurityBaselineSummary", - "Microsoft-SecurityEvent", "Microsoft-Syslog", "Microsoft-WindowsEvent" ], @@ -582,9 +490,6 @@ }, "extensionName": { "description": "The name of the VM extension.", - "maxLength": 64, - "minLength": 0, - "pattern": "^[-\\w\\._\\(\\)]+$", "type": "string", "example": "AzureSecurityLinuxAgent" }, @@ -592,11 +497,15 @@ "description": "The extension settings. The format is specific for particular extension.", "type": "object" }, + "inputDataSources": { + "description": "The list of data sources this extension needs data from.", + "type": "array", + "items": { + "type": "string" + } + }, "name": { "description": "A friendly name for the data source. \r\nThis name should be unique across all data sources (regardless of type) within the data collection rule.", - "maxLength": 32, - "minLength": 0, - "pattern": "^[-\\w\\._\\(\\)]+$", "type": "string", "example": "myDataSource1" } @@ -608,7 +517,6 @@ "properties": { "performanceCounters": { "description": "The list of performance counter data source configurations.", - "maxLength": 10, "type": "array", "items": { "$ref": "#/definitions/PerfCounterDataSource" @@ -616,7 +524,6 @@ }, "windowsEventLogs": { "description": "The list of Windows Event Log data source configurations.", - "maxLength": 10, "type": "array", "items": { "$ref": "#/definitions/WindowsEventLogDataSource" @@ -624,7 +531,6 @@ }, "syslog": { "description": "The list of Syslog data source configurations.", - "maxLength": 10, "type": "array", "items": { "$ref": "#/definitions/SyslogDataSource" @@ -632,7 +538,6 @@ }, "extensions": { "description": "The list of Azure VM extension data source configurations.", - "maxLength": 10, "type": "array", "items": { "$ref": "#/definitions/ExtensionDataSource" @@ -642,10 +547,6 @@ }, "LogAnalyticsDestination": { "description": "Log Analytics destination.", - "required": [ - "name", - "workspaceResourceId" - ], "type": "object", "properties": { "workspaceResourceId": { @@ -653,11 +554,17 @@ "type": "string", "example": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace" }, + "workspaceId": { + "description": "The Customer ID of the Log Analytics workspace.", + "type": "string", + "readOnly": true, + "example": "9ba8bc53-bd36-4156-8667-e983e7ae0e4f", + "x-ms-mutability": [ + "read" + ] + }, "name": { "description": "A friendly name for the destination. \r\nThis name should be unique across all destinations (regardless of type) within the data collection rule.", - "maxLength": 32, - "minLength": 0, - "pattern": "^[-\\w\\._\\(\\)]+$", "type": "string", "example": "myDest1" } @@ -665,16 +572,10 @@ }, "AzureMonitorMetricsDestination": { "description": "Azure Monitor Metrics destination.", - "required": [ - "name" - ], "type": "object", "properties": { "name": { "description": "A friendly name for the destination. \r\nThis name should be unique across all destinations (regardless of type) within the data collection rule.", - "maxLength": 32, - "minLength": 0, - "pattern": "^[-\\w\\._\\(\\)]+$", "type": "string", "example": "myDest1" } @@ -686,7 +587,6 @@ "properties": { "logAnalytics": { "description": "List of Log Analytics destinations.", - "maxLength": 10, "type": "array", "items": { "$ref": "#/definitions/LogAnalyticsDestination" @@ -704,37 +604,16 @@ }, "DataFlow": { "description": "Definition of which streams are sent to which destinations.", - "required": [ - "destinations", - "streams" - ], "type": "object", "properties": { "streams": { "description": "List of streams for this data flow.", - "maxLength": 20, - "minLength": 1, "type": "array", "items": { "enum": [ - "Microsoft-AntiMalwareStatus", - "Microsoft-Auditd", - "Microsoft-CISCOASA", - "Microsoft-CommonSecurityLog", - "Microsoft-ComputerGroup", "Microsoft-Event", - "Microsoft-FirewallLog", - "Microsoft-HealthStateChange", - "Microsoft-Heartbeat", "Microsoft-InsightsMetrics", - "Microsoft-OperationLog", "Microsoft-Perf", - "Microsoft-ProcessInvestigator", - "Microsoft-ProtectionStatus", - "Microsoft-RomeDetectionEvent", - "Microsoft-SecurityBaseline", - "Microsoft-SecurityBaselineSummary", - "Microsoft-SecurityEvent", "Microsoft-Syslog", "Microsoft-WindowsEvent" ], @@ -747,8 +626,6 @@ }, "destinations": { "description": "List of destinations for this data flow.", - "maxLength": 10, - "minLength": 1, "type": "array", "items": { "type": "string" @@ -758,17 +635,21 @@ }, "DataCollectionRule": { "description": "Definition of what monitoring data to collect and where that data should be sent.", - "required": [ - "dataFlows", - "destinations" - ], "type": "object", "properties": { "description": { "description": "Description of the data collection rule.", - "maxLength": 256, "type": "string" }, + "immutableId": { + "description": "The immutable ID of this data collection rule. This property is READ-ONLY.", + "type": "string", + "readOnly": true, + "example": "dcr-b74e0d383fc9415abaa584ec41adece3", + "x-ms-mutability": [ + "read" + ] + }, "dataSources": { "description": "The specification of data sources. \r\nThis property is optional and can be omitted if the rule is meant to be used via direct calls to the provisioned endpoint.", "allOf": [ @@ -787,8 +668,6 @@ }, "dataFlows": { "description": "The specification of data flows.", - "maxLength": 10, - "minLength": 1, "type": "array", "items": { "$ref": "#/definitions/DataFlow" @@ -819,8 +698,7 @@ "DataCollectionRuleResource": { "description": "Definition of ARM tracked top level resource.", "required": [ - "location", - "properties" + "location" ], "type": "object", "properties": { @@ -848,6 +726,19 @@ "type": "string" } }, + "kind": { + "description": "The kind of the resource.", + "enum": [ + "Linux", + "Windows" + ], + "type": "string", + "example": "Linux", + "x-ms-enum": { + "name": "KnownDataCollectionRuleResourceKind", + "modelAsString": true + } + }, "id": { "description": "Fully qualified ID of the resource.", "type": "string", @@ -906,100 +797,6 @@ } } }, - "ErrorAdditionalInfo": { - "description": "Additional information for common error response.", - "type": "object", - "properties": { - "type": { - "description": "The additional info type.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "info": { - "description": "The additional info.", - "type": "object", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, - "ErrorDetails": { - "description": "Common error details.", - "type": "object", - "properties": { - "code": { - "description": "Error code which can be used to programmatically identify the class of error.", - "type": "string", - "readOnly": true, - "example": "BadArgument", - "x-ms-mutability": [ - "read" - ] - }, - "message": { - "description": "Describes the error in detail and provides debugging information.", - "type": "string", - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "target": { - "description": "The target of the particular error (for example, the name of the property in error).", - "type": "string", - "readOnly": true, - "example": "properties.provisioningState", - "x-ms-mutability": [ - "read" - ] - }, - "details": { - "description": "Additional nested error detail objects.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorDetails" - }, - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - }, - "additionalInfo": { - "description": "Additional error information.", - "type": "array", - "items": { - "$ref": "#/definitions/ErrorAdditionalInfo" - }, - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, - "ErrorResponse": { - "description": "Common error response.", - "type": "object", - "properties": { - "error": { - "description": "Error details.", - "allOf": [ - { - "$ref": "#/definitions/ErrorDetails" - } - ], - "readOnly": true, - "x-ms-mutability": [ - "read" - ] - } - } - }, "ResourceForUpdate": { "description": "Definition of ARM tracked top level resource properties for update operation.", "type": "object", @@ -1021,20 +818,6 @@ "description": "The name of the data collection rule. The name is case insensitive.", "required": true, "type": "string", - "maxLength": 64, - "minLength": 1, - "pattern": "^[-\\w\\._\\(\\)]+$", - "x-ms-parameter-location": "method" - }, - "ResourceGroupNameParameter": { - "in": "path", - "name": "resourceGroupName", - "description": "The name of the resource group. The name is case insensitive.", - "required": true, - "type": "string", - "maxLength": 90, - "minLength": 1, - "pattern": "^[-\\w\\._\\(\\)]+$", "x-ms-parameter-location": "method" } }, diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesCreate.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesCreate.json index a610b8a6e132..bc0ec0180881 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesCreate.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesCreate.json @@ -14,7 +14,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 15, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -28,7 +27,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT5M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Process(_Total)\\Thread Count" @@ -41,7 +39,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!" ] @@ -51,7 +48,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT5M", "xPathQueries": [ "System![System[(Level = 1 or Level = 2 or Level = 3)]]", "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" @@ -124,6 +120,7 @@ "tag2": "B" }, "properties": { + "immutableId": "dcr-b74e0d383fc9415abaa584ec41adece3", "dataSources": { "performanceCounters": [ { @@ -131,7 +128,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 15, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -145,7 +141,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT5M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Process(_Total)\\Thread Count" @@ -158,7 +153,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!" ] @@ -168,7 +162,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT5M", "xPathQueries": [ "System![System[(Level = 1 or Level = 2 or Level = 3)]]", "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" @@ -210,6 +203,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace", + "workspaceId": "9ba8bc53-bd36-4156-8667-e983e7ae0e4f", "name": "centralWorkspace" } ] @@ -241,6 +235,7 @@ "tag2": "B" }, "properties": { + "immutableId": "dcr-b74e0d383fc9415abaa584ec41adece3", "dataSources": { "performanceCounters": [ { @@ -248,7 +243,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 15, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -262,7 +256,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT5M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Process(_Total)\\Thread Count" @@ -275,7 +268,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!" ] @@ -285,7 +277,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT5M", "xPathQueries": [ "System![System[(Level = 1 or Level = 2 or Level = 3)]]", "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" @@ -327,6 +318,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace", + "workspaceId": "9ba8bc53-bd36-4156-8667-e983e7ae0e4f", "name": "centralWorkspace" } ] diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesGet.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesGet.json index 0f97cfe6d944..fbc3ded22da4 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesGet.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesGet.json @@ -17,6 +17,7 @@ "tag2": "B" }, "properties": { + "immutableId": "dcr-b74e0d383fc9415abaa584ec41adece3", "dataSources": { "performanceCounters": [ { @@ -24,7 +25,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 15, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -38,7 +38,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT5M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Process(_Total)\\Thread Count" @@ -51,7 +50,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!" ] @@ -61,7 +59,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT5M", "xPathQueries": [ "System![System[(Level = 1 or Level = 2 or Level = 3)]]", "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" @@ -103,6 +100,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace", + "workspaceId": "9ba8bc53-bd36-4156-8667-e983e7ae0e4f", "name": "centralWorkspace" } ] diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListByResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListByResourceGroup.json index 72eabe2037d6..4843d4810263 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListByResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListByResourceGroup.json @@ -18,6 +18,7 @@ "tag2": "B" }, "properties": { + "immutableId": "dcr-b74e0d383fc9415abaa584ec41adece3", "dataSources": { "performanceCounters": [ { @@ -25,7 +26,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 15, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -39,7 +39,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT5M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Process(_Total)\\Thread Count" @@ -52,7 +51,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!" ] @@ -62,7 +60,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT5M", "xPathQueries": [ "System![System[(Level = 1 or Level = 2 or Level = 3)]]", "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" @@ -104,6 +101,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace", + "workspaceId": "9ba8bc53-bd36-4156-8667-e983e7ae0e4f", "name": "centralWorkspace" } ] @@ -132,6 +130,7 @@ "tag1": "C" }, "properties": { + "immutableId": "dcr-ca1e6d9dad844b2c94e7961c42af917a", "dataSources": { "performanceCounters": [ { @@ -139,7 +138,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -154,7 +152,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!*", "System!*[System[(Level = 1 or Level = 2 or Level = 3)]]", @@ -167,6 +164,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/herResourceGroup/providers/Microsoft.OperationalInsights/workspaces/herTeamWorkspace", + "workspaceId": "c49b982a-c4f7-40c4-bd13-d6588f1b4015", "name": "herWorkspace" } ] diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListBySubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListBySubscription.json index e22378ae4ae7..58a188f48e35 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListBySubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesListBySubscription.json @@ -17,6 +17,7 @@ "tag2": "B" }, "properties": { + "immutableId": "dcr-b74e0d383fc9415abaa584ec41adece3", "dataSources": { "performanceCounters": [ { @@ -24,7 +25,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 15, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -38,7 +38,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT5M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Process(_Total)\\Thread Count" @@ -51,7 +50,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!" ] @@ -61,7 +59,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT5M", "xPathQueries": [ "System![System[(Level = 1 or Level = 2 or Level = 3)]]", "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" @@ -103,6 +100,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace", + "workspaceId": "9ba8bc53-bd36-4156-8667-e983e7ae0e4f", "name": "centralWorkspace" } ] @@ -131,6 +129,7 @@ "tag1": "C" }, "properties": { + "immutableId": "dcr-ca1e6d9dad844b2c94e7961c42af917a", "dataSources": { "performanceCounters": [ { @@ -138,7 +137,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -153,7 +151,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!*", "System!*[System[(Level = 1 or Level = 2 or Level = 3)]]", @@ -166,6 +163,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/herResourceGroup/providers/Microsoft.OperationalInsights/workspaces/herTeamWorkspace", + "workspaceId": "c49b982a-c4f7-40c4-bd13-d6588f1b4015", "name": "herWorkspace" } ] diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesUpdate.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesUpdate.json index f886de91f69c..4c42feb17ce3 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesUpdate.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2019-11-01-preview/examples/DataCollectionRulesUpdate.json @@ -25,6 +25,7 @@ "tag3": "C" }, "properties": { + "immutableId": "dcr-b74e0d383fc9415abaa584ec41adece3", "dataSources": { "performanceCounters": [ { @@ -32,7 +33,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT1M", "samplingFrequencyInSeconds": 15, "counterSpecifiers": [ "\\Processor(_Total)\\% Processor Time", @@ -46,7 +46,6 @@ "streams": [ "Microsoft-Perf" ], - "scheduledTransferPeriod": "PT5M", "samplingFrequencyInSeconds": 30, "counterSpecifiers": [ "\\Process(_Total)\\Thread Count" @@ -59,7 +58,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT1M", "xPathQueries": [ "Security!" ] @@ -69,7 +67,6 @@ "streams": [ "Microsoft-WindowsEvent" ], - "scheduledTransferPeriod": "PT5M", "xPathQueries": [ "System![System[(Level = 1 or Level = 2 or Level = 3)]]", "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" @@ -111,6 +108,7 @@ "logAnalytics": [ { "workspaceResourceId": "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace", + "workspaceId": "9ba8bc53-bd36-4156-8667-e983e7ae0e4f", "name": "centralWorkspace" } ]