From 29a1dae471a736b9a1fe5c1447db271f58776021 Mon Sep 17 00:00:00 2001 From: irrogozh Date: Thu, 20 Aug 2020 20:02:52 -0700 Subject: [PATCH] Minor fix in flowLog URI + updated examples for connection monitor (#10524) * Minor fix in flowLog URI + updated examples for connection monitor * Reseted the change in networkWtacher spec, updated examples * fix --- ...NetworkWatcherConnectionMonitorCreate.json | 140 +++++++++++++----- .../NetworkWatcherConnectionMonitorGet.json | 48 ++++-- .../NetworkWatcherConnectionMonitorList.json | 96 ++++++++---- 3 files changed, 211 insertions(+), 73 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json index a1adc90ebe99..41e4126c061c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorCreate.json @@ -5,17 +5,43 @@ "resourceGroupName": "rg1", "networkWatcherName": "nw1", "connectionMonitorName": "cm1", - "location": "centraluseuap", "parameters": { + "location": "eastus", "properties": { - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1" - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60 + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] } } }, @@ -27,19 +53,42 @@ "etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"", "properties": { "provisioningState": "Updating", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "monitoringStatus": "NotStarted" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } }, @@ -49,20 +98,43 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1", "etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"", "properties": { - "provisioningState": "Updating", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "monitoringStatus": "NotStarted" + "provisioningState": "Succeeded", + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json index ae469303de6e..06c3cedb4159 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorGet.json @@ -14,20 +14,42 @@ "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "startTime": "2018-01-08T03:42:33.3387305Z", - "monitoringStatus": "Running" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json index c55a840b12d8..569590e66a36 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/NetworkWatcherConnectionMonitorList.json @@ -15,20 +15,42 @@ "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1", - "port": 0 - }, - "destination": { - "address": "bing.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 60, - "autoStart": true, - "startTime": "2018-01-08T03:42:33.3387305Z", - "monitoringStatus": "Running" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct1" + }, + { + "name": "destination", + "address": "bing.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" }, { @@ -37,20 +59,42 @@ "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "properties": { "provisioningState": "Succeeded", - "source": { - "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm2", - "port": 0 - }, - "destination": { - "address": "google.com", - "port": 80 - }, - "monitoringIntervalInSeconds": 30, - "autoStart": true, - "startTime": "2018-01-08T05:42:33.3387305Z", - "monitoringStatus": "Running" + "endpoints": [ + { + "name": "source", + "resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/ct2" + }, + { + "name": "destination", + "address": "google.com" + } + ], + "testConfigurations": [ + { + "name": "tcp", + "testFrequencySec": 60, + "protocol": "Tcp", + "tcpConfiguration": { + "port": 80 + } + } + ], + "testGroups": [ + { + "name": "tg", + "testConfigurations": [ + "tcp" + ], + "sources": [ + "source" + ], + "destinations": [ + "destination" + ] + } + ] }, - "location": "centraluseuap", + "location": "eastus", "type": "Microsoft.Network/networkWatchers/connectionMonitors" } ]