Merge branch 'master' into live-event-errors2

Author: IngridAtMicrosoft

articles/azure-monitor/platform/autoscale-overview.md

@@ -102,6 +102,7 @@ You can set up autoscale via
 | Virtual Machines: Linux Scale Sets |[Scaling virtual machine scale sets in Linux](../../virtual-machine-scale-sets/tutorial-autoscale-cli.md) |
 | Virtual Machines: Windows Example |[Advanced Autoscale configuration using Resource Manager templates for VM Scale Sets](../../azure-monitor/platform/autoscale-virtual-machine-scale-sets.md) |
 | API Management service|[Automatically scale an Azure API Management instance](https://docs.microsoft.com/azure/api-management/api-management-howto-autoscale)
+| Azure Data Explorer Clusters| |
 
 ## Next steps
 To learn more about autoscale, use the Autoscale Walkthroughs listed previously or refer to the following resources:

articles/cost-management-billing/costs/cost-mgt-best-practices.md

@@ -3,7 +3,7 @@ title: Optimize your cloud investment with Azure Cost Management
 description: This article helps get the most value out of your cloud investments, reduce your costs, and evaluate where your money is being spent.
 author: bandersmsft
 ms.author: banders
-ms.date: 04/07/2020
+ms.date: 05/04/2020
 ms.topic: conceptual
 ms.service: cost-management-billing
 ms.reviewer: adwise
@@ -100,6 +100,12 @@ To learn more about the various options, visit [How to buy Azure](https://azure.
 - Options for up-front monetary commitments
 - Access to reduced Azure pricing
 
+#### [Azure in CSP](https://azure.microsoft.com/offers/ms-azr-0145p/)
+
+- CSP partners are the first point of contact for their customers’ needs and the center of the customer relationship
+- CSP partners provision new customers, order subscriptions, manage subscriptions, and perform admin tasks on behalf of their customers
+- CSP partners bundle services with unique solutions or resell Azure while controlling the pricing, terms and billing
+
 ## Estimate the cost of your solution
 
 Before you deploy any infrastructure, assess how much your solution will cost. The assessment will help you create a budget for your organization for the workload, up-front. Then you can use a budget over time to benchmark the validity of your initial estimation. And you can compare it with the actual cost of your deployed solution.

articles/hdinsight/TOC.yml

@@ -155,8 +155,16 @@
       items:
       - name: Manage clusters using the Apache Ambari web UI
         href: ./hdinsight-hadoop-manage-ambari.md
-      - name: Optimize clusters with the Apache Ambari web UI
-        href: ./hdinsight-changing-configs-via-ambari.md
+      - name: Optimize with Apache Ambari
+        items:
+        - name: Optimize clusters
+          href: ./hdinsight-changing-configs-via-ambari.md
+        - name: Optimize Apache HBase
+          href: ./optimize-hbase-ambari.md
+        - name: Optimize Apache Hive
+          href: ./optimize-hive-ambari.md
+        - name: Optimize Apache Pig
+          href: ./optimize-pig-ambari.md
       - name: Use Apache Ambari REST API
         href: ./hdinsight-hadoop-manage-ambari-rest-api.md
       - name: Delete a cluster

articles/hdinsight/hbase/apache-hbase-migrate-new-version.md

@@ -215,4 +215,4 @@ To learn more about [Apache HBase](https://hbase.apache.org/) and upgrading HDIn
 * [Upgrade an HDInsight cluster to a newer version](../hdinsight-upgrade-cluster.md)
 * [Monitor and manage Azure HDInsight using the Apache Ambari Web UI](../hdinsight-hadoop-manage-ambari.md)
 * [Apache Hadoop components and versions](../hdinsight-component-versioning.md)
-* [Optimize configurations using Apache Ambari](../hdinsight-changing-configs-via-ambari.md#apache-hbase-optimization-with-the-ambari-web-ui)
+* [Optimize Apache HBase](../optimize-hbase-ambari.md)

articles/hdinsight/hdinsight-changing-configs-via-ambari.md

@@ -193,5 +193,6 @@ There are more optimization methods that you can consider, for example:
 In this article, you have learned several common Hive query optimization methods. To learn more, see the following articles:
 
 * [Use Apache Hive in HDInsight](hadoop/hdinsight-use-hive.md)
+* [Optimize Apache Hive](./optimize-hive-ambari.md)
 * [Analyze flight delay data by using Interactive Query in HDInsight](./interactive-query/interactive-query-tutorial-analyze-flight-data.md)
 * [Analyze Twitter data using Apache Hive in HDInsight](hdinsight-analyze-twitter-data-linux.md)