From f4f438af5a3d42a21936ecb6d3f661f3fa4a4442 Mon Sep 17 00:00:00 2001 From: wen zheng Date: Wed, 31 Oct 2018 18:02:53 -0700 Subject: [PATCH 1/7] Update specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json [Networkwatcher] add a new field "Format" with new type"FlowLogFormat" to FlowLogProperties --- .../stable/2018-08-01/networkWatcher.json | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json index 6103a395dcf9..448130f73a3e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json @@ -2585,6 +2585,9 @@ }, "retentionPolicy": { "$ref": "#/definitions/RetentionPolicyParameters" + }, + "format": { + "$ref": "#/definitions/FlowLogFormatParameters" } } }, @@ -2615,6 +2618,26 @@ } } }, + "FlowLogFormatParameters": { + "description": "Parameters that define the flow log format.", + "properties": { + "type": { + "description": "The type of flow log format.", + "enum": [ + "JSON" + ], + "x-ms-enum": { + "name": "FlowLogFormatType", + "modelAsString": true + } + }, + "version": { + "description": "The version (revision) of the flow log format.", + "type": "integer", + "default": 0 + } + } + }, "FlowLogInformation": { "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [ From 2c9be471e813d9b542737e7b31148a4806fd3af4 Mon Sep 17 00:00:00 2001 From: wen zheng Date: Thu, 1 Nov 2018 00:01:39 -0700 Subject: [PATCH 2/7] Revert "Update specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json" This reverts commit f4f438af5a3d42a21936ecb6d3f661f3fa4a4442. --- .../stable/2018-08-01/networkWatcher.json | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json index 448130f73a3e..6103a395dcf9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json @@ -2585,9 +2585,6 @@ }, "retentionPolicy": { "$ref": "#/definitions/RetentionPolicyParameters" - }, - "format": { - "$ref": "#/definitions/FlowLogFormatParameters" } } }, @@ -2618,26 +2615,6 @@ } } }, - "FlowLogFormatParameters": { - "description": "Parameters that define the flow log format.", - "properties": { - "type": { - "description": "The type of flow log format.", - "enum": [ - "JSON" - ], - "x-ms-enum": { - "name": "FlowLogFormatType", - "modelAsString": true - } - }, - "version": { - "description": "The version (revision) of the flow log format.", - "type": "integer", - "default": 0 - } - } - }, "FlowLogInformation": { "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [ From 90b4c89541d64f099b7dc4af0f58b88114399f0e Mon Sep 17 00:00:00 2001 From: wen zheng Date: Thu, 1 Nov 2018 00:11:53 -0700 Subject: [PATCH 3/7] Update specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json [networkwatcer] add FlowLogFormatParameters --- .../stable/2018-10-01/networkWatcher.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json index 61f1f7763ecd..3a3fe9ce057b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json @@ -2585,6 +2585,9 @@ }, "retentionPolicy": { "$ref": "#/definitions/RetentionPolicyParameters" + }, + "format": { + "$ref": "#/definitions/FlowLogFormatParameters" } } }, @@ -2615,6 +2618,27 @@ } } }, + "FlowLogFormatParameters": { + "description": "Parameters that define the flow log format.", + "properties": { + "type": { + "type": "string", + "description": "The file type of flow log.", + "enum": [ + "JSON" + ], + "x-ms-enum": { + "name": "FlowLogFormatType", + "modelAsString": true + } + }, + "version": { + "description": "The version (revision) of the flow log.", + "type": "integer", + "default": 0 + } + } + }, "FlowLogInformation": { "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [ From 0d9f657e93e79576f9aedb080512bfe2f795708a Mon Sep 17 00:00:00 2001 From: wen zheng Date: Wed, 7 Nov 2018 11:55:07 -0800 Subject: [PATCH 4/7] Update specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json add new field trafficAnalyticsInterval --- .../Microsoft.Network/stable/2018-10-01/networkWatcher.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json index 3a3fe9ce057b..8d4190a3b8d7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json @@ -2693,7 +2693,11 @@ }, "workspaceResourceId": { "description": "Resource Id of the attached workspace ", - "type": "string" + "type": "string" + }, + "trafficAnalyticsInterval": { + "description": "The interval in minutes which would decide how frequently TA service should do flow analytics", + "type": "integer" } } }, From af9e218257feb246b0dd983b9ae6b23c0d469277 Mon Sep 17 00:00:00 2001 From: wen zheng Date: Wed, 7 Nov 2018 13:09:39 -0800 Subject: [PATCH 5/7] Revert "Update specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json" This reverts commit 90b4c89541d64f099b7dc4af0f58b88114399f0e. --- .../stable/2018-10-01/networkWatcher.json | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json index 8d4190a3b8d7..554383f58873 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/networkWatcher.json @@ -2585,9 +2585,6 @@ }, "retentionPolicy": { "$ref": "#/definitions/RetentionPolicyParameters" - }, - "format": { - "$ref": "#/definitions/FlowLogFormatParameters" } } }, @@ -2618,27 +2615,6 @@ } } }, - "FlowLogFormatParameters": { - "description": "Parameters that define the flow log format.", - "properties": { - "type": { - "type": "string", - "description": "The file type of flow log.", - "enum": [ - "JSON" - ], - "x-ms-enum": { - "name": "FlowLogFormatType", - "modelAsString": true - } - }, - "version": { - "description": "The version (revision) of the flow log.", - "type": "integer", - "default": 0 - } - } - }, "FlowLogInformation": { "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [ From 092763a603ff6d4632dea038ba6155ac52c735be Mon Sep 17 00:00:00 2001 From: wen zheng Date: Wed, 7 Nov 2018 13:09:42 -0800 Subject: [PATCH 6/7] Revert "Revert "Update specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json"" This reverts commit 2c9be471e813d9b542737e7b31148a4806fd3af4. --- .../stable/2018-08-01/networkWatcher.json | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json index 6103a395dcf9..448130f73a3e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json @@ -2585,6 +2585,9 @@ }, "retentionPolicy": { "$ref": "#/definitions/RetentionPolicyParameters" + }, + "format": { + "$ref": "#/definitions/FlowLogFormatParameters" } } }, @@ -2615,6 +2618,26 @@ } } }, + "FlowLogFormatParameters": { + "description": "Parameters that define the flow log format.", + "properties": { + "type": { + "description": "The type of flow log format.", + "enum": [ + "JSON" + ], + "x-ms-enum": { + "name": "FlowLogFormatType", + "modelAsString": true + } + }, + "version": { + "description": "The version (revision) of the flow log format.", + "type": "integer", + "default": 0 + } + } + }, "FlowLogInformation": { "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [ From 16209617f6aae3f89ac5c4d7869d069af62d49ba Mon Sep 17 00:00:00 2001 From: wen zheng Date: Wed, 7 Nov 2018 13:09:52 -0800 Subject: [PATCH 7/7] Revert "Update specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json" This reverts commit f4f438af5a3d42a21936ecb6d3f661f3fa4a4442. --- .../stable/2018-08-01/networkWatcher.json | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json index 448130f73a3e..6103a395dcf9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/networkWatcher.json @@ -2585,9 +2585,6 @@ }, "retentionPolicy": { "$ref": "#/definitions/RetentionPolicyParameters" - }, - "format": { - "$ref": "#/definitions/FlowLogFormatParameters" } } }, @@ -2618,26 +2615,6 @@ } } }, - "FlowLogFormatParameters": { - "description": "Parameters that define the flow log format.", - "properties": { - "type": { - "description": "The type of flow log format.", - "enum": [ - "JSON" - ], - "x-ms-enum": { - "name": "FlowLogFormatType", - "modelAsString": true - } - }, - "version": { - "description": "The version (revision) of the flow log format.", - "type": "integer", - "default": 0 - } - } - }, "FlowLogInformation": { "description": "Information on the configuration of flow log and traffic analytics (optional) .", "required": [