Merge pull request #273233 from halkazwini/nw-vnetflow

Spell out VNet flow logs

Author: prmerger-automator[bot]

articles/network-watcher/flow-logs-read.md

@@ -6,7 +6,7 @@ author: halkazwini
 ms.author: halkazwini
 ms.service: network-watcher
 ms.topic: how-to
-ms.date: 04/22/2024
+ms.date: 04/24/2024
 ms.custom: devx-track-azurepowershell
 
 #CustomerIntent: As an Azure administrator, I want to read my flow logs using a PowerShell script so I can see the latest data.
@@ -24,15 +24,15 @@ The concepts discussed in this article aren't limited to the PowerShell and are
 
 - PowerShell installed on your machine. For more information, see [Install PowerShell on Windows, Linux, and macOS](/powershell/scripting/install/installing-powershell). This article requires the Az PowerShell module. For more information, see [How to install Azure PowerShell](/powershell/azure/install-azure-powershell). To find the installed version, run `Get-Module -ListAvailable Az`. 
 
-- Flow logs in a region or more. For more information, see [Create NSG flow logs](nsg-flow-logs-portal.md#create-a-flow-log) or [Create VNet flow logs](vnet-flow-logs-portal.md#create-a-flow-log).
+- Flow logs in a region or more. For more information, see [Create network security group flow logs](nsg-flow-logs-portal.md#create-a-flow-log) or [Create virtual network flow logs](vnet-flow-logs-portal.md#create-a-flow-log).
 
 - Necessary RBAC permissions for the subscriptions of flow logs and storage account. For more information, see [Network Watcher RBAC permissions](required-rbac-permissions.md).
 
 ## Retrieve the blocklist
 
-# [**NSG flow logs**](#tab/nsg)
+# [**Network security group flow logs**](#tab/nsg)
 
-The following PowerShell script sets up the variables needed to query the NSG flow log blob and list the blocks within the [CloudBlockBlob](/dotnet/api/microsoft.azure.storage.blob.cloudblockblob) block blob. Update the script to contain valid values for your environment.
+The following PowerShell script sets up the variables needed to query the network security group flow log blob and list the blocks within the [CloudBlockBlob](/dotnet/api/microsoft.azure.storage.blob.cloudblockblob) block blob. Update the script to contain valid values for your environment.
 
 ```powershell
 function Get-NSGFlowLogCloudBlockBlob {
@@ -48,16 +48,16 @@ function Get-NSGFlowLogCloudBlockBlob {
     )
 
     process {
-        # Retrieve the primary storage account key to access the NSG logs
+        # Retrieve the primary storage account key to access the network security group logs
         $StorageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $storageAccountResourceGroup -Name $storageAccountName).Value[0]
 
         # Setup a new storage context to be used to query the logs
         $ctx = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $StorageAccountKey
 
-        # Container name used by NSG flow logs
+        # Container name used by network security group flow logs
         $ContainerName = "insights-logs-networksecuritygroupflowevent"
 
-        # Name of the blob that contains the NSG flow log
+        # Name of the blob that contains the network security group flow log
         $BlobName = "resourceId=/SUBSCRIPTIONS/${subscriptionId}/RESOURCEGROUPS/${NSGResourceGroupName}/PROVIDERS/MICROSOFT.NETWORK/NETWORKSECURITYGROUPS/${NSGName}/y=$($logTime.Year)/m=$(($logTime).ToString("MM"))/d=$(($logTime).ToString("dd"))/h=$(($logTime).ToString("HH"))/m=00/macAddress=$($macAddress)/PT1H.json"
 
         # Gets the storage blog
@@ -91,9 +91,9 @@ $CloudBlockBlob = Get-NSGFlowLogCloudBlockBlob -subscriptionId "yourSubscription
 $blockList = Get-NSGFlowLogBlockList -CloudBlockBlob $CloudBlockBlob
 ```
 
-# [**VNet flow logs**](#tab/vnet)
+# [**Virtual network flow logs**](#tab/vnet)
 
-The following PowerShell script sets up the variables needed to query the VNet flow log blob and list the blocks within the [CloudBlockBlob](/dotnet/api/microsoft.azure.storage.blob.cloudblockblob) block blob. Update the script to contain valid values for your environment.
+The following PowerShell script sets up the variables needed to query the virtual network flow log blob and list the blocks within the [CloudBlockBlob](/dotnet/api/microsoft.azure.storage.blob.cloudblockblob) block blob. Update the script to contain valid values for your environment.
 
 ```powershell
 function Get-VNetFlowLogCloudBlockBlob {
@@ -109,16 +109,16 @@ function Get-VNetFlowLogCloudBlockBlob {
     )
 
     process {
-        # Retrieve the primary storage account key to access the VNet flow logs
+        # Retrieve the primary storage account key to access the virtual network flow logs
         $StorageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $storageAccountResourceGroup -Name $storageAccountName).Value[0]
 
         # Setup a new storage context to be used to query the logs
         $ctx = New-AzStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $StorageAccountKey
 
-        # Container name used by VNet flow logs
+        # Container name used by virtual network flow logs
         $ContainerName = "insights-logs-flowlogflowevent"
 
-        # Name of the blob that contains the VNet flow log
+        # Name of the blob that contains the virtual network flow log
         $BlobName = "flowLogResourceID=/$($subscriptionId.ToUpper())_NETWORKWATCHERRG/NETWORKWATCHER_$($region.ToUpper())_$($VNetFlowLogName.ToUpper())/y=$($logTime.Year)/m=$(($logTime).ToString("MM"))/d=$(($logTime).ToString("dd"))/h=$(($logTime).ToString("HH"))/m=00/macAddress=$($macAddress)/PT1H.json"
 
         # Gets the storage blog
@@ -174,7 +174,7 @@ ZjAyZTliYWE3OTI1YWZmYjFmMWI0MjJhNzMxZTI4MDM=      2      True
 
 In this section, you read the `$blocklist` variable to retrieve the data. In the following example, we iterate through the blocklist to read the bytes from each block and store them in an array. Use the [DownloadRangeToByteArray](/dotnet/api/microsoft.azure.storage.blob.cloudblob.downloadrangetobytearray) method to retrieve the data.
 
-# [**NSG flow logs**](#tab/nsg)
+# [**Network security group flow logs**](#tab/nsg)
 
 ```powershell
 function Get-NSGFlowLogReadBlock  {
@@ -218,7 +218,7 @@ function Get-NSGFlowLogReadBlock  {
 $valuearray = Get-NSGFlowLogReadBlock -blockList $blockList -CloudBlockBlob $CloudBlockBlob
 ```
 
-# [**VNet flow logs**](#tab/vnet)
+# [**Virtual network flow logs**](#tab/vnet)
 
 ```powershell
 function Get-VNetFlowLogReadBlock  {
@@ -272,7 +272,7 @@ The `$valuearray` array contains now the string value of each block. To verify t
 
 The results of this value are shown in the following example:
 
-# [**NSG flow logs**](#tab/nsg)
+# [**Network security group flow logs**](#tab/nsg)
 
 ```json
 {
@@ -333,7 +333,7 @@ The results of this value are shown in the following example:
 }
 ```
 
-# [**VNet flow logs**](#tab/vnet)
+# [**Virtual network flow logs**](#tab/vnet)
 
 ```json
 {

articles/network-watcher/network-watcher-overview.md

@@ -5,7 +5,7 @@ author: halkazwini
 ms.author: halkazwini
 ms.service: network-watcher
 ms.topic: overview
-ms.date: 04/22/2024
+ms.date: 04/24/2024
 
 #CustomerIntent: As someone with basic Azure network experience, I want to understand how Azure Network Watcher can help me resolve some of the network-related problems I've encountered and provide insight into how I use Azure networking.
 ---
@@ -90,8 +90,8 @@ Network Watcher offers two traffic tools that help you log and visualize network
 ### Flow logs
 
 **Flow logs** allows you to log information about your Azure IP traffic and stores the data in Azure storage. You can log IP traffic flowing through a network security group or Azure virtual network. For more information, see:
-- [NSG flow logs](nsg-flow-logs-overview.md) and [Manage NSG flow logs](nsg-flow-logs-portal.md).
-- [VNet flow logs](vnet-flow-logs-overview.md) and [Manage VNet flow logs](vnet-flow-logs-portal.md).
+- [Network security group flow logs](nsg-flow-logs-overview.md) and [Manage network security group flow logs](nsg-flow-logs-portal.md).
+- [Virtual network flow logs](vnet-flow-logs-overview.md) and [Manage virtual network flow logs](vnet-flow-logs-portal.md).
 
 ### Traffic analytics
 

articles/network-watcher/nsg-flow-logs-migrate.md

@@ -1,43 +1,44 @@
 ---
-title: Migrate to VNet flow logs
+title: Migrate to virtual network flow logs
 titleSuffix: Azure Network Watcher
-description: Learn how to migrate your Azure Network Watcher NSG flow logs to VNet flow logs using the Azure portal and a PowerShell script.
+description: Learn how to migrate your Azure Network Watcher network security group flow logs to virtual network flow logs using the Azure portal and a PowerShell script.
 author: halkazwini
 ms.author: halkazwini
 ms.service: network-watcher
 ms.topic: how-to
-ms.date: 04/22/2024
+ms.date: 04/24/2024
+ms.custom: devx-track-azurepowershell
 
-#CustomerIntent: As an Azure administrator, I want to migrate my NSG flow logs to the new VNet flow logs so that I can use all the benefits of VNet flow logs, which overcome some of the NSG flow logs limitations..
+#CustomerIntent: As an Azure administrator, I want to migrate my network security group flow logs to the new virtual network flow logs so that I can use all the benefits of virtual network flow logs, which overcome some of the network security group flow logs limitations.
 ---
 
-# Migrate from NSG flow logs to VNet flow logs
+# Migrate from network security group flow logs to virtual network flow logs
 
-In this article, you learn how to migrate your existing NSG flow logs to VNet flow logs. VNet flow logs overcome some of the limitations of NSG flow logs. For more information, see [VNet flow logs](vnet-flow-logs-overview.md).
+In this article, you learn how to migrate your existing network security group flow logs to virtual network flow logs. Virtual network flow logs overcome some of the limitations of network security group flow logs. For more information, see [Virtual network flow logs](vnet-flow-logs-overview.md).
 
 ## Prerequisites
 
 - An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 
 - PowerShell installed on your machine. For more information, see [Install PowerShell on Windows, Linux, and macOS](/powershell/scripting/install/installing-powershell). This article requires the Az PowerShell module. For more information, see [How to install Azure PowerShell](/powershell/azure/install-azure-powershell). To find the installed version, run `Get-Module -ListAvailable Az`. 
 
-- Necessary RBAC permissions for subscriptions of the flow logs and Log Analytics workspaces if traffic analytics is enabled for any of the NSG flow logs. For more information, see [Network Watcher RBAC permissions](required-rbac-permissions.md).
+- Necessary RBAC permissions for subscriptions of the flow logs and Log Analytics workspaces if traffic analytics is enabled for any of the network security group flow logs. For more information, see [Network Watcher RBAC permissions](required-rbac-permissions.md).
 
-- NSG flow logs in a region or more. For more information, see [Create NSG flow logs](nsg-flow-logs-portal.md#create-a-flow-log).
+- Network security group flow logs in a region or more. For more information, see [Create network security group flow logs](nsg-flow-logs-portal.md#create-a-flow-log).
 
 ## Generate migration script
 
-In this section, you learn how to generate and download the migration files for the NSG flow logs that you want to migrate. 
+In this section, you learn how to generate and download the migration files for the network security group flow logs that you want to migrate. 
 
 1. In the search box at the top of the portal, enter *network watcher*. Select **Network Watcher** in the search results.
 
     :::image type="content" source="./media/nsg-flow-logs-migrate/portal-search.png" alt-text="Screenshot that shows how to search for Network Watcher in the Azure portal." lightbox="./media/nsg-flow-logs-migrate/portal-search.png":::
 
 1. Under **Logs**, select **Migrate flow logs**.
 
-    :::image type="content" source="./media/nsg-flow-logs-migrate/migrate-flow-logs.png" alt-text="Screenshot that shows the NSG flow logs migration page in the Azure portal." lightbox="./media/nsg-flow-logs-migrate/migrate-flow-logs.png":::
+    :::image type="content" source="./media/nsg-flow-logs-migrate/migrate-flow-logs.png" alt-text="Screenshot that shows the network security group flow logs migration page in the Azure portal." lightbox="./media/nsg-flow-logs-migrate/migrate-flow-logs.png":::
 
-1. Select the subscriptions that contain the NSG flow logs that you want to migrate.
+1. Select the subscriptions that contain the network security group flow logs that you want to migrate.
 
 1. For each subscription, select the regions that contain the flow logs that you want to migrate. **Total NSG flow logs** shows the total number of flow logs that are in the selected subscriptions. **Selected NSG flow logs** shows the number of flow logs in the selected regions.
 
@@ -51,7 +52,7 @@ In this section, you learn how to generate and download the migration files for
 
 ## Run migration script
 
-In this section, you learn how to use the script file that you downloaded in the previous section to migrate your NSG flow logs.
+In this section, you learn how to use the script file that you downloaded in the previous section to migrate your network security group flow logs.
 
 > [!IMPORTANT]
 > Once you start running the script, you shouldn't make any changes to the topology in the regions and subscriptions of the flow logs that you're migrating. 
@@ -81,7 +82,7 @@ In this section, you learn how to use the script file that you downloaded in the
     Please enter the number of threads you would like to use, press enter for using default value of 16:    
     ```
 
-    After the analysis is complete, you'll see the analysis report on screen and in an html file in the same directory of the migration files. The report lists the number of NSG flow logs that will be disabled and the number of VNet flow logs that are created to replace them. The number of VNet flow logs that are created depends on the type of migration that you choose. For example, if the network security group that you're migrating its flow log is associated with three network interfaces in the same virtual network, then you can choose *migration with aggregation* to have a single VNet flow log resource applied to the virtual network. You can also choose *migration without aggregation* to have three VNet flow logs (one VNet flow log resource per network interface).
+    After the analysis is complete, you'll see the analysis report on screen and in an html file in the same directory of the migration files. The report lists the number of network security group flow logs that will be disabled and the number of virtual network flow logs that are created to replace them. The number of virtual network flow logs that are created depends on the type of migration that you choose. For example, if the network security group that you're migrating its flow log is associated with three network interfaces in the same virtual network, then you can choose *migration with aggregation* to have a single virtual network flow log resource applied to the virtual network. You can also choose *migration without aggregation* to have three virtual network flow logs (one virtual network flow log resource per network interface).
 
     > [!NOTE]
     > See `AnalysisReport-<subscriptionId>-<region>-<time>.html` file for a full report of the analysis that you performed. The file is available in the same directory of the script.
@@ -102,14 +103,14 @@ In this section, you learn how to use the script file that you downloaded in the
     Do you want to rollback? You won't get the option to revert the actions done now again (y/n): n
     ```
 
-1. Check the Azure portal to confirm that the status of NSG flow logs that you migrated became disabled, and VNet flow logs are created to replace them.
+1. Check the Azure portal to confirm that the status of network security group flow logs that you migrated became disabled, and virtual network flow logs are created to replace them.
  
-    :::image type="content" source="./media/nsg-flow-logs-migrate/list-flow-logs.png" alt-text="Screenshot that shows the newly created VNet flow log as a result of migrating from NSG flow log." lightbox="./media/nsg-flow-logs-migrate/list-flow-logs.png":::
+    :::image type="content" source="./media/nsg-flow-logs-migrate/list-flow-logs.png" alt-text="Screenshot that shows the newly created virtual network flow log as a result of migrating from network security group flow log." lightbox="./media/nsg-flow-logs-migrate/list-flow-logs.png":::
 
     > [!NOTE]
     > Keep the script and analysis report files for reference in case you have any issues with the migration.
     
 ## Related content
 
-- [NSG flow logs](nsg-flow-logs-overview.md)
-- [VNet flow logs](vnet-flow-logs-overview.md)
+- [Network security group flow logs](nsg-flow-logs-overview.md)
+- [Virtual network flow logs](vnet-flow-logs-overview.md)

articles/network-watcher/required-rbac-permissions.md

@@ -6,7 +6,7 @@ author: halkazwini
 ms.author: halkazwini
 ms.service: network-watcher
 ms.topic: concept-article
-ms.date: 04/22/2024
+ms.date: 04/24/2024
 
 #CustomerIntent: As an Azure administrator, I want to know the required Azure role-based access control (Azure RBAC) permissions to use each of the Network Watcher capabilities, so I can assign them correctly to users using any of those capabilities.
 ---
@@ -78,7 +78,7 @@ Since traffic analytics is enabled as part of the Flow log resource, the followi
 > | Microsoft.Insights/dataCollectionEndpoints/write <sup>1</sup>       | Create or update a data collection endpoint                    |
 > | Microsoft.Insights/dataCollectionEndpoints/delete <sup>1</sup>      | Delete a data collection endpoint                              |
 
-<sup>1</sup> Only required when using traffic analytics to analyze VNet flow logs. For more information, see [Data collection rules in Azure Monitor](../azure-monitor/essentials/data-collection-rule-overview.md?toc=/azure/network-watcher/toc.json) and [Data collection endpoints in Azure Monitor](../azure-monitor/essentials/data-collection-endpoint-overview.md?toc=/azure/network-watcher/toc.json).
+<sup>1</sup> Only required when using traffic analytics to analyze virtual network flow logs. For more information, see [Data collection rules in Azure Monitor](../azure-monitor/essentials/data-collection-rule-overview.md?toc=/azure/network-watcher/toc.json) and [Data collection endpoints in Azure Monitor](../azure-monitor/essentials/data-collection-endpoint-overview.md?toc=/azure/network-watcher/toc.json).
 
 > [!CAUTION]
 > Data collection rule and data collection endpoint resources are created and managed by traffic analytics. If you perform any operation on these resources, traffic analytics may not function as expected.