Merge pull request #94289 from MicrosoftDocs/release-ignite-bastion

Ignite

Author: SyntaxC4

articles/azure-subscription-service-limits.md

@@ -79,6 +79,7 @@ In the following list of limits, a new table reflects any differences in limits
 * [Multi-Factor Authentication](#multi-factor-authentication-limits)
 * [Networking](#networking-limits)
   * [Application Gateway](#application-gateway-limits)
+  * [Azure Bastion](#azure-bastion-limits)
   * [Azure DNS](#azure-dns-limits)
   * [Azure Front Door Service](#azure-front-door-service-limits)
   * [Azure Firewall](#azure-firewall-limits)
@@ -175,6 +176,9 @@ The following table applies to v1, v2, Standard, and WAF SKUs unless otherwise s
 #### Traffic Manager limits
 [!INCLUDE [traffic-manager-limits](../includes/traffic-manager-limits.md)]
 
+#### Azure Bastion limits
+[!INCLUDE [Azure Bastion limits](../includes/bastion-limits.md)]
+
 #### Azure DNS limits
 [!INCLUDE [dns-limits](../includes/dns-limits.md)]
 

articles/bastion/TOC.yml

@@ -7,13 +7,19 @@
 - name: How-to guides
   items:
   - name: Create a bastion host
-    href: bastion-create-host-portal.md
+    items:
+    - name: Azure portal
+      href: bastion-create-host-portal.md
+    - name: Azure PowerShell
+      href: bastion-create-host-powershell.md
   - name: Connect to a virtual machine
     items:
     - name: SSH (Linux)
       href: bastion-connect-vm-ssh.md
     - name: RDP (Windows)
       href: bastion-connect-vm-rdp.md
+  - name: Connect to a virtual machine scale set
+    href: bastion-connect-vm-scale-set.md
   - name: Connect to DevTest Labs virtual machines
     href: ../lab-services/enable-browser-connection-lab-virtual-machines.md?toc=%2fazure%2fbastion%2ftoc.json
   - name: Work with a virtual machine session
@@ -24,6 +30,12 @@
       href: bastion-vm-full-screen.md
   - name: Work with NSGs
     href: bastion-nsg.md
+  - name: Configure and access diagnostic logs
+    href: diagnostic-logs.md
+  - name: Monitor and manage sessions
+    href: session-monitoring.md
+  - name: Troubleshoot
+    href: troubleshoot.md
 - name: Resources
   items:
   - name: Bastion FAQ

articles/bastion/bastion-connect-vm-rdp.md

@@ -6,23 +6,19 @@ author: cherylmc
 
 ms.service: bastion
 ms.topic: conceptual
-ms.date: 06/03/2019
+ms.date: 10/15/2019
 ms.author: cherylmc
 # Customer intent: As someone with a networking background, I want to connect to an Azure virtual machine running Windows that doesn't have a public IP address by using Azure Bastion.
 
 ---
 
-# Connect to a Windows virtual machine using Azure Bastion (Preview)
+# Connect to a Windows virtual machine using Azure Bastion
 
 This article shows you how to securely and seamlessly RDP to your Windows VMs in an Azure virtual network using Azure Bastion. You can connect to a VM directly from the Azure portal. When using Azure Bastion, VMs don't require a client, agent, or additional software. For more information about Azure Bastion, see the [Overview](bastion-overview.md).
 
-> [!IMPORTANT]
-> This public preview is provided without a service level agreement and should not be used for production workloads. Certain features may not be supported, may have constrained capabilities, or may not be available in all Azure locations. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for details.
->
-
 ## Before you begin
 
-Make sure that you have set up an Azure Bastion host for the virtual network in which the VM resides. For more information, see [Create an Azure Bastion host](bastion-create-host-portal.md). Once the Bastion service is provisioned and deployed in your virtual network, you can use it to connect to any VM in this virtual network. In this preview, Bastion assumes that you are using RDP to connect to a Windows VM, and SSH to connect to your Linux VMs. For information about connection to a Linux VM, see [Connect to a VM - Linux](bastion-connect-vm-ssh.md).
+Make sure that you have set up an Azure Bastion host for the virtual network in which the VM resides. For more information, see [Create an Azure Bastion host](bastion-create-host-portal.md). Once the Bastion service is provisioned and deployed in your virtual network, you can use it to connect to any VM in this virtual network. Bastion assumes that you are using RDP to connect to a Windows VM, and SSH to connect to your Linux VMs. For information about connection to a Linux VM, see [Connect to a VM - Linux](bastion-connect-vm-ssh.md).
 
 In order to make a connection, the following roles are required:
 
@@ -32,18 +28,16 @@ In order to make a connection, the following roles are required:
 
 ## <a name="rdp"></a>Connect using RDP
 
-1. Use [this link](https://aka.ms/BastionHost) to open the preview portal page for Azure Bastion. Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Windows virtual machine when using an RDP connection.
-
-    ![VM connect](./media/bastion-connect-vm-rdp/connect.png)
-
-1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, you can click the link to configure Bastion. For configuration instructions, see [Configure Bastion](bastion-create-host-portal.md). If you do not see **Bastion** listed, you have not opened the preview portal. Open the portal using this [preview link](https://aka.ms/BastionHost).
+1. Open the [Azure portal](https://portal.azure.com). Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Windows virtual machine when using an RDP connection.
 
-    ![VM connect](./media/bastion-connect-vm-rdp/bastion.png)
+   ![VM connect](./media/bastion-connect-vm-rdp/connect.png)
+1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, you can click the link to configure Bastion. For configuration instructions, see [Configure Bastion](bastion-create-host-portal.md).
 
+   ![VM connect](./media/bastion-connect-vm-rdp/bastion.png)
 1. On the Bastion tab, the username and password for your virtual machine, then click **Connect**. The RDP connection to this virtual machine via Bastion will open directly in the Azure portal (over HTML5) using port 443 and the Bastion service.
 
-    ![VM connect](./media/bastion-connect-vm-rdp/443rdp.png)
+   ![VM connect](./media/bastion-connect-vm-rdp/443rdp.png)
 
 ## Next steps
 
-Read the [Bastion FAQ](bastion-faq.md)
+Read the [Bastion FAQ](bastion-faq.md)

articles/bastion/bastion-connect-vm-scale-set.md

@@ -0,0 +1,40 @@
+---
+title: 'Connect to a Windows virtual machine scale set using Azure Bastion  | Microsoft Docs'
+description: In this article, learn how to connect to an Azure virtual machine scale set using Azure Bastion.
+services: bastion
+author: cherylmc
+
+ms.service: bastion
+ms.topic: conceptual
+ms.date: 10/14/2019
+ms.author: cherylmc
+
+---
+
+# Connect to a virtual machine scale set using Azure Bastion
+
+This article shows you how to securely and seamlessly RDP to your Windows virtual machine scale set instance in an Azure virtual network using Azure Bastion. You can connect to a virtual machine scale set instance directly from the Azure portal. When using Azure Bastion, VMs don't require a client, agent, or additional software. For more information about Azure Bastion, see the [Overview](bastion-overview.md).
+
+## Before you begin
+
+Make sure that you have set up an Azure Bastion host for the virtual network in which the virtual machine scale set resides. For more information, see [Create an Azure Bastion host](bastion-create-host-portal.md). Once the Bastion service is provisioned and deployed in your virtual network, you can use it to connect to a virtual machine scale set instance in this virtual network. Bastion assumes that you are using RDP to connect to a Windows virtual machine scale set, and SSH to connect to your Linux virtual machine scale set. For information about connection to a Linux VM, see [Connect to a VM - Linux](bastion-connect-vm-ssh.md).
+
+## <a name="rdp"></a>Connect using RDP
+
+1. Open the [Azure portal](https://portal.azure.com). Navigate to the virtual machine scale set that you want to connect to.
+
+   ![navigate](./media/bastion-connect-vm-scale-set/1.png)
+2. Navigate to the virtual machine scale set instance that you want to connect to, then select **Connect**. When using an RDP connection, the virtual machine scale set should be a Windows virtual machine scale set.
+
+   ![virtual machine scale set](./media/bastion-connect-vm-scale-set/2.png)
+3. After you select **Connect**, a side bar appears that has three tabs – RDP, SSH, and Bastion. Select the **Bastion** tab from the side bar. If you didn't provision Bastion for the virtual network, you can select the link to configure Bastion. For configuration instructions, see [Configure Bastion](bastion-create-host-portal.md).
+
+   ![Bastion tab](./media/bastion-connect-vm-scale-set/3.png)
+4. On the Bastion tab, enter the username and password for your virtual machine scale set, then select **Connect**.
+
+   ![connect](./media/bastion-connect-vm-scale-set/4.png)
+5. The RDP connection to this virtual machine via Bastion will open directly in the Azure portal (over HTML5) using port 443 and the Bastion service.
+
+## Next steps
+
+Read the [Bastion FAQ](bastion-faq.md).

articles/bastion/bastion-connect-vm-ssh.md

@@ -6,13 +6,13 @@ author: cherylmc
 
 ms.service: bastion
 ms.topic: conceptual
-ms.date: 06/03/2019
+ms.date: 10/15/2019
 ms.author: cherylmc
 # Customer intent: As someone with a networking background, I want to connect to an Azure virtual machine running Linux that doesn't have a public IP address by using Azure Bastion.
 
 ---
 
-# Connect using SSH to a Linux virtual machine using Azure Bastion (Preview)
+# Connect using SSH to a Linux virtual machine using Azure Bastion
 
 This article shows you how to securely and seamlessly SSH to your Linux VMs in an Azure virtual network. You can connect to a VM directly from the Azure portal. When using Azure Bastion, VMs don't require a client, agent, or additional software. For more information about Azure Bastion, see the [Overview](bastion-overview.md).
 
@@ -23,13 +23,9 @@ You can use Azure Bastion to connect to a Linux virtual machine using SSH. You c
 
 The SSH private key must be in a format that begins with  `"-----BEGIN RSA PRIVATE KEY-----"` and ends with `"-----END RSA PRIVATE KEY-----"`.
 
-> [!IMPORTANT]
-> This public preview is provided without a service level agreement and should not be used for production workloads. Certain features may not be supported, may have constrained capabilities, or may not be available in all Azure locations. See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for details.
->
-
 ## Before you begin
 
-Make sure that you have set up an Azure Bastion host for the virtual network in which the VM resides. For more information, see [Create an Azure Bastion host](bastion-create-host-portal.md). Once the Bastion service is provisioned and deployed in your virtual network, you can use it to connect to any VM in this virtual network. In this preview, when you use Bastion to connect, it assumes that you are using RDP to connect to a Windows VM, and SSH to connect to your Linux VMs.
+Make sure that you have set up an Azure Bastion host for the virtual network in which the VM resides. For more information, see [Create an Azure Bastion host](bastion-create-host-portal.md). Once the Bastion service is provisioned and deployed in your virtual network, you can use it to connect to any VM in this virtual network. When you use Bastion to connect, it assumes that you are using RDP to connect to a Windows VM, and SSH to connect to your Linux VMs.
 
 In order to make a connection, the following roles are required:
 
@@ -39,41 +35,36 @@ In order to make a connection, the following roles are required:
 
 ## <a name="username"></a>Connect: Using username and password
 
+1.   Open the [Azure portal](https://portal.azure.com). Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Linux virtual machine when using an SSH connection.
+1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, see [Configure Bastion](bastion-create-host-portal.md).
 
-1.  Use [this link](https://aka.ms/BastionHost) to open the preview portal page for Azure Bastion. Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Linux virtual machine when using an SSH connection.
-1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, see [Configure Bastion](bastion-create-host-portal.md). If you do not see **Bastion** listed, you have not opened the preview portal. Open the portal using [this link](https://aka.ms/BastionHost).
-
-      ![VM connect](./media/bastion-connect-vm-ssh/bastion.png)
-
+   ![VM connect](./media/bastion-connect-vm-ssh/bastion.png)
 1. Enter the username and password for SSH to your virtual machine.
 1. Click **Connect** button after entering the key.
 
 ## <a name="privatekey"></a>Connect: Manually enter a private key
 
-1.  Use [this link](https://aka.ms/BastionHost) to open the preview portal page for Azure Bastion. Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Linux virtual machine when using an SSH connection.
-1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, see [Configure Bastion](bastion-create-host-portal.md). If you do not see **Bastion** listed, you have not opened the preview portal. Open the portal using [this link](https://aka.ms/BastionHost).
-
-      ![VM connect](./media/bastion-connect-vm-ssh/bastion.png)
+1. Open the [Azure portal](https://portal.azure.com). Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Linux virtual machine when using an SSH connection.
+1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, see [Configure Bastion](bastion-create-host-portal.md).
 
+   ![VM connect](./media/bastion-connect-vm-ssh/bastion.png)
 1. Enter the username and select **SSH Private Key**.
 1. Enter your private key into the text area **SSH Private Key** (or paste it directly).
 1. Click **Connect** button after entering the key.
 
 ## <a name="ssh"></a>Connect: Using a private key file
 
-1.  Use [this link](https://aka.ms/BastionHost) to open the preview portal page for Azure Bastion. Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Linux virtual machine when using an SSH connection.
-
-    ![VM connect](./media/bastion-connect-vm-ssh/connect.png)
-
-1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, see [Configure Bastion](bastion-create-host-portal.md). If you do not see **Bastion** listed, you have not opened the preview portal. Open the portal using [this link](https://aka.ms/BastionHost).
+1. Open the [Azure portal](https://portal.azure.com). Navigate to the virtual machine that you want to connect to, then click **Connect**. The VM should be a Linux virtual machine when using an SSH connection.
 
-    ![VM connect](./media/bastion-connect-vm-ssh/bastion.png)
+   ![VM connect](./media/bastion-connect-vm-ssh/connect.png)
+1. After you click Connect, a side bar appears that has three tabs – RDP, SSH, and Bastion. If Bastion was provisioned for the virtual network, the Bastion tab is active by default. If you didn't provision Bastion for the virtual network, see [Configure Bastion](bastion-create-host-portal.md).
 
+   ![VM connect](./media/bastion-connect-vm-ssh/bastion.png)
 1. Enter the username and select **SSH Private Key from Local File**.
 1. Click the **Browse** button (the folder icon in the local file).
 1. Browse for the file, then click **Open**.
 1. Click **Connect** to connect to the VM. Once you click Connect, SSH to this virtual machine will directly open in the Azure portal. This connection is over HTML5 using port 443 on the Bastion service over the private IP of your virtual machine.
 
 ## Next steps
 
-Read the [Bastion FAQ](bastion-faq.md)
+Read the [Bastion FAQ](bastion-faq.md)