Skip to content

Commit 7158f67

Browse files
authored
Merge pull request #194371 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents b63364e + 7d03a29 commit 7158f67

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

articles/azure-monitor/app/availability-azure-functions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This article will cover how to create an Azure Function with TrackAvailability()
1212

1313
> [!NOTE]
1414
> This example is designed solely to show you the mechanics of how the TrackAvailability() API call works within an Azure Function. Not how to write the underlying HTTP Test code/business logic that would be required to turn this into a fully functional availability test. By default if you walk through this example you will be creating a basic availability HTTP GET test.
15+
> To follow these instructions, you must use the [dedicated plan](https://docs.microsoft.com/azure/azure-functions/dedicated-plan) to allow editing code in App Service Editor.
1516
1617
## Create a timer trigger function
1718

articles/azure-vmware/create-placement-policy.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create placement policy
33
description: Learn how to create a placement policy in Azure VMware Solution to control the placement of virtual machines (VMs) on hosts within a cluster through the Azure portal.
44
ms.topic: how-to
5-
ms.date: 12/16/2021
5+
ms.date: 04/07/2022
66

77
#Customer intent: As an Azure service administrator, I want to control the placement of virtual machines on hosts within a cluster in my private cloud.
88

@@ -45,7 +45,7 @@ The assignment of hosts isn't required or permitted for this policy type.
4545

4646
- **VM-VM Affinity** policies instruct DRS to try to keeping the specified VMs together on the same host. It's useful for performance reasons, for example.
4747

48-
- **VM-VM Anti-Affinity** policies instruct DRS to try keeping the specified VMs apart from each other on separate hosts. It's useful in scenarios where a problem with one host doesn't affect multiple VMs within the same policy.
48+
- **VM-VM Anti-Affinity** policies instruct DRS to try keeping the specified VMs apart from each other on separate hosts. It's useful in availability scenarios where a problem with one host doesn't affect multiple VMs within the same policy.
4949

5050

5151
### VM-Host policies
@@ -171,7 +171,7 @@ You can delete a placement policy and its corresponding DRS rule.
171171

172172
Use the vSphere Client to monitor the operation of a placement policy's corresponding DRS rule.
173173

174-
As a holder of the cloudadmin role, you can view, but not edit, the DRS rules created by a placement policy on the cluster's Configure tab under VM/Host Rules. It lets you view additional information, such as if the DRS rules are in a conflict state.
174+
As a holder of the CloudAdmin role, you can view, but not edit, the DRS rules created by a placement policy on the cluster's Configure tab under VM/Host Rules. It lets you view additional information, such as if the DRS rules are in a conflict state.
175175

176176
Additionally, you can monitor various DRS rule operations, such as recommendations and faults, from the cluster's Monitor tab.
177177

@@ -187,7 +187,7 @@ For most workloads this is not necessary and may cause unintended performance im
187187
1. Navigate to Manage Placement policies and click Restrict VM movement.
188188
1. Select the VM or VMs you want to restrict, then click Select.
189189
1. The VM or VMS you selected appears in the VMs with restricted movement tab.
190-
In the vSphere client, a VM override will be created to set DRS to partially automated for that VM.
190+
In the vSphere Client, a VM override will be created to set DRS to partially automated for that VM.
191191
DRS will no longer migrate the VM automatically.
192192
Manual vMotion of the VM and automatic initial placement of the VM will continue to function.
193193

@@ -201,7 +201,7 @@ Yes, and no. While vSphere DRS implements the current set of policies, we have s
201201

202202
Azure VMware Solution provides a VMware private cloud in Azure. In this managed VMware infrastructure, Microsoft manages the clusters, hosts, datastores, and distributed virtual switches in the private cloud. At the same time, the tenant is responsible for managing the workloads deployed on the private cloud. As a result, the tenant administering the private cloud [does not have the same set of privileges](concepts-identity.md) as available to the VMware administrator in an on-premises deployment.
203203

204-
Further, the lack of the desired granularity in the vSphere privileges presents some challenges when managing the placement of the workloads on the private cloud. For example, vSphere DRS rules commonly used on-premises to define affinity and anti-affinity rules can't be used as-is in a VMware Cloud environment, as some of those rules can block day-to-day operation the private cloud. Placement Policies provides a way to define those rules using the Azure VMware Solution portal, thereby circumventing the need to use DRS rules. Coupled with a simplified experience, they also ensure that the rules don't impact the day-to-day infrastructure maintenance and operation activities.
204+
Further, the lack of the desired granularity in the vSphere privileges presents some challenges when managing the placement of the workloads on the private cloud. For example, vSphere DRS rules commonly used on-premises to define affinity and anti-affinity rules can't be used as-is in an Azure VMware Solution environment, as some of those rules can block day-to-day operation the private cloud. Placement Policies provides a way to define those rules using the Azure VMware Solution portal, thereby circumventing the need to use DRS rules. Coupled with a simplified experience, they also ensure that the rules don't impact the day-to-day infrastructure maintenance and operation activities.
205205

206206
### What is the difference between the VM-Host affinity policy and Restrict VM movement?
207207

@@ -213,5 +213,5 @@ The VM-Host **MUST** rules aren't supported because they block maintenance opera
213213

214214
VM-Host **SHOULD** rules are preferential rules, where vSphere DRS tries to accommodate the rules to the extent possible. Occasionally, vSphere DRS may vMotion VMs subjected to the VM-Host **SHOULD** rules to ensure that the workloads get the resources they need. It's a standard vSphere DRS behavior, and the Placement policies feature does not change the underlying vSphere DRS behavior.
215215

216-
If you create conflicting rules, those conflicts may show up on the vCenter, and the newly defined rules may not take effect. It's a standard vSphere DRS behavior, the logs for which can be observed in the vCenter.
216+
If you create conflicting rules, those conflicts may show up on the vCenter Server, and the newly defined rules may not take effect. It's a standard vSphere DRS behavior, the logs for which can be observed in the vCenter Server.
217217

articles/frontdoor/front-door-caching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ These formats are supported in the lists of paths to purge:
143143
- **Root domain purge**: Purge the root of the endpoint with "/" in the path.
144144

145145
> [!NOTE]
146-
> **Purging wildcard domains**: Specifying cached paths for purging as discussed in this section doesn't apply to any wildcard domains that are associated with the Front Door. Currently, we don't support directly purging wildcard domains. You can purge paths from specific subdomains by specifying that specfic subdomain and the purge path. For example, if my Front Door has `*.contoso.com`, I can purge assets of my subdomain `foo.contoso.com` by typing `foo.contoso.com/path/*`. Currently, specifying host names in the purge content path is imited to subdomains of wildcard domains, if applicable.
146+
> **Purging wildcard domains**: Specifying cached paths for purging as discussed in this section doesn't apply to any wildcard domains that are associated with the Front Door. Currently, we don't support directly purging wildcard domains. You can purge paths from specific subdomains by specifying that specfic subdomain and the purge path. For example, if my Front Door has `*.contoso.com`, I can purge assets of my subdomain `foo.contoso.com` by typing `foo.contoso.com/path/*`. Currently, specifying host names in the purge content path is limited to subdomains of wildcard domains, if applicable.
147147
>
148148
149149
Cache purges on the Front Door are case-insensitive. Additionally, they're query string agnostic, meaning purging a URL will purge all query-string variations of it.

articles/purview/catalog-lineage-user-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ One of the platform features of Azure Purview is the ability to show the lineage
2525
Each system supports a different level of lineage scope. Check the sections below, or your system's individual lineage article, to confirm the scope of lineage currently available.
2626

2727
### Data processing systems
28-
Data integration and ETL tools can push lineage in to Azure Purview at execution time. Tools such as Data Factory, Data Share, Synapse, Azure Databricks, and so on, belong to this category of data systems. The data processing systems reference datasets as source from different databases and storage solutions to create target datasets. The list of data processing systems currently integrated with Azure Purview for lineage are listed in below table.
28+
Data integration and ETL tools can push lineage into Azure Purview at execution time. Tools such as Data Factory, Data Share, Synapse, Azure Databricks, and so on, belong to this category of data processing systems. The data processing systems reference datasets as source from different databases and storage solutions to create target datasets. The list of data processing systems currently integrated with Azure Purview for lineage are listed in below table.
2929

3030
| Data processing system | Supported scope |
3131
| ---------------------- | ------------|
@@ -54,7 +54,7 @@ Databases & storage solutions such as Oracle, Teradata, and SAP have query engin
5454
|| [SAP S/4HANA](register-scan-saps4hana-source.md) |
5555

5656
### Data analytics and reporting systems
57-
Data systems like Azure ML and Power BI report lineage into Azure Purview. These systems will use the datasets from storage systems and process through their meta model to create BI Dashboard, ML experiments and so on.
57+
Data analytics and reporting systems like Azure ML and Power BI report lineage into Azure Purview. These systems will use the datasets from storage systems and process through their meta model to create BI Dashboards, ML experiments and so on.
5858

5959
| Data analytics & reporting system | Supported scope |
6060
| ---------------------- | ------------|

articles/virtual-machines/linux/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ This table shows some of the ways you can get a list of available locations.
5454
Azure announced an industry leading single instance virtual machine Service Level Agreement of 99.9% provided you deploy the VM with premium storage for all disks. In order for your deployment to qualify for the standard 99.95% VM Service Level Agreement, you still need to deploy two or more VMs running your workload inside of an availability set. An availability set ensures that your VMs are distributed across multiple fault domains in the Azure data centers as well as deployed onto hosts with different maintenance windows. The full [Azure SLA](https://azure.microsoft.com/support/legal/sla/virtual-machines/) explains the guaranteed availability of Azure as a whole.
5555

5656
## VM Size
57-
The [size](../sizes.md) of the VM that you use is determined by the workload that you want to run. The size that you choose then determines factors such as processing power, memory, and storage capacity. Azure offers a wide variety of sizes to support many types of uses.
57+
The [size](../sizes.md) of the VM that you use is determined by the workload that you want to run. The size that you choose then determines factors such as processing power, memory, storage capacity, and network bandwidth. Azure offers a wide variety of sizes to support many types of uses.
5858

5959
Azure charges an [hourly price](https://azure.microsoft.com/pricing/details/virtual-machines/linux/) based on the VM’s size and operating system. For partial hours, Azure charges only for the minutes used. Storage is priced and charged separately.
6060

@@ -122,4 +122,4 @@ Create your first VM!
122122

123123
- [Portal](quick-create-portal.md)
124124
- [Azure CLI](quick-create-cli.md)
125-
- [PowerShell](quick-create-powershell.md)
125+
- [PowerShell](quick-create-powershell.md)

0 commit comments

Comments
 (0)