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

Updated NetworkConfigurationDiagnostic API + example #3905

Merged
merged 1 commit into from
Sep 14, 2018
Merged

Updated NetworkConfigurationDiagnostic API + example #3905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions ...soft.Network/stable/2018-08-01/examples/NetworkWatcherNetworkConfigurationDiagnostic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"networkWatcherName" : "nw1",
"parameters" : {
"targetResourceId" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Compute/virtualMachines/vm1",
"queries": [
"profiles": [
{
"direction" : "Inbound",
"protocol" : "TCP",
Expand All @@ -22,7 +22,7 @@
"body" : {
"results": [
{
"trafficQuery": {
"profile": {
"direction": "Inbound",
"protocol": "TCP",
"source": "10.1.0.4",
Expand All @@ -34,6 +34,7 @@
"evaluatedNetworkSecurityGroups": [
{
"networkSecurityGroupId": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1",
"appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AppSubnet",
"matchedRule": {
"ruleName": "UserRule_fe_rule",
"action": "Allow"
Expand Down Expand Up @@ -83,6 +84,7 @@
},
{
"networkSecurityGroupId": "/subscriptions/61cc8a98-a8be-4bfe-a04e-0b461f93fe35/resourceGroups/NwRgCentralUSEUAP_copy/providers/Microsoft.Network/networkSecurityGroups/AppNSG",
"appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/networkInterfaces/nic",
"matchedRule": {
"ruleName": "UserRule_fe_rule",
"action": "Allow"
Expand All @@ -108,7 +110,7 @@
"body" : {
"results": [
{
"trafficQuery": {
"profile": {
"direction": "Inbound",
"protocol": "TCP",
"source": "10.1.0.4",
Expand All @@ -120,6 +122,7 @@
"evaluatedNetworkSecurityGroups": [
{
"networkSecurityGroupId": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/networkSecurityGroups/nsg1",
"appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/subnets/AppSubnet",
"matchedRule": {
"ruleName": "UserRule_fe_rule",
"action": "Allow"
Expand Down Expand Up @@ -169,6 +172,7 @@
},
{
"networkSecurityGroupId": "/subscriptions/61cc8a98-a8be-4bfe-a04e-0b461f93fe35/resourceGroups/NwRgCentralUSEUAP_copy/providers/Microsoft.Network/networkSecurityGroups/AppNSG",
"appliedTo": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/vnet/networkInterfaces/nic",
"matchedRule": {
"ruleName": "UserRule_fe_rule",
"action": "Allow"
Expand Down
31 changes: 24 additions & 7 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3432,23 +3432,36 @@
"description": "Parameters to get network configuration diagnostic.",
"required": [
"targetResourceId",
"queries"
"profiles"
],
"properties": {
"targetResourceId": {
"type": "string",
"description": "The ID of the target resource to perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway."
},
"queries": {
"verbosityLevel": {
"type": "string",
"enum": [
"Normal",
"Minimum",
"Full"
],
"x-ms-enum": {
"name": "VerbosityLevel",
"modelAsString": true
},
"description": "Verbosity level. Accepted values are 'Normal', 'Minimum', 'Full'."
},
"profiles": {
"type": "array",
"description": "List of traffic queries.",
"description": "List of network configuration diagnostic profiles.",
"items": {
"$ref": "#/definitions/TrafficQuery"
"$ref": "#/definitions/NetworkConfigurationDiagnosticProfile"
}
}
}
},
"TrafficQuery": {
"NetworkConfigurationDiagnosticProfile": {
"description": "Parameters to compare with network configuration.",
"required": [
"direction",
Expand Down Expand Up @@ -3504,8 +3517,8 @@
"NetworkConfigurationDiagnosticResult": {
"description": "Network configuration diagnostic result corresponded to provided traffic query.",
"properties": {
"trafficQuery": {
"$ref": "#/definitions/TrafficQuery"
"profile": {
"$ref": "#/definitions/NetworkConfigurationDiagnosticProfile"
},
"networkSecurityGroupResult": {
"$ref": "#/definitions/NetworkSecurityGroupResult"
Expand Down Expand Up @@ -3544,6 +3557,10 @@
"type": "string",
"description": "Network security group ID."
},
"appliedTo": {
"type": "string",
"description": "Resource ID of nic or subnet to which network security group is applied."
},
"matchedRule": {
"$ref": "#/definitions/MatchedRule"
},
Expand Down