Merge branch 'MicrosoftDocs:main' into patch-1

cilwerner · web-flow · commit d27b893672a6 · 2022-10-28T14:53:20.000+01:00
diff --git a/articles/app-service/reference-dangling-subdomain-prevention.md b/articles/app-service/reference-dangling-subdomain-prevention.md
@@ -18,7 +18,7 @@ The risks of subdomain takeover include:
 - Phishing campaigns
 - Further risks of classic attacks such as XSS, CSRF, CORS bypass
 
-Learn more about Subdomain Takeover at [Dangling DNS and subdomain takeover](/azure/security/fundamentals/subdomain-takeover.md).
+Learn more about Subdomain Takeover at [Dangling DNS and subdomain takeover](/azure/security/fundamentals/subdomain-takeover).
 
 Azure App Service provides [Name Reservation Service](#how-app-service-prevents-subdomain-takeovers) and [domain verification tokens](#how-you-can-prevent-subdomain-takeovers) to prevent subdomain takeovers.
 ## How App Service prevents subdomain takeovers
diff --git a/articles/cognitive-services/personalizer/includes/quickstart-local-inference-csharp.md b/articles/cognitive-services/personalizer/includes/quickstart-local-inference-csharp.md
@@ -83,9 +83,9 @@ using System.Linq;
 
 The Personalizer client is a [PersonalizerClient](/dotnet/api/azure.ai.personalizer.personalizerclient?view=azure-dotnet-preview&branch=main) object that authenticates to Azure using Azure.AzureKeyCredential, which contains your key.
 
-To ask for the single best item to show th user, create a [PersonalizerRankOptions](/dotnet/api/azure.ai.personalizer.personalizerrankoptions?view=azure-dotnet-preview&branch=main), then pass it to [PersonalizerClient.Rank](/dotnet/api/azure.ai.personalizer.personalizerclient.rank?view=azure-dotnet-preview&branch=main#azure-ai-personalizer-personalizerclient-rank(azure-ai-personalizer-personalizerrankoptions-system-threading-cancellationtoken)) method. The Rank method returns a [PersonalizerRankResult](/dotnet/api/azure.ai.personalizer.personalizerrankresult?view=azure-dotnet-preview&branch=main).
+To ask for the single best item to show the user, create a [PersonalizerRankOptions](/dotnet/api/azure.ai.personalizer.personalizerrankoptions?view=azure-dotnet-preview&branch=main), then pass it to [PersonalizerClient.Rank](/dotnet/api/azure.ai.personalizer.personalizerclient.rank?view=azure-dotnet-preview&branch=main#azure-ai-personalizer-personalizerclient-rank(azure-ai-personalizer-personalizerrankoptions-system-threading-cancellationtoken)) method. The Rank method returns a [PersonalizerRankResult](/dotnet/api/azure.ai.personalizer.personalizerrankresult?view=azure-dotnet-preview&branch=main).
 
-To send a reward score to Personalizer, pass the event ID and the reward score to the [PersonalizerClient.Reward](/dotnet/api/azure.ai.personalizer.personalizerclient.reward?view=azure-dotnet-preview&branch=main#azure-ai-personalizer-personalizerclient-reward(system-string-system-single-system-threading-cancellationtoken) method.
+To send a reward score to Personalizer, pass the event ID and the reward score to the [PersonalizerClient.Reward](dotnet/api/azure.ai.personalizer.personalizerclient.reward?view=azure-dotnet-preview&branch=main#azure-ai-personalizer-personalizerclient-reward(system-string-system-single-system-threading-cancellationtoken) method.
 
 Determining the reward score, in this quickstart is trivial. In a production system, the determination of what impacts the [reward score](../concept-rewards.md) and by how much can be a complex process, that you may decide to change over time. This design decision should be one of the primary decisions in your Personalizer architecture.
 
@@ -114,7 +114,7 @@ private const string ServiceEndpoint  = "https://REPLACE-WITH-YOUR-PERSONALIZER-
 private const string ResourceKey = "<REPLACE-WITH-YOUR-PERSONALIZER-KEY>";
 ```
 
-Next, construct the Rank and Reward URLs.
+Next, construct the Rank and Reward URLs. Note that setting `useLocalInference: true` as a parameter for `PersonalizerClientOptions` is required to enable local inference. 
 
 ```csharp
 static PersonalizerClient InitializePersonalizerClient(Uri url)
diff --git a/articles/migrate/migrate-replication-appliance.md b/articles/migrate/migrate-replication-appliance.md
@@ -69,7 +69,7 @@ MySQL must be installed on the replication appliance machine. It can be installe
 
 **Method** | **Details**
 --- | ---
-Download and install manually | Download MySQL application & place it in the folder C:\Temp\ASRSetup, then install manually.<br> When you set up the appliance, MySQL will show as already installed.
+Download and install manually | [Download](https://dev.mysql.com/get/Downloads/MySQLInstaller/mysql-installer-community-5.7.20.0.msi) the MySQL application & place it in the folder C:\Temp\ASRSetup, then install manually.<br> When you set up the appliance, MySQL will show as already installed.
 Without online download | Place the MySQL installer application in the folder C:\Temp\ASRSetup. When you install the appliance and select download and install MySQL, setup will use the installer you added.
 Download and install in Azure Migrate | When you install the appliance and are prompted for MySQL, select **Download and install**.
 
diff --git a/articles/mysql/flexible-server/concepts-high-availability.md b/articles/mysql/flexible-server/concepts-high-availability.md
@@ -122,6 +122,10 @@ Here are some considerations to keep in mind when you use high availability:
 
 ## Frequently asked questions (FAQ)
 
+- **What are the SLAs for same-zone vs zone-redundant HA enabled Flexible server?**
+
+SLA information for Azure Database for MySQL Flexible Server can be found at [SLA for Azure Database for MySQL](https://azure.microsoft.com/support/legal/sla/mysql/v1_2/).
+
 - **How am I billed for high available (HA) servers?**
 Servers enabled with HA have a primary and secondary replica. Secondary replica can be in same zone or zone redundant. You're billed for the provisioned compute and storage for both the primary and secondary replica. For example, if you have a primary with 4 vCores of compute and 512 GB of provisioned storage, your secondary replica will also have 4 vCores and 512 GB of provisioned storage. Your zone redundant HA server will be billed for 8 vCores and 1,024 GB of storage. Depending on your backup storage volume, you may also be billed for backup storage.
 
diff --git a/articles/mysql/flexible-server/overview.md b/articles/mysql/flexible-server/overview.md
@@ -176,6 +176,7 @@ One advantage of running your workload in Azure is its global reach. The flexibl
 | Central US | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: |
 | China East 2 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: |
 | China North 2 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: |
+| China North 3 |:heavy_check_mark:  | :heavy_check_mark: | :x: | :x: |
 | East Asia (Hong Kong) | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: |
 | East US | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | East US 2 | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: |
@@ -203,6 +204,8 @@ One advantage of running your workload in Azure is its global reach. The flexibl
 | West US | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: |
 | West US 2 | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: |
 | West US 3 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: |
+| Qatar Central | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |
+| Sweden Central | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: |
 
 ## Contacts
 
diff --git a/articles/network-watcher/network-watcher-network-configuration-diagnostics-overview.md b/articles/network-watcher/network-watcher-network-configuration-diagnostics-overview.md
@@ -14,7 +14,7 @@ ms.author: damendo
 
 # Introduction to Network Configuration Diagnostics in Azure Network Watcher
 
-The Network Configuration Diagnostic tool helps customers understand which traffic flows will be allowed or denied in your Azure Virtual Network along with detailed information for debugging. It can help your in understanding if your NSG rules are configured correctly. 
+The Network Configuration Diagnostic tool helps customers understand which traffic flows will be allowed or denied in your Azure Virtual Network along with detailed information for debugging. It can help you in understanding if your NSG rules are configured correctly. 
 
 ## Pre-requisites
 For using Network Configuration Diagnostics, Network Watcher must be enabled in your subscription. See [Create an Azure Network Watcher instance](./network-watcher-create.md) to enable.
diff --git a/articles/network-watcher/network-watcher-nsg-flow-logging-overview.md b/articles/network-watcher/network-watcher-nsg-flow-logging-overview.md
@@ -4,7 +4,7 @@ titleSuffix: Azure Network Watcher
 description: This article explains how to use the NSG flow logs feature of Azure Network Watcher.
 services: network-watcher
 documentationcenter: na
-author: harshacs
+author: harsha-cs
 
 ms.service: network-watcher
 ms.topic: article
diff --git a/articles/storage/common/storage-disaster-recovery-guidance.md b/articles/storage/common/storage-disaster-recovery-guidance.md
@@ -7,7 +7,7 @@ author: jimmart-dev
 
 ms.service: storage
 ms.topic: conceptual
-ms.date: 03/01/2022
+ms.date: 10/28/2022
 ms.author: jammart
 ms.subservice: common
 ---
@@ -161,6 +161,7 @@ Keep in mind that any data stored in a temporary disk is lost when the VM is shu
 
 The following features and services are not supported for account failover:
 
+- Storage accounts that have [change feed](../blobs/storage-blob-change-feed.md) enabled are not supported for failover. Since [operational backup of Azure Blob Storage enables the change feed feature](../../backup/blob-backup-support-matrix.md#limitations), storage accounts that have operational backup of blobs configured do not support failover.
 - Azure File Sync does not support storage account failover. Storage accounts containing Azure file shares being used as cloud endpoints in Azure File Sync should not be failed over. Doing so will cause sync to stop working and may also cause unexpected data loss in the case of newly tiered files.
 - Storage accounts that have hierarchical namespace enabled (such as for Data Lake Storage Gen2) are not supported at this time.
 - A storage account containing premium block blobs cannot be failed over. Storage accounts that support premium block blobs do not currently support geo-redundancy.
diff --git a/articles/virtual-desktop/autoscale-scenarios.md b/articles/virtual-desktop/autoscale-scenarios.md
@@ -61,9 +61,9 @@ Before you create your plan, keep the following things in mind:
 - Make sure you understand usage patterns before defining your schedule. You'll need to schedule around the following times of day:
 
     - Ramp-up: the start of the day, when usage picks up.
-    - Peak hours: the time of day when usage is highest.
+    - Peak hours: the time of day when usage is expected to be at its highest.
     - Ramp-down: when usage tapers off. This is usually when you shut down your VMs to save costs.
-    - Off-peak hours: the time with the lowest possible usage. You can define the maximum number of VMs that can be active during this time.
+    - Off-peak hours: the time of the day when usage is expected to be at its lowest.
 
 - The scaling plan will take effect as soon as you enable it.
 
diff --git a/articles/virtual-desktop/set-up-scaling-script.md b/articles/virtual-desktop/set-up-scaling-script.md
@@ -12,15 +12,17 @@ manager: femila
 In this article, you'll learn about the scaling tool that uses an Azure Automation runbook and Azure Logic App to automatically scale session host VMs in your Azure Virtual Desktop environment. To learn more about the scaling tool, see [Scale session hosts using Azure Automation and Azure Logic Apps](scaling-automation-logic-apps.md).
 
 > [!NOTE]
-> You can't scale session hosts using Azure Automation and Azure Logic Apps together with [autoscale](autoscale-scaling-plan.md) on the same host pool. You must use one or the other.
+> - Autoscale is an alternative way to scale session host VMs and is a native feature of Azure Virtual Desktop. We recommend you use Autoscale instead. For more information, see [Autoscale scaling plans](autoscale-scenarios.md).
+>
+> - You can't scale session hosts using Azure Automation and Azure Logic Apps together with [autoscale](autoscale-scaling-plan.md) on the same host pool. You must use one or the other.
 
 ## Prerequisites
 
 Before you start setting up the scaling tool, make sure you have the following things ready:
 
 - An [Azure Virtual Desktop host pool](create-host-pools-azure-marketplace.md).
 - Session host pool VMs configured and registered with the Azure Virtual Desktop service.
-- A user with the [Contributor role](../role-based-access-control/role-assignments-portal.md) assigned on the Azure subscription.
+- A user with the [*Contributor*](../role-based-access-control/role-assignments-portal.md) role-based access control (RBAC) role assigned on the Azure subscription to create the resources. You'll also need the *Application administrator* and/or *Owner* RBAC role to create a Run As account.
 - A Log Analytics workspace (optional).
 
 The machine you use to deploy the tool must have:
@@ -92,9 +94,14 @@ First, you'll need an Azure Automation account to run the PowerShell runbook. Th
 
 Now that you have an Azure Automation account, you'll also need to create an Azure Automation Run As account if you don't have one already. This account will let the tool access your Azure resources.
 
+> [!IMPORTANT]
+> This scaling tool uses a Run As account with Azure Automation. Azure Automation Run As accounts will retire on September 30, 2023. Microsoft won't provide support beyond that date. From now through September 30, 2023, you can continue to use Azure Automation Run As accounts. This scaling tool won't be updated to create the resources using managed identities, however, you can transition to use [managed identities](../automation/automation-security-overview.md#managed-identities) and will need to before then. For more information, see [Migrate from an existing Run As account to a managed identity](../automation/migrate-run-as-accounts-managed-identity.md). 
+>
+> Autoscale is an alternative way to scale session host VMs and is a native feature of Azure Virtual Desktop. We recommend you use Autoscale instead. For more information, see [Autoscale scaling plans](autoscale-scenarios.md).
+
 An [Azure Automation Run As account](../automation/manage-runas-account.md) provides authentication for managing resources in Azure with Azure cmdlets. When you create a Run As account, it creates a new service principal user in Azure Active Directory and assigns the Contributor role to the service principal user at the subscription level. An Azure Run As account is a great way to authenticate securely with certificates and a service principal name without needing to store a username and password in a credential object. To learn more about Run As account authentication, see [Limit Run As account permissions](../automation/manage-runas-account.md#limit-run-as-account-permissions).
 
-Any user who's a member of the Subscription Admins role and coadministrator of the subscription can create a Run As account.
+Any user who's assigned the *Application administrator* and/or *Owner* RBAC role on the subscription can create a Run As account.
 
 To create a Run As account in your Azure Automation account:
 
@@ -286,6 +293,8 @@ If you decided to use Log Analytics, you can view all the log data in a custom l
     | project TimeStampUTC = TimeGenerated, TimeStampLocal = TimeStamp_s, HostPool = hostpoolName_s, LineNumAndMessage = logmessage_s, AADTenantId = TenantId
     ```
 
-## Report issues
+## Limitations
+
+Here are some limitations with scaling session host VMs with this scaling script:
 
-Issue reports for the scaling tool are currently being handled by Microsoft Support. When you make an issue report, make sure to follow the instructions in [Reporting issues](#reporting-issues). If you have feedback about the tool or want to request new features, open a GitHub issue labeled *4-WVD-scaling-tool* on the [RDS GitHub page](https://github.com/Azure/RDS-Templates/issues?q=is%3Aissue+is%3Aopen+label%3A4-WVD-scaling-tool).
+- The scaling script doesn’t consider time changes between standard and daylight savings.
