Merge pull request #107187 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit e15278becdd4 · 2020-03-11T09:38:36.000-07: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/application-gateway/application-gateway-metrics.md b/articles/application-gateway/application-gateway-metrics.md
@@ -121,10 +121,6 @@ For Application Gateway, the following metrics are available:
 
    Count of successful requests that Application Gateway has served. The request count can be further filtered to show count per each/specific backend pool-http setting combination.
 
-- **Web Application Firewall matched rules**
-
-- **Web Application Firewall triggered rules**
-
 ### Backend metrics
 
 For Application Gateway, the following metrics are available:
@@ -176,9 +172,9 @@ For Application Gateway, the following metrics are available:
 
   Count of successful requests that Application Gateway has served. The request count can be further filtered to show count per each/specific backend pool-http setting combination.
 
-- **Web Application Firewall matched rules**
-
-- **Web Application Firewall triggered rules**
+- **Web Application Firewall Blocked Requests Count**
+- **Web Application Firewall Blocked Requests Distribution**
+- **Web Application Firewall Total Rule Distribution**
 
 ### Backend metrics
 
diff --git a/articles/azure-functions/functions-create-first-azure-function-azure-cli.md b/articles/azure-functions/functions-create-first-azure-function-azure-cli.md
@@ -276,7 +276,7 @@ Use the following Azure CLI commands to create these items. Each command provide
     If you are using Python 3.6, change `--runtime-version` to `3.6`.
 
     ```azurecli
-    az functionapp create --resource-group AzureFunctionsQuickstart-rg --os-type Linux --consumption-plan-location westeurope --runtime python --runtime-version 3.7 --functions_version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
+    az functionapp create --resource-group AzureFunctionsQuickstart-rg --os-type Linux --consumption-plan-location westeurope --runtime python --runtime-version 3.7 --functions-version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
     ```
     ::: zone-end  
 
@@ -285,19 +285,19 @@ Use the following Azure CLI commands to create these items. Each command provide
 
     
     ```azurecli
-    az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location westeurope --runtime node --runtime-version 10 --functions_version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
+    az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location westeurope --runtime node --runtime-version 10 --functions-version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
     ```
     ::: zone-end  
 
     ::: zone pivot="programming-language-csharp"  
     ```azurecli
-    az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location westeurope --runtime dotnet --functions_version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
+    az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location westeurope --runtime dotnet --functions-version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
     ```
     ::: zone-end  
     
     ::: zone pivot="programming-language-powershell"  
     ```azurecli
-    az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location westeurope --runtime powershell --functions_version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
+    az functionapp create --resource-group AzureFunctionsQuickstart-rg --consumption-plan-location westeurope --runtime powershell --functions-version 2 --name <APP_NAME> --storage-account <STORAGE_NAME>
     ```
     ::: zone-end  
 
diff --git a/articles/azure-monitor/insights/network-performance-monitor-faq.md b/articles/azure-monitor/insights/network-performance-monitor-faq.md
@@ -182,7 +182,7 @@ A hop may not respond to a traceroute in one or more of the below scenarios:
 * The network devices are not allowing ICMP_TTL_EXCEEDED traffic.
 * A firewall is blocking the ICMP_TTL_EXCEEDED response from the network device.
 
-When either of the endpoints lies in Azure, traceroute shows up unidentified hops as Azure ndrastructure does not reveal identity to traceroute. 
+When either of the endpoints lies in Azure, traceroute shows up unidentified hops as Azure Infrastructure does not reveal identity to traceroute. 
 
 ### I get alerts for unhealthy tests but I do not see the high values in NPM's loss and latency graph. How do I check what is unhealthy?
 NPM raises an alert if end to end latency between source and destination crosses the threshold for any path between them. Some networks have multiple paths connecting the same source and destination. NPM raises an alert is any path is unhealthy. The loss and latency seen in the graphs is the average value for all the paths, hence it may not show the exact value of a single path. To understand where the threshold has been breached, look for the "SubType" column in the alert. If the issue is caused by a path the SubType value will be NetworkPath (for Performance Monitor tests), EndpointPath (for Service Connectivity Monitor tests) and ExpressRoutePath (for ExpressRotue Monitor tests). 
diff --git a/articles/azure-portal/admin-timeout.md b/articles/azure-portal/admin-timeout.md
@@ -39,7 +39,7 @@ To confirm that the inactivity timeout policy is set correctly, select **Notific
 The setting takes effect for new sessions. It won’t apply immediately to any users who are already signed in.
 
 > [!NOTE]
-> If an admin has configured a directory-level timeout setting, users can override the policy and set their own inactive sign-out duration. However, the user must choose a time interval that is less than what is set at the directory level.
+> If a Global Administrator has configured a directory-level timeout setting, users can override the policy and set their own inactive sign-out duration. However, the user must choose a time interval that is less than what is set at the directory level by the Global Administrator.
 >
 
 ## Next steps
diff --git a/articles/azure-portal/supportability/how-to-create-azure-support-request.md b/articles/azure-portal/supportability/how-to-create-azure-support-request.md
@@ -37,7 +37,7 @@ You can get to **Help + support** in the Azure portal. It's available from the A
 
 ### Role-based access control
 
-To create a support request, you must be an admin or be assigned to the [Support Request Contributor](../../role-based-access-control/built-in-roles.md#support-request-contributor) role.
+To create a support request, you must be an admin or be assigned to the [Support Request Contributor](../../role-based-access-control/built-in-roles.md#support-request-contributor) role at the subscription level.
 
 ### Go to Help + support from the global header
 
diff --git a/articles/cosmos-db/data-explorer.md b/articles/cosmos-db/data-explorer.md
@@ -43,6 +43,8 @@ Azure Cosmos DB explorer is a standalone web-based interface that allows you to
 
 Currently the **Open Full Screen** experience that allows you to share temporary read-write or read access is not yet supported for Azure Cosmos DB Gremlin and Table API accounts. You can still view your Gremlin and Table API accounts by passing the connection string to Azure Cosmos DB Explorer. 
 
+Currently, viewing documents that contain a UUID is not supported in Data Explorer. This does not affect loading collections, only viewing individual documents or queries that include these documents. To view and manage these documents, users should continue to use the tool that was originally used to create these documents.
+
 ## Next steps
 Now that you have learned how to get started with Azure Cosmos DB explorer to manage your data, next you can:
 
diff --git a/articles/data-explorer/ingest-data-event-grid.md b/articles/data-explorer/ingest-data-event-grid.md
@@ -115,7 +115,7 @@ Now connect to the Event Grid from Azure Data Explorer, so that data flowing int
      **Setting** | **Suggested value** | **Field description**
     |---|---|---|
     | Table | *TestTable* | The table you created in **TestDatabase**. |
-    | Data format | *JSON* | Supported formats are Avro, CSV, JSON, MULTILINE JSON, PSV, SOH, SCSV, TSV, and TXT. Supported compression options: Zip and GZip |
+    | Data format | *JSON* | Supported formats are Avro, CSV, JSON, MULTILINE JSON, PSV, SOH, SCSV, TSV, RAW, and TXT. Supported compression options: Zip and GZip |
     | Column mapping | *TestMapping* | The mapping you created in **TestDatabase**, which maps incoming JSON data to the column names and data types of **TestTable**.|
     | | |
     
@@ -147,14 +147,33 @@ Save the data into a file and upload it with this script:
     az storage container create --name $container_name
 
     echo "Uploading the file..."
-    az storage blob upload --container-name $container_name --file $file_to_upload --name $blob_name
+    az storage blob upload --container-name $container_name --file $file_to_upload --name $blob_name --metadata "rawSizeBytes=1024"
 
     echo "Listing the blobs..."
     az storage blob list --container-name $container_name --output table
 
     echo "Done"
 ```
 
+> [!NOTE]
+> To achieve the best ingestion performance, the *uncompressed* size of the compressed blobs submitted for ingestion must be communicated. Because Event Grid notifications contain only basic details, the size information must be explicitly communicated. The uncompressed size information can be provided by setting the `rawSizeBytes` property on the blob metadata with the *uncompressed* data size in bytes.
+
+### Ingestion properties
+
+You can specify the [Ingestion properties](https://docs.microsoft.com/azure/kusto/management/data-ingestion/#ingestion-properties) of the blob ingestion via the blob metadata.
+
+These properties can be set:
+
+|**Property** | **Property description**|
+|---|---|
+| `rawSizeBytes` | Size of the raw (uncompressed) data. For Avro/ORC/Parquet, this is the size before format-specific compression is applied.|
+| `kustoTable` |  Name of the existing target table. Overrides the `Table` set on the `Data Connection` blade. |
+| `kustoDataFormat` |  Data format. Overrides the `Data format` set on the `Data Connection` blade. |
+| `kustoIngestionMappingReference` |  Name of the existing ingestion mapping to be used. Overrides the `Column mapping` set on the `Data Connection` blade.|
+| `kustoIgnoreFirstRecord` | If set to `true`, Kusto ignores the first row of the blob. Use in tabular format data (CSV, TSV, or similar) to ignore headers. |
+| `kustoExtentTags` | String representing [tags](/azure/kusto/management/extents-overview#extent-tagging) that will be attached to resulting extent. |
+| `kustoCreationTime` |  Overrides [$IngestionTime](/azure/kusto/query/ingestiontimefunction?pivots=azuredataexplorer) for the blob, formatted as a ISO 8601 string. Use for backfilling. |
+
 > [!NOTE]
 > Azure Data Explorer won't delete the blobs post ingestion.
 > Retain the blobs for thrre to five days.
diff --git a/articles/hdinsight/hdinsight-hadoop-compare-storage-options.md b/articles/hdinsight/hdinsight-hadoop-compare-storage-options.md
@@ -6,7 +6,7 @@ ms.author: hrasheed
 ms.reviewer: jasonh
 ms.service: hdinsight
 ms.topic: conceptual
-ms.date: 02/26/2020
+ms.date: 03/10/2020
 ---
 
 # Compare storage options for use with Azure HDInsight clusters
@@ -41,14 +41,14 @@ You can create a cluster using different combinations of services for primary an
 |---|---|---|---|
 | 3.6 & 4.0 | General Purpose V1 , General Purpose V2 | General Purpose V1 , General Purpose V2, BlobStorage(Block Blobs) | Yes |
 | 3.6 & 4.0 | General Purpose V1 , General Purpose V2 | Data Lake Storage Gen2 | No |
-| 3.6 & 4.0 | General Purpose V1 , General Purpose V2 | Data Lake Storage Gen1 | Yes |
 | 3.6 & 4.0 | Data Lake Storage Gen2* | Data Lake Storage Gen2 | Yes |
 | 3.6 & 4.0 | Data Lake Storage Gen2* | General Purpose V1 , General Purpose V2, BlobStorage(Block Blobs) | Yes |
 | 3.6 & 4.0 | Data Lake Storage Gen2 | Data Lake Storage Gen1 | No |
 | 3.6 | Data Lake Storage Gen1 | Data Lake Storage Gen1 | Yes |
 | 3.6 | Data Lake Storage Gen1 | General Purpose V1 , General Purpose V2, BlobStorage(Block Blobs) | Yes |
 | 3.6 | Data Lake Storage Gen1 | Data Lake Storage Gen2 | No |
 | 4.0 | Data Lake Storage Gen1 | Any | No |
+| 4.0 | General Purpose V1 , General Purpose V2 | Data Lake Storage Gen1 | No |
 
 *=This could be one or multiple Data Lake Storage Gen2 accounts, as long as they are all setup to use the same managed identity for cluster access.
 
diff --git a/articles/media-services/previous/media-services-sspk.md b/articles/media-services/previous/media-services-sspk.md
@@ -87,10 +87,10 @@ Interim and Final SSPK licensees can submit technical questions to [smoothpk@mic
 * EchoStar Purchasing Corporation
 * Enseo, Inc.
 * Fluendo S.A.
+* Guangzhou Shikun Electronics., Ltd.
 * HANDAN BroadInfoCom Co., Ltd.
 * Infomir GMBH
 * Irdeto USA Inc.
-* iWEDIA S.A. 
 * Liberty Global Services BV
 * MediaTek Inc.
 * MStar Co, Ltd
diff --git a/articles/sql-database/sql-database-business-continuity.md b/articles/sql-database/sql-database-business-continuity.md
@@ -59,7 +59,7 @@ If the maximum supported backup retention period for point-in-time restore (PITR
 |:---------------------------------------------| :-------------- | :----------------|
 | Automatic failover                           |     No          |      Yes         |
 | Fail over multiple databases simultaneously  |     No          |      Yes         |
-| Update connection string after failover      |     Yes         |      No          |
+| User must update connection string after failover      |     Yes         |      No          |
 | Managed instance supported                   |     No          |      Yes         |
 | Can be in same region as primary             |     Yes         |      No          |
 | Multiple replicas                            |     Yes         |      No          |
diff --git a/articles/storage/blobs/storage-quickstart-blobs-dotnet.md b/articles/storage/blobs/storage-quickstart-blobs-dotnet.md
@@ -233,9 +233,11 @@ Console.WriteLine("\nDownloading blob to\n\t{0}\n", downloadFilePath);
 // Download the blob's contents and save it to a file
 BlobDownloadInfo download = await blobClient.DownloadAsync();
 
-using FileStream downloadFileStream = File.OpenWrite(downloadFilePath);
-await download.Content.CopyToAsync(downloadFileStream);
-downloadFileStream.Close();
+using (FileStream downloadFileStream = File.OpenWrite(downloadFilePath))
+{
+    await download.Content.CopyToAsync(downloadFileStream);
+    downloadFileStream.Close();
+}
 ```
 
 ### Delete a container
diff --git a/includes/data-explorer-container-system-properties.md b/includes/data-explorer-container-system-properties.md
@@ -2,36 +2,52 @@
 author: orspod
 ms.service: data-explorer
 ms.topic: include
-ms.date: 01/08/2020
+ms.date: 02/27/2020
 ms.author: orspodek
 ---
 
 ### Event system properties mapping
 
-If you selected **Event system properties** in the **Data Source** section of the table above, go to the [Web UI](https://dataexplorer.azure.com/) to run the relevant KQL command for proper mapping creation.
+> [!Note]
+> * System properties are supported for single-record events.
+> * For `csv` mapping, properties are added at the beginning of the record. For `json` mapping, properties are added according to the name that appears in the drop-down list.
 
-   **For csv mapping:**
+If you selected **Event system properties** in the **Data Source** section of the table, you must include the following properties in the table schema and mapping.
 
-    ```kusto
-    .create table MyTable ingestion csv mapping "CsvMapping1"
+**Table schema example**
+
+If your data includes three columns (`Timespan`, `Metric`, and `Value`) and the properties you include are `x-opt-enqueued-time` and `x-opt-offset`, create or alter the table schema by using this command:
+
+```kusto
+    .create-merge table TestTable (TimeStamp: datetime, Metric: string, Value: int, EventHubEnqueuedTime:datetime, EventHubOffset:string)
+```
+
+**CSV mapping example**
+
+Run the following commands to add data to the beginning of the record. Note ordinal values.
+
+```kusto
+    .create table TestTable ingestion csv mapping "CsvMapping1"
     '['
-    '   { "column" : "messageid", "DataType":"string", "Properties":{"Ordinal":"0"}},'
-    '   { "column" : "userid", "DataType":"string", "Properties":{"Ordinal":"1"}},'
-    '   { "column" : "other", "DataType":"int", "Properties":{"Ordinal":"2"}}'
+    '   { "column" : "Timespan", "Properties":{"Ordinal":"2"}},'
+    '   { "column" : "Metric", "Properties":{"Ordinal":"3"}},'
+    '   { "column" : "Value", "Properties":{"Ordinal":"4"}},'
+    '   { "column" : "EventHubEnqueuedTime", "Properties":{"Ordinal":"0"}},'
+    '   { "column" : "EventHubOffset", "Properties":{"Ordinal":"1"}}'
     ']'
-    ```
+```
  
-   **For json mapping:**
+**JSON mapping example**
+
+Data is added by using the system properties names as they appear in the **Data connection** blade **Event system properties** list. Run these commands:
 
-    ```kusto
-    .create table MyTable ingestion json mapping "JsonMapping1"
+```kusto
+    .create table TestTable ingestion json mapping "JsonMapping1"
     '['
-    '    { "column" : "messageid", "datatype" : "string", "Properties":{"Path":"$.message-id"}},'
-    '    { "column" : "userid", "Properties":{"Path":"$.user-id"}},'
-    '    { "column" : "other", "Properties":{"Path":"$.other"}}'
+    '    { "column" : "Timespan", "Properties":{"Path":"$.timestamp"}},'
+    '    { "column" : "Metric", "Properties":{"Path":"$.metric"}},'
+    '    { "column" : "Value", "Properties":{"Path":"$.metric_value"}},'
+    '    { "column" : "EventHubEnqueuedTime", "Properties":{"Path":"$.x-opt-enqueued-time"}},'
+    '    { "column" : "EventHubOffset", "Properties":{"Path":"$.x-opt-offset"}}'
     ']'
-    ```
-
-   > [!TIP]
-   > * You must include all selected properties in the mapping. 
-   > * The properties order is important in csv mapping. The system properties must be listed before all other properties and in the same order in which they appear in the **Event system properties** dropdown.
+```

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ To confirm that the inactivity timeout policy is set correctly, select **Notific`
`39`	`39`	`The setting takes effect for new sessions. It won’t apply immediately to any users who are already signed in.`
`40`	`40`
`41`	`41`	`> [!NOTE]`
`42`		`-> If an admin has configured a directory-level timeout setting, users can override the policy and set their own inactive sign-out duration. However, the user must choose a time interval that is less than what is set at the directory level.`
	`42`	`+> If a Global Administrator has configured a directory-level timeout setting, users can override the policy and set their own inactive sign-out duration. However, the user must choose a time interval that is less than what is set at the directory level by the Global Administrator.`
`43`	`43`	`>`
`44`	`44`
`45`	`45`	`## Next steps`