Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into asc-melvyn-containerwork

Author: memildin

.openpublishing.redirection.json

@@ -47108,8 +47108,8 @@
     },
     {
       "source_path": "articles/terraform/terraform-vm-msi.md",
-      "redirect_url": "/azure/terraform/terraform-vm-managed-identities-for-azure-resources",
-      "redirect_document_id": true
+      "redirect_url": "/azure/terraform/terraform-create-complete-vm",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/cognitive-services/speech-service/quickstart-csharp-dotnet-windows.md",
@@ -48554,17 +48554,17 @@
     {
       "source_path": "articles/virtual-machines/linux/ansible-install-configure.md",
       "redirect_url": "/azure/ansible/ansible-install-configure",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path": "articles/virtual-machines/linux/ansible-create-vm.md",
       "redirect_url": "/azure/ansible/ansible-create-vm",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path": "articles/virtual-machines/linux/ansible-manage-linux-vm.md",
       "redirect_url": "/azure/ansible/ansible-manage-linux-vm",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path": "articles/app-service/containers/tutorial-java-enterprise-postgresql-app.md",
@@ -48574,11 +48574,16 @@
     {
       "source_path": "articles/virtual-machines/linux/terraform-install-configure.md",
       "redirect_url": "/azure/terraform/terraform-install-configure",
-      "redirect_document_id": false
+      "redirect_document_id": true
     },
     {
       "source_path": "articles/virtual-machines/linux/terraform-create-complete-vm.md",
       "redirect_url": "/azure/terraform/terraform-create-complete-vm",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/terraform/terraform-vm-managed-identities-for-azure-resources.md",
+      "redirect_url": "/azure/terraform/terraform-create-complete-vm",
       "redirect_document_id": false
     }
   ]

articles/active-directory/reports-monitoring/reference-sign-ins-error-codes.md

@@ -14,7 +14,7 @@ ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
 ms.subservice: report-monitor
-ms.date: 08/08/2019
+ms.date: 02/19/2020
 ms.author: markvi
 ms.reviewer: dhanyahk
 
@@ -198,6 +198,7 @@ You can also programmatically access the sign-in data using the [reporting API](
 |530021|Application does not meet the Conditional Access approved app requirements.|
 |530032|Blocked by security policy.| 
 |700016|Application with identifier '{appIdentifier}' was not found in the directory '{tenantName}'. This can happen if the application has not been installed by the administrator of the tenant or consented to by any user in the tenant. You may have sent your authentication request to the wrong tenant.|
+|700051|Response_type 'token' is not enabled for the application. The application requested an unsupported response type due to the following reasons: response_type 'token' is not enabled for the application. Application owner should go to the Azure portal or call MS Graph to enable the implicit access token grant.|
 |900432|Confidential Client is not supported in Cross Cloud request.|
 |5000811|Unable to verify SAML token signature. The signing key identifier does not match any valid registered keys.|
 |7000215|Invalid client secret was provided.|

articles/aks/certificate-rotation.md

@@ -38,7 +38,7 @@ AKS generates and uses the following certificates, Certificate Authorities, and
 > 
 > Additionally, you can check the expiration date of your cluster's certificate. For example, the following command displays the certificate details for the *myAKSCluster* cluster.
 > ```console
-> kubectl config view --raw -o jsonpath='{.clusters[?(@.name == "myAKSCluster")].cluster.certificate-authority-data}' | base64 -d > my-cert.crt
+> kubectl config view --raw -o jsonpath="{.clusters[?(@.name == 'myAKSCluster')].cluster.certificate-authority-data}" | base64 -d > my-cert.crt
 > openssl x509 -in my-cert.crt -text
 > ```
 

articles/application-gateway/application-gateway-metrics.md

@@ -17,7 +17,7 @@ Application Gateway publishes data points, called metrics, to [Azure Monitor](ht
 
 ### Timing metrics
 
-Application Gateway provides several built‑in timing metrics related to the request and response which are all measured in milliseconds. 
+Application Gateway provides several built‑in timing metrics related to the request and response, which are all measured in milliseconds. 
 
 ![](./media/application-gateway-metrics/application-gateway-metrics.png)
 
@@ -62,7 +62,7 @@ For example, If there’s a spike in *Backend first byte response time* trend bu
 
 If you notice a spike in *Backend last byte response time* but the *Backend first byte response time* is stable, then it can be deduced that the spike is because of a larger file being requested.
 
-Similarly, if the *Application gateway total time* has a spike but the *Backend last byte response time* is stable, then it can either be a sign of performance bottleneck at the Application Gateway or a bottleneck in the network between client and Application Gateway. Additionally, if the *client RTT* also has a corresponding spike, then this indicates that that the degradation is because of the network between client and Application Gateway.
+Similarly, if the *Application gateway total time* has a spike but the *Backend last byte response time* is stable, then it can either be a sign of performance bottleneck at the Application Gateway or a bottleneck in the network between client and Application Gateway. Additionally, if the *client RTT* also has a corresponding spike, then it indicates that that the degradation is because of the network between client and Application Gateway.
 
 ### Application Gateway metrics
 
@@ -82,7 +82,7 @@ For Application Gateway, the following metrics are available:
 
 - **Current capacity units**
 
-   Count of capacity units consumed. Capacity units measure consumption-based cost that is charged in addition to the fixed cost. There are three determinants to capacity unit - compute unit, persistent connections and throughput. Each capacity unit is composed of at most: 1 compute unit, or 2500 persistent connections, or 2.22-Mbps throughput.
+   Count of capacity units consumed to load balance the traffic. There are three determinants to capacity unit - compute unit, persistent connections and throughput. Each capacity unit is composed of at most: 1 compute unit, or 2500 persistent connections, or 2.22-Mbps throughput.
 
 - **Current compute units**
 
@@ -94,14 +94,15 @@ For Application Gateway, the following metrics are available:
 
 - **Estimated Billed Capacity units**
 
-  Number of capacity units using which the billing is estimated. This is calcutaed as the greater value between *Current capacity units* and *Fixed billable capacity units*.  
+  With the v2 SKU, the pricing model is driven by consumption. Capacity units measure consumption-based cost that is charged in addition to the fixed cost. *Estimated Billed Capacity units* indicates the number of capacity units using which the billing is estimated. This is calculated as the greater value between *Current capacity units* (capacity units required to load balance the traffic) and *Fixed billable capacity units* (minimum capacity units kept provisioned).
 
 - **Failed Requests**
 
-   Count of failed requests that Application Gateway has served. The request count can be further filtered to show count per each/specific backend pool-http setting combination.
+  Count of failed requests that Application Gateway has served. The request count can be further filtered to show count per each/specific backend pool-http setting combination.
 
 - **Fixed Billable Capacity Units**
-The minimum number of capacity units kept provisioned as per the *Minimum scale units* setting in the Application Gateway configuration.
+
+  The minimum number of capacity units kept provisioned as per the *Minimum scale units* setting (one instance translates to 10 capacity units) in the Application Gateway configuration.
 
  - **New connections per second**
 
@@ -141,6 +142,7 @@ For Application Gateway, the following metrics are available:
   The number of backends that are determined unhealthy by the health probe. You can filter on a per backend pool basis to show the number of unhealthy hosts in a specific backend pool.
 
 - **Requests per minute per Healthy Host**
+
   The average number of requests received by each healthy member in a backend pool in a minute. You must specify the backend pool using the *BackendPool HttpSettings* dimension.  
 
 

articles/backup/backup-client-automation.md

@@ -129,14 +129,16 @@ $CredsFilename = Get-AzRecoveryServicesVaultSettingsFile -Backup -Vault $Vault1
 
 ### Registering using the PS Az module
 
+> [!NOTE]
+> A bug with generation of vault certificate is fixed in Az 3.5.0 release. Use Az 3.5.0 release version or greater to download a vault certificate.
+
 In the latest Az module of Powershell, due to underlying platform limitations, downloading the vault credentials requires a self-signed certificate. The following example shows how to provide a self-signed certificate and download the vault credentials.
 
 ```powershell
-$Vault = Get-AzRecoveryServicesVault -ResourceGroupName $rgName -Name $VaultName
-$cert = New-SelfSignedCertificate -certstorelocation cert:\localmachine\my -dnsname xxxxxxxxxxxxx
-$certificate =[System.Convert]::ToBase64String($cert.RawData)
-$CredsPath = "C:\downloads"
-$CredsFilename = Get-AzRecoveryServicesVaultSettingsFile -Certificate $certificate -Vault $vault -Backup -Path $CredsPath
+$dt = $(Get-Date).ToString("M-d-yyyy")
+$cert = New-SelfSignedCertificate -CertStoreLocation Cert:\CurrentUser\My -FriendlyName 'test-vaultcredentials' -subject "Windows Azure Tools" -KeyExportPolicy Exportable -NotAfter $(Get-Date).AddHours(48) -NotBefore $(Get-Date).AddHours(-24) -KeyProtection None -KeyUsage None -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.2") -Provider "Microsoft Enhanced Cryptographic Provider v1.0"
+$certficate = [convert]::ToBase64String($cert.Export([System.Security.Cryptography.X509Certificates.X509ContentType]::Pfx))
+$CredsFilename = Get-AzRecoveryServicesVaultSettingsFile -Backup -Vault $Vault -Path $CredsPath -Certificate $certficate
 ```
 
 On the Windows Server or Windows client machine, run the [Start-OBRegistration](https://technet.microsoft.com/library/hh770398%28v=wps.630%29.aspx) cmdlet to register the machine with the vault.

articles/cosmos-db/sql-query-select.md

@@ -164,9 +164,53 @@ The results are:
       }
     }]
 ```
+## Reserved keywords and special characters
+
+If your data contains properties with the same names as reserved keywords such as "order" or "Group" then the queries against these documents will result in syntax errors. You should explicitly include the property in `[]` character to run the query successfully.
+
+For example, here's a document with a property named `order` and a property `price($)` that contains special characters:
+
+```json
+{
+  "id": "AndersenFamily",
+  "order": [
+     {
+         "orderId": "12345",
+         "productId": "A17849",
+         "price($)": 59.33
+     }
+  ],
+  "creationDate": 1431620472,
+  "isRegistered": true
+}
+```
+
+If you run a queries that includes the `order` property or `price($)` property, you will receive a syntax error.
+
+```sql
+SELECT * FROM c where c.order.orderid = "12345"
+```
+```sql
+SELECT * FROM c where c.order.price($) > 50
+```
+The result is:
+
+`
+Syntax error, incorrect syntax near 'order'
+`
+
+You should rewrite the same queries as below:
+
+```sql
+SELECT * FROM c WHERE c["order"].orderId = "12345"
+```
+
+```sql
+SELECT * FROM c WHERE c["order"]["price($)"] > 50
+```
 
 ## Next steps
 
 - [Getting started](sql-query-getting-started.md)
 - [Azure Cosmos DB .NET samples](https://github.com/Azure/azure-cosmos-dotnet-v3)
-- [WHERE clause](sql-query-where.md)
+- [WHERE clause](sql-query-where.md)

articles/hdinsight/TOC.yml

@@ -529,6 +529,8 @@
         href: ./hadoop/troubleshoot-lost-key-vault-access.md
       - name: WASBS storage exception
         href: ./hadoop/troubleshoot-wasbs-storage-exception.md
+      - name: Manage disk space
+        href: ./hadoop/troubleshoot-disk-space.md
 - name: Apache Kafka
   items:
   - name: Overview

articles/hdinsight/hadoop/troubleshoot-disk-space.md

@@ -0,0 +1,50 @@
+---
+title: Manage disk space in Azure HDInsight
+description: Troubleshooting steps and possible resolutions for issues when interacting with Azure HDInsight clusters.
+author: hrasheed-msft
+ms.author: hrasheed
+ms.reviewer: jasonh
+ms.service: hdinsight
+ms.topic: troubleshooting
+ms.date: 02/17/2020
+---
+
+# Manage disk space in Azure HDInsight
+
+This article describes troubleshooting steps and possible resolutions for issues when interacting with Azure HDInsight clusters.
+
+## Hive log configurations
+
+1. From a web browser, navigate to `https://CLUSTERNAME.azurehdinsight.net`, where `CLUSTERNAME` is the name of your cluster.
+
+1. Navigate to **Hive** > **Configs** > **Advanced** > **Advanced hive-log4j**. Review the following settings:
+
+    * `hive.root.logger=DEBUG,RFA`. This is the default value, modify the [log level](https://logging.apache.org/log4j/2.x/log4j-api/apidocs/org/apache/logging/log4j/Level.html) to `INFO` to print less logs entries.
+
+    * `log4jhive.log.maxfilesize=1024MB`. This is the default value, modify as desired.
+
+    * `log4jhive.log.maxbackupindex=10`. This is the default value, modify as desired. If the parameter has been omitted, the generated log files will be endless.
+
+## Yarn log configurations
+
+Review the following configurations:
+
+* Apache Ambari
+
+    1. From a web browser, navigate to `https://CLUSTERNAME.azurehdinsight.net`, where `CLUSTERNAME` is the name of your cluster.
+
+    1. Navigate to **Hive** > **Configs** > **Advanced** > **Resource Manager**. Ensure **Enable Log Aggregation** is checked. If disabled, name nodes will keep the logs locally and not aggregate them in remote store on application completion or termination.
+
+* Ensure that the cluster size is appropriate for the workload. The workload might have changed recently or the cluster might have been resized. [Scale up](../hdinsight-scaling-best-practices.md) the cluster to match a higher workload.
+
+* `/mnt/resource` might be filled with orphaned files (as in the case of resource manager restart). If necessary, manually clean `/mnt/resource/hadoop/yarn/log` and `/mnt/resource/hadoop/yarn/local`.
+
+## Next steps
+
+If you didn't see your problem or are unable to solve your issue, visit one of the following channels for more support:
+
+* Get answers from Azure experts through [Azure Community Support](https://azure.microsoft.com/support/community/).
+
+* Connect with [@AzureSupport](https://twitter.com/azuresupport) - the official Microsoft Azure account for improving customer experience. Connecting the Azure community to the right resources: answers, support, and experts.
+
+* If you need more help, you can submit a support request from the [Azure portal](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade/). Select **Support** from the menu bar or open the **Help + support** hub. For more detailed information, review [How to create an Azure support request](https://docs.microsoft.com/azure/azure-supportability/how-to-create-azure-support-request). Access to Subscription Management and billing support is included with your Microsoft Azure subscription, and Technical Support is provided through one of the [Azure Support Plans](https://azure.microsoft.com/support/plans/).

articles/terraform/index.yml

@@ -60,8 +60,6 @@ landingContent:
             url: terraform-create-complete-vm.md
       - linkListType: tutorial
         links:
-          - text: Create a Terraform VM with MSI enabled
-            url: terraform-vm-managed-identities-for-azure-resources.md
           - text: Create a VM cluster with Terraform modules
             url: terraform-create-vm-cluster-module.md
           - text: Create a VM cluster with Terraform and HCL