Skip to content

Commit 7768414

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-sensitive-attributes-note
2 parents 00b666d + cf6b677 commit 7768414

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed
154 KB
Loading
156 KB
Loading

articles/bastion/quickstart-host-portal.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
title: 'Quickstart: Deploy Bastion with default settings'
33
titleSuffix: Azure Bastion
44
description: Learn how to deploy Bastion with default settings from the Azure portal.
5-
services: bastion
65
author: cherylmc
76
ms.service: bastion
87
ms.topic: quickstart
98
ms.date: 08/02/2022
109
ms.author: cherylmc
1110
ms.custom: ignite-fall-2021, mode-other
12-
#Customer intent: As someone with a networking background, I want to connect to a virtual machine securely via RDP/SSH using a private IP address through my browser.
11+
1312
---
1413

1514
# Quickstart: Deploy Azure Bastion with default settings
@@ -78,22 +77,22 @@ When you deploy from VM settings, Bastion is automatically configured with defau
7877
When you create Azure Bastion using default settings, the settings are configured for you. You can't modify or specify additional values for a default deployment. After deployment completes, you can always go to the bastion host **Configuration** page to select additional settings and features. For example, the default SKU is the Basic SKU. You can later upgrade to the Standard SKU to support more features. For more information, see [About configuration settings](configuration-settings.md).
7978

8079
1. Sign in to the [Azure portal](https://portal.azure.com).
81-
1. In the portal, go to the VM to which you want to connect. The values from the virtual network in which this VM resides will be used to create the Bastion deployment.
82-
1. On the page for your VM, in the **Operations** section on the left menu, select **Bastion**. You can view some of the values that will be used when creating the bastion host for your virtual network. Select **Create Azure Bastion using defaults**.
80+
1. In the portal, go to the VM to which you want to connect. The values from the virtual network in which this VM resides will be used to create the Bastion deployment.
81+
1. On the page for your VM, in the **Operations** section on the left menu, select **Bastion**. When the **Bastion** page opens, it checks to see if you have enough available address space to create the AzureBastionSubnet. If you don't, you'll see settings to allow you to add more address space to your VNet to meet this requirement.
82+
1. On the **Bastion** page, you can view some of the values that will be used when creating the bastion host for your virtual network. Select **Create Azure Bastion using defaults** to deploy bastion using default settings.
8383

8484
:::image type="content" source="./media/quickstart-host-portal/deploy-bastion.png" alt-text="Screenshot of Deploy Bastion." lightbox="./media/quickstart-host-portal/deploy-bastion.png":::
8585

8686
1. Bastion begins deploying. This can take around 10 minutes to complete.
8787

88-
:::image type="content" source="./media/quickstart-host-portal/creating-bastion.png" alt-text="Screenshot of Bastion resources being created." lightbox="./media/quickstart-host-portal/creating-bastion.png":::
89-
9088
## <a name="connect"></a>Connect to a VM
9189

9290
When the Bastion deployment is complete, the screen changes to the **Connect** page.
9391

94-
1. Type the username and password for your virtual machine. Then, select **Connect**.
92+
1. Type your authentication credentials. Then, select **Connect**.
9593

9694
:::image type="content" source="./media/quickstart-host-portal/connect-vm.png" alt-text="Screenshot shows the Connect using Azure Bastion dialog." lightbox="./media/quickstart-host-portal/connect-vm.png":::
95+
9796
1. The connection to this virtual machine via Bastion will open directly in the Azure portal (over HTML5) using port 443 and the Bastion service. Select **Allow** when asked for permissions to the clipboard. This lets you use the remote clipboard arrows on the left of the screen.
9897

9998
* When you connect, the desktop of the VM may look different than the example screenshot.
@@ -121,7 +120,8 @@ When you're done using the virtual network and the virtual machines, delete the
121120

122121
## Next steps
123122

124-
In this quickstart, you deployed Bastion to your virtual network, and then connected to a virtual machine securely via Bastion. Next, you can continue with the following steps if you want to copy and paste to your VM.
123+
In this quickstart, you deployed Bastion to your virtual network, and then connected to a virtual machine securely via Bastion. Next, you can configure more features and work with VM connections.
125124

126125
> [!div class="nextstepaction"]
127-
> [Copy and paste to a Windows VM](bastion-vm-copy-paste.md)
126+
> [VM connections](vm-about.md)
127+
> [Azure Bastion configuration settings and features](configuration-settings.md).

articles/sentinel/indicators-bulk-file-import.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,5 +159,5 @@ Here's an example ipv4-addr indicator using the JSON template.
159159

160160
This article has shown you how to manually bolster your threat intelligence by importing indicators gathered in flat files. Check out these links to learn how indicators power other analytics in Microsoft Sentinel.
161161
- [Work with threat indicators in Microsoft Sentinel](work-with-threat-indicators.md)
162-
- [Threat indicators for cyber threat intelligence in Microsoft Sentinel](/azure/architecture/example-scenario/data/sentinel-threat-intelligence.md)
162+
- [Threat indicators for cyber threat intelligence in Microsoft Sentinel](/azure/architecture/example-scenario/data/sentinel-threat-intelligence)
163163
- [Detect threats quickly with near-real-time (NRT) analytics rules in Microsoft Sentinel](near-real-time-rules.md)

0 commit comments

Comments
 (0)