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

Network 2018 05 01 #3068

Merged
merged 7 commits into from
May 14, 2018
Merged

Network 2018 05 01 #3068

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
a8b493d
Adding optional traffic analytics parameters with existing network wa…
sayghosh May 6, 2018
dbd95cb
Updating the version
sayghosh May 6, 2018
4572481
Updating latest versoin in readme.md
sayghosh May 6, 2018
1c52e0b
Resolving conflicts in readme.md
sayghosh May 10, 2018
bdc9b08
Adding optional traffic analytics parameters with flowlog parameters
sayghosh May 14, 2018
372aa0d
Merge remote-tracking branch 'upstream/Network-2018-05-01' into Netwo…
sayghosh May 14, 2018
3ff4a43
Reverting old chnages
sayghosh May 14, 2018
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
63 changes: 10 additions & 53 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
Expand All @@ -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",
Expand All @@ -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"
Expand All @@ -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"
}
Expand Down Expand Up @@ -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"
}
}
Expand All @@ -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"
Expand All @@ -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"
}
}
},
Expand Down
65 changes: 54 additions & 11 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
Expand All @@ -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",
Expand All @@ -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"
Expand All @@ -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"
}
Expand Down Expand Up @@ -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"
}
}
Expand All @@ -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"
}
}
},
Expand Down