Skip to content

Commit ca409dd

Browse files
authored
Merge pull request #79122 from MicrosoftDocs/master
Merge master to live 12:24 PM
2 parents 52049cf + b231c39 commit ca409dd

25 files changed

+132
-134
lines changed

articles/hdinsight/hadoop/hdinsight-use-hive.md

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.reviewer: jasonh
88
ms.service: hdinsight
99
ms.custom: hdinsightactive,hdiseo17may2017
1010
ms.topic: conceptual
11-
ms.date: 03/26/2019
11+
ms.date: 06/06/2019
1212
---
1313

1414
# What is Apache Hive and HiveQL on Azure HDInsight?
@@ -43,7 +43,7 @@ Use the following table to discover the different ways to use Hive with HDInsigh
4343

4444
## HiveQL language reference
4545

46-
HiveQL language reference is available in the [language manual (https://cwiki.apache.org/confluence/display/Hive/LanguageManual)](https://cwiki.apache.org/confluence/display/Hive/LanguageManual).
46+
HiveQL language reference is available in the [language manual](https://cwiki.apache.org/confluence/display/Hive/LanguageManual).
4747

4848
## Hive and data structure
4949

@@ -86,7 +86,7 @@ There are two types of tables that you can create with Hive:
8686
* You need a custom location, such as a non-default storage account.
8787
* A program other than hive manages the data format, location, etc.
8888

89-
For more information, see the [Hive Internal and External Tables Intro][cindygross-hive-tables] blog post.
89+
For more information, see the [Hive Internal and External Tables Intro](https://blogs.msdn.microsoft.com/cindygross/2013/02/05/hdinsight-hive-internal-and-external-tables-intro/) blog post.
9090

9191
## User-defined functions (UDF)
9292

@@ -199,50 +199,20 @@ Azure Data Factory allows you to use HDInsight as part of a Data Factory pipelin
199199

200200
You can use SQL Server Integration Services (SSIS) to run a Hive job. The Azure Feature Pack for SSIS provides the following components that work with Hive jobs on HDInsight.
201201

202-
* [Azure HDInsight Hive Task][hivetask]
202+
* [Azure HDInsight Hive Task](https://docs.microsoft.com/sql/integration-services/control-flow/azure-hdinsight-hive-task)
203203

204-
* [Azure Subscription Connection Manager][connectionmanager]
204+
* [Azure Subscription Connection Manager](https://docs.microsoft.com/sql/integration-services/connection-manager/azure-subscription-connection-manager)
205205

206-
For more information, see the [Azure Feature Pack][ssispack] documentation.
206+
For more information, see the [Azure Feature Pack](https://docs.microsoft.com/sql/integration-services/azure-feature-pack-for-integration-services-ssis) documentation.
207207

208208
### Apache Oozie
209209

210210
Apache Oozie is a workflow and coordination system that manages Hadoop jobs. For more information on using Oozie with Hive, see the [Use Apache Oozie to define and run a workflow](../hdinsight-use-oozie-linux-mac.md) document.
211211

212-
## <a id="nextsteps"></a>Next steps
212+
## Next steps
213213

214214
Now that you've learned what Hive is and how to use it with Hadoop in HDInsight, use the following links to explore other ways to work with Azure HDInsight.
215215

216-
* [Upload data to HDInsight][hdinsight-upload-data]
217-
* [Use Apache Pig with HDInsight][hdinsight-use-pig]
218-
* [Use MapReduce jobs with HDInsight][hdinsight-use-mapreduce]
219-
220-
[azure-purchase-options]: https://azure.microsoft.com/pricing/purchase-options/
221-
[azure-member-offers]: https://azure.microsoft.com/pricing/member-offers/
222-
[azure-free-trial]: https://azure.microsoft.com/pricing/free-trial/
223-
224-
[apache-tez]: https://tez.apache.org
225-
[apache-hive]: https://hive.apache.org/
226-
[apache-log4j]: https://en.wikipedia.org/wiki/Log4j
227-
[hive-on-tez-wiki]: https://cwiki.apache.org/confluence/display/Hive/Hive+on+Tez
228-
[import-to-excel]: https://azure.microsoft.com/documentation/articles/hdinsight-connect-excel-power-query/
229-
[hivetask]: https://msdn.microsoft.com/library/mt146771(v=sql.120).aspx
230-
[connectionmanager]: https://msdn.microsoft.com/library/mt146773(v=sql.120).aspx
231-
[ssispack]: https://msdn.microsoft.com/library/mt146770(v=sql.120).aspx
232-
233-
[hdinsight-use-pig]: hdinsight-use-pig.md
234-
[hdinsight-use-oozie]: hdinsight-use-oozie-linux-mac.md
235-
[hdinsight-use-mapreduce]: hdinsight-use-mapreduce.md
236-
237-
238-
[hdinsight-storage]: hdinsight-hadoop-use-blob-storage.md
239-
240-
[hdinsight-provision]: hdinsight-hadoop-provision-linux-clusters.md
241-
[hdinsight-submit-jobs]: hdinsight-submit-hadoop-jobs-programmatically.md
242-
[hdinsight-upload-data]: ../hdinsight-upload-data.md
243-
244-
[Powershell-install-configure]: /powershell/azureps-cmdlets-docs
245-
[powershell-here-strings]: https://technet.microsoft.com/library/ee692792.aspx
246-
247-
248-
[cindygross-hive-tables]: https://blogs.msdn.com/b/cindygross/archive/2013/02/06/hdinsight-hive-internal-and-external-tables-intro.aspx
216+
* [Upload data to HDInsight](../hdinsight-upload-data.md)
217+
* [Use Python User Defined Functions (UDF) with Apache Hive and Apache Pig in HDInsight](./python-udf-hdinsight.md)
218+
* [Use MapReduce jobs with HDInsight](hdinsight-use-mapreduce.md)

articles/hdinsight/hdinsight-extend-hadoop-virtual-network.md

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: hrasheed
66
ms.service: hdinsight
77
ms.custom: hdinsightactive
88
ms.topic: conceptual
9-
ms.date: 05/28/2019
9+
ms.date: 06/04/2019
1010
---
1111

1212
# Extend Azure HDInsight using an Azure Virtual Network
@@ -218,7 +218,7 @@ As a managed service, HDInsight requires unrestricted access to the HDInsight he
218218
219219
![Diagram of HDInsight entities created in Azure custom VNET](./media/hdinsight-virtual-network-architecture/vnet-diagram.png)
220220
221-
### <a id="hdinsight-ip"></a> HDInsight with network security groups
221+
### HDInsight with network security groups
222222
223223
If you plan on using **network security groups** to control network traffic, perform the following actions before installing HDInsight:
224224
@@ -323,28 +323,29 @@ The following Resource Management template creates a virtual network that restri
323323
324324
* [Deploy a secured Azure Virtual Network and an HDInsight Hadoop cluster](https://azure.microsoft.com/resources/templates/101-hdinsight-secure-vnet/)
325325
326-
> [!IMPORTANT]
327-
> Change the IP addresses used in this example to match the Azure region you are using. You can find this information in the [HDInsight with network security groups and user-defined routes](#hdinsight-ip) section.
328-
329326
### Azure PowerShell
330327
331328
Use the following PowerShell script to create a virtual network that restricts inbound traffic and allows traffic from the IP addresses for the North Europe region.
332329
333330
> [!IMPORTANT]
334-
> Change the IP addresses used in this example to match the Azure region you are using. You can find this information in the [HDInsight with network security groups and user-defined routes](#hdinsight-ip) section.
331+
> Change the IP addresses for `hdirule1` and `hdirule2` in this example to match the Azure region you are using. You can find this information in the [HDInsight with network security groups and user-defined routes](#hdinsight-ip) section.
335332
336333
```powershell
337334
$vnetName = "Replace with your virtual network name"
338335
$resourceGroupName = "Replace with the resource group the virtual network is in"
339336
$subnetName = "Replace with the name of the subnet that you plan to use for HDInsight"
337+
340338
# Get the Virtual Network object
341339
$vnet = Get-AzVirtualNetwork `
342340
-Name $vnetName `
343341
-ResourceGroupName $resourceGroupName
342+
344343
# Get the region the Virtual network is in.
345344
$location = $vnet.Location
345+
346346
# Get the subnet object
347347
$subnet = $vnet.Subnets | Where-Object Name -eq $subnetName
348+
348349
# Create a Network Security Group.
349350
# And add exemptions for the HDInsight health and management services.
350351
$nsg = New-AzNetworkSecurityGroup `
@@ -417,8 +418,10 @@ $nsg = New-AzNetworkSecurityGroup `
417418
-Access Allow `
418419
-Priority 305 `
419420
-Direction Inbound `
421+
420422
# Set the changes to the security group
421423
Set-AzNetworkSecurityGroup -NetworkSecurityGroup $nsg
424+
422425
# Apply the NSG to the subnet
423426
Set-AzVirtualNetworkSubnetConfig `
424427
-VirtualNetwork $vnet `
@@ -428,14 +431,12 @@ Set-AzVirtualNetworkSubnetConfig `
428431
$vnet | Set-AzVirtualNetwork
429432
```
430433

431-
> [!IMPORTANT]
432-
> This example demonstrates how to add rules to allow inbound traffic on the required IP addresses. It does not contain a rule to restrict inbound access from other sources.
433-
>
434-
> The following example demonstrates how to enable SSH access from the Internet:
435-
>
436-
> ```powershell
437-
> Add-AzNetworkSecurityRuleConfig -Name "SSH" -Description "SSH" -Protocol "*" -SourcePortRange "*" -DestinationPortRange "22" -SourceAddressPrefix "*" -DestinationAddressPrefix "VirtualNetwork" -Access Allow -Priority 306 -Direction Inbound
438-
> ```
434+
This example demonstrates how to add rules to allow inbound traffic on the required IP addresses. It does not contain a rule to restrict inbound access from other sources. The following code demonstrates how to enable SSH access from the Internet:
435+
436+
```powershell
437+
Get-AzNetworkSecurityGroup -Name hdisecure -ResourceGroupName RESOURCEGROUP |
438+
Add-AzNetworkSecurityRuleConfig -Name "SSH" -Description "SSH" -Protocol "*" -SourcePortRange "*" -DestinationPortRange "22" -SourceAddressPrefix "*" -DestinationAddressPrefix "VirtualNetwork" -Access Allow -Priority 306 -Direction Inbound
439+
```
439440

440441
### Azure CLI
441442

@@ -452,7 +453,7 @@ Use the following steps to create a virtual network that restricts inbound traff
452453
2. Use the following to add rules to the new network security group that allow inbound communication on port 443 from the Azure HDInsight health and management service. Replace `RESOURCEGROUP` with the name of the resource group that contains the Azure Virtual Network.
453454
454455
> [!IMPORTANT]
455-
> Change the IP addresses used in this example to match the Azure region you are using. You can find this information in the [HDInsight with network security groups and user-defined routes](#hdinsight-ip) section.
456+
> Change the IP addresses for `hdirule1` and `hdirule2` in this example to match the Azure region you are using. You can find this information in the [HDInsight with network security groups and user-defined routes](#hdinsight-ip) section.
456457
457458
```azurecli
458459
az network nsg rule create -g RESOURCEGROUP --nsg-name hdisecure -n hdirule1 --protocol "*" --source-port-range "*" --destination-port-range "443" --source-address-prefix "52.164.210.96" --destination-address-prefix "VirtualNetwork" --access "Allow" --priority 300 --direction "Inbound"
@@ -466,15 +467,13 @@ Use the following steps to create a virtual network that restricts inbound traff
466467
3. To retrieve the unique identifier for this network security group, use the following command:
467468
468469
```azurecli
469-
az network nsg show -g RESOURCEGROUP -n hdisecure --query 'id'
470+
az network nsg show -g RESOURCEGROUP -n hdisecure --query "id"
470471
```
471472
472473
This command returns a value similar to the following text:
473474
474475
"/subscriptions/SUBSCRIPTIONID/resourceGroups/RESOURCEGROUP/providers/Microsoft.Network/networkSecurityGroups/hdisecure"
475476
476-
Use double-quotes around `id` in the command if you don't get the expected results.
477-
478477
4. Use the following command to apply the network security group to a subnet. Replace the `GUID` and `RESOURCEGROUP` values with the ones returned from the previous step. Replace `VNETNAME` and `SUBNETNAME` with the virtual network name and subnet name that you want to create.
479478
480479
```azurecli
@@ -483,14 +482,14 @@ Use the following steps to create a virtual network that restricts inbound traff
483482
484483
Once this command completes, you can install HDInsight into the Virtual Network.
485484
486-
> [!IMPORTANT]
487-
> These steps only open access to the HDInsight health and management service on the Azure cloud. Any other access to the HDInsight cluster from outside the Virtual Network is blocked. To enable access from outside the virtual network, you must add additional Network Security Group rules.
488-
>
489-
> The following example demonstrates how to enable SSH access from the Internet:
490-
>
491-
> ```azurecli
492-
> az network nsg rule create -g RESOURCEGROUP --nsg-name hdisecure -n hdirule5 --protocol "*" --source-port-range "*" --destination-port-range "22" --source-address-prefix "*" --destination-address-prefix "VirtualNetwork" --access "Allow" --priority 306 --direction "Inbound"
493-
> ```
485+
486+
These steps only open access to the HDInsight health and management service on the Azure cloud. Any other access to the HDInsight cluster from outside the Virtual Network is blocked. To enable access from outside the virtual network, you must add additional Network Security Group rules.
487+
488+
The following code demonstrates how to enable SSH access from the Internet:
489+
490+
```azurecli
491+
az network nsg rule create -g RESOURCEGROUP --nsg-name hdisecure -n ssh --protocol "*" --source-port-range "*" --destination-port-range "22" --source-address-prefix "*" --destination-address-prefix "VirtualNetwork" --access "Allow" --priority 306 --direction "Inbound"
492+
```
494493

495494
## <a id="example-dns"></a> Example: DNS configuration
496495

@@ -653,7 +652,7 @@ After completing these steps, you can connect to resources in the virtual networ
653652
## Next steps
654653
655654
* For an end-to-end example of configuring HDInsight to connect to an on-premises network, see [Connect HDInsight to an on-premises network](./connect-on-premises-network.md).
656-
* For configuring Apache Hbase clusters in Azure virtual networks, see [Create Apache HBase clusters on HDInsight in Azure Virtual Network](hbase/apache-hbase-provision-vnet.md).
655+
* For configuring Apache HBase clusters in Azure virtual networks, see [Create Apache HBase clusters on HDInsight in Azure Virtual Network](hbase/apache-hbase-provision-vnet.md).
657656
* For configuring Apache HBase geo-replication, see [Set up Apache HBase cluster replication in Azure virtual networks](hbase/apache-hbase-replication.md).
658657
* For more information on Azure virtual networks, see the [Azure Virtual Network overview](../virtual-network/virtual-networks-overview.md).
659658

articles/hdinsight/kafka/apache-kafka-get-started.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: hrasheed-msft
66
ms.author: hrasheed
77
ms.custom: mvc
88
ms.topic: quickstart
9-
ms.date: 04/01/2019
9+
ms.date: 06/05/2019
1010
#Customer intent: I need to create a Kafka cluster so that I can use it to process streaming data
1111
---
1212

@@ -23,11 +23,11 @@ In this quickstart, you learn how to create an [Apache Kafka](https://kafka.apac
2323
>
2424
> For more information, see the [Connect to Apache Kafka using a virtual network](apache-kafka-connect-vpn-gateway.md) document.
2525
26-
## Prerequisites
26+
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2727

28-
* An Azure subscription. If you don’t have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
28+
## Prerequisites
2929

30-
* An SSH client. For more information, see [Connect to HDInsight (Apache Hadoop) using SSH](../hdinsight-hadoop-linux-use-ssh-unix.md).
30+
An SSH client. For more information, see [Connect to HDInsight (Apache Hadoop) using SSH](../hdinsight-hadoop-linux-use-ssh-unix.md).
3131

3232
## Create an Apache Kafka cluster
3333

articles/iot-central/howto-build-azure-logic-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Use the IoT Central connector in Azure Logic Apps to trigger workfl
44
services: iot-central
55
author: viv-liu
66
ms.author: viviali
7-
ms.date: 02/20/2019
7+
ms.date: 06/09/2019
88
ms.topic: conceptual
99
ms.service: iot-central
1010
manager: peterpr

articles/iot-central/howto-connect-powerbi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.service: iot-central
55
services: iot-central
66
author: viv-liu
77
ms.author: viviali
8-
ms.date: 02/15/2019
8+
ms.date: 06/09/2019
99
ms.topic: conceptual
1010
---
1111

articles/iot-central/howto-create-analytics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Analyze your device data in your Azure IoT Central application | Microsof
33
description: Analyze your device data in your Azure IoT Central application.
44
author: lmasieri
55
ms.author: lmasieri
6-
ms.date: 02/20/2019
6+
ms.date: 06/09/2019
77
ms.topic: conceptual
88
ms.service: iot-central
99
services: iot-central

articles/iot-central/howto-create-event-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create and manage event rules in your Azure IoT Central application | Mic
33
description: Azure IoT Central event rules enable you to monitor your devices in near real time and to automatically invoke actions, such as sending an email, when the rule triggers.
44
author: ankitscribbles
55
ms.author: ankitgup
6-
ms.date: 02/20/2019
6+
ms.date: 06/09/2019
77
ms.topic: conceptual
88
ms.service: iot-central
99
services: iot-central

articles/iot-central/howto-create-telemetry-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create and manage telemetry rules in your Azure IoT Central application |
33
description: Azure IoT Central telemetry rules enable you to monitor your devices in near real time and to automatically invoke actions, such as sending an email, when the rule triggers.
44
author: ankitgupta
55
ms.author: ankitgup
6-
ms.date: 02/02/2019
6+
ms.date: 06/09/2019
77
ms.topic: conceptual
88
ms.service: iot-central
99
services: iot-central

articles/iot-central/howto-manage-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage the devices in your Azure IoT Central application | Microsoft Docs
33
description: As an operator, learn how to manage devices in your Azure IoT Central application.
44
author: ellenfosborne
55
ms.author: elfarber
6-
ms.date: 01/30/2019
6+
ms.date: 06/09/2019
77
ms.topic: conceptual
88
ms.service: iot-central
99
services: iot-central

articles/iot-central/howto-personalize-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create Azure IoT Central personal dashboards | Microsoft Docs
33
description: As a user, learn how to create and manage your personal dashboards.
44
author: dominicbetts
55
ms.author: dobett
6-
ms.date: 02/13/2019
6+
ms.date: 06/09/2019
77
ms.topic: conceptual
88
ms.service: iot-central
99
services: iot-central

0 commit comments

Comments
 (0)