Skip to content

Commit 4b6a29d

Browse files
authored
Merge pull request #293354 from MicrosoftDocs/main
1/21/2025 PM Publish
2 parents 00e5abe + 960a5e2 commit 4b6a29d

File tree

78 files changed

+1353
-2122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1353
-2122
lines changed

.openpublishing.redirection.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,6 +2244,20 @@
22442244
"source_path_from_root": "/articles/ddos-protection/telemetry-monitoring-alerting.md",
22452245
"redirect_url": "/azure/ddos-protection/telemetry",
22462246
"redirect_document_id": false
2247+
}, {
2248+
"source_path_from_root": "/articles/ddos-protection/telemetry.md",
2249+
"redirect_url": "/azure/ddos-protection/monitor-ddos-protection",
2250+
"redirect_document_id": false
2251+
},
2252+
{
2253+
"source_path_from_root": "/articles/ddos-protection/ddos-configure-log-analytics-workspace.md",
2254+
"redirect_url": "/azure/azure-monitor/logs/quick-create-workspace",
2255+
"redirect_document_id": false
2256+
},
2257+
{
2258+
"source_path_from_root": "/articles/ddos-protection/diagnostic-logging.md",
2259+
"redirect_url": "/azure/azure-monitor/essentials/tutorial-resource-logs",
2260+
"redirect_document_id": false
22472261
},
22482262
{
22492263
"source_path_from_root": "/articles/defender-for-iot/concept-pricing.md",

articles/azure-cache-for-redis/cache-whats-new.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,24 @@ For the Standard and Premium tiers, you can now use availability zones (Preview)
3737

3838
Azure cache for Redis now offers you the ability to use Redis 7.2 (preview) with your Enterprise and Enterprise Flash tiers.
3939

40-
You can upgrade your caches automatically or manually. For more information, see [How to upgrade an existing cache](cache-how-to-upgrade.md).
40+
You can upgrade your caches automatically or manually. For more information, see [How to upgrade an existing cache](cache-how-to-upgrade.md).
4141

4242
You are able to manually trigger an upgrade to the latest version of Redis software. This provides two benefits above waiting for the automatic upgrade to occur:
4343

4444
1. You can control when the upgrade occurs.
4545
1. You can upgrade to preview releases of Redis software.
4646

47-
| **Tier** | Basic, Standard, Premium | Enterprise, Enterprise Flash |
48-
|:--------------------------|:----------------------------------------------:|:----------------------------:|
49-
| **Latest Redis Version** | Redis 6.0 (GA) | Redis 6.0 (GA) / Redis 7.2 (Preview)|
50-
| **Upgrade Policy** | Manual upgrade to newer version | Automatic upgrade to latest GA version |
47+
This table contains the information for Redis upgrades features available in each tier.
48+
49+
| Tier | Automatic Upgrade | Manual Upgrade |
50+
|:---------------------------- |:-----------------:|:--------------:|
51+
| Basic, Standard, Premium | No | No |
52+
| Enterprise, Enterprise Flash | Yes | Yes |
5153

5254
### Enterprise tier E1 (preview) SKU
5355

5456
The E1 SKU is intended primarily for dev/test scenarios. It runs on smaller [burstable virtual machines](/azure/virtual-machines/b-series-cpu-credit-model/b-series-cpu-credit-model). As a result, E1 offers variable performance depending on how much CPU is consumed. Unlike other Enterprise offerings, it isn't possible to scale out E1. However, it's still possible to scale up to a larger SKU. The E1 SKU also doesn't support [active geo-replication](cache-how-to-active-geo-replication.md).
5557

56-
5758
### .NET Output cache and HybridCache
5859

5960
Using Azure Cache for Reds as output cache was introduced in .NET 8 in November 2023. Output Caching saves rendered web pages to improve performance, resilience, and reduce cost through server resource utilization. You can use Redis as a built-in output cache store in .NET 8. For more information on using Redis as an output cache, see [Output caching middleware in ASP.NET Core](/aspnet/core/performance/caching/output#redis-cache)

articles/azure-functions/run-functions-from-deployment-package.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ The following table indicates the recommended `WEBSITE_RUN_FROM_PACKAGE` values
5353
+ When deploying your function app to Windows, you should set `WEBSITE_RUN_FROM_PACKAGE` to `1` and publish with zip deployment.
5454
+ When you run from a package, the `wwwroot` folder is read-only and you receive an error if you write files to this directory. Files are also read-only in the Azure portal.
5555
+ The maximum size for a deployment package file is 1 GB.
56+
+ The deployment uses temporary storage when unpacking your project files. This means that your function app must have enough available temporary storage space to hold the contents of your package. Keep in mind that the temporary storage limit for a Consumption plan is [500 MB per plan](functions-scale.md#service-limits). To learn about how to troubleshoot issues with temporary storage, see [How to troubleshoot temporary storage on Azure App Service](/troubleshoot/azure/app-service/temporary-storage-for-azure-app-service).
5657
+ You can't use the local cache when running from a deployment package.
5758
+ If your project needs to use remote build, don't use the `WEBSITE_RUN_FROM_PACKAGE` app setting. Instead, add the `SCM_DO_BUILD_DURING_DEPLOYMENT=true` deployment customization app setting. For Linux, also add the `ENABLE_ORYX_BUILD=true` setting. For more information, see [Remote build](functions-deployment-technologies.md#remote-build).
5859

articles/bastion/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- name: Quickstarts
88
expanded: true
99
items:
10-
- name: Deploy Bastion automatically - Basic SKU
10+
- name: Deploy Bastion automatically
1111
href: quickstart-host-portal.md
1212
- name: Deploy Bastion automatically - Developer SKU
1313
href: quickstart-developer-sku.md
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

articles/bastion/quickstart-developer-sku.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ description: Learn how to deploy Bastion using the Developer SKU.
44
author: cherylmc
55
ms.service: azure-bastion
66
ms.topic: quickstart
7-
ms.date: 12/09/2024
7+
ms.date: 01/21/2025
88
ms.author: cherylmc
99
ms.custom: references_regions
1010
---
1111

1212
# Quickstart: Deploy Azure Bastion - Developer SKU
1313

14-
In this quickstart, you learn how to deploy Azure Bastion using the Developer SKU. After Bastion is deployed, you can connect to virtual machines (VM) in the virtual network via Bastion using the private IP address of the VM. The VMs you connect to don't need a public IP address, client software, agent, or a special configuration. For more information about Azure Bastion, see [What is Azure Bastion?](bastion-overview.md)
14+
In this quickstart, you learn how to deploy Azure Bastion using the Developer SKU. After Bastion is deployed, you can connect to virtual machines (VM) in the virtual network via Bastion using the private IP address of the VM. The VMs you connect to don't need a public IP address, client software, agent, or a special configuration. For more information about Azure Bastion, see [What is Azure Bastion](bastion-overview.md)?
1515

1616
The following diagram shows the architecture for Azure Bastion and the Developer SKU.
1717

@@ -20,7 +20,7 @@ The following diagram shows the architecture for Azure Bastion and the Developer
2020
[!INCLUDE [regions](../../includes/bastion-developer-sku-regions.md)]
2121

2222
> [!NOTE]
23-
> VNet peering isn't currently supported for the Developer SKU.
23+
> Virtual network peering isn't currently supported for the Developer SKU.
2424
2525
## About the Developer SKU
2626

@@ -30,7 +30,7 @@ The following diagram shows the architecture for Azure Bastion and the Developer
3030

3131
* Verify that you have an Azure subscription. If you don't already have an Azure subscription, you can activate your [MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details) or sign up for a [free account](https://azure.microsoft.com/pricing/free-trial).
3232

33-
* **A VM in a VNet**.
33+
* **A VM in a virtual network**.
3434

3535
When you deploy Bastion using default values, the values are pulled from the virtual network in which your VM resides. Make sure the VM resides in a resource group that's in a region where the Developer SKU is supported.
3636

@@ -73,18 +73,13 @@ These steps help you deploy Bastion using the developer SKU and automatically co
7373

7474
1. Sign in to the [Azure portal](https://portal.azure.com).
7575
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 are used to create the Bastion deployment. The VM must be located in a region that supports the Developer SKU.
76-
1. On the page for your VM, in the **Operations** section on the left menu, select **Bastion**.
77-
1. On the **Bastion** page, select the **Authentication Type** you want to use, input the required credential values, and click **Connect**.
78-
79-
:::image type="content" source="./media/quickstart-developer-sku/deploy-bastion-developer.png" alt-text="Screenshot of the Bastion page showing Deploy Bastion." lightbox="./media/quickstart-developer-sku/deploy-bastion-developer.png":::
80-
81-
1. Bastion deploys using the Developer SKU.
76+
1. On the page for your VM, expand the settings on the left menu if necessary, and select **Bastion**.
77+
1. On the **Bastion** page, you'll see a number of options. The SKU that you deploy depends on the settings you choose. To automatically deploy using the **Developer SKU**, select **Authentication Type** and input the required credential values. Then, click **Connect**. When you click **Connect**, Bastion automatically deploys using the Developer SKU. You could also deploy the Developer SKU using the "Configure manually" button, but it's more efficient to use the **Connect** button.
8278
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.
8379

8480
* When you connect, the desktop of the VM might look different than the example screenshot.
8581
* Using keyboard shortcut keys while connected to a VM might not result in the same behavior as shortcut keys on a local computer. For example, when connected to a Windows VM from a Windows client, CTRL+ALT+END is the keyboard shortcut for CTRL+ALT+Delete on a local computer. To do this from a Mac while connected to a Windows VM, the keyboard shortcut is Fn+CTRL+ALT+Backspace.
8682

87-
:::image type="content" source="./media/quickstart-host-portal/connected.png" alt-text="Screenshot showing a Bastion RDP connection selected." lightbox="./media/quickstart-host-portal/connected.png":::
8883
1. When you disconnect from the VM, Bastion remains deployed to the virtual network. You can reconnect to the VM from the virtual machine page in the Azure portal by selecting **Bastion -> Connect**.
8984

9085
### <a name="audio"></a>To enable audio output

articles/bastion/quickstart-host-portal.md

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
---
2-
title: 'Quickstart: Deploy Azure Bastion automatically - Basic SKU'
2+
title: 'Quickstart: Deploy Azure Bastion automatically'
33
titleSuffix: Azure Bastion
44
description: Learn how to deploy Azure Bastion with default settings from the Azure portal.
55
author: cherylmc
66
ms.service: azure-bastion
77
ms.topic: quickstart
8-
ms.date: 12/09/2024
8+
ms.date: 01/21/2025
99
ms.author: cherylmc
1010

1111
---
1212

13-
# Quickstart: Deploy Azure Bastion automatically - Basic SKU
13+
# Quickstart: Deploy Azure Bastion automatically
1414

15-
In this quickstart, you learn how to deploy Azure Bastion automatically in the Azure portal by using default settings and the Basic SKU. After you deploy Bastion, you can use SSH or RDP to connect to virtual machines (VMs) in the virtual network via Bastion by using the private IP addresses of the VMs. The VMs that you connect to don't need a public IP address, client software, an agent, or a special configuration.
15+
In this quickstart, you learn how to deploy Azure Bastion automatically in the Azure portal by using default settings and the Basic SKU. After you deploy Bastion, you can use SSH or RDP to connect to virtual machines (VMs) in the virtual network via Bastion by using the private IP addresses of the VMs. The VMs that you connect to don't need a public IP address, client software, an agent, or a special configuration. For more information about Bastion, see [What is Azure Bastion](bastion-overview.md)?
1616

1717
:::image type="content" source="./media/create-host/host-architecture.png" alt-text="Diagram that shows the Azure Bastion architecture." lightbox="./media/create-host/host-architecture.png":::
1818

19-
When you deploy Bastion automatically, Bastion is deployed with the Basic SKU. If you want to deploy with the Developer SKU instead, see [Quickstart: Deploy Azure Bastion - Developer SKU](quickstart-developer-sku.md). If you want to specify features, configuration settings, or use a different SKU when you deploy Bastion, see [Tutorial: Deploy Azure Bastion by using specified settings](tutorial-create-host-portal.md). For more information about Bastion, see [What is Azure Bastion](bastion-overview.md)?
19+
At this time, when you deploy Bastion automatically, Bastion is deployed with Basic SKU.
20+
21+
* If you want to deploy with the Developer SKU instead, see [Quickstart: Deploy Azure Bastion - Developer SKU](quickstart-developer-sku.md).
22+
* If you want to specify features, configuration settings, or use a different SKU when you deploy Bastion, see [Tutorial: Deploy Azure Bastion by using specified settings](tutorial-create-host-portal.md).
2023

2124
The steps in this article help you:
2225

@@ -53,7 +56,7 @@ To complete this quickstart, you need these resources:
5356

5457
You can use the following example values when you're creating this configuration, or you can substitute your own.
5558

56-
#### Basic virtual network and VM values
59+
#### Virtual network and VM example values
5760

5861
|Name | Value |
5962
| --- | --- |
@@ -81,26 +84,16 @@ When you create an Azure Bastion instance in the portal by using **Deploy Bastio
8184

8285
1. Sign in to the [Azure portal](https://portal.azure.com).
8386
1. In the portal, go to the VM that you want to connect to. The values from the virtual network where this VM resides will be used to create the Bastion deployment.
84-
1. On the page for your VM, in the **Operations** section on the left menu, select **Bastion** to open the Bastion page. The Bastion page has different interfaces, depending on the region to which your VM is deployed. Certain features aren't available in all regions. You might need to expand **Dedicated Deployment Options** to access **Deploy Bastion**.
87+
1. On the page for your VM, in the left menu, select **Bastion** to open the Bastion page. The Bastion page has different interfaces, depending on the region to which your VM is deployed. Certain features aren't available in all regions. You might need to expand **Dedicated Deployment Options** to access **Deploy Bastion**.
8588
1. Select **Deploy Bastion**. Bastion begins deploying. This process can take around 10 minutes to complete.
8689

87-
:::image type="content" source="./media/quickstart-host-portal/deploy-bastion-automatically.png" alt-text="Screenshot that shows dedicated deployment options and the button for deploying an Azure Bastion instance." lightbox="./media/quickstart-host-portal/deploy-bastion-automatically.png":::
88-
89-
> [!NOTE]
90-
> [!INCLUDE [Bastion failed subnet](../../includes/bastion-failed-subnet.md)]
91-
9290
## <a name="connect"></a>Connect to a VM
9391

9492
When the Bastion deployment is complete, the screen changes to the **Connect** pane.
9593

9694
1. Enter your authentication credentials. Then, select **Connect**.
9795
1. The connection to this virtual machine via Bastion opens directly in the Azure portal (over HTML5) by using port 443 and the Bastion service. When the portal asks you for permissions to the clipboard, select **Allow**. This step lets you use the remote clipboard arrows on the left of the window.
9896

99-
:::image type="content" source="./media/quickstart-host-portal/connected.png" alt-text="Screenshot that shows an RDP connection to a virtual machine." lightbox="./media/quickstart-host-portal/connected.png":::
100-
101-
> [!NOTE]
102-
> When you connect, the desktop of the VM might look different from the example screenshot.
103-
10497
Using keyboard shortcut keys while you're connected to a VM might not result in the same behavior as shortcut keys on a local computer. For example, when you're connected to a Windows VM from a Windows client, Ctrl+Alt+End is the keyboard shortcut for Ctrl+Alt+Delete on a local computer. To do this from a Mac while you're connected to a Windows VM, the keyboard shortcut is Fn+Ctrl+Alt+Backspace.
10598

10699
### <a name="audio"></a>Enable audio output

0 commit comments

Comments
 (0)