Skip to content

Catching up with missing commits (not moved to the new branch), Fixing issue #1475: incorrect example in LogProfiles API documentation for CreateOrUpdate, fixing incorrect logProfiles example names. #1481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishrutshah merged 10 commits into from
Aug 8, 2017
Merged

Catching up with missing commits (not moved to the new branch), Fixing issue #1475: incorrect example in LogProfiles API documentation for CreateOrUpdate, fixing incorrect logProfiles example names. #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dae5cba
Catching up with missing commits (not moved to the new branch), fFixi…
gucalder Jul 27, 2017
8a339ef
Removing success response code from example for log profiles delete A…
gucalder Aug 3, 2017
764f130
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
gucalder Aug 3, 2017
d04983f
Fixing some warnings and one example
gucalder Aug 3, 2017
ca4db34
Fixing issues with the examples validation.
gucalder Aug 7, 2017
d596398
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
gucalder Aug 7, 2017
b1bda80
Fixing one example.
gucalder Aug 7, 2017
6c48a91
Adding tags and location in the proper place for two examples.
gucalder Aug 7, 2017
3449ce9
Fixing name change in the body parameter and the corresponding exampl…
gucalder Aug 8, 2017
c266d97
Merge branch 'current' of https://github.com/Azure/azure-rest-api-spe…
gucalder Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions specification/monitor/resource-manager/microsoft.insights/2015-04-01/autoscale_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,8 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/AutoscaleSetting"
"$ref": "#/definitions/AutoscaleSetting",
"description": "The autoscale setting of the resource."
}
},
"description": "The autoscale setting resource."
Expand All @@ -1270,7 +1271,8 @@
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/AutoscaleSetting"
"$ref": "#/definitions/AutoscaleSetting",
"description": "The autoscale setting properties of the update operation."
}
}
},
Expand Down Expand Up @@ -1338,4 +1340,4 @@
"x-ms-parameter-location": "method"
}
}
}
}
80 changes: 75 additions & 5 deletions specification/monitor/resource-manager/microsoft.insights/2016-03-01/alertRules_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,72 @@
"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":[]
}
}
}
}
}
Expand Down Expand Up @@ -506,7 +572,8 @@
"x-ms-enum": {
"name": "ConditionOperator",
"modelAsString": false
}
},
"description": "Operators allowed in the rule condition."
},
"TimeAggregationOperator": {
"type": "string",
Expand All @@ -520,7 +587,8 @@
"x-ms-enum": {
"name": "TimeAggregationOperator",
"modelAsString": false
}
},
"description": "Aggregation operators allowed in a rule."
},
"ThresholdRuleCondition": {
"x-ms-discriminator-value": "Microsoft.Azure.Management.Insights.Models.ThresholdRuleCondition",
Expand Down Expand Up @@ -765,7 +833,8 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/AlertRule"
"$ref": "#/definitions/AlertRule",
"description": "The alert rule properties of the resource."
}
},
"description": "The alert rule resource."
Expand All @@ -781,7 +850,8 @@
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/AlertRule"
"$ref": "#/definitions/AlertRule",
"description": "The properties of an alert rule."
}
}
},
Expand Down Expand Up @@ -844,4 +914,4 @@
"x-ms-parameter-location": "method"
}
}
}
}
101 changes: 28 additions & 73 deletions ...tor/resource-manager/microsoft.insights/2016-03-01/examples/createOrUpdateLogProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,47 @@
{
"parameters": {
"subscriptionId": "b67f7fec-69fc-4974-9099-a26bd6ffeda3",
"subscriptionId": "df602c9c-7aa0-407d-a6fb-eb20c8bd1192",
"logProfileName": "Rac46PostSwapRG",
"api-version": "2016-03-01",
"parameters": {
"location": "West US",
"location": "",
"tags": { },
"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"
"locations": [ "global" ],
"categories": [ "Write", "Delete", "Action" ],
"retentionPolicy": {
"enabled": true,
"days": 3
},
"lastUpdatedTime":"2016-11-23T21:23:52.0221265Z",
"actions":[]
"storageAccountId": "/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/JohnKemTest/providers/Microsoft.Storage/storageAccounts/johnkemtest8162",
"serviceBusRuleId": ""
}
}
},
"responses": {
"200": {
"headers": { },
"body": {
"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": {
"headers": { },
"body": {
"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"
},
"id":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/providers/microsoft.insights/logprofiles/default",
"type":"",
"name":"default",
"location":"",
"tags":null,
"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":[]
"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
}
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions ...ion/monitor/resource-manager/microsoft.insights/2016-03-01/examples/deleteLogProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"200": {
"headers": {},
"body": null
},
"204": {
"headers": {},
"body": null
}
}
}
16 changes: 9 additions & 7 deletions specification/monitor/resource-manager/microsoft.insights/2016-03-01/logProfiles_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}
},
"x-ms-examples": {
"List alert rules": { "$ref": "./examples/deleteLogProfile.json" }
"Delete log profile": { "$ref": "./examples/deleteLogProfile.json" }
Copy link
Copy Markdown
Contributor

@vishrutshah vishrutshah Jul 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like this example contains an additional response code that has not been modeled in swagger. Could you please verify?

https://travis-ci.org/Azure/azure-rest-api-specs/jobs/258292847#L657

Copy link
Copy Markdown
Contributor Author

@gucalder gucalder Aug 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

}
},
"get": {
Expand Down Expand Up @@ -117,7 +117,7 @@
}
},
"x-ms-examples": {
"List alert rules": { "$ref": "./examples/getLogProfile.json" }
"Get log profile": { "$ref": "./examples/getLogProfile.json" }
}
},
"put": {
Expand Down Expand Up @@ -180,7 +180,7 @@
}
},
"x-ms-examples": {
"List alert rules": { "$ref": "./examples/createOrUpdateLogProfile.json" }
"Create or update a log profile": { "$ref": "./examples/createOrUpdateLogProfile.json" }
}
},
"patch": {
Expand Down Expand Up @@ -249,7 +249,7 @@
"nextLinkName": null
},
"x-ms-examples": {
"List alert rules": { "$ref": "./examples/listLogProfile.json" }
"List log profiles": { "$ref": "./examples/listLogProfile.json" }
}
}
}
Expand Down Expand Up @@ -351,7 +351,8 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/LogProfileProperties"
"$ref": "#/definitions/LogProfileProperties",
"description": "The log profile properties of the resource."
}
},
"required": ["properties"],
Expand All @@ -368,7 +369,8 @@
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/LogProfileProperties"
"$ref": "#/definitions/LogProfileProperties",
"description": "The log profile properties for an update operation."
}
}
},
Expand Down Expand Up @@ -424,4 +426,4 @@
"x-ms-parameter-location": "method"
}
}
}
}
2 changes: 1 addition & 1 deletion ...anager/microsoft.insights/2016-09-01/examples/createOrUpdateServiceDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"resourceUri": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
"api-version": "2016-09-01",
"parameters": {
"location":"",
"location": "",
"properties": {
"storageAccountId":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
"serviceBusRuleId":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/andy1101/providers/Microsoft.EventHub/namespaces/andy1101/authorizationrules/RootManageSharedAccessKey",
Expand Down
4 changes: 2 additions & 2 deletions ...source-manager/microsoft.insights/2016-09-01/examples/updateServiceDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"parameters": {
"resourceUri": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourcegroups/viruela1/providers/microsoft.logic/workflows/viruela6",
"api-version": "2016-09-01",
"parameters": {
"location":"",
"serviceDiagnosticSettingsResource": {
"tags": null,
"properties": {
"storageAccountId":"/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
"serviceBusRuleId":"/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/andy1101/providers/Microsoft.EventHub/namespaces/andy1101/authorizationrules/RootManageSharedAccessKey",
Expand Down
8 changes: 5 additions & 3 deletions ...onitor/resource-manager/microsoft.insights/2016-09-01/serviceDiagnosticsSettings_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,8 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ServiceDiagnosticSettings"
"$ref": "#/definitions/ServiceDiagnosticSettings",
"description": "The service diagnostics settings of the resource."
}
},
"description": "Description of a service diagnostic setting"
Expand All @@ -363,7 +364,8 @@
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ServiceDiagnosticSettings"
"$ref": "#/definitions/ServiceDiagnosticSettings",
"description": "The service diagnostics settings for an update operation."
}
}
},
Expand Down Expand Up @@ -399,4 +401,4 @@
"x-ms-parameter-location": "method"
}
}
}
}
Loading