Skip to content
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

Jump to bottom

[Hub Generated] Review request for Microsoft.Insights to add version preview/2020-10-05-preview #13712

Merged
merged 7 commits into from
Apr 12, 2021
Merged

[Hub Generated] Review request for Microsoft.Insights to add version preview/2020-10-05-preview #13712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
32cd42c
Adjustments to API to include validation grouping and updated text.
aarongas Mar 29, 2021
b692be5
Fixed missing curly brace
aarongas Mar 29, 2021
53fe611
adjusted name
aarongas Mar 29, 2021
20564db
Added basic and standard examples
aarongas Mar 31, 2021
5d0622d
adjusted type.
aarongas Mar 31, 2021
88df249
corrected case for key value
aarongas Mar 31, 2021
45d9847
aarongas Mar 31, 2021
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
72 changes: 72 additions & 0 deletions ...ce-manager/Microsoft.Insights/preview/2020-10-05-preview/examples/WebTestCreateBasic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"parameters": {
"api-version": "2020-10-05-preview",
"subscriptionId": "subid",
"resourceGroupName": "my-resource-group",
"webTestName": "my-webtest-my-component",
"WebTestDefinition": {
"location": "South Central US",
"properties": {
"Name": "my-webtest-my-component",
"SyntheticMonitorId": "my-webtest-my-component",
"Description": "Ping web test alert for mytestwebapp",
"Enabled": true,
"Frequency": 900,
"Timeout": 120,
"Kind": "basic",
"RetryEnabled": true,
"ValidationRules": {
"ExpectedHttpStatusCode": 200,
"SSLCheck": true
},
"Request": {
"ParseDependentRequests": true,
"RequestUrl": "https://www.bing.com"
},
"Locations": [
{
"Id": "us-fl-mia-edge"
}
]
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/my-resource-group/providers/Microsoft.Insights/webtests/my-webtest-my-component",
"name": "my-webtest-my-component",
"type": "Microsoft.Insights/webtests",
"location": "southcentralus",
"tags": {
"hidden-link:/subscriptions/subid/resourceGroups/my-resource-group/providers/Microsoft.Insights/components/my-component": "Resource",
"hidden-link:/subscriptions/subid/resourceGroups/my-resource-group/providers/Microsoft.Web/sites/mytestwebapp": "Resource"
},
"properties": {
"Name": "my-webtest-my-component",
"SyntheticMonitorId": "my-webtest-my-component",
"Description": "Ping web test alert for mytestwebapp",
"Enabled": true,
"Frequency": 900,
"Timeout": 120,
"Kind": "basic",
"RetryEnabled": true,
"Locations": [
{
"Id": "us-fl-mia-edge"
}
],
"ValidationRules": {
"ExpectedHttpStatusCode": 200,
"SSLCheck": true
},
"Request": {
"ParseDependentRequests": true,
"RequestUrl": "https://www.bing.com"
},
"provisioningState": "Succeeded"
}
}
}
}
}
94 changes: 94 additions & 0 deletions ...manager/Microsoft.Insights/preview/2020-10-05-preview/examples/WebTestCreateStandard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"parameters": {
"api-version": "2020-10-05-preview",
"subscriptionId": "subid",
"resourceGroupName": "my-resource-group",
"webTestName": "my-webtest-my-component",
"WebTestDefinition": {
"location": "South Central US",
"properties": {
"Name": "my-webtest-my-component",
"SyntheticMonitorId": "my-webtest-my-component",
"Description": "Ping web test alert for mytestwebapp",
"Enabled": true,
"Frequency": 900,
"Timeout": 120,
"Kind": "standard",
"RetryEnabled": true,
"Request": {
"RequestUrl": "https://bing.com",
"Headers": [
{
"key": "Content-Language",
"value": "de-DE"
},
{
"key": "Accept-Language",
"value": "de-DE"
}
],
"HttpVerb": "POST",
"RequestBody": "SGVsbG8gd29ybGQ="
},
"ValidationRules": {
"SSLCheck": true,
"SSLCertRemainingLifetimeCheck": 100
},
"Locations": [
{
"Id": "us-fl-mia-edge"
}
]
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/my-resource-group/providers/Microsoft.Insights/webtests/my-webtest-my-component",
"name": "my-webtest-my-component",
"type": "Microsoft.Insights/webtests",
"location": "southcentralus",
"tags": {
"hidden-link:/subscriptions/subid/resourceGroups/my-resource-group/providers/Microsoft.Insights/components/my-component": "Resource",
"hidden-link:/subscriptions/subid/resourceGroups/my-resource-group/providers/Microsoft.Web/sites/mytestwebapp": "Resource"
},
"properties": {
"Name": "my-webtest-my-component",
"SyntheticMonitorId": "my-webtest-my-component",
"Description": "Ping web test alert for mytestwebapp",
"Enabled": true,
"Frequency": 900,
"Timeout": 120,
"Kind": "standard",
"RetryEnabled": true,
"Locations": [
{
"Id": "us-fl-mia-edge"
}
],
"Request": {
"RequestUrl": "https://bing.com",
"Headers": [
{
"key": "Content-Language",
"value": "de-DE"
},
{
"key": "Accept-Language",
"value": "de-DE"
}
],
"HttpVerb": "POST",
"RequestBody": "SGVsbG8gd29ybGQ="
},
"ValidationRules": {
"SSLCheck": true,
"SSLCertRemainingLifetimeCheck": 100
},
"provisioningState": "Succeeded"
}
}
}
}
}
66 changes: 39 additions & 27 deletions ...insights/resource-manager/Microsoft.Insights/preview/2020-10-05-preview/webTests_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,12 @@
"webTestCreate": {
"$ref": "./examples/WebTestCreate.json"
},
"webTestCreateBasic": {
"$ref": "./examples/WebTestCreateBasic.json"
},
"webTestCreateStandard": {
"$ref": "./examples/WebTestCreateStandard.json"
},
"webTestUpdate": {
"$ref": "./examples/WebTestUpdate.json"
}
Expand Down Expand Up @@ -529,41 +535,47 @@
}
}
},
"ContentValidation": {
"ValidationRules": {
"type": "object",
"description": "The collection of content validation properties",
"description": "The collection of validation rule properties",
"properties": {
"ContentMatch": {
"type": "string",
"description": "Content to look for in the return of the WebTest."
"ContentValidation": {
"type": "object",
"description": "The collection of content validation properties",
"properties": {
"ContentMatch": {
"type": "string",
"description": "Content to look for in the return of the WebTest. Must not be null or empty."
},
"IgnoreCase": {
"type": "boolean",
"description": "When set, this value makes the ContentMatch validation case insensitive."
},
"PassIfTextFound": {
"type": "boolean",
"description": "When true, validation will pass if there is a match for the ContentMatch string. If false, validation will fail if there is a match"
}
}
},
"IgnoreCase": {
"SSLCheck": {
"type": "boolean",
"description": "When set, this value makes the ContentMatch validation case insensitive."
"description": "Checks to see if the SSL cert is still valid."
},
"PassIfTextFound": {
"SSLCertRemainingLifetimeCheck": {
"type": "integer",
"format": "int32",
"description": "A number of days to check still remain before the the existing SSL cert expires. Value must be positive and the SSLCheck must be set to true."
},
"ExpectedHttpStatusCode": {
"type": "integer",
"format": "int32",
"description": "Validate that the WebTest returns the http status code provided."
},
"IgnoreHttpsStatusCode": {
"type": "boolean",
"description": "When true, validation will pass if there is a match for the ContentMatch string. If false, validation will fail if there is a match"
"description": "When set, validation will ignore the status code."
}
}
},
"SSLCheck": {
"type": "boolean",
"description": "Checks to see if the SSL cert is still valid."
},
"SSLCertRemainingLifetimeCheck": {
"type": "integer",
"format": "int32",
"description": "A number of days to check still remain before the the existing SSL cert expires."
},
"ExpectedHttpStatusCode": {
"type": "integer",
"format": "int32",
"description": "Validate that the WebTest returns the http status code provided."
},
"IgnoreHttpsStatusCode": {
"type": "boolean",
"description": "When set, validation will ignore the status code."
}
}
},
Expand Down