Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-old-review-1

asudbring · asudbring · commit 3f241fea3e87 · 2023-03-23T14:50:23.000-07:00
diff --git a/articles/machine-learning/how-to-interactive-jobs.md b/articles/machine-learning/how-to-interactive-jobs.md
@@ -27,18 +27,18 @@ Interactive training is supported on **Azure Machine Learning Compute Clusters**
 
 ## Prerequisites
 - Review [getting started with training on Azure Machine Learning](./how-to-train-model.md).
-- To use this feature in Azure Machine Learning Studio, enable the "Debug & monitor your training jobs" flight via the [preview panel](./how-to-enable-preview-features.md#how-do-i-enable-preview-features).
+- To use this feature in Azure Machine Learning studio, enable the "Debug & monitor your training jobs" flight via the [preview panel](./how-to-enable-preview-features.md#how-do-i-enable-preview-features).
 - To use **VS Code**, [follow this guide](how-to-setup-vs-code.md) to set up the Azure Machine Learning extension.
 - Make sure your job environment has the `openssh-server` and `ipykernel ~=6.0` packages installed (all Azure Machine Learning curated training environments have these packages installed by default).
 - Interactive applications can't be enabled on distributed training runs where the distribution type is anything other than Pytorch, Tensorflow or MPI. Custom distributed training setup (configuring multi-node training without using the above distribution frameworks) is not currently supported.
-
-
+- To use SSH, you need an SSH key pair. You can use the `ssh-keygen -f "<filepath>"` command to generate a public and private key pair.
+   
 ## Interact with your job container
 
 By specifying interactive applications at job creation, you can connect directly to the container on the compute node where your job is running. Once you have access to the job container, you can test or debug your job in the exact same environment where it would run. You can also use VS Code to attach to the running process and debug as you would locally. 
 
 ### Enable during job submission
-# [Azure Machine Learning Studio](#tab/ui)
+# [Azure Machine Learning studio](#tab/ui)
 1. Create a new job from the left navigation pane in the studio portal.
 
 
@@ -54,10 +54,10 @@ By specifying interactive applications at job creation, you can connect directly
   :::image type="content" source="./media/interactive-jobs/sleep-command.png" alt-text="Screenshot of reviewing a drafted job and completing the creation.":::
 
   You can put `sleep <specific time>` at the end of your command to specify the amount of time you want to reserve the compute resource. The format follows: 
-      * sleep 1s
-      * sleep 1m
-      * sleep 1h
-      * sleep 1d
+  * sleep 1s
+  * sleep 1m
+  * sleep 1h
+  * sleep 1d
 
   You can also use the ```sleep infinity``` command that would keep the job alive indefinitely. 
     
@@ -77,105 +77,94 @@ If you don't see the above options, make sure you have enabled the "Debug & moni
 
    Note that you have to import the `JobService` class from the `azure.ai.ml.entities` package to configure interactive services via the SDKv2. 
 
-    ```python
-    command_job = command(...
-        code="./src",  # local path where the code is stored
-        command="python main.py", # you can add a command like "sleep 1h" to reserve the compute resource is reserved after the script finishes running
-        environment="AzureML-tensorflow-2.7-ubuntu20.04-py38-cuda11-gpu@latest",
-        compute="<name-of-compute>",
-        services={
-          "My_jupyterlab": JobService(
-            job_service_type="jupyter_lab",
-            nodes="all" # For distributed jobs, use the `nodes` property to pick which node you want to enable interactive services on. If `nodes` are not selected, by default, interactive applications are only enabled on the head node. Values are "all", or compute node index (for ex. "0", "1" etc.)
-          ),
-          "My_vscode": JobService(
-            job_service_type="vs_code",
-            nodes="all"
-          ),
-          "My_tensorboard": JobService(
-            job_service_type="tensor_board",
-            nodes="all",
-            properties={
-                "logDir": "output/tblogs"  # relative path of Tensorboard logs (same as in your training script)
-            }          
-          ),
-          "My_ssh": JobService(
-            job_service_type="ssh",
-            sshPublicKeys="<add-public-key>",
-            nodes="all"
-            properties={
-                "sshPublicKeys":"<add-public-key>"
-            }    
-          ),
-        }
-    )
-
-    # submit the command
-    returned_job = ml_client.jobs.create_or_update(command_job)
-    ```
-
-    The `services` section specifies the training applications you want to interact with.  
-
-    You can put `sleep <specific time>` at the end of your command to specify the amount of time you want to reserve the compute resource. The format follows: 
-    * sleep 1s
-    * sleep 1m
-    * sleep 1h
-    * sleep 1d
-
-    You can also use the `sleep infinity` command that would keep the job alive indefinitely. 
-    
-    > [!NOTE]
-    > If you use `sleep infinity`, you will need to manually [cancel the job](./how-to-interactive-jobs.md#end-job) to let go of the compute resource (and stop billing). 
+   ```python
+   command_job = command(...
+       code="./src",  # local path where the code is stored
+       command="python main.py", # you can add a command like "sleep 1h" to reserve the compute resource is reserved after the script finishes running
+       environment="AzureML-tensorflow-2.7-ubuntu20.04-py38-cuda11-gpu@latest",
+       compute="<name-of-compute>",
+       services={
+         "My_jupyterlab": JupyterLabJobService(
+           nodes="all" # For distributed jobs, use the `nodes` property to pick which node you want to enable interactive services on. If `nodes` are not selected, by default, interactive applications are only enabled on the head node. Values are "all", or compute node index (for ex. "0", "1" etc.)
+         ),
+         "My_vscode": VsCodeJobService(
+           nodes="all"
+         ),
+         "My_tensorboard": TensorBoardJobService(
+           nodes="all",
+           log_Dir="output/tblogs"  # relative path of Tensorboard logs (same as in your training script)         
+         ),
+         "My_ssh": SshJobService(
+           ssh_Public_Keys="<add-public-key>",
+           nodes="all"  
+         ),
+       }
+   )
+   
+   # submit the command
+   returned_job = ml_client.jobs.create_or_update(command_job)
+   ```
+
+   The `services` section specifies the training applications you want to interact with.  
+
+   You can put `sleep <specific time>` at the end of your command to specify the amount of time you want to reserve the compute resource. The format follows: 
+   * sleep 1s
+   * sleep 1m
+   * sleep 1h
+   * sleep 1d
+
+   You can also use the `sleep infinity` command that would keep the job alive indefinitely. 
+   
+   > [!NOTE]
+   > If you use `sleep infinity`, you will need to manually [cancel the job](./how-to-interactive-jobs.md#end-job) to let go of the compute resource (and stop billing). 
 
 2. Submit your training job. For more details on how to train with the Python SDKv2, check out this [article](./how-to-train-model.md).
 
 # [Azure CLI](#tab/azurecli)
 
 1. Create a job yaml `job.yaml` with below sample content. Make sure to replace `your compute name` with your own value. If you want to use custom environment, follow the examples in [this tutorial](how-to-manage-environments-v2.md) to create a custom environment. 
-    ```dotnetcli
-    code: src 
-    command: 
-      python train.py 
-      # you can add a command like "sleep 1h" to reserve the compute resource is reserved after the script finishes running.
-    environment: azureml:AzureML-tensorflow-2.4-ubuntu18.04-py37-cuda11-gpu:41
-    compute: azureml:<your compute name>
-    services:
-        my_vs_code:
-          job_service_type: vs_code
-          nodes: all # For distributed jobs, use the `nodes` property to pick which node you want to enable interactive services on. If `nodes` are not selected, by default, interactive applications are only enabled on the head node. Values are "all", or compute node index (for ex. "0", "1" etc.)
-        my_tensor_board:
-          job_service_type: tensor_board
-          properties:
-            logDir: "output/tblogs" # relative path of Tensorboard logs (same as in your training script)
-          nodes: all
-        my_jupyter_lab:
-          job_service_type: jupyter_lab
-          nodes: all
-        my_ssh:
+   ```dotnetcli
+   code: src 
+   command: 
+     python train.py 
+     # you can add a command like "sleep 1h" to reserve the compute resource is reserved after the script finishes running.
+   environment: azureml:AzureML-tensorflow-2.4-ubuntu18.04-py37-cuda11-gpu:41
+   compute: azureml:<your compute name>
+   services:
+       my_vs_code:
+         job_service_type: vs_code
+         nodes: all # For distributed jobs, use the `nodes` property to pick which node you want to enable interactive services on. If `nodes` are not selected, by default, interactive applications are only enabled on the head node. Values are "all", or compute node index (for ex. "0", "1" etc.)
+       my_tensor_board:
+        job_service_type: tensor_board
+         log_dir: "output/tblogs" # relative path of Tensorboard logs (same as in your training script)
+         nodes: all
+       my_jupyter_lab:
+         job_service_type: jupyter_lab
+         nodes: all
+       my_ssh:
          job_service_type: ssh
-         properties:
-           sshPublicKeys: <paste the entire pub key content>
+         ssh_public_keys: <paste the entire pub key content>
          nodes: all
-    ```
-    The `services` section specifies the training applications you want to interact with.  
+   ```
 
-    You can put `sleep <specific time>` at the end of the command to specify the amount of time you want to reserve the compute resource. The format follows: 
-    * sleep 1s
-    * sleep 1m
-    * sleep 1h
-    * sleep 1d
+   The `services` section specifies the training applications you want to interact with.  
 
-    You can also use the `sleep infinity` command that would keep the job alive indefinitely. 
-    
-    > [!NOTE]
-    > If you use `sleep infinity`, you will need to manually [cancel the job](./how-to-interactive-jobs.md#end-job) to let go of the compute resource (and stop billing). 
+   You can put `sleep <specific time>` at the end of the command to specify the amount of time you want to reserve the compute resource. The format follows: 
+   * sleep 1s
+   * sleep 1m
+   * sleep 1h
+   * sleep 1d
+
+   You can also use the `sleep infinity` command that would keep the job alive indefinitely. 
+ 
+   > [!NOTE]
+   > If you use `sleep infinity`, you will need to manually [cancel the job](./how-to-interactive-jobs.md#end-job) to let go of the compute resource (and stop billing). 
 
 2. Run command `az ml job create --file <path to your job yaml file> --workspace-name <your workspace name> --resource-group <your resource group name> --subscription <sub-id> `to submit your training job. For more details on running a job via CLIv2, check out this [article](./how-to-train-model.md). 
 
 ---
-
 ### Connect to endpoints
-# [Azure Machine Learning Studio](#tab/ui)
+# [Azure Machine Learning studio](#tab/ui)
 To interact with your running job, click the button **Debug and monitor** on the job details page. 
 
 :::image type="content" source="media/interactive-jobs/debug-and-monitor.png" alt-text="Screenshot of interactive jobs debug and monitor panel location.":::
@@ -206,7 +195,6 @@ You can find the reference documentation for these commands [here](/cli/azure/ml
 You can access the applications only when they are in **Running** status and only the **job owner** is authorized to access the applications. If you're training on multiple nodes, you can pick the specific node you would like to interact with by passing in the node index.
 
 ---
-
 ### Interact with the applications
 When you click on the endpoints to interact when your job, you're taken to the user container under your working directory, where you can access your code, inputs, outputs, and logs. If you run into any issues while connecting to the applications, the interactive capability and applications logs can be found from **system_logs->interactive_capability** under **Outputs + logs** tab.
 
@@ -258,4 +246,4 @@ To submit a job with a debugger attached and the execution paused, you can use d
 
 ## Next steps
 
-+ Learn more about [how and where to deploy a model](./how-to-deploy-online-endpoints.md).
++ Learn more about [how and where to deploy a model](./how-to-deploy-online-endpoints.md).
diff --git a/articles/networking/powershell-samples.md b/articles/networking/powershell-samples.md
@@ -1,32 +1,23 @@
 ---
 title: Azure PowerShell Samples - Networking
 description: Learn about Azure PowerShell samples for networking, including a sample for creating a virtual network for multi-tier applications.
-services: virtual-network
-documentationcenter: virtual-network
-author: mbender-ms
-manager: kumudD
-
-tags:
-ms.assetid:
+author: asudbring
 ms.service: virtual-network
 ms.topic: article
-ms.tgt_pltfrm:
-ms.workload: infrastructure
-ms.date: 05/24/2017
-ms.author: mbender
-
+ms.date: 03/23/2023
+ms.author: allensu
 ---
 # Azure PowerShell Samples for networking
 
-The following table includes links to scripts built using Azure PowerShell.
+The following table includes links to scripts for Azure PowerShell.
 
 | Script | Description |
 |-|-|
 |**Connectivity between Azure resources**||
 | [Create a virtual network for multi-tier applications](./scripts/virtual-network-powershell-sample-multi-tier-application.md?toc=%2fazure%2fnetworking%2ftoc.json) | Creates a virtual network with front-end and back-end subnets. Traffic to the front-end subnet is limited to HTTP, while traffic to the back-end subnet is limited to SQL, port 1433. |
 | [Peer two virtual networks](./scripts/virtual-network-powershell-sample-peer-two-virtual-networks.md?toc=%2fazure%2fnetworking%2ftoc.json) | Creates and connects two virtual networks in the same region. |
 | [Route traffic through a network virtual appliance](./scripts/virtual-network-powershell-sample-route-traffic-through-nva.md?toc=%2fazure%2fnetworking%2ftoc.json) | Creates a virtual network with front-end and back-end subnets and a VM that is able to route traffic between the two subnets. |
-| [Filter inbound and outbound VM network traffic](./scripts/virtual-network-powershell-filter-network-traffic.md?toc=%2fazure%2fnetworking%2ftoc.json) | Creates a virtual network with front-end and back-end subnets. Inbound network traffic to the front-end subnet is limited to HTTP and HTTPS.. Outbound traffic to the Internet from the back-end subnet is not permitted. |
+| [Filter inbound and outbound VM network traffic](./scripts/virtual-network-powershell-filter-network-traffic.md?toc=%2fazure%2fnetworking%2ftoc.json) | Creates a virtual network with front-end and back-end subnets. Inbound network traffic to the front-end subnet is limited to HTTP and HTTPS. Outbound traffic to the Internet from the back-end subnet isn't permitted. |
 |**Load balancing and traffic direction**||
 | [Load balance traffic to VMs for high availability](./scripts/load-balancer-windows-powershell-sample-nlb.md?toc=%2fazure%2fnetworking%2ftoc.json) | Creates several virtual machines in a highly available and load balanced configuration. |
 | [Direct traffic across multiple regions for high application availability](./scripts/traffic-manager-powershell-websites-high-availability.md?toc=%2fazure%2fnetworking%2ftoc.json) |  Creates two app service plans, two web apps, a traffic manager profile, and two traffic manager endpoints. |
diff --git a/articles/networking/scripts/virtual-network-powershell-sample-multi-tier-application.md b/articles/networking/scripts/virtual-network-powershell-sample-multi-tier-application.md
@@ -1,24 +1,18 @@
 ---
 title: Azure PowerShell script sample - Create a network for multi-tier applications
 description: Azure PowerShell script sample - Create a virtual network for multi-tier applications.
-services: virtual-network
-documentationcenter: virtual-network
-author: mbender-ms
-manager: kumudD
+author: asudbring
 ms.service: virtual-network
-ms.devlang: powershell
 ms.topic: article
-ms.tgt_pltfrm:
-ms.workload: infrastructure
-ms.date: 05/16/2017
-ms.author: mbender 
+ms.date: 03/23/2023
+ms.author: allensu 
 ms.custom: devx-track-azurepowershell
 
 ---
 
 # Create a network for multi-tier applications
 
-This script sample creates a virtual network with front-end and back-end subnets. Traffic to the front-end subnet is limited to HTTP and SSH, while traffic to the back-end subnet is limited to MySQL, port 3306. After running the script, you will have two virtual machines, one in each subnet that you can deploy web server and MySQL software to.
+This script sample creates a virtual network with front-end and back-end subnets. Traffic to the front-end subnet is limited to HTTP and SSH, while traffic to the back-end subnet is limited to MySQL, port 3306. After running the script, you'll have two virtual machines, one in each subnet that you can deploy web server and MySQL software to.
 
 If needed, install the Azure PowerShell using the instruction found in the [Azure PowerShell guide](/powershell/azure/), and then run `Connect-AzAccount` to create a connection with Azure.
 
@@ -35,7 +29,7 @@ If needed, install the Azure PowerShell using the instruction found in the [Azur
 Run the following command to remove the resource group, VM, and all related resources.
 
 ```powershell
-Remove-AzResourceGroup -Name myResourceGroup
+Remove-AzResourceGroup -Name $rgName
 ```
 
 ## Script explanation
@@ -58,4 +52,4 @@ This script uses the following commands to create a resource group, virtual netw
 
 For more information on the Azure PowerShell, see [Azure PowerShell documentation](/powershell/azure/).
 
-Additional networking PowerShell script samples can be found in the [Azure Networking Overview documentation](../powershell-samples.md?toc=%2fazure%2fnetworking%2ftoc.json).
+More networking PowerShell script samples can be found in the [Azure Networking Overview documentation](../powershell-samples.md?toc=%2fazure%2fnetworking%2ftoc.json).
diff --git a/articles/networking/scripts/virtual-network-powershell-sample-route-traffic-through-nva.md b/articles/networking/scripts/virtual-network-powershell-sample-route-traffic-through-nva.md
@@ -1,19 +1,12 @@
 ---
 title: Azure PowerShell script sample - Route traffic through a network virtual appliance
 description: Azure PowerShell script sample - Route traffic through a firewall network virtual appliance.
-services: virtual-network
-documentationcenter: virtual-network
-author: mbender-ms
-manager: kumudD
+author: asudbring
 ms.service: virtual-network
-ms.devlang: powershell
 ms.topic: article
-ms.tgt_pltfrm:
-ms.workload: infrastructure
-ms.date: 05/16/2017
-ms.author: mbender 
+ms.date: 03/23/2023
+ms.author: allensu
 ms.custom: devx-track-azurepowershell
-
 ---
 
 # Route traffic through a network virtual appliance
@@ -60,4 +53,4 @@ This script uses the following commands to create a resource group, virtual netw
 
 For more information on the Azure PowerShell, see [Azure PowerShell documentation](/powershell/azure/).
 
-Additional networking PowerShell script samples can be found in the [Azure Networking Overview documentation](../powershell-samples.md?toc=%2fazure%2fnetworking%2ftoc.json).
+More networking PowerShell script samples can be found in the [Azure Networking Overview documentation](../powershell-samples.md?toc=%2fazure%2fnetworking%2ftoc.json).
diff --git a/articles/virtual-machines/linux/quick-create-cli.md b/articles/virtual-machines/linux/quick-create-cli.md
@@ -87,8 +87,6 @@ You can retrieve and store the IP address in the variable IP_ADDRESS with the fo
 export IP_ADDRESS=$(az vm show --show-details --resource-group $RESOURCE_GROUP_NAME --name $VM_NAME --query publicIps --output tsv)
 ```
 
-[!INCLUDE [ephemeral-ip-note.md](../../../includes/ephemeral-ip-note.md)]
-
 ## Install web server 
 
 To see your VM in action, install the NGINX web server. Update your package sources and then install the latest NGINX package. The following command uses run-command to run `sudo apt-get update && sudo apt-get install -y nginx` on the VM:
