Skip to content

Commit 8cc02c5

Browse files
authored
Merge pull request #188476 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents b14c299 + 57fa9ad commit 8cc02c5

File tree

88 files changed

+403
-263
lines changed

Some content is hidden

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

88 files changed

+403
-263
lines changed

articles/app-service/environment/using.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Use an App Service Environment
33
description: Learn how to use your App Service Environment to host isolated applications.
44
author: madsd
55
ms.topic: article
6-
ms.date: 07/06/2021
6+
ms.date: 02/14/2022
77
ms.author: madsd
88
---
99

@@ -30,10 +30,11 @@ To create an app in an App Service Environment:
3030
1. Enter a name for a new resource group, or select **Use existing** and select one from the dropdown list.
3131
1. Enter a name for the app. If you already selected an App Service plan in an App Service Environment, the domain name for the app reflects the domain name of the App Service Environment.
3232
1. For **Publish**, **Runtime stack**, and **Operating System**, make your selections as appropriate.
33-
1. For **Region**, select a pre-existing App Service Environment v3. You can't make a new one when you're creating your app.
33+
1. For **Region**, select a pre-existing App Service Environment v3. If you want to create a new App Service Environment, select a region.
3434
![Screenshot that shows how to create an app in an App Service Environment.][1]
35-
1. Select an existing App Service plan, or create a new one. If you're creating a new app, select the size that you want for your App Service plan. The only SKU you can select for your app is an isolated v2 pricing SKU. Making a new App Service plan will normally take less than 20 minutes.
35+
1. Select an existing App Service plan, or create a new one. If you're creating a new plan, select the size that you want for your App Service plan. The only SKU you can select for your app is an Isolated v2 pricing SKU. Making a new App Service plan will normally take less than 20 minutes.
3636
![Screenshot that shows pricing tiers and their features and hardware.][2]
37+
1. If you chose to create a new App Service Environment as part of creating your new App Service plan, fill out the name and virtual IP type.
3738
1. Select **Next: Monitoring**. If you want to enable Application Insights with your app, you can do it here during the creation flow.
3839
1. Select **Next: Tags**, and add any tags you want to the app.
3940
1. Select **Review + create**. Make sure that the information is correct, and then select **Create**.

articles/automanage/automanage-hotpatch.md

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Hotpatch for Windows Server Azure Edition (preview)
2+
title: Hotpatch for Windows Server Azure Edition
33
description: Learn how Hotpatch for Windows Server Azure Edition works and how to enable it
44
author: ju-shim
55
ms.service: automanage
@@ -10,12 +10,17 @@ ms.author: jushiman
1010
ms.custom: devx-track-azurepowershell
1111
---
1212

13-
# Hotpatch for new virtual machines (Preview)
13+
# Hotpatch for new virtual machines
1414

15+
<!--
1516
> [!IMPORTANT]
1617
> Hotpatch is currently in Public Preview. An opt-in procedure is needed to use the Hotpatch capability described below.
1718
> This preview is provided without a service level agreement, and is not recommended for production workloads. Certain features might not be supported or might have constrained capabilities.
1819
> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
20+
-->
21+
22+
> [!IMPORTANT]
23+
> Hotpatch is supported on _Windows Server 2022 Datacenter: Azure Edition (Server Core)_.
1924
2025
Hotpatching is a new way to install updates on supported _Windows Server Azure Edition_ virtual machines (VMs) that doesn’t require a reboot after installation. This article covers information about Hotpatch for supported _Windows Server Azure Edition_ VMs, which has the following benefits:
2126
* Lower workload impact with less reboots
@@ -35,26 +40,24 @@ There are two types of baselines: **Planned baselines** and **unplanned baseline
3540
* The sample schedule above illustrates two unplanned baselines that would replace the hotpatch releases for those months (the actual number of unplanned baselines in a year isn't known in advance).
3641

3742
## Regional availability
38-
Hotpatch is available in all global Azure regions in preview. Azure Government regions aren't supported in the preview.
43+
Hotpatch is available in all global Azure regions.
3944

4045
## How to get started
4146

4247
> [!NOTE]
43-
> During the preview phase you can get started in the Azure portal using [this link](https://aka.ms/ws2022ae-portal-preview).
48+
> You can preview onboarding Automanage machine best practices during VM creation in the Azure portal using [this link](https://aka.ms/ws2022ae-portal-preview).
4449
4550
To start using Hotpatch on a new VM, follow these steps:
46-
1. Enable preview access
47-
* One-time preview access enablement is required per subscription.
48-
* Preview access can be enabled through API, PowerShell, or CLI as described in the 'Enabling preview access' section below.
4951
1. Start creating a new VM from the Azure portal
50-
* During the preview, you'll need to get started using [this link](https://aka.ms/ws2022ae-portal-preview).
51-
1. Supply details during VM creation
52+
* You can preview onboarding Automanage machine best practices during VM creation in the Azure portal using [this link](https://aka.ms/ws2022ae-portal-preview).
53+
1. Supply details during VM creation
5254
* Ensure that a supported _Windows Server Azure Edition_ image is selected in the Image dropdown. Use [this guide](automanage-windows-server-services-overview.md#getting-started-with-windows-server-azure-edition) to determine which images are supported.
53-
* On the Management tab under section ‘Guest OS updates’, select the checkbox for 'Enable hotpatch' to evaluate hotpatch while in preview. Patch orchestration options will be set to 'Azure-orchestrated'.
54-
* On the Management tab under section 'Azure Automanage', select 'Dev/Test' or 'Production' for 'Azure Automanage environment' to evaluate Automanage machine best practices while in preview.
55+
* On the Management tab under section ‘Guest OS updates’, the checkbox for 'Enable hotpatch' will be selected. Patch orchestration options will be set to 'Azure-orchestrated'.
56+
* If you create a VM using [this link](https://aka.ms/ws2022ae-portal-preview), on the Management tab under section 'Azure Automanage', select 'Dev/Test' or 'Production' for 'Azure Automanage environment' to evaluate Automanage machine best practices while in preview.
5557

5658
1. Create your new VM
5759

60+
<!--
5861
## Enabling preview access
5962
6063
### REST API
@@ -127,16 +130,17 @@ Once the feature has been registered for your subscription, complete the opt-in
127130
```
128131
az provider register --namespace Microsoft.Compute
129132
```
133+
-->
130134

131135
## Patch installation
132136

133-
During the preview, [Automatic VM Guest Patching](../virtual-machines/automatic-vm-guest-patching.md) is enabled automatically for all VMs created with a supported _Windows Server Azure Edition_ image. With automatic VM guest patching enabled:
137+
[Automatic VM Guest Patching](../virtual-machines/automatic-vm-guest-patching.md) is enabled automatically for all VMs created with a supported _Windows Server Azure Edition_ image. With automatic VM guest patching enabled:
134138
* Patches classified as Critical or Security are automatically downloaded and applied on the VM.
135139
* Patches are applied during off-peak hours in the VM's time zone.
136140
* Patch orchestration is managed by Azure and patches are applied following [availability-first principles](../virtual-machines/automatic-vm-guest-patching.md#availability-first-updates).
137141
* Virtual machine health, as determined through platform health signals, is monitored to detect patching failures.
138142

139-
### How does automatic VM guest patching work?
143+
## How does automatic VM guest patching work?
140144

141145
When [Automatic VM Guest Patching](../virtual-machines/automatic-vm-guest-patching.md) is enabled on a VM, the available Critical and Security patches are downloaded and applied automatically. This process kicks off automatically every month when new patches are released. Patch assessment and installation are automatic, and the process includes rebooting the VM as required.
142146

@@ -192,7 +196,7 @@ There are some important considerations to running a supported _Windows Server A
192196

193197
### What will the Hotpatch schedule look like?
194198

195-
* Hotpatching works by establishing a baseline with a Windows Update Latest Cumulative Update, then builds upon that baseline with Hotpatch updates released monthly. During the preview, baselines will be released starting out every three months. See the image below for an example of an annual three-month schedule (including example unplanned baselines due to zero-day fixes).
199+
* Hotpatching works by establishing a baseline with a Windows Update Latest Cumulative Update, then builds upon that baseline with Hotpatch updates released monthly. Baselines will be released starting out every three months. See the image below for an example of an annual three-month schedule (including example unplanned baselines due to zero-day fixes).
196200

197201
:::image type="content" source="media\automanage-hotpatch\hotpatch-sample-schedule.png" alt-text="Hotpatch Sample Schedule.":::
198202

@@ -212,14 +216,6 @@ There are some important considerations to running a supported _Windows Server A
212216

213217
* Yes, upgrading from existing versions of Windows Server (such as Windows Server 2016 or Windows Server 2019) to _Windows Server 2022 Datacenter: Azure Edition_ is supported.
214218

215-
### Can I use Hotpatch for production workloads during the preview?
216-
217-
* Previews are intended for testing purposes only and not for use in production environments.
218-
219-
### Will I be charged during the preview?
220-
221-
* The license for _Windows Server Azure Edition_ is free during the preview. However, the cost of any underlying infrastructure set up for your VM (storage, compute, networking, etc.) will still be charged to your subscription.
222-
223219
### How can I get troubleshooting support for Hotpatching?
224220

225221
* You can file a [technical support case ticket](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest). For the Service option, search for and select **Virtual Machine running Windows** under Compute. Select **Azure Features** for the problem type and **Automatic VM Guest Patching** for the problem subtype.

articles/automanage/automanage-windows-server-services-overview.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,23 @@ author: nwashburn-ms
55
ms.service: automanage
66
ms.workload: infrastructure
77
ms.topic: conceptual
8-
ms.date: 07/09/2021
8+
ms.date: 02/13/2022
99
ms.author: niwashbu
1010
---
1111

1212
# Azure Automanage for Windows Server
1313

1414
Azure Automanage for Windows Server brings new capabilities specifically to _Windows Server Azure Edition_. These capabilities include:
15-
- Hotpatch (preview)
15+
- Hotpatch
1616
- SMB over QUIC
1717
- Extended network for Azure
1818

19+
<!--
1920
> [!IMPORTANT]
2021
> Hotpatch is currently in Public Preview. An opt-in procedure is needed to use the Hotpatch capability described below.
2122
> This preview is provided without a service level agreement, and is not recommended for production workloads. Certain features might not be supported or might have constrained capabilities.
2223
> For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
24+
-->
2325

2426
Automanage for Windows Server capabilities can be found in one or more of these _Windows Server Azure Edition_ images:
2527

@@ -30,17 +32,17 @@ Capabilities vary by image, see [getting started](#getting-started-with-windows-
3032

3133
## Automanage for Windows Server capabilities
3234

33-
### Hotpatch (preview)
35+
### Hotpatch
3436

35-
Hotpatch is available in public preview on the following images:
37+
Hotpatch is available on the following images:
3638

3739
- Windows Server 2022 Datacenter: Azure Edition (Core)
3840

3941
Hotpatch gives you the ability to apply security updates on your VM without rebooting. Additionally, Automanage for Windows Server automates the onboarding, configuration, and orchestration of Hotpatching. To learn more, see [Hotpatch](automanage-hotpatch.md).
4042

4143
### SMB over QUIC
4244

43-
SMB over QUIC is available in public preview on the following images:
45+
SMB over QUIC is available on the following images:
4446

4547
- Windows Server 2022 Datacenter: Azure Edition (Desktop experience)
4648
- Windows Server 2022 Datacenter: Azure Edition (Core)
@@ -77,8 +79,10 @@ It's important to consider up front, which Automanage for Windows Server capabil
7779

7880
To start using Automanage for Windows Server capabilities on a new VM, use your preferred method to create an Azure VM, and select the _Windows Server Azure Edition_ image that corresponds to the set of [capabilities](#getting-started-with-windows-server-azure-edition) that you would like to use.
7981

82+
<!--
8083
> [!IMPORTANT]
8184
> Some capabilities have specific configuration steps to perform during VM creation, and some capabilities that are in preview have specific opt-in and portal viewing requirements. See the individual capability topics above to learn more about using that capability with your VM.
85+
-->
8286

8387
## Next steps
8488

articles/azure-app-configuration/faq.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,21 @@ sections:
107107
answer: |
108108
Azure App Configuration supports Azure Availability Zones to protect your application and data from single datacenter failures. All Availability Zone enabled regions consist of a minimum of 3 availability zones, where each is a physically independent datacenter. For resiliency, this support in App Configuration is enabled for all customers at no extra cost. Following are regions that App Configuration has enabled Availability Zone support. For more information, see [Regions and Availability Zones in Azure.](../availability-zones/az-overview.md)
109109
- Central US
110+
- South Central US
110111
- East US
111112
- East US 2
112113
- West US 2
113114
- West US 3
114115
- Canada Central
116+
- Brazil South
115117
- France Central
116118
- Germany West Central
117119
- North Europe
118120
- UK South
119121
- West Europe
120122
- Southeast Asia
121123
- Japan East
124+
- Korea Central
122125
123126
- question: Are there any limits on the number of requests made to App Configuration?
124127
answer: |

articles/azure-monitor/logs/manage-cost-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: azure-monitor
1111
ms.workload: na
1212
ms.tgt_pltfrm: na
1313
ms.topic: conceptual
14-
ms.date: 01/26/2022
14+
ms.date: 02/13/2022
1515
ms.author: bwren
1616
ms.custom: devx-track-azurepowershell
1717
---
@@ -79,7 +79,7 @@ The easiest way to view your billed usage for a particular Log Analytics workspa
7979

8080
Alternatively, you can start in the [Azure Cost Management + Billing](../../cost-management-billing/costs/quick-acm-cost-analysis.md?toc=%2fazure%2fbilling%2fTOC.json) hub. here you can use the "Cost analysis" functionality to view your Azure resource expenses. To track your Log Analytics expenses, you can add a filter by "Resource type" (to microsoft.operationalinsights/workspace for Log Analytics and microsoft.operationalinsights/cluster for Log Analytics Clusters). For **Group by**, select **Meter category** or **Meter**. Other services, like Microsoft Defender for Cloud and Microsoft Sentinel, also bill their usage against Log Analytics workspace resources. To see the mapping to the service name, you can select the Table view instead of a chart.
8181

82-
To gain more understanding of your usage, you can [download your usage from the Azure portal](../../cost-management-billing/understand/download-azure-daily-usage.md).
82+
To gain more understanding of your usage, you can [download your usage from the Azure portal](../../cost-management-billing/understand/download-azure-daily-usage.md). For step-by-step instructions, review this [tutorial](../../cost-management-billing/costs/tutorial-export-acm-data.md).
8383
In the downloaded spreadsheet, you can see usage per Azure resource (for example, Log Analytics workspace) per day. In this Excel spreadsheet, usage from your Log Analytics workspaces can be found by first filtering on the "Meter Category" column to show "Log Analytics", "Insight and Analytics" (used by some of the legacy pricing tiers), and "Azure Monitor" (used by commitment tier pricing tiers), and then adding a filter on the "Instance ID" column that is "contains workspace" or "contains cluster" (the latter to include Log Analytics Cluster usage). The usage is shown in the "Consumed Quantity" column, and the unit for each entry is shown in the "Unit of Measure" column. For more information, see [Review your individual Azure subscription bill](../../cost-management-billing/understand/review-individual-bill.md).
8484

8585
## Understand your usage and optimizing your pricing tier

articles/backup/backup-center-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ To stop protection, navigate to Backup center and select the **Backup Instances*
134134

135135
You can resume backup for your workloads if you have retained data during **Stop Protection**.
136136

137-
- [Learn more](manage-azure-database-postgresql.md#resume-protection) about resuming protection for your disk.
138-
- [Learn more](manage-azure-managed-disks.md#resume-protection) about resuming protection for Azure Database for PostgreSQL server.
137+
- [Learn more](manage-azure-managed-disks.md#resume-protection) about resuming protection for your disk.
138+
- [Learn more](manage-azure-database-postgresql.md#resume-protection) about resuming protection for Azure Database for PostgreSQL server.
139139

140140
## Next steps
141141

articles/backup/backup-vault-overview.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
title: Overview of Backup vaults
33
description: An overview of Backup vaults.
44
ms.topic: conceptual
5-
ms.date: 10/31/2021
5+
ms.date: 02/14/2022
66
ms.custom: references_regions
7+
author: v-amallick
8+
ms.service: backup
9+
ms.author: v-amallick
710
---
811
# Backup vaults overview
912

@@ -19,7 +22,7 @@ A Backup vault is an entity that stores the backups and recovery points created
1922

2023
- Azure Backup automatically handles storage for the vault. Choose the storage redundancy that matches your business needs when creating the Backup vault.
2124

22-
- To learn more about storage redundancy, see these articles on [geo](../storage/common/storage-redundancy.md#geo-redundant-storage) and [local](../storage/common/storage-redundancy.md#locally-redundant-storage) redundancy.
25+
- To learn more about storage redundancy, see these articles on [geo](../storage/common/storage-redundancy.md#geo-redundant-storage), [zonal](../storage/common/storage-redundancy.md#zone-redundant-storage), and [local](../storage/common/storage-redundancy.md#locally-redundant-storage) redundancy.
2326

2427
## Encryption settings in the Backup vault
2528

articles/cognitive-services/LUIS/concepts/application-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.custom: seodec18
1010
ms.service: cognitive-services
1111
ms.subservice: language-understanding
12-
ms.topic: how-to
12+
ms.topic: conceptual
1313
ms.date: 01/10/2022
1414

1515
---

articles/cognitive-services/LUIS/concepts/entities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.custom: seodec18
1010
ms.service: cognitive-services
1111
ms.subservice: language-understanding
12-
ms.topic: how-to
12+
ms.topic: conceptual
1313
ms.date: 01/06/2022
1414

1515
---

articles/cognitive-services/LUIS/concepts/intents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: aahill
88
manager: nitinme
99
ms.service: cognitive-services
1010
ms.subservice: language-understanding
11-
ms.topic: how-to
11+
ms.topic: conceptual
1212
ms.date: 01/06/2022
1313

1414
---

0 commit comments

Comments
 (0)