Skip to content

Commit ca654c2

Browse files
anuchandyanuchandy
authored
sync with master (#3153)
* Use common Resource & Sku definitions in all Sql specs (#3134) * Use common Resource & Sku definitions * Don't use common Sku definition * Just use common SQL definitions * Fixed syntax error * Fixed another syntax error * Fixed sku ref error * Fixed syntax error in example * Fix Python conf of servermanager (#3140) * Fix ServerManager Py Conf (#3141) * Plug SwaggerToSdk to LogAnalyticsMgmt (#3142) * [Storage] Support Management policy on new api version 2018-03-01-preview (#3137) * [Storage] Add new API version 2018-03-01-preview * [Storage] Update rest version 2018-03-01-preview * [Storage] Support Management Policy * [Storage] Update since code review comments * Add Python conf * [Storage] Add managment policy doc link to policy description. * [Storage] modify as review comments * RSA key size examples, ECC descriptions (#3136) * RSA key size examples, ECC descriptions * remove preview changes for now * Added GroupType property in HybridWorkerGroup (#3132) * Watcher resource swagger specs. For more details on the Usage of the resource: https://docs.microsoft.com/en-us/azure/automation/automation-watchers-tutorial (#3102) * Watcher specs * using the same model for get/put input and output. * Fix storage Python conf (#3148) * Fix for Azure Networking swagger 2018-04-01 version (#3146)
1 parent 27e4e7a commit ca654c2

File tree

239 files changed

+12896
-3007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+12896
-3007
lines changed

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,6 +1801,18 @@
18011801
"credential": {
18021802
"$ref": "#/definitions/RunAsCredentialAssociationProperty",
18031803
"description": "Sets the credential of a worker group."
1804+
},
1805+
"groupType": {
1806+
"type": "string",
1807+
"description": "Type of the HybridWorkerGroup.",
1808+
"enum": [
1809+
"User",
1810+
"System"
1811+
],
1812+
"x-ms-enum": {
1813+
"name": "GroupTypeEnum",
1814+
"modelAsString": true
1815+
}
18041816
}
18051817
},
18061818
"description": "Definition of hybrid runbook worker group."
@@ -3804,6 +3816,117 @@
38043816
}
38053817
},
38063818
"description": "The parameters supplied to the update webhook operation."
3819+
},
3820+
"WatcherProperties": {
3821+
"properties": {
3822+
"executionFrequencyInSeconds": {
3823+
"type": "integer",
3824+
"format": "int64",
3825+
"description": "Gets or sets the frequency at which the watcher is invoked."
3826+
},
3827+
"scriptName": {
3828+
"type": "string",
3829+
"description": "Gets or sets the name of the script the watcher is attached to, i.e. the name of an existing runbook."
3830+
},
3831+
"scriptParameters": {
3832+
"type": "object",
3833+
"additionalProperties": {
3834+
"type": "string"
3835+
},
3836+
"description": "Gets or sets the parameters of the script."
3837+
},
3838+
"scriptRunOn": {
3839+
"type": "string",
3840+
"description": "Gets or sets the name of the hybrid worker group the watcher will run on."
3841+
},
3842+
"status": {
3843+
"type": "string",
3844+
"readOnly": true,
3845+
"description": "Gets the current status of the watcher."
3846+
},
3847+
"creationTime": {
3848+
"type": "string",
3849+
"readOnly": true,
3850+
"format": "date-time",
3851+
"description": "Gets or sets the creation time.",
3852+
"x-nullable": false
3853+
},
3854+
"lastModifiedTime": {
3855+
"type": "string",
3856+
"readOnly": true,
3857+
"format": "date-time",
3858+
"description": "Gets or sets the last modified time.",
3859+
"x-nullable": false
3860+
},
3861+
"lastModifiedBy": {
3862+
"type": "string",
3863+
"readOnly": true,
3864+
"description": "Details of the user who last modified the watcher."
3865+
},
3866+
"description": {
3867+
"type": "string",
3868+
"description": "Gets or sets the description."
3869+
}
3870+
},
3871+
"description": "Definition of the watcher properties"
3872+
},
3873+
"Watcher": {
3874+
"properties": {
3875+
"properties": {
3876+
"$ref": "#/definitions/WatcherProperties",
3877+
"x-ms-client-flatten": true,
3878+
"description": "Gets or sets the watcher properties."
3879+
},
3880+
"etag": {
3881+
"type": "string",
3882+
"description": "Gets or sets the etag of the resource."
3883+
}
3884+
},
3885+
"description": "Definition of the watcher type.",
3886+
"allOf": [
3887+
{
3888+
"$ref": "#/definitions/TrackedResource"
3889+
}
3890+
]
3891+
},
3892+
"WatcherListResult": {
3893+
"properties": {
3894+
"value": {
3895+
"type": "array",
3896+
"items": {
3897+
"$ref": "#/definitions/Watcher"
3898+
},
3899+
"description": "Gets or sets a list of watchers."
3900+
},
3901+
"nextLink": {
3902+
"type": "string",
3903+
"description": "Gets or sets the next link."
3904+
}
3905+
},
3906+
"description": "The response model for the list watcher operation."
3907+
},
3908+
"WatcherUpdateParameters": {
3909+
"properties": {
3910+
"properties": {
3911+
"$ref": "#/definitions/WatcherUpdateProperties",
3912+
"x-ms-client-flatten": true,
3913+
"description": "Gets or sets the watcher update properties."
3914+
},
3915+
"name": {
3916+
"type": "string",
3917+
"description": "Gets or sets the name of the resource."
3918+
}
3919+
}
3920+
},
3921+
"WatcherUpdateProperties": {
3922+
"properties": {
3923+
"executionFrequencyInSeconds": {
3924+
"type": "integer",
3925+
"format": "int64",
3926+
"description": "Gets or sets the frequency at which the watcher is invoked."
3927+
}
3928+
},
3929+
"description": "The properties of the update watcher operation."
38073930
}
38083931
},
38093932
"parameters": {

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/createOrUpdateWatcher.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2015-10-31",
8+
"parameters": {
9+
"name":"MyTestWatcher",
10+
"type":null,
11+
"location":null,
12+
"tags":{ },
13+
"etag":null,
14+
"properties":{
15+
"executionFrequencyInSeconds":60,
16+
"scriptName":"MyTestWatcherRunbook",
17+
"scriptParameters":null,
18+
"description":"This is a test watcher.",
19+
"scriptRunOn":"MyTestHybridWorkerGroup",
20+
"creationTime":"2016-11-01T04:22:47.7333333-07:00",
21+
"lastModifiedBy":null,
22+
"lastModifiedTime":"2016-11-01T04:22:47.7333333-07:00"
23+
}
24+
}
25+
},
26+
"responses": {
27+
"201": {
28+
"headers": {},
29+
"body": {
30+
"id":"/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
31+
"name":"MyTestWatcher",
32+
"type":null,
33+
"location":null,
34+
"tags":{ },
35+
"etag":null,
36+
"properties":{
37+
"executionFrequencyInSeconds":60,
38+
"scriptName":"MyTestWatcherRunbook",
39+
"scriptParameters":null,
40+
"description":"This is a test watcher.",
41+
"status":"New",
42+
"scriptRunOn":"MyTestHybridWorkerGroup",
43+
"creationTime":"2018-05-14T21:14:09.607+00:00",
44+
"lastModifiedBy":null,
45+
"lastModifiedTime":"2018-05-14T21:14:09.607+00:00"
46+
}
47+
}
48+
},
49+
"200": {
50+
"headers": {},
51+
"body": {
52+
"id":"/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
53+
"name":"MyTestWatcher",
54+
"type":null,
55+
"location":null,
56+
"tags":{ },
57+
"etag":null,
58+
"properties":{
59+
"executionFrequencyInSeconds":60,
60+
"scriptName":"MyTestWatcherRunbook",
61+
"scriptParameters":null,
62+
"description":"This is a test watcher.",
63+
"status":"New",
64+
"scriptRunOn":"MyTestHybridWorkerGroup",
65+
"creationTime":"2018-05-14T21:14:09.607+00:00",
66+
"lastModifiedBy":null,
67+
"lastModifiedTime":"2018-05-14T21:14:09.607+00:00"
68+
}
69+
}
70+
}
71+
}
72+
}

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/deleteWatcher.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2015-10-31"
8+
},
9+
"responses": {
10+
"200": {}
11+
}
12+
}

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/getWatcher.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2015-10-31"
8+
},
9+
"responses":{
10+
"200": {
11+
"headers": {},
12+
"body": {
13+
"id":"/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
14+
"name":"MyTestWatcher",
15+
"type":null,
16+
"location":null,
17+
"tags":{ },
18+
"etag":null,
19+
"properties":{
20+
"executionFrequencyInSeconds":60,
21+
"scriptName":"MyTestWatcherRunbook",
22+
"scriptParameters":{ },
23+
"description":"",
24+
"status":"Running",
25+
"scriptRunOn":"MyTestHybridWorkerGroup",
26+
"creationTime":"2017-11-30T18:50:17.163+00:00",
27+
"lastModifiedBy":null,
28+
"lastModifiedTime":"2017-11-30T18:50:17.163+00:00"
29+
}
30+
}
31+
}
32+
}
33+
}

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/listWatchersByAutomationAccount.json‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"api-version": "2015-10-31"
7+
},
8+
"responses": {
9+
"200": {
10+
"headers": {},
11+
"body": {
12+
"value": [
13+
{
14+
"id":"/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
15+
"name":"MyTestWatcher",
16+
"properties":{
17+
"executionFrequencyInSeconds":60,
18+
"scriptName":"MyTestWatcher",
19+
"scriptParameters":null,
20+
"description":"This is a test watcher.",
21+
"status":null,
22+
"scriptRunOn":"MyTestHybridWorkerGroup",
23+
"creationTime":"2016-12-20T21:36:48.597+00:00",
24+
"lastModifiedBy":null,
25+
"lastModifiedTime":"2016-12-20T21:36:48.597+00:00"
26+
}
27+
},
28+
{
29+
"id":"/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher01",
30+
"name":"MyTestWatcher01",
31+
"properties":{
32+
"executionFrequencyInSeconds":60,
33+
"scriptName":"MyTestWatcher",
34+
"scriptParameters":null,
35+
"description":"This is a test watcher.",
36+
"status":null,
37+
"scriptRunOn":"MyTestHybridWorkerGroup",
38+
"creationTime":"2016-12-20T20:47:24.697+00:00",
39+
"lastModifiedBy":null,
40+
"lastModifiedTime":"2016-12-20T20:47:24.697+00:00"
41+
}
42+
},
43+
{
44+
"id":"/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher02",
45+
"name":"MyTestWatcher02",
46+
"properties":{
47+
"executionFrequencyInSeconds":60,
48+
"scriptName":"MyTestWatcher",
49+
"scriptParameters":null,
50+
"description":"This is a test watcher.",
51+
"status":null,
52+
"scriptRunOn":"MyTestHybridWorkerGroup",
53+
"creationTime":"2016-12-20T21:26:35.647+00:00",
54+
"lastModifiedBy":null,
55+
"lastModifiedTime":"2016-12-20T21:26:35.647+00:00"
56+
}
57+
}
58+
]
59+
}
60+
}
61+
}
62+
}

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/startWatcher.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2015-10-31"
8+
},
9+
"responses": {
10+
"200": {}
11+
}
12+
}

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/stopWatcher.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2018-01-15"
8+
},
9+
"responses": {
10+
"200": {}
11+
}
12+
}

‎specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/examples/updateWatcher.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"parameters": {
8+
"name":"MyTestWatcher",
9+
"properties":{
10+
"executionFrequencyInSeconds":600
11+
}
12+
},
13+
"api-version": "2015-10-31"
14+
},
15+
"responses": {
16+
"200": {
17+
"headers": {},
18+
"body": {
19+
"id":"/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
20+
"name":"MyTestWatcher",
21+
"type":null,
22+
"location":null,
23+
"tags":{},
24+
"etag":null,
25+
"properties":{
26+
"executionFrequencyInSeconds":600,
27+
"scriptName":"MyTestWatcherRunbook",
28+
"scriptParameters":{},
29+
"description":"This is a test watcher.",
30+
"status":"New",
31+
"scriptRunOn":"MyTestHybridWorkerGroup",
32+
"creationTime":"2018-05-14T21:33:02.197+00:00",
33+
"lastModifiedBy":null,
34+
"lastModifiedTime":"2018-05-14T22:29:57.65+00:00"
35+
}
36+
}
37+
}
38+
}
39+
}

0 commit comments

Comments
 (0)