Merge branch 'main' into fix-conflicts

Author: ElazarK

.openpublishing.redirection.app-service.json

@@ -2659,6 +2659,21 @@
             "source_path": "articles/app-service/quickstart-dotnet-framework.md",
             "redirect_url": "/azure/app-service/quickstart-dotnetcore?tabs=netframework48",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/app-service/quickstart-arm-template-uiex.md",
+            "redirect_url": "/azure/app-service/quickstart-arm-template",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/app-service/quickstart-dotnetcore-uiex.md",
+            "redirect_url": "/azure/app-service/quickstart-dotnetcore",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/app-service/quickstart-java-uiex.md",
+            "redirect_url": "/azure/app-service/quickstart-java",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.json

@@ -6750,6 +6750,11 @@
             "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/search/cognitive-search-tutorial-blob-python.md",
+            "redirect_url": "/azure/search/samples-python",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/search/semantic-ranking.md",
             "redirect_url": "/azure/search/semantic-search-overview",

.openpublishing.redirection.sentinel.json

@@ -1055,6 +1055,21 @@
             "redirect_url": "/azure/sentinel/normalization-schema-process-event",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-ama.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog-options.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
             "redirect_url": "/azure/sentinel/notebooks-hunt",

.whatsnew/.azure-monitor.json

@@ -10,53 +10,54 @@ ms.date: 04/07/2022
 Learn about the key capabilities of Azure Advisor and get answers to frequently asked questions.
 
 ## What is Advisor?
-Advisor is a personalized cloud consultant that helps you follow best practices to optimize your Azure deployments. It analyzes your resource configuration and usage telemetry and then recommends solutions that can help you improve the cost effectiveness, performance, Reliability (formerly called High availability), and security of your Azure resources.
+Advisor is a digital cloud assistant that helps you follow best practices to optimize your Azure deployments. It analyzes your resource configuration and usage telemetry and then recommends solutions that can help you improve the cost effectiveness, performance, reliability, and security of your Azure resources.
 
 With Advisor, you can:
+
 * Get proactive, actionable, and personalized best practices recommendations. 
 * Improve the performance, security, and reliability of your resources, as you identify opportunities to reduce your overall Azure spend.
 * Get recommendations with proposed actions inline.
 
 You can access Advisor through the [Azure portal](https://aka.ms/azureadvisordashboard). Sign in to the [portal](https://portal.azure.com), locate **Advisor** in the navigation menu, or search for it in the **All services** menu.
 
-The Advisor dashboard displays personalized recommendations for all your subscriptions.  You can apply filters to display recommendations for specific subscriptions and resource types.  The recommendations are divided into five categories: 
+The Advisor dashboard displays personalized recommendations for all your subscriptions. The recommendations are divided into five categories: 
 
-* **Reliability (formerly called High Availability)**: To ensure and improve the continuity of your business-critical applications. For more information, see [Advisor Reliability recommendations](advisor-high-availability-recommendations.md).
+* **Reliability**: To ensure and improve the continuity of your business-critical applications. For more information, see [Advisor Reliability recommendations](advisor-high-availability-recommendations.md).
 * **Security**: To detect threats and vulnerabilities that might lead to security breaches. For more information, see [Advisor Security recommendations](advisor-security-recommendations.md).
 * **Performance**: To improve the speed of your applications. For more information, see [Advisor Performance recommendations](advisor-performance-recommendations.md).
 * **Cost**: To optimize and reduce your overall Azure spending. For more information, see [Advisor Cost recommendations](advisor-cost-recommendations.md).
 * **Operational Excellence**: To help you achieve process and workflow efficiency, resource manageability and deployment best practices. For more information, see [Advisor Operational Excellence recommendations](advisor-operational-excellence-recommendations.md).
 
-  ![Advisor recommendation types](./media/advisor-overview/advisor-dashboard.png)
+You can apply filters to display recommendations for specific subscriptions and resource types.
 
-You can click a category to display the list of recommendations within that category, and select a recommendation to learn more about it.  You can also learn about actions that you can perform to take advantage of an opportunity or resolve an issue.
+:::image type="content" source="./media/advisor-overview/advisor-dashboard-overview-m.png" alt-text="Screenshot of the Azure Advisor opening score page." lightbox="./media/advisor-overview/advisor-dashboard-overview-m.png":::
 
-![Advisor recommendation category](./media/advisor-overview/advisor-ha-category-example.png) 
+Select a category to display the list of recommendations for that category, and select a recommendation to learn more about it. You can also learn about actions that you can perform to take advantage of an opportunity or resolve an issue.
 
-Select the recommended action for a recommendation to implement the recommendation.  A simple interface will open that enables you to implement the recommendation or refer you to documentation that assists you with implementation.  Once you implement a recommendation, it can take up to a day for Advisor to recognize that.
+:::image type="content" source="./media/advisor-overview/advisor-reliability-recommendations-main-m.png" alt-text="Screenshot of the Azure Advisor Reliability recommendations page, example." lightbox="./media/advisor-overview/advisor-reliability-recommendations-main-m.png":::
 
-If you do not intend to take immediate action on a recommendation, you can postpone it for a specified time period or dismiss it.  If you do not want to receive recommendations for a specific subscription or resource group, you can configure Advisor to only generate recommendations for specified subscriptions and resource groups.
+Select the recommended action for a recommendation to implement the recommendation. A simple interface opens that enables you to implement the recommendation or refer you to documentation that assists you with implementation. Once you implement a recommendation, it can take up to a day for Advisor to recognize that.
 
+If you don't intend to take immediate action on a recommendation, you can postpone it for a specified time period, or dismiss it. If you don't want to receive recommendations for a specific subscription or resource group, you can configure Advisor to only generate recommendations for specified subscriptions and resource groups.
+ 
 ## Frequently asked questions
 
 ### How do I access Advisor?
 You can access Advisor through the [Azure portal](https://aka.ms/azureadvisordashboard). Sign in to the [portal](https://portal.azure.com), locate **Advisor** in the navigation menu, or search for it in the **All services** menu.
 
-You can also view Advisor recommendations through the virtual machine resource interface. Choose a virtual machine, and then scroll to Advisor recommendations in the menu. 
-
 ### What permissions do I need to access Advisor?
 
-You can access Advisor recommendations as *Owner*, *Contributor*, or *Reader* of a subscription, Resource Group or Resource.
+You can access Advisor recommendations as *Owner*, *Contributor*, or *Reader* of a subscription, Resource Group, or Resource.
 
 ### What resources does Advisor provide recommendations for?
 
-Advisor provides recommendations for Application Gateway, App Services, availability sets, Azure Cache, Azure Data Factory, Azure Database for MySQL, Azure Database for PostgreSQL, Azure Database for MariaDB, Azure ExpressRoute, Azure Cosmos DB, Azure public IP addresses, Azure Synapse Analytics, SQL servers, storage accounts, Traffic Manager profiles, and virtual machines.
+Advisor provides recommendations for the following services: API Management, Application Gateway, App Services, Availability Sets, Azure Cache, Azure Database for MySQL, Azure Database for PostgreSQL, Azure Farmbeats, Azure Stack ACI, Azure Public IP Addresses, Azure Synapse Analytics, Central Server, Cognitive Service, Cosmos DB, Data Explorer, Data Factory, Databricks Workspace, ExpressRoute, Front Door, HDInsight Cluster, IoT Hub, KeyV Vault, Kubernetes, Log Analytics, Redis Cache Server, SQL Server, Storage Account, Traffic Manager Profile, Virtual Machine, Virtual Machine Scale Set, and Virtual Network Gateway.
 
-Azure Advisor also includes your recommendations from [Microsoft Defender for Cloud](../defender-for-cloud/defender-for-cloud-introduction.md) which may include recommendations for additional resource types.
+Azure Advisor also includes your recommendations from [Microsoft Defender for Cloud](../defender-for-cloud/defender-for-cloud-introduction.md), which might include recommendations for other resource types.
 
 ### Can I postpone or dismiss a recommendation?
 
-To postpone or dismiss a recommendation, click the **Postpone** link. You can specify a postpone period or select **Never** to dismiss the recommendation.
+To postpone or dismiss a recommendation, select the **Postpone**  or **Dismiss** link, and the recommendation is moved to the Postponed/Dismissed tab on the recommendation list page.
 
 ## Next steps