From a8b493da6bd22b40055f3971a5183432de92eb49 Mon Sep 17 00:00:00 2001 From: Sayantan Ghosh Date: Sun, 6 May 2018 21:01:05 +0530 Subject: [PATCH 1/5] Adding optional traffic analytics parameters with existing network watched flowlog configuration --- .../stable/2018-04-01/networkWatcher.json | 65 +++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json index f2f5df00c10c..f919356c235d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json @@ -3,7 +3,7 @@ "info": { "title": "NetworkManagementClient", "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", - "version": "2018-04-01" + "version": "2018-02-01" }, "host": "management.azure.com", "schemes": [ @@ -895,11 +895,12 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/configureFlowLog": { "post": { "tags": [ - "NetworkWatchers" + "NetworkWatchers", + "TrafficAnalytics" ], "operationId": "NetworkWatchers_SetFlowLogConfiguration", "x-ms-long-running-operation": true, - "description": "Configures flow log on a specified resource.", + "description": "Configures flow log and traffic analytics (optional) on a specified resource.", "parameters": [ { "name": "resourceGroupName", @@ -933,7 +934,7 @@ ], "responses": { "200": { - "description": "Successful request for setting flow log configuration.", + "description": "Successful request for setting flow log and traffic analytics (optional) configuration.", "schema": { "$ref": "#/definitions/FlowLogInformation" } @@ -950,11 +951,12 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryFlowLogStatus": { "post": { "tags": [ - "NetworkWatchers" + "NetworkWatchers", + "TrafficAnalytics" ], "operationId": "NetworkWatchers_GetFlowLogStatus", "x-ms-long-running-operation": true, - "description": "Queries status of flow log on a specified resource.", + "description": "Queries status of flow log and traffic analytics (optional) on a specified resource.", "parameters": [ { "name": "resourceGroupName", @@ -977,7 +979,7 @@ "schema": { "$ref": "#/definitions/FlowLogStatusParameters" }, - "description": "Parameters that define a resource to query flow log status." + "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -988,7 +990,7 @@ ], "responses": { "200": { - "description": "Successful request for query flow log status.", + "description": "Successful request for query flow log and traffic analytics (optional) status.", "schema": { "$ref": "#/definitions/FlowLogInformation" } @@ -2252,13 +2254,13 @@ } }, "FlowLogStatusParameters": { - "description": "Parameters that define a resource to query flow log status.", + "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status.", "required": [ "targetResourceId" ], "properties": { "targetResourceId": { - "description": "The target resource where getting the flow logging status.", + "description": "The target resource where getting the flow log and and traffic analytics (optional) status.", "type": "string" } } @@ -2279,7 +2281,7 @@ } }, "FlowLogInformation": { - "description": "Information on the configuration of flow log.", + "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [ "targetResourceId", "properties" @@ -2292,6 +2294,47 @@ "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/FlowLogProperties" + }, + "flowAnalyticsConfiguration": { + "$ref": "#/definitions/TrafficAnalyticsProperties" + } + } + }, + "TrafficAnalyticsProperties": { + "description": "Parameters that define the configuration of traffic analytics.", + "required": [ + "networkWatcherFlowAnalyticsConfiguration" + ], + "properties": { + "networkWatcherFlowAnalyticsConfiguration": { + "$ref": "#/definitions/TrafficAnalyticsConfigurationProperties" + } + } + }, + "TrafficAnalyticsConfigurationProperties": { + "description": "Parameters that define the configuration of traffic analytics.", + "required": [ + "enabled", + "workspaceId", + "workspaceRegion", + "workspaceResourceId" + ], + "properties": { + "enabled": { + "description": "Flag to enable/disable traffic analytics.", + "type": "boolean" + }, + "workspaceId": { + "description": "The resource guid of the attached workspace", + "type": "string" + }, + "workspaceRegion": { + "description": "The location of the attached workspace", + "type": "string" + }, + "workspaceResourceId": { + "description": "Resource Id of the attached workspace ", + "type": "string" } } }, From dbd95cb609a66083bc546d9babe1d3395f53af80 Mon Sep 17 00:00:00 2001 From: Sayantan Ghosh Date: Sun, 6 May 2018 21:02:54 +0530 Subject: [PATCH 2/5] Updating the version --- .../Microsoft.Network/stable/2018-04-01/networkWatcher.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json index f919356c235d..0b1993e81f4b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json @@ -3,7 +3,7 @@ "info": { "title": "NetworkManagementClient", "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", - "version": "2018-02-01" + "version": "2018-04-01" }, "host": "management.azure.com", "schemes": [ From 45724811397510c72f6363d4c8582f353691875b Mon Sep 17 00:00:00 2001 From: Sayantan Ghosh Date: Sun, 6 May 2018 22:51:38 +0530 Subject: [PATCH 3/5] Updating latest versoin in readme.md --- .../network/resource-manager/readme.md | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index 67b18152b697..c1e82ad163f6 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -28,7 +28,38 @@ These are the global settings for the Network API. title: NetworkManagementClient description: Network Client openapi-type: arm -tag: package-2018-02 +tag: package-2018-04 +``` + +### Tag: package-2018-04 + +These settings apply only when `--tag=package-2018-04` is specified on the command line. + +``` yaml $(tag) == 'package-2018-04' + +input-file: +- Microsoft.Network/stable/2018-04-01/applicationGateway.json +- Microsoft.Network/stable/2018-04-01/applicationSecurityGroup.json +- Microsoft.Network/stable/2018-04-01/checkDnsAvailability.json +- Microsoft.Network/stable/2018-04-01/ddosProtectionPlan.json +- Microsoft.Network/stable/2018-04-01/endpointService.json +- Microsoft.Network/stable/2018-04-01/expressRouteCircuit.json +- Microsoft.Network/stable/2018-04-01/expressRouteCrossConnection.json +- Microsoft.Network/stable/2018-04-01/loadBalancer.json +- Microsoft.Network/stable/2018-04-01/network.json +- Microsoft.Network/stable/2018-04-01/networkInterface.json +- Microsoft.Network/stable/2018-04-01/networkSecurityGroup.json +- Microsoft.Network/stable/2018-04-01/networkWatcher.json +- Microsoft.Network/stable/2018-04-01/operation.json +- Microsoft.Network/stable/2018-04-01/publicIpAddress.json +- Microsoft.Network/stable/2018-04-01/routeFilter.json +- Microsoft.Network/stable/2018-04-01/routeTable.json +- Microsoft.Network/stable/2018-04-01/serviceCommunity.json +- Microsoft.Network/stable/2018-04-01/usage.json +- Microsoft.Network/stable/2018-04-01/virtualNetwork.json +- Microsoft.Network/stable/2018-04-01/virtualNetworkGateway.json +- Microsoft.Network/stable/2018-04-01/vmssNetworkInterface.json +- Microsoft.Network/stable/2018-04-01/vmssPublicIpAddress.json ``` ### Tag: package-2018-02 From bdc9b082a9bc9d9e8444c237e20fcb9b2725699f Mon Sep 17 00:00:00 2001 From: Sayantan Ghosh Date: Tue, 15 May 2018 00:53:38 +0530 Subject: [PATCH 4/5] Adding optional traffic analytics parameters with flowlog parameters --- .../stable/2018-05-01/networkWatcher.json | 65 +++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json index e2e2fddf2f58..34bddfe89154 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json @@ -943,11 +943,12 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/configureFlowLog": { "post": { "tags": [ - "NetworkWatchers" + "NetworkWatchers", + "TrafficAnalytics" ], "operationId": "NetworkWatchers_SetFlowLogConfiguration", "x-ms-long-running-operation": true, - "description": "Configures flow log on a specified resource.", + "description": "Configures flow log and traffic analytics (optional) on a specified resource.", "parameters": [ { "name": "resourceGroupName", @@ -981,7 +982,7 @@ ], "responses": { "200": { - "description": "Successful request for setting flow log configuration.", + "description": "Successful request for setting flow log and traffic analytics (optional) configuration.", "schema": { "$ref": "#/definitions/FlowLogInformation" } @@ -1001,11 +1002,12 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryFlowLogStatus": { "post": { "tags": [ - "NetworkWatchers" + "NetworkWatchers", + "TrafficAnalytics" ], "operationId": "NetworkWatchers_GetFlowLogStatus", "x-ms-long-running-operation": true, - "description": "Queries status of flow log on a specified resource.", + "description": "Queries status of flow log and traffic analytics (optional) on a specified resource.", "parameters": [ { "name": "resourceGroupName", @@ -1028,7 +1030,7 @@ "schema": { "$ref": "#/definitions/FlowLogStatusParameters" }, - "description": "Parameters that define a resource to query flow log status." + "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -1039,7 +1041,7 @@ ], "responses": { "200": { - "description": "Successful request for query flow log status.", + "description": "Successful request for query flow log and traffic analytics (optional) status.", "schema": { "$ref": "#/definitions/FlowLogInformation" } @@ -2330,13 +2332,13 @@ } }, "FlowLogStatusParameters": { - "description": "Parameters that define a resource to query flow log status.", + "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status.", "required": [ "targetResourceId" ], "properties": { "targetResourceId": { - "description": "The target resource where getting the flow logging status.", + "description": "The target resource where getting the flow log and traffic analytics (optional) status.", "type": "string" } } @@ -2357,19 +2359,60 @@ } }, "FlowLogInformation": { - "description": "Information on the configuration of flow log.", + "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [ "targetResourceId", "properties" ], "properties": { "targetResourceId": { - "description": "The ID of the resource to configure for flow logging.", + "description": "The ID of the resource to configure for flow log and traffic analytics (optional) .", "type": "string" }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/FlowLogProperties" + }, + "flowAnalyticsConfiguration": { + "$ref": "#/definitions/TrafficAnalyticsProperties" + } + } + }, + "TrafficAnalyticsProperties": { + "description": "Parameters that define the configuration of traffic analytics.", + "required": [ + "networkWatcherFlowAnalyticsConfiguration" + ], + "properties": { + "networkWatcherFlowAnalyticsConfiguration": { + "$ref": "#/definitions/TrafficAnalyticsConfigurationProperties" + } + } + }, + "TrafficAnalyticsConfigurationProperties": { + "description": "Parameters that define the configuration of traffic analytics.", + "required": [ + "enabled", + "workspaceId", + "workspaceRegion", + "workspaceResourceId" + ], + "properties": { + "enabled": { + "description": "Flag to enable/disable traffic analytics.", + "type": "boolean" + }, + "workspaceId": { + "description": "The resource guid of the attached workspace", + "type": "string" + }, + "workspaceRegion": { + "description": "The location of the attached workspace", + "type": "string" + }, + "workspaceResourceId": { + "description": "Resource Id of the attached workspace ", + "type": "string" } } }, From 3ff4a43796571d980b108cc34e3654a12010bb78 Mon Sep 17 00:00:00 2001 From: Sayantan Ghosh Date: Tue, 15 May 2018 01:24:16 +0530 Subject: [PATCH 5/5] Reverting old chnages --- .../stable/2018-04-01/networkWatcher.json | 63 +++---------------- .../stable/2018-05-01/networkWatcher.json | 2 +- 2 files changed, 11 insertions(+), 54 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json index 0b1993e81f4b..f2f5df00c10c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json @@ -895,12 +895,11 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/configureFlowLog": { "post": { "tags": [ - "NetworkWatchers", - "TrafficAnalytics" + "NetworkWatchers" ], "operationId": "NetworkWatchers_SetFlowLogConfiguration", "x-ms-long-running-operation": true, - "description": "Configures flow log and traffic analytics (optional) on a specified resource.", + "description": "Configures flow log on a specified resource.", "parameters": [ { "name": "resourceGroupName", @@ -934,7 +933,7 @@ ], "responses": { "200": { - "description": "Successful request for setting flow log and traffic analytics (optional) configuration.", + "description": "Successful request for setting flow log configuration.", "schema": { "$ref": "#/definitions/FlowLogInformation" } @@ -951,12 +950,11 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryFlowLogStatus": { "post": { "tags": [ - "NetworkWatchers", - "TrafficAnalytics" + "NetworkWatchers" ], "operationId": "NetworkWatchers_GetFlowLogStatus", "x-ms-long-running-operation": true, - "description": "Queries status of flow log and traffic analytics (optional) on a specified resource.", + "description": "Queries status of flow log on a specified resource.", "parameters": [ { "name": "resourceGroupName", @@ -979,7 +977,7 @@ "schema": { "$ref": "#/definitions/FlowLogStatusParameters" }, - "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status." + "description": "Parameters that define a resource to query flow log status." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -990,7 +988,7 @@ ], "responses": { "200": { - "description": "Successful request for query flow log and traffic analytics (optional) status.", + "description": "Successful request for query flow log status.", "schema": { "$ref": "#/definitions/FlowLogInformation" } @@ -2254,13 +2252,13 @@ } }, "FlowLogStatusParameters": { - "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status.", + "description": "Parameters that define a resource to query flow log status.", "required": [ "targetResourceId" ], "properties": { "targetResourceId": { - "description": "The target resource where getting the flow log and and traffic analytics (optional) status.", + "description": "The target resource where getting the flow logging status.", "type": "string" } } @@ -2281,7 +2279,7 @@ } }, "FlowLogInformation": { - "description": "Information on the configuration of flow log and traffic analytics (optional) .", + "description": "Information on the configuration of flow log.", "required": [ "targetResourceId", "properties" @@ -2294,47 +2292,6 @@ "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/FlowLogProperties" - }, - "flowAnalyticsConfiguration": { - "$ref": "#/definitions/TrafficAnalyticsProperties" - } - } - }, - "TrafficAnalyticsProperties": { - "description": "Parameters that define the configuration of traffic analytics.", - "required": [ - "networkWatcherFlowAnalyticsConfiguration" - ], - "properties": { - "networkWatcherFlowAnalyticsConfiguration": { - "$ref": "#/definitions/TrafficAnalyticsConfigurationProperties" - } - } - }, - "TrafficAnalyticsConfigurationProperties": { - "description": "Parameters that define the configuration of traffic analytics.", - "required": [ - "enabled", - "workspaceId", - "workspaceRegion", - "workspaceResourceId" - ], - "properties": { - "enabled": { - "description": "Flag to enable/disable traffic analytics.", - "type": "boolean" - }, - "workspaceId": { - "description": "The resource guid of the attached workspace", - "type": "string" - }, - "workspaceRegion": { - "description": "The location of the attached workspace", - "type": "string" - }, - "workspaceResourceId": { - "description": "Resource Id of the attached workspace ", - "type": "string" } } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json index 34bddfe89154..b84a54236cb1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json @@ -1041,7 +1041,7 @@ ], "responses": { "200": { - "description": "Successful request for query flow log and traffic analytics (optional) status.", + "description": "Successful request for query flow log and traffic analytics (optional) status.", "schema": { "$ref": "#/definitions/FlowLogInformation" }