Skip to content

Commit 0c16553

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into three-event-hubs-articles
2 parents eeb1315 + 7ae33af commit 0c16553

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

articles/data-explorer/ingest-json-formats.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ ms.author: orspodek
66
ms.reviewer: kerend
77
ms.service: data-explorer
88
ms.topic: conceptual
9-
ms.date: 01/23/2020
9+
ms.date: 01/27/2020
1010
---
1111

1212
# Ingest JSON formatted sample data into Azure Data Explorer
1313

14-
This article shows you how to ingest JSON formatted data into an Azure Data Explorer database. You'll start with simple examples of raw and mapped JSON, continue to multi-lined JSON, and then tackle more complex JSON schemas containing arrays and dictionaries.
14+
This article shows you how to ingest JSON formatted data into an Azure Data Explorer database. You'll start with simple examples of raw and mapped JSON, continue to multi-lined JSON, and then tackle more complex JSON schemas containing arrays and dictionaries. The examples detail the process of ingesting JSON formatted data using Kusto query language (KQL), C#, or Python. The Kusto query language `ingest` control commands are executed directly to the engine endpoint. In production scenarios, ingestion is executed to the Data Management service using client libraries or data connections. Read [Ingest data using the Azure Data Explorer Python library](/azure/data-explorer/python-ingest-data) and [Ingest data using the Azure Data Explorer .NET Standard SDK](/azure/data-explorer/net-standard-ingest-data) for a walk-through regarding ingesting data with these client libraries.
1515

1616
## Prerequisites
1717

@@ -77,9 +77,6 @@ Use Kusto query language to ingest data in a raw JSON format.
7777
.ingest into table RawEvents h'https://kustosamplefiles.blob.core.windows.net/jsonsamplefiles/simple.json?st=2018-08-31T22%3A02%3A25Z&se=2020-09-01T22%3A02%3A00Z&sp=r&sv=2018-03-28&sr=b&sig=LQIbomcKI8Ooz425hWtjeq6d61uEaq21UVX7YrM61N4%3D' with (format=json, jsonMappingReference=RawEventMapping)
7878
```
7979
80-
> [!NOTE]
81-
> This shows the `ingest` control commands executed directly to the engine endpoint. In production scenarios, ingestion is executed to the Data Management service using client libraries or data connections. Read [Ingest data using the Azure Data Explorer Python library](/azure/data-explorer/python-ingest-data) and [Ingest data using the Azure Data Explorer .NET Standard SDK](/azure/data-explorer/net-standard-ingest-data) for a walk-through regarding ingesting data with these client libraries.
82-
8380
# [C#](#tab/c-sharp)
8481
8582
Use C# to ingest data in raw JSON format.

articles/digital-twins/how-to-configure-postman.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ Set up and configure Postman to obtain an Azure Active Directory token. Afterwar
8282
8383
| Name | Replace with | Example |
8484
|---------|---------|---------|
85-
| YOUR_AZURE_TENANT | The name of your tenant or organization | `microsoft` |
86-
87-
The YOUR_AZURE_TENANT placeholder is for your **Tenant ID** in the Azure Active Directory. There is a numeric directory Id and a human-readable tenant Id. You must use the human-readable Id. The **Tenant ID** is located under the **Overview** tab of your Azure Active Directory.
85+
| YOUR_AZURE_TENANT | The name of your tenant or organization. Use the human-friendly name instead of the alphanumeric **Tenant ID** of your Azure Active Directory app registration. | `microsoft` |
8886
8987
1. Go to [www.getpostman.com](https://www.getpostman.com/) to download the app.
9088

includes/machine-learning-service-inference-config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The entries in the `inferenceconfig.json` document map to the parameters for the
1414
| `runtime` | `runtime` | Optional. Which runtime to use for the image. Current supported runtimes are `spark-py` and `python`. If `environment` is set, this gets ignored. |
1515
| `condaFile` | `conda_file` | Optional. Path to a local file that contains a Conda environment definition to use for the image. If `environment` is set, this gets ignored. |
1616
| `extraDockerFileSteps` | `extra_docker_file_steps` | Optional. Path to a local file that contains additional Docker steps to run when setting up the image. If `environment` is set, this gets ignored.|
17-
| `sourceDirectory` | `source_directory` | Optional. Path to folders that contain all files to create the image. |
17+
| `sourceDirectory` | `source_directory` | Optional. Path to folders that contain all files to create the image which makes it easy to access any files within this folder or subfolder. You can upload an entire folder from your local machine as dependencies for the Webservice. Note: your entry_script, conda_file, and extra_docker_file_steps paths are relative paths to the source_directory path. |
1818
| `enableGpu` | `enable_gpu` | Optional. Whether to enable GPU support in the image. The GPU image must be used on an Azure service, like Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. The default is False. If `environment` is set, this gets ignored.|
1919
| `baseImage` | `base_image` | Optional. Custom image to be used as a base image. If no base image is provided, the image will be based on the provided runtime parameter. If `environment` is set, this gets ignored. |
2020
| `baseImageRegistry` | `base_image_registry` | Optional. Image registry that contains the base image. If `environment` is set, this gets ignored.|

0 commit comments

Comments
 (0)