diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json index b6893335255c..dc301c59af0f 100755 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json @@ -1,79 +1,83 @@ { "parameters": { - "subscriptionId": "51766542-3ed7-4a72-a187-0c8ab644ddab", - "resourceGroupName": "mygroup", - "automationAccountName": "myaccount", - "softwareUpdateConfigurationName": "testpatch", - "api-version": "2017-05-15-preview", - "parameters": { - "properties": { - "updateConfiguration": { - "operatingSystem": "Windows", - "duration": "PT2H0M", - "windows": { - "excludedKbNumbers": [ - "168934", - "168973" - ], - "includedUpdateClassifications": "Critical", - "rebootSetting": "IfRequired" - }, - "azureVirtualMachines": [ - "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-01", - "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-02", - "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-03" - ], - "nonAzureComputerNames": [ - "box1.contoso.com", - "box2.contoso.com" - ], - "targets": [ - { - "azureQueries": { - "scope": [ - "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources", - "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067" - ], - "tagSettings": { - "tags": [ - { - "tag1": [ - "tag1Value1", - "tag1Value2", - "tag1Value3" - ] - }, - { - "tag2": [ - "tag2Value1", - "tag2Value2", - "tag2Value3" - ] - } + "subscriptionId": "51766542-3ed7-4a72-a187-0c8ab644ddab", + "resourceGroupName": "mygroup", + "automationAccountName": "myaccount", + "softwareUpdateConfigurationName": "testpatch", + "api-version": "2017-05-15-preview", + "parameters": { + "properties": { + "updateConfiguration": { + "operatingSystem": "Windows", + "duration": "PT2H0M", + "windows": { + "excludedKbNumbers": [ + "168934", + "168973" + ], + "includedUpdateClassifications": "Critical", + "rebootSetting": "IfRequired" + }, + "azureVirtualMachines": [ + "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-01", + "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-02", + "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-03" ], - "filterOperator": "All" - }, - "locations": [ - "Japan East", - "UK South" - ] - } - } - ] - }, - "scheduleInfo": { - "frequency": "Hour", - "startTime": "2017-10-19T12:22:57+00:00", - "timeZone": "America/Los_Angeles", - "interval": 1, - "expiryTime": "2018-11-09T11:22:57+00:00", - "advancedSchedule": { - "weekDays": [ - "Monday", - "Thursday" - ] - } - }, + "nonAzureComputerNames": [ + "box1.contoso.com", + "box2.contoso.com" + ], + "targets": + { + "azureQueries":[ + { + "scope":[ + "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources", + "/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067" + ], + "tagSettings":{ + "tags":[ + { + "tag1": ["tag1Value1", "tag1Value2", "tag1Value3"] + }, + { + "tag2": ["tag2Value1", "tag2Value2", "tag2Value3"] + } + ], + "filterOperator" : "All" + }, + "locations":[ + "Japan East", + "UK South" + ] + } + ], + "nonAzureQueries":[ + { + "FunctionAlias": "SavedSearch1", + "WorkspaceId" : "WorkspaceId1" + }, + { + "FunctionAlias": "SavedSearch2", + "WorkspaceId" : "WorkspaceId2" + } + ] + + } + }, + "scheduleInfo": { + "frequency": "Hour", + "startTime": "2017-10-19T12:22:57+00:00", + "timeZone": "America/Los_Angeles", + "interval": 1, + "expiryTime": "2018-11-09T11:22:57+00:00", + "advancedSchedule": { + "weekDays": [ + "Monday", + "Thursday" + ] + } + }, "tasks": { "preTask": { "source": "HelloWorld", diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json index 2862d3dbe5ed..2c04af304423 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json @@ -801,8 +801,31 @@ "type": "object", "$ref": "#/definitions/AzureQueryProperties" } + }, + "nonAzureQueries":{ + "description": "List of non Azure queries in the software update configuration.", + "type": "array", + "items": { + "type": "object", + "$ref": "#/definitions/NonAzureQueryProperties" + } + } + } + }, + "NonAzureQueryProperties":{ + "type": "object", + "description": "Non Azure query for the update configuration.", + "properties":{ + "functionAlias" :{ + "type": "string", + "description": "Log Analytics Saved Search name." + }, + "workspaceId" :{ + "type": "string", + "description": "Workspace Id for Log Analytics in which the saved Search is resided." } } + }, "AzureQueryProperties": { "type": "object",