Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

articles/azure-cache-for-redis/cache-how-to-monitor.md

@@ -147,6 +147,8 @@ In contrast, for clustered caches, we recommend using the metrics with the suffi
   - The amount of data written to the cache in Megabytes per second (MB/s) during the specified reporting interval. This value is derived from the network interface cards that support the virtual machine that hosts the cache and isn't Redis specific. This value corresponds to the network bandwidth of data sent to the cache from the client.
 - Connected Clients
   - The number of client connections to the cache during the specified reporting interval. This number maps to `connected_clients` from the Redis INFO command. Once the [connection limit](cache-configure.md#default-redis-server-configuration) is reached, later attempts to connect to the cache fail. Even if there are no active client applications, there may still be a few instances of connected clients because of internal processes and connections.
+- Connected Clients Using AAD Token (preview)
+   - The number of client connections to the cache authenticated using Azure AD token during the specified reporting interval.
 - Connections Created Per Second
   - The number of instantaneous connections created per second on the cache via port 6379 or 6380 (SSL). This metric can help identify whether clients are frequently disconnecting and reconnecting, which can cause higher CPU usage and Redis Server Load. This metric isn't available in Enterprise or Enterprise Flash tier caches.
 - Connections Closed Per Second
@@ -162,6 +164,8 @@ In contrast, for clustered caches, we recommend using the metrics with the suffi
     - **RDB** – when there's an issue related to RDB persistence
     - **Import** – when there's an issue related to Import RDB
     - **Export** – when there's an issue related to Export RDB
+    - **AADAuthenticationFailure** (preview) - when there's an authentication failure using Azure AD Access token
+    - **AADTokenExpired** (preview) - when an Azure AD access token used for authentication is not renewed and it expires.
 - Evicted Keys
   - The number of items evicted from the cache during the specified reporting interval because of the `maxmemory` limit.
   - This number maps to `evicted_keys` from the Redis INFO command.

articles/mysql/TOC.yml

@@ -701,14 +701,16 @@
     href: ../dms/faq-mysql-single-to-flex.md?bc=%2fazure%2fmysql%2fbreadcrumb%2ftoc.json&toc=%2fazure%2fmysql%2ftoc.json
   - name: Choose the right tools for migration to Azure Database for MySQL
     href: migrate/how-to-decide-on-right-migration-tools.md
-  - name: Migrate data from MySQL on-premises to Azure Database for MySQL >
+  - name: Migrate data from MySQL on-premises to Azure Database for MySQL
     href: migrate/mysql-on-premises-azure-db/01-mysql-migration-guide-intro.md
   - name: Migrate MySQL - Single Server to Flexible Server offline using DMS (classic)
     href: ../dms/tutorial-mysql-azure-single-to-flex-offline-portal.md?bc=%2fazure%2fmysql%2fbreadcrumb%2ftoc.json&toc=%2fazure%2fmysql%2ftoc.json
   - name: Migrate MySQL - Single Server to Flexible Server online using DMS (classic)
     href: ../dms/tutorial-mysql-azure-single-to-flex-online-portal.md?bc=%2fazure%2fmysql%2fbreadcrumb%2ftoc.json&toc=%2fazure%2fmysql%2ftoc.json
-  - name: Migrate MySQL - Single Server to Flexible Server using Azure MySQL Import CLI >
+  - name: Migrate MySQL - Single Server to Flexible Server using Azure MySQL Import CLI
     href: migrate/migrate-single-flexible-mysql-import-cli.md
+  - name: In-place auto-migration for MySQL - Single Server to Flexible Server
+    href: migrate/migrate-single-flexible-in-place-auto-migration.md
   - name: Migrate data with mysqldump or phpmyadmin
     href: single-server/concepts-migrate-dump-restore.md
     displayName: migrate, mysqldump

articles/mysql/migrate/migrate-single-flexible-in-place-auto-migration.md

@@ -0,0 +1,122 @@
+---
+title: "In-place automigration from Azure Database for MySQL – Single Server to Flexible Server"
+description: This tutorial describes how to configure notifications, review migration details and FAQs for an Azure Database for MySQL Single Server instance schedule for in-place automigration to Flexible Server.
+author: adig
+ms.author: adig
+ms.date: 07/10/2023
+ms.service: mysql
+ms.subservice: flexible-server
+ms.topic: quickstart
+ms.custom:
+  - mvc
+  - devx-track-azurecli
+  - mode-api
+---
+# In-place automigration from Azure Database for MySQL – Single Server to Flexible Server
+
+[!INCLUDE[applies-to-mysql-single-server](../includes/applies-to-mysql-single-server.md)]
+
+In-place automigration from Azure Database for MySQL – Single Server to Flexible Server is a service-initiated in-place migration during planned maintenance window for Single Server database workloads with Basic or General Purpose SKU, data storage used < 10 GiB and no complex features enabled. The eligible servers are identified by the service and are sent an advance notification detailing steps to review migration details.
+
+The in-place migration provides a highly resilient and self-healing offline migration experience during a planned maintenance window, with less than 5 mins of downtime. It uses backup and restore technology for faster migration time. This migration removes the overhead to manually migrate your server and ensure you can take advantage of the benefits of Flexible Server, including better price & performance, granular control over database configuration, and custom maintenance windows. Following described are the key phases of the migration:
+
+* Target Flexible Server is deployed, inheriting all feature set and properties (including server parameters and firewall rules) from source Single Server. Source Single Server is set to read-only and backup from source Single Server is copied to the target Flexible Server.
+* DNS switch and cutover are performed successfully within the planned maintenance window with minimal downtime, allowing maintenance of the same connection string post-migration. Client applications seamlessly connect to the target flexible server without any user driven manual updates. In addition to both connection string formats (Single and Flexible Server) being supported on migrated Flexible Server, both username formats – username@server_name and username are also supported on the migrated Flexible Server.
+* The migrated Flexible Server is online and can now be managed via Azure portal/CLI. Stopped Single Server is deleted post days set as it's Backup Retention Period.
+
+> [!NOTE]
+> In-place migration is only for Single Server database workloads with Basic or GP SKU, data storage used < 10 GiB and no complex features enabled. All other Single Server workloads are recommended to use user-initiated migration tooling offered by Azure - Azure DMS, Azure MySQL Import to migrate.
+
+## Configure migration alerts and review migration schedule
+
+Servers eligible for in-place automigration are sent an advance notification by the service.
+
+Following described are the ways to check and configure automigration notifications:
+
+* Subscription owners for Single Servers scheduled for automigration receive an email notification.
+* Configure service health alerts to receive in-place migration schedule and progress notifications via email/SMS by following steps [here](../single-server/concepts-planned-maintenance-notification.md#to-receive-planned-maintenance-notification).
+* Check the in-place migration notification on the Azure portal by following steps [here](../single-server/concepts-planned-maintenance-notification.md#check-planned-maintenance-notification-from-azure-portal).
+
+Following described are the ways to review your migration schedule once you have received the in-place automigration notification:
+
+> [!NOTE]
+> The migration schedule will be locked 7 days prior to the scheduled migration window after which you’ll be unable to reschedule.
+
+* The Single Server overview page for your instance displays a portal banner with information about your migration schedule.
+* For Single Servers scheduled for automigration, a new Migration blade is lighted on the portal. You can review the migration schedule by navigating to the Migration blade of your Single Server instance.
+* If you wish to defer the migration, you can defer by a month at a time by navigating to the Migration blade of your single server instance on the Azure portal and rescheduling the migration by selecting another migration window within a month.
+* If your Single Server has General Purpose SKU, you have the other option to enable High Availability when reviewing the migration schedule. As High Availability can only be enabled during create time for a MySQL Flexible Server, it's highly recommended that you enable this feature when reviewing the migration schedule.
+
+## How is the target MySQL Flexible Server auto-provisioned?
+
+* The compute tier and SKU for the target flexible server is provisioned based on the source single server’s pricing tier and VCores based on the detail in the following table.
+
+    | Single Server Pricing Tier | Single Server VCores | Flexible Server Tier | Flexible Server SKU Name |
+    | ------------- | ------------- |:-------------:|:-------------:|
+    | Basic | 1 | Burstable | Standard_B1s |
+    | Basic | 2 | Burstable | Standard_B2s |
+    | General Purpose | 4 | GeneralPurpose | Standard_D4ds_v4 |
+    | General Purpose | 8 | GeneralPurpose | Standard_D8ds_v4 |
+    | General Purpose | 16 | GeneralPurpose | Standard_D16ds_v4 |
+    | General Purpose | 32 | GeneralPurpose | Standard_D32ds_v4 |
+    | General Purpose | 64 | GeneralPurpose | Standard_D64ds_v4 |
+    | Memory Optimized | 4 | MemoryOptimized | Standard_E4ds_v4 |
+    | Memory Optimized | 8 | MemoryOptimized | Standard_E8ds_v4 |
+    | Memory Optimized | 16 | MemoryOptimized | Standard_E16ds_v4 |
+    | Memory Optimized | 32 | MemoryOptimized | Standard_E32ds_v4 |
+
+* The MySQL version, region, *storage size, subscription and resource group for the target Flexible Server is same as that of the source Single Server.
+*For Single Servers with less than 20 GiB storage, the storage size is set to 20 GiB as that is the minimum storage limit on Azure Database for MySQL - Flexible Server.
+* Both username formats – username@server_name (Single Server) and username (Flexible Server) are supported on the migrated Flexible Server.
+* Both connection string formats – Single Server and Flexible Server are supported on the migrated Flexible Server.
+
+## Post-migration steps
+
+Copy the following properties from the source Single Server to target Flexible Server post in-place migration operation is completed successfully:
+
+* Monitoring page settings (Alerts, Metrics, and Diagnostic settings)
+* Any Terraform/CLI scripts you host to manage your Single Server instance should be updated with Flexible Server references.
+
+## Frequently Asked Questions (FAQs)
+
+**Q. Why am I being auto-migrated​?**
+
+**A.** Your Azure Database for MySQL - Single Server instance is eligible for in-place migration to our flagship offering Azure Database for MySQL - Flexible Server. This in-place migration will remove the overhead to manually migrate your server and ensure you can take advantage of the benefits of Flexible Server, including better price & performance, granular control over database configuration, and custom maintenance windows.
+
+**Q. How does the automigration take place? What all does it migrate?​**
+
+**A.** The Flexible Server is provisioned to match the same VCores and storage as that of your Single Server. Next the source Single Server is put to stopped state, data file snapshot is taken and copied to target Flexible Server. The DNS switch is performed to route all existing connections to target and the target Flexible Server is brought online. The automigration migrates the entire server’s data files (including schema, data, logins) in addition to server parameters (all modified server parameters on source are copied to target, unmodified server parameters take up the default value defined by Flexible Server) and firewall rules. This is an offline migration where you see downtime of up-to 5 minutes or less.
+
+**Q. How can I set up or view in-place migration alerts?​**
+
+**A.**
+
+* Configure service health alerts to receive in-place migration schedule and progress notifications via email/SMS by following steps [here](../single-server/concepts-planned-maintenance-notification.md#to-receive-planned-maintenance-notification).
+* Check the in-place migration notification on the Azure portal by following steps [here](../single-server/concepts-planned-maintenance-notification.md#check-planned-maintenance-notification-from-azure-portal).
+
+**Q. How can I defer the scheduled migration?​**
+
+**A.** You can review the migration schedule by navigating to the Migration blade of your Single Server instance. If you wish to defer the migration, you can defer by a month at the most by navigating to the Migration blade of your single server instance on the Azure portal and re-scheduling the migration by selecting another migration window within a month. Note that the migration details will be locked 7 days prior to the scheduled migration window after which you're unable to reschedule. This in-place migration can be deferred monthly until 16 September 2024.  
+
+**Q. What are some post-migration activities I need to perform?​**
+
+**A.**
+
+* Monitoring page settings (Alerts, Metrics, and Diagnostic settings)
+* Any Terraform/CLI scripts you host to manage your Single Server instance should be updated with Flexible Server references.
+
+**Q. What username and connection string would be supported for the migrated Flexible Server?  ​​**
+
+**A.** Both username formats - username@server_name (Single Server format) and username (Flexible Server format) will be supported for the migrated Flexible Server, and hence you aren't required to update them to maintain your application continuity post migration. Additionally, both connection string formats (Single and Flexible server format) will also be supported for the migrated Flexible Server.
+
+**Q. How to enable HA (High Availability) for my auto-migrated server??​**
+
+**A.** By default, automigration sets up migration to a non-HA instance. As HA can only be enabled at server-create time, you should enable HA before the scheduled automigration using the automigration schedule edit option on portal. HA can only be enabled for General purpose\Memory Optimized SKUs on target Flexible Server, as Basic to Burstable SKU migration doesn’t support HA configuration.
+
+**Q. I see a pricing difference on my potential move from MySQL Basic Single Server to MySQL Flexible Server??​**
+
+**A.** Few servers may see a small price increase after migration (estimated costs can be seen by clicking the automigration schedule edit option on the portal), as the minimum storage limit on both offerings is different (5 GiB on Single Server; 20 GiB on Flexible Server) and storage cost (0.1$ on Single Server; 0.115$ on Flexible Server) for Flexible Server is slightly higher than Single Server. For impacted servers, this price increase in Flexible Server provides better throughput and performance compared to Single Server
+
+## Next steps
+
+* [Manage an Azure Database for MySQL - Flexible Server using the Azure portal](../flexible-server/how-to-manage-server-portal.md)

articles/mysql/migrate/migrate-single-flexible-mysql-import-cli.md

@@ -30,7 +30,7 @@ The [Azure Cloud Shell](../../cloud-shell/overview.md) is a free interactive she
 
 To open the Cloud Shell, select **Try it** from the upper right corner of a code block. You can also open Cloud Shell in a separate browser tab by going to [https://shell.azure.com/bash](https://shell.azure.com/bash). Select **Copy** to copy the blocks of code, paste it into the Cloud Shell, and select **Enter** to run it.
 
-If you prefer to install and use the CLI locally, this tutorial requires Azure CLI version 2.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
+If you prefer to install and use the CLI locally, this tutorial requires Azure CLI version 2.50.0 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
 
 ## Prerequisites