Skip to content

Commit 20cfa8a

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into jun19-sec-dev
2 parents 2866c0e + 928eb56 commit 20cfa8a

File tree

81 files changed

+723
-548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+723
-548
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39543,6 +39543,11 @@
3954339543
"redirect_url": "/azure/hdinsight/",
3954439544
"redirect_document_id": true
3954539545
},
39546+
{
39547+
"source_path": "articles/hdinsight/hdinsight-migrate-from-windows-to-linux.md",
39548+
"redirect_url": "/azure/hdinsight/",
39549+
"redirect_document_id": true
39550+
},
3954639551
{
3954739552
"source_path" : "articles/active-directory-domain-services/active-directory-ds-troubleshoot-service-principals.md",
3954839553
"redirect_url" : "/azure/active-directory-domain-services/alert-service-principal",

articles/active-directory/develop/howto-create-service-principal-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ When programmatically signing in, you need to pass the tenant ID with your authe
9494
![Client ID](./media/howto-create-service-principal-portal/copy-app-id.png)
9595

9696
## Certificates and secrets
97-
Deamon applications can use two forms of credentials to authenticate with Azure AD: certificates and application secrets. We recommend using a certificate, but you can also create a new application secret.
97+
Daemon applications can use two forms of credentials to authenticate with Azure AD: certificates and application secrets. We recommend using a certificate, but you can also create a new application secret.
9898

9999
### Upload a certificate
100100

articles/azure-monitor/app/asp-net-troubleshoot-no-data.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -246,18 +246,10 @@ You can modify these parameters as needed.
246246
- **MaxCollectSec**. Set this parameter to prevent PerfView from running indefinitely and affecting the performance of your server.
247247
- **OnlyProviders**. Set this paramater to only collect logs from the SDK. You can customize this list based on your specific investigations.
248248

249-
Our full list of providers is:
250249

251-
- Microsoft-ApplicationInsights-Core
252-
- Microsoft-ApplicationInsights-Extensibility-DependencyCollector
253-
- Microsoft-ApplicationInsights-Extensibility-Rtia-SharedCore
254-
- Microsoft-ApplicationInsights-Extensibility-Web
255-
- Microsoft-ApplicationInsights-Extensibility-WindowsServer
256-
- Microsoft-ApplicationInsights-Web
257-
- Microsoft-ApplicationInsights-WindowsServer-TelemetryChannel
258-
259-
260-
For more information, see [Recording performance traces with PerfView](https://github.com/dotnet/roslyn/wiki/Recording-performance-traces-with-PerfView).
250+
For more information,
251+
- [Recording performance traces with PerfView](https://github.com/dotnet/roslyn/wiki/Recording-performance-traces-with-PerfView).
252+
- [Application Insights Event Sources](https://github.com/microsoft/ApplicationInsights-Home/tree/master/Samples/ETW)
261253

262254
## Still not working...
263255
* [Application Insights forum](https://social.msdn.microsoft.com/Forums/vstudio/en-US/home?forum=ApplicationInsights)

articles/cloud-services/cloud-services-model-and-package.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ The following sample shows the configuration for a web role with a website and w
182182
</Site>
183183
<Site name="MailSite" packageDir="MailSite">
184184
<Bindings>
185-
<Binding name="mail" endpointName="HttpIn" hostheader="mail.mysite.cloudapp.net" />
185+
<Binding name="mail" endpointName="HttpIn" hostHeader="mail.mysite.cloudapp.net" />
186186
</Bindings>
187187
<VirtualDirectory name="artifacts" />
188188
<VirtualApplication name="storageproxy">

articles/cognitive-services/LUIS/luis-tutorial-pattern-any.md

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.service: cognitive-services
1010
ms.subservice: language-understanding
1111
ms.topic: tutorial
12-
ms.date: 12/21/2018
12+
ms.date: 06/12/2019
1313
ms.author: diberry
1414
#Customer intent: As a new user, I want to understand how and why to use pattern.any entity to improve predictions.
1515
---
@@ -61,24 +61,20 @@ The varying length includes words that may confuse LUIS about where the entity e
6161
|{FormName} is published in French[?]|
6262

6363
## Import example app
64-
Continue with the app created in the last tutorial, named **HumanResources**.
6564

66-
Use the following steps:
65+
1. Download and save [app JSON file](https://github.com/Azure-Samples/cognitive-services-language-understanding/blob/master/documentation-samples/tutorials/custom-domain-pattern-roles-HumanResources.json).
6766

68-
1. Download and save [app JSON file](https://github.com/Azure-Samples/cognitive-services-language-understanding/blob/master/documentation-samples/tutorials/custom-domain-pattern-roles-HumanResources.json).
67+
1. In the [LUIS portal](https://www.luis.ai), on the **My apps** page, import the JSON into a new app.
6968

70-
2. Import the JSON into a new app.
71-
72-
3. From the **Manage** section, on the **Versions** tab, clone the version, and name it `patt-any`. Cloning is a great way to play with various LUIS features without affecting the original version. Because the version name is used as part of the URL route, the name can't contain any characters that are not valid in a URL.
69+
1. From the **Manage** section, on the **Versions** tab, clone the version, and name it `patt-any`. Cloning is a great way to play with various LUIS features without affecting the original version. Because the version name is used as part of the URL route, the name can't contain any characters that are not valid in a URL.
7370

7471
## Add example utterances
75-
Remove the prebuilt keyPhrase entity if it is difficult to create and label the FormName entity.
7672

7773
1. Select **Build** from the top navigation, then select **Intents** from left navigation.
7874

79-
2. Select **FindForm** from the intents list.
75+
1. Select **FindForm** from the intents list.
8076

81-
3. Add some example utterances:
77+
1. Add some example utterances:
8278

8379
|Example utterance|
8480
|--|
@@ -90,23 +86,23 @@ Remove the prebuilt keyPhrase entity if it is difficult to create and label the
9086
Without a Pattern.any entity, it would be difficult for LUIS to understand where the form title ends because of the many variations of form names.
9187

9288
## Create a Pattern.any entity
93-
The Pattern.any entity extracts entities of varying length. It only works in a pattern because the pattern marks the beginning and end of the entity. If you find that your pattern, when it includes a Pattern.any, extracts entities incorrectly, use an [explicit list](luis-concept-patterns.md#explicit-lists) to correct this problem.
89+
The Pattern.any entity extracts entities of varying length. It only works in a pattern because the pattern marks the beginning and end of the entity.
9490

9591
1. Select **Entities** in the left navigation.
9692

97-
2. Select **Create new entity**, enter the name `FormName`, and select **Pattern.any** as the type. Select **Done**.
93+
1. Select **Create new entity**, enter the name `FormName`, and select **Pattern.any** as the type. Select **Done**.
9894

99-
You can't label the entity in the intent because a Pattern.any is only valid in a pattern.
95+
You can't label the entity in an intent's example utterances because a Pattern.any is only valid in a pattern.
10096

10197
If you want the extracted data to include other entities such as number or datetimeV2, you need to create a composite entity that includes the Pattern.any, as well as number and datetimeV2.
10298

10399
## Add a pattern that uses the Pattern.any
104100

105101
1. Select **Patterns** from the left navigation.
106102

107-
2. Select the **FindForm** intent.
103+
1. Select the **FindForm** intent.
108104

109-
3. Enter the following template utterances, which use the new entity:
105+
1. Enter the following template utterances, which use the new entity:
110106

111107
|Template utterances|
112108
|--|
@@ -117,24 +113,27 @@ The Pattern.any entity extracts entities of varying length. It only works in a p
117113

118114
If you want to account for variations of the form such as single quotes instead of double quotes or a period instead of a question mark, create a new pattern for each variation.
119115

120-
4. If you removed the keyPhrase entity, add it back to the app.
121-
122116
## Train the LUIS app
123117

124118
[!INCLUDE [LUIS How to Train steps](../../../includes/cognitive-services-luis-tutorial-how-to-train.md)]
125119

126120
## Test the new pattern for free-form data extraction
127121
1. Select **Test** from the top bar to open the test panel.
128122

129-
2. Enter the following utterance:
123+
1. Enter the following utterance:
130124

131125
`Where is the form Understand your responsibilities as a member of the community and who needs to sign it after I read it?`
132126

133-
3. Select **Inspect** under the result to see the test results for entity and intent.
127+
1. Select **Inspect** under the result to see the test results for entity and intent.
134128

135129
The entity `FormName` is found first, then the pattern is found, determining the intent. If you have a test result where the entities are not detected, and therefore the pattern is not found, you need to add more example utterances on the intent (not the pattern).
136130

137-
4. Close the test panel by selecting the **Test** button in the top navigation.
131+
1. Close the test panel by selecting the **Test** button in the top navigation.
132+
133+
## Using an explicit list
134+
135+
If you find that your pattern, when it includes a Pattern.any, extracts entities incorrectly, use an [explicit list](luis-concept-patterns.md#explicit-lists) to correct this problem.
136+
138137

139138
## Clean up resources
140139

articles/digital-twins/about-digital-twins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Azure Digital Twins applies to all types of environments. Just a few examples ar
3030
- Analyze occupancy levels for a building.
3131
- Find the busiest cash register in your store.
3232

33-
Whatever your real-world business scenario is, a corresponding digital instance can be provisioned through Azure Digital Twins.
33+
Whatever your real-world business scenario is, it's very likely a corresponding digital instance can be provisioned through Azure Digital Twins.
3434

3535
The following video takes a closer look at Azure Digital Twins.
3636

articles/digital-twins/concepts-events-routing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ IoT solutions often unite several powerful services that include storage, analyt
1616

1717
## Route types
1818

19-
Azure Digital Twins offers two ways to integrate IoT events into other Azure services or business applications:
19+
Azure Digital Twins offers two ways to connect IoT events with other Azure services or business applications:
2020

2121
* **Routing Azure Digital Twins events**: An object in the spatial graph that changes, telemetry data that's received, or a user-defined function that creates a notification based on predefined conditions can trigger Azure Digital Twins events. Users can send these events to [Azure Event Hubs](https://azure.microsoft.com/services/event-hubs/), [Azure Service Bus topics](https://azure.microsoft.com/services/service-bus/), or [Azure Event Grid](https://azure.microsoft.com/services/event-grid/) for further processing.
2222

articles/hdinsight/domain-joined/apache-domain-joined-introduction.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ author: omidm1
66
ms.author: omidm
77
ms.reviewer: jasonh
88
ms.custom: hdinsightactive
9-
ms.topic: conceptual
10-
ms.date: 04/19/2019
9+
ms.topic: overview
10+
ms.date: 06/12/2019
1111
---
12+
1213
# What is Enterprise Security Package in Azure HDInsight
1314

1415
In the past, Azure HDInsight supported only a single user: local admin. This worked great for smaller application teams or departments. As Apache Hadoop-based workloads gained more popularity in the enterprise sector, the need for enterprise-grade capabilities like Active Directory-based authentication, multi-user support, and role-based access control became increasingly important.
1516

1617
You can create an HDInsight cluster with Enterprise Security Package (ESP) that's joined to an Active Directory domain. You can then configure a list of employees from the enterprise who can authenticate through Azure Active Directory to sign in to the HDInsight cluster. No one from outside the enterprise can sign in or access the HDInsight cluster.
1718

18-
The enterprise admin can configure role-based access control (RBAC) for Apache Hive security by using [Apache Ranger](https://hortonworks.com/apache/ranger/). Configuring RBAC restricts data access to only what's needed. Finally, the admin can audit the data access by employees and any changes done to access control policies. The admin can then achieve a high degree of governance of their corporate resources.
19+
The enterprise admin can configure role-based access control (RBAC) for Apache Hive security by using [Apache Ranger](https://ranger.apache.org/). Configuring RBAC restricts data access to only what's needed. Finally, the admin can audit the data access by employees and any changes done to access control policies. The admin can then achieve a high degree of governance of their corporate resources.
1920

2021
> [!NOTE]
2122
> Apache Oozie is now enabled on ESP clusters. To access the Oozie web UI, users should enable [tunneling](../hdinsight-linux-ambari-ssh-tunnel.md).
@@ -37,14 +38,14 @@ With this setup, enterprise employees can sign in to the cluster nodes by using
3738
## Authorization
3839
A best practice that most enterprises follow is making sure that not every employee has access to all enterprise resources. Likewise, the admin can define role-based access control policies for the cluster resources.
3940

40-
For example, the admin can configure [Apache Ranger](https://hortonworks.com/apache/ranger/) to set access control policies for Hive. This functionality ensures that employees can access only as much data as they need to be successful in their jobs. SSH access to the cluster is also restricted to only the administrator.
41+
For example, the admin can configure [Apache Ranger](https://ranger.apache.org/) to set access control policies for Hive. This functionality ensures that employees can access only as much data as they need to be successful in their jobs. SSH access to the cluster is also restricted to only the administrator.
4142

4243
## Auditing
4344
Auditing of all access to the cluster resources, and the data, is necessary to track unauthorized or unintentional access of the resources. It's as important as protecting the HDInsight cluster resources from unauthorized users and securing the data.
4445

4546
The admin can view and report all access to the HDInsight cluster resources and data. The admin can also view and report all changes to the access control policies created in Apache Ranger supported endpoints.
4647

47-
A HDInsight cluster with ESP uses the familiar Apache Ranger UI to search audit logs. On the back end, Ranger uses [Apache Solr](https://hortonworks.com/apache/solr/) for storing and searching the logs.
48+
A HDInsight cluster with ESP uses the familiar Apache Ranger UI to search audit logs. On the back end, Ranger uses [Apache Solr](http://lucene.apache.org/solr/) for storing and searching the logs.
4849

4950
## Encryption
5051
Protecting data is important for meeting organizational security and compliance requirements. Along with restricting access to data from unauthorized employees, you should encrypt it.
@@ -55,7 +56,4 @@ Both data stores for HDInsight clusters--Azure Blob storage and Azure Data Lake
5556

5657
* [Plan for HDInsight clusters with ESP](apache-domain-joined-architecture.md)
5758
* [Configure HDInsight clusters with ESP](apache-domain-joined-configure.md)
58-
* [Manage HDInsight clusters with ESP](apache-domain-joined-manage.md)
59-
* [Configure Apache Hive policies for HDInsight clusters with ESP](apache-domain-joined-run-hive.md)
60-
* [Use SSH with HDInsight](../hdinsight-hadoop-linux-use-ssh-unix.md#domainjoined)
61-
59+
* [Manage HDInsight clusters with ESP](apache-domain-joined-manage.md)

articles/hdinsight/hadoop/TOC.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,6 @@
471471
items:
472472
- name: Windows clusters
473473
items:
474-
- name: Migrate Windows clusters to Linux clusters
475-
href: ../hdinsight-migrate-from-windows-to-linux.md
476-
maintainContext: true
477474
- name: Migrate .NET solutions to Linux clusters
478475
href: ../hdinsight-hadoop-migrate-dotnet-to-linux.md
479476
maintainContext: true

articles/hdinsight/hadoop/apache-hadoop-introduction.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This article provides an introduction to Apache Hadoop on Azure HDInsight. Azure
2121
[Apache Hadoop](https://hadoop.apache.org/) was the original open-source framework for distributed processing and analysis of big data sets on clusters. The Hadoop technology stack includes related software and utilities, including Apache Hive, Apache HBase, Spark, Kafka, and many others.
2222

2323

24-
Azure HDInsight is a cloud distribution of the Hadoop components from the [Hortonworks Data Platform (HDP)](https://hortonworks.com/products/data-center/hdp/). Azure HDInsight makes it easy, fast, and cost-effective to process massive amounts of data. You can use the most popular open-source frameworks such as Hadoop, Spark, Hive, LLAP, Kafka, Storm, R, and more. With these frameworks, you can enable a broad range of scenarios such as extract, transform, and load (ETL), data warehousing, machine learning, and IoT.
24+
Azure HDInsight is a cloud distribution of Hadoop components. Azure HDInsight makes it easy, fast, and cost-effective to process massive amounts of data. You can use the most popular open-source frameworks such as Hadoop, Spark, Hive, LLAP, Kafka, Storm, R, and more. With these frameworks, you can enable a broad range of scenarios such as extract, transform, and load (ETL), data warehousing, machine learning, and IoT.
2525

2626
To see available Hadoop technology stack components on HDInsight, see [Components and versions available with HDInsight](../hdinsight-component-versioning.md). To read more about Hadoop in HDInsight, see the [Azure features page for HDInsight](https://azure.microsoft.com/services/hdinsight/).
2727

@@ -136,7 +136,4 @@ Familiar business intelligence (BI) tools retrieve, analyze, and report data tha
136136

137137
## Next steps
138138

139-
In this article, you learned what is Azure HDInsight and how it provides Hadoop and other cluster types on Azure. Proceed to the next article to learn how to create an Apache Hadoop cluster in HDInsight.
140-
141-
> [!div class="nextstepaction"]
142-
> [Create Apache Hadoop cluster in HDInsight](apache-hadoop-linux-create-cluster-get-started-portal.md)
139+
* [Create Apache Hadoop cluster in HDInsight](apache-hadoop-linux-create-cluster-get-started-portal.md)

0 commit comments

Comments
 (0)