Merge pull request #102543 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit a1f28a78b5b8 · 2020-01-28T14:55:04.000-08:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/azure-cache-for-redis/cache-how-to-premium-vnet.md b/articles/azure-cache-for-redis/cache-how-to-premium-vnet.md
@@ -31,7 +31,7 @@ To configure the VNet for your new cache, click **Virtual Network** on the **New
 
 ![Virtual network][redis-cache-vnet]
 
-Select the desired subnet from the **Subnet** drop-down list, and specify the desired **Static IP address**. If you are using a classic VNet the **Static IP address** field is optional, and if none is specified, one is chosen from the selected subnet.
+Select the desired subnet from the **Subnet** drop-down list.  If desired, specify a **Static IP address**. The **Static IP address** field is optional, and if none is specified, one is chosen from the selected subnet.
 
 > [!IMPORTANT]
 > When deploying an Azure Cache for Redis to a Resource Manager VNet, the cache must be in a dedicated subnet that contains no other resources except for Azure Cache for Redis instances. If an attempt is made to deploy an Azure Cache for Redis to a Resource Manager VNet to a subnet that contains other resources, the deployment fails.
diff --git a/articles/azure-functions/functions-create-first-java-maven.md b/articles/azure-functions/functions-create-first-java-maven.md
@@ -24,9 +24,8 @@ To develop functions using Java, you must have the following installed:
 - [Apache Maven](https://maven.apache.org), version 3.0 or above
 - [Azure CLI]
 - [Azure Functions Core Tools](./functions-run-local.md#v2) version 2.6.666 or above
-- An Azure subscription.
 
-[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
+You also need an active Azure subscription. [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
 
 > [!IMPORTANT]
diff --git a/articles/azure-monitor/platform/activity-log-export.md b/articles/azure-monitor/platform/activity-log-export.md
@@ -31,9 +31,10 @@ Archiving the Activity Log to a storage account is useful if you would like to r
 ### Storage account
 If you're archiving your Activity Log, you need to [create a storage account](../../storage/common/storage-account-create.md) if you don't already have one. You should not use an existing storage account that has other, non-monitoring data stored in it so that you can better control access to monitoring data. If you are also archiving logs and metrics to a storage account though, you may choose to use that same storage account to keep all monitoring data in a central location.
 
-The storage account does not have to be in the same subscription as the subscription emitting logs as long as the user who configures the setting has appropriate RBAC access to both subscriptions.
-> [!NOTE]
->  You cannot currently archive data to a storage account that is behind a secured virtual network.
+The storage account does not have to be in the same subscription as the subscription emitting logs as long as the user who configures the setting has appropriate RBAC access to both subscriptions. 
+
+> [!TIP]
+> See [Configure Azure Storage firewalls and virtual networks](https://docs.microsoft.com/azure/storage/common/storage-network-security#exceptions) for providing access to a storage account behind a secured virtual network.
 
 ### Event Hubs
 If you're sending your Activity Log to an event hub, then you need to [create an event hub](../../event-hubs/event-hubs-create.md) if you don't already have one. If you previously streamed Activity Log events to this Event Hubs namespace, then that event hub will be reused.
diff --git a/articles/data-explorer/manage-cluster-horizontal-scaling.md b/articles/data-explorer/manage-cluster-horizontal-scaling.md
@@ -53,9 +53,10 @@ Optimized autoscale starts working. Its actions are now visible in the Azure act
 When your cluster approaches a state of over-utilization, scale out to maintain optimal performance. Scale out will occur when:
 * The number of cluster instances is below the maximum number of instances defined by the user.
 * The cache utilization is high for over an hour.
+* The CPU is high for over an hour.
 
 > [!NOTE]
-> The scale out logic doesn't currently consider the ingestion utilization and CPU metrics. If those metrics are important for your use case, use [custom autoscale](#custom-autoscale).
+> The scale out logic doesn't currently consider the ingestion utilization metric. If this metric is important for your use case, use [custom autoscale](#custom-autoscale).
 
 **Scale in**
 
diff --git a/articles/key-vault/event-grid-logicapps.md b/articles/key-vault/event-grid-logicapps.md
@@ -30,7 +30,6 @@ First, create Logic App with event grid handler and subscribe to Azure Key Vault
 
 To create an Azure Event Grid subscription, follow these steps:
 
-1. Open the Azure portal using the following link: https://portal.azure.com/?Microsoft_Azure_KeyVault_ShowEvents=true&Microsoft_Azure_EventGrid_publisherPreview=true 
 1. In the Azure portal, go to your key vault, select **Events > Get Started** and click **Logic Apps**
 
     
diff --git a/articles/key-vault/key-vault-overview-vnet-service-endpoints.md b/articles/key-vault/key-vault-overview-vnet-service-endpoints.md
@@ -69,7 +69,8 @@ Here's a list of trusted services that are allowed to access a key vault if the
 |Azure Databricks|[Fast, easy, and collaborative Apache Spark–based analytics service](../azure-databricks/what-is-azure-databricks.md)|
 |Azure API Management|[Deploy certificates for Custom Domain from Key Vault using MSI](../api-management/api-management-howto-use-managed-service-identity.md#use-the-managed-service-identity-to-access-other-resources)|
 |Azure Data Factory|[Fetch data store credentials in Key Vault from Data Factory](https://go.microsoft.com/fwlink/?linkid=2109491)|
-
+|Azure Event Hubs|[Allow access to a key vault for customer-managed keys scenario](https://docs.microsoft.com/azure/event-hubs/configure-customer-managed-key)|
+|Azure Service Bus|[Allow access to a key vault for customer-managed keys scenario](https://docs.microsoft.com/azure/service-bus-messaging/configure-customer-managed-key)|
 
 
 > [!NOTE]
diff --git a/articles/virtual-machines/troubleshooting/linux-recovery-cannot-start-file-system-errors.md b/articles/virtual-machines/troubleshooting/linux-recovery-cannot-start-file-system-errors.md
@@ -107,20 +107,20 @@ To resolve this problem, boot the VM into emergency mode by using the [serial co
 
    ```
    mkdir /temp
-   mount /dev/sda2 /temp
+   mount /dev/sda1 /temp
    ```
 
 8. If the disk fails to mount, run the xfs_repair command with the -L option (force log zeroing):
 
    ```
-   xfs_repair /dev/sda2 -L
+   xfs_repair /dev/sda1 -L
    ```
 
 9. Next, try to mount the file system. If the disk is mounted successfully, you will receive the following output:
  
    ```
-   XFS (sda2): Mounting V1 Filesystem
-   XFS (sda2): Ending clean mount
+   XFS (sda1): Mounting V1 Filesystem
+   XFS (sda1): Ending clean mount
    ```
 
 10. Restart the VM, and then check if the problem is resolved.

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ First, create Logic App with event grid handler and subscribe to Azure Key Vault`
`30`	`30`
`31`	`31`	`To create an Azure Event Grid subscription, follow these steps:`
`32`	`32`
`33`		`-1. Open the Azure portal using the following link: https://portal.azure.com/?Microsoft_Azure_KeyVault_ShowEvents=true&Microsoft_Azure_EventGrid_publisherPreview=true`
`34`	`33`	`1. In the Azure portal, go to your key vault, select Events > Get Started and click Logic Apps`
`35`	`34`
`36`	`35`