Merge pull request #178903 from savjani/master

PRMerger13 · web-flow · commit a1f4a7147211 · 2021-11-05T13:10:36.000-07:00
Quickfix
diff --git a/articles/mysql/flexible-server/overview.md b/articles/mysql/flexible-server/overview.md
@@ -15,8 +15,8 @@ ms.date: 08/10/2021
 
 Azure Database for MySQL powered by the MySQL community edition is available in two deployment modes:
 
-- Single Server
 - Flexible Server
+- Single Server
 
 In this article, we'll provide an overview and introduction to core concepts of flexible server deployment model. For information on how to decide what deployment option is appropriate for your workload, see [choosing the right MySQL server option in Azure](./../select-right-deployment-type.md).
 
@@ -31,7 +31,7 @@ Flexible servers are best suited for
 - Application developments requiring community version of MySQL with better control and customizations
 - Production workloads with same-zone, zone redundant high availability and managed maintenance windows
 - Simplified development experience 
-- Enterprise grade security
+- Enterprise grade security, compliance and privacy
 
 For latest updates on Flexible Server, refer to [What's new in Azure Database for MySQL - Flexible Server](whats-new.md).
 
@@ -67,7 +67,7 @@ See [Scheduled Maintenance](concepts-maintenance.md) for more details.
 
 ## Automatic backups
 
-The flexible server service automatically creates server backups and stores them in user configured locally redundant or geo-redundant storage. Backups can be used to restore your server to any point-in-time within the backup retention period. The default backup retention period is seven days. The retention can be optionally configured up to 35 days. All backups are encrypted using AES 256-bit encryption.
+The flexible server service automatically creates server backups and stores them in user configured locally redundant or geo-redundant storage. Backups can be used to restore your server to any point-in-time within the backup retention period. The default backup retention period is seven days. The retention can be optionally configured between 1-35 days. All backups are encrypted using AES 256-bit encryption.
 
 See [Backup concepts](concepts-backup-restore.md) to learn more.
 
@@ -115,11 +115,11 @@ For more information, see [Data-in replication concepts](concepts-data-in-replic
 
 ## Stop/Start server to optimize cost
 
-The flexible server service allows you to stop and start server on-demand to optimize cost. The compute tier billing is stopped immediately when the server is stopped. This can allow you to have significant cost savings during development, testing and for time-bound predictable production workloads. The server remains in stopped state for seven days unless re-started sooner.
+The flexible server service allows you to stop and start server on-demand to optimize cost. The compute tier billing is stopped immediately when the server is stopped. This can allow you to have significant cost savings during development, testing and for time-bound predictable production workloads. The server remains in stopped state for thirty days unless re-started sooner.
 
 For more information, see [Server concepts](concept-servers.md).
 
-## Enterprise grade security and privacy
+## Enterprise grade security, compliance and privacy
 
 The flexible server service uses the FIPS 140-2 validated cryptographic module for storage encryption of data at-rest. Data, including backups, and temporary files created while running queries are encrypted. The service uses the AES 256-bit cipher included in Azure storage encryption, and the keys can be system managed (default).
 
@@ -133,7 +133,13 @@ For more information, see [Networking concepts](concepts-networking.md).
 
 ## Monitoring and alerting
 
-The flexible server service is equipped with built-in performance monitoring and alerting features. All Azure metrics have a one-minute frequency, and each metric provides 30 days of history. You can configure alerts on the metrics. The service exposes host server metrics to monitor resources utilization and allows configuring slow query logs. Using these tools, you can quickly optimize your workloads, and configure your server for best performance. In addition, you can use and integrate with community monitoring tools like [Percona Monitoring and Management with your MySQL Flexible Server](https://techcommunity.microsoft.com/t5/azure-database-for-mysql/monitor-azure-database-for-mysql-using-percona-monitoring-and/ba-p/2568545). 
+The flexible server service is equipped with built-in performance monitoring and alerting features. All Azure metrics have a one-minute frequency, and each metric provides 30 days of history. You can configure alerts on the metrics. The service exposes host server metrics to monitor resources utilization, allows configuring slow query logs. Using these tools, you can quickly optimize your workloads, and configure your server for best performance. Azure Database for MySQL Flexible Server is allows you to visualize the slow query and audit logs data using Azure Monitor workbooks. With workbooks, you get a flexible canvas for analyzing data and creating rich visual reports within the Azure portal. Azure Database for MySQL Flexible Server provides three available workbook templates out of the box viz Server Overview, [Auditing](tutorial-configure-audit.md) and [Query Performance Insights](tutorial-query-performance-insights.md). [Query Performance Insights](tutorial-query-performance-insights.md) workbook is designed to help you spend less time troubleshooting database performance by providing such information as:
+
+* Top N long-running queries and their trends.
+* The query details: view the query text as well as the history of execution with minimum, maximum, average, and standard deviation query time.
+* The resource utilizations (CPU, memory, and storage).
+
+In addition, you can use and integrate with community monitoring tools like [Percona Monitoring and Management with your MySQL Flexible Server](https://techcommunity.microsoft.com/t5/azure-database-for-mysql/monitor-azure-database-for-mysql-using-percona-monitoring-and/ba-p/2568545). 
 
 For more information, see [Monitoring concepts](concepts-monitoring.md).
 
@@ -150,7 +156,7 @@ Use data-in replication with mydumper/myloader consistent backup/restore for ini
 
 To migrate from Azure Database for MySQL - Single Server to Flexible Server in 5 easy steps, refer to [this blog](https://techcommunity.microsoft.com/t5/azure-database-for-mysql/migrate-from-azure-database-for-mysql-single-server-to-flexible/ba-p/2674057).
 
-For more information, see [Migration Guide for Azure Database for MySQL](../../mysql/migrate/mysql-on-premises-azure-db/01-mysql-migration-guide-intro.md)
+For more information, see [Select the right tools for migration to Azure Database for MySQL](../../mysql/how-to-decide-on-right-migration-tools.md)
 
 ## Azure regions
 
diff --git a/articles/mysql/overview.md b/articles/mysql/overview.md
@@ -18,11 +18,11 @@ Azure Database for MySQL is a relational database service in the Microsoft cloud
 - Zone redundant and same zone high availability.
 - Maximum control with ability to select your scheduled maintenance window.
 - Data protection using automatic backups and point-in-time-restore for up to 35 days.
-- Scheduled maintenance for underlying hardware, operating system and database engine to keep the service secure and up to date.
+- Automated patching and maintenance for underlying hardware, operating system and database engine to keep the service secure and up to date.
 - Predictable performance, using inclusive pay-as-you-go pricing.
 - Elastic scaling within seconds.
 - Cost optimization controls with low cost burstable SKU and ability to stop/start server.
-- Enterprise grade security and industry-leading compliance to protect sensitive data at-rest and in-motion.
+- Enterprise grade security, industry-leading compliance, and privacy to protect sensitive data at-rest and in-motion.
 - Monitoring and automation to simplify management and monitoring for large-scale deployments.
 - Industry-leading support experience.
 
diff --git a/articles/mysql/single-server-overview.md b/articles/mysql/single-server-overview.md
@@ -14,8 +14,8 @@ ms.date: 6/19/2021
 
 [Azure Database for MySQL](overview.md) powered by the MySQL community edition is available in two deployment modes:
 
-- Single Server
 - Flexible Server 
+- Single Server
 
 In this article, we'll provide an overview and introduction to core concepts of the Single Server deployment model. To learn about flexible server deployment mode, refer [flexible server overview](flexible-server/index.yml). For information on how to decide what deployment option is appropriate for your workload, see [choosing the right MySQL server option in Azure](select-right-deployment-type.md).
 
diff --git a/articles/mysql/single-server-whats-new.md b/articles/mysql/single-server-whats-new.md
@@ -12,7 +12,7 @@ ms.date: 06/17/2021
 
 [!INCLUDE[applies-to-mysql-single-server](includes/applies-to-mysql-single-server.md)]
 
-Azure Database for MySQL is a relational database service in the Microsoft cloud. The service is based on the [MySQL Community Edition](https://www.mysql.com/products/community/) (available under the GPLv2 license) database engine and supports versions 5.6, 5.7, and 8.0. [Azure Database for MySQL - Single Server](./overview.md#azure-database-for-mysql---single-server) is a deployment mode that provides a fully managed database service with minimal requirements for customizations of database. The Single Server platform is designed to handle most database management functions such as patching, backups, high availability, and security, all with minimal user configuration and control.
+Azure Database for MySQL is a relational database service in the Microsoft cloud. The service is based on the [MySQL Community Edition](https://www.mysql.com/products/community/) (available under the GPLv2 license) database engine and supports versions 5.6(retired), 5.7, and 8.0. [Azure Database for MySQL - Single Server](./overview.md#azure-database-for-mysql---single-server) is a deployment mode that provides a fully managed database service with minimal requirements for customizations of database. The Single Server platform is designed to handle most database management functions such as patching, backups, high availability, and security, all with minimal user configuration and control.
 
 This article summarizes new releases and features in Azure Database for MySQL - Single Server beginning in January 2021. Listings appear in reverse chronological order, with the most recent updates first.
 
