Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into DocsInProgress
Browse files Browse the repository at this point in the history
  • Loading branch information
@ysxu
ysxu committed Dec 3, 2015
2 parents 6e257a5 + f76c375 commit 3dcf350
Show file tree
Hide file tree
Showing 105 changed files with 358 additions and 358 deletions.
6 changes: 3 additions & 3 deletions articles/hdinsight/hdinsight-administer-use-command-line.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ You must have a Azure Resource Management (ARM), and a Azure Blob storage accoun
> [AZURE.NOTE] The Storage account must be collocated with HDInsight in the data center.
> The storage account type can't be ZRS, because ZRS doesn't support table.

For information on creating an Azure Storage account by using the Azure preview portal, see [Create, manage, or delete a Storage account][azure-create-storageaccount].
For information on creating an Azure Storage account by using the Azure Portal, see [Create, manage, or delete a Storage account][azure-create-storageaccount].

If you already have a Storage account but do not know the account name and account key, you can use the following commands to retrieve the information:

Expand All @@ -85,7 +85,7 @@ You must have a Azure Resource Management (ARM), and a Azure Blob storage accoun
-- Lists the keys for a Storage account
azure storage account keys list "<Storage Account Name>" -g "<Resource Group Name>"

For details on getting the information by using the Azure preview portal, see the "View, copy, and regenerate storage access keys" section of [Create, manage, or delete a Storage account][azure-create-storageaccount].
For details on getting the information by using the Azure Portal, see the "View, copy, and regenerate storage access keys" section of [Create, manage, or delete a Storage account][azure-create-storageaccount].

- **(Optional) Default Blob container**: The **azure hdinsight cluster create** command creates the container if it doesn't exist. If you choose to create the container beforehand, you can use the following command:

Expand Down Expand Up @@ -161,7 +161,7 @@ To change the Hadoop cluster size by using Azure PowerShell, run the following c
##Next steps
In this article, you have learned how to perform different HDInsight cluster administrative tasks. To learn more, see the following articles:

* [Administer HDInsight by using the Azure preview portal] [hdinsight-admin-portal]
* [Administer HDInsight by using the Azure Portal] [hdinsight-admin-portal]
* [Administer HDInsight by using Azure PowerShell] [hdinsight-admin-powershell]
* [Get started with Azure HDInsight] [hdinsight-get-started]
* [How to use the Azure CLI] [azure-command-line-tools]
Expand Down
28 changes: 14 additions & 14 deletions articles/hdinsight/hdinsight-administer-use-management-portal-v1.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<properties
pageTitle="Manage Hadoop clusters in HDInsight using Azure portal | Microsoft Azure"
pageTitle="Manage Hadoop clusters in HDInsight using Azure Classic Portal | Microsoft Azure"
description="Learn how to administer HDInsight Service. Create an HDInsight cluster, open the interactive JavaScript console, and open the Hadoop command console."
services="hdinsight"
documentationCenter=""
Expand All @@ -16,16 +16,16 @@
ms.date="11/04/2015"
ms.author="jgao"/>

# Manage Hadoop clusters in HDInsight by using the Azure portal
# Manage Hadoop clusters in HDInsight by using the Azure Classic Portal

Using the [Azure portal](https://manage.windowsazure.com), you can provision Hadoop clusters in Azure HDInsight, change Hadoop user password, and enable Remote Desktop Protocol (RDP) so you can access the Hadoop command console on the cluster.
Using the [Azure Classic Portal](https://manage.windowsazure.com), you can provision Hadoop clusters in Azure HDInsight, change Hadoop user password, and enable Remote Desktop Protocol (RDP) so you can access the Hadoop command console on the cluster.

[AZURE.INCLUDE [hdinsight-azure-portal](../../includes/hdinsight-azure-portal.md)]

* [Manage Hadoop clusters in HDInsight by using the Azure preview portal](hdinsight-administer-use-management-portal.md)
* [Manage Hadoop clusters in HDInsight by using the Azure Portal](hdinsight-administer-use-management-portal.md)

## Other tools for administering HDInsight
There are also other tools available for administering HDInsight in addition to the Azure portal.
There are also other tools available for administering HDInsight in addition to the Azure Classic Portal.

- For more information on administering HDInsight by using Azure PowerShell, see [Administer HDInsight Using Azure PowerShell](hdinsight-administer-use-powershell.md).

Expand All @@ -41,7 +41,7 @@ Before you begin this article, you must have the following:

##Provision HDInsight clusters

You can provision HDInsight clusters from the Azure portal by using the Quick Create or Custom Create option. See the following links for instructions:
You can provision HDInsight clusters from the Azure Classic Portal by using the Quick Create or Custom Create option. See the following links for instructions:

- [Provision a cluster by using Quick Create](../hdinsight-get-started.md#provision)
- [Provision a cluster by using Custom Create](hdinsight-provision-clusters.md#portal)
Expand Down Expand Up @@ -70,7 +70,7 @@ An HDInsight cluster can have two user accounts. The HDInsight cluster user acco

**To change the HDInsight cluster user name and password**

1. Sign in to the [Azure portal](https://manage.windowsazure.com/).
1. Sign in to the [Azure Classic Portal](https://manage.windowsazure.com/).
2. Click **HDINSIGHT** on the left pane. You will see a list of deployed HDInsight clusters.
3. Click the HDInsight cluster that you want to reset the user name and password for.
4. From the top of the page, click **CONFIGURATION**.
Expand All @@ -87,7 +87,7 @@ The credentials for the cluster that you provided at its creation give access to

**To enable Remote Desktop**

1. Sign in to the [Azure portal](https://manage.windowsazure.com/).
1. Sign in to the [Azure Classic Portal](https://manage.windowsazure.com/).
2. Click **HDINSIGHT** on the left pane. You will see a list of deployed HDInsight clusters.
3. Click the HDInsight cluster that you want to connect to.
4. From the top of the page, click **CONFIGURATION**.
Expand All @@ -105,7 +105,7 @@ The credentials for the cluster that you provided at its creation give access to
**To connect to a cluster by using RDP**

1. Sign in to the [Azure portal](https://manage.windowsazure.com/).
1. Sign in to the [Azure Classic Portal](https://manage.windowsazure.com/).
2. Click **HDINSIGHT** on the left pane. You will see a list of deployed HDInsight clusters.
3. Click the HDInsight cluster that you want to connect to.
4. From the top of the page, click **CONFIGURATION**.
Expand All @@ -121,7 +121,7 @@ If you want to perform any operations on the cluster by using the .NET SDK, you

2. Browse to the location of the certificate, right-click the certificate, click **Install Certificate**, and install the certificate to the computer's personal store. Edit the certificate properties to assign it a friendly name.

3. Import the certificate into the Azure portal. From the portal, click **SETTINGS** on the bottom left of the page, and then click **MANAGEMENT CERTIFICATES**. From the bottom of the page, click **UPLOAD** and follow the instructions to upload the .cer file you created in the previous step.
3. Import the certificate into the Azure Classic Portal. From the portal, click **SETTINGS** on the bottom left of the page, and then click **MANAGEMENT CERTIFICATES**. From the bottom of the page, click **UPLOAD** and follow the instructions to upload the .cer file you created in the previous step.

![HDI.ClusterCreate.UploadCert][image-hdiclustercreate-uploadcert]

Expand All @@ -136,13 +136,13 @@ HDInsight clusters have the following HTTP web services (all of these services h
- Oozie
- Templeton

By default, these services are granted for access. You can revoke/grant the access from the Azure portal.
By default, these services are granted for access. You can revoke/grant the access from the Azure Classic Portal.

>[AZURE.NOTE] By granting/revoking the access, you will reset the cluster user name and password.
**To grant/revoke HTTP web services access**

1. Sign in to the [Azure portal](https://manage.windowsazure.com/).
1. Sign in to the [Azure Classic Portal](https://manage.windowsazure.com/).
2. Click **HDINSIGHT** on the left pane. You will see a list of deployed HDInsight clusters.
3. Click the HDInsight cluster that you want to configure.
4. From the top of the page, click **CONFIGURATION**.
Expand All @@ -158,7 +158,7 @@ To connect to the cluster by using Remote Desktop and use the Hadoop command lin

**To open a Hadoop command line**

1. Sign in to the [Azure portal](https://manage.windowsazure.com/).
1. Sign in to the [Azure Classic Portal](https://manage.windowsazure.com/).
2. Click **HDINSIGHT** on the left pane. You will see a list of deployed Hadoop clusters.
3. Click the HDInsight cluster that you want to connect to.
3. Click **CONFIGURATION** on the top of the page.
Expand All @@ -185,7 +185,7 @@ In the previous screenshot, the folder name has the Hadoop version number embedd
See [Scale Hadoop clusters in HDInsight](hdinsight-hadoop-cluster-scaling.md).

##Next steps
In this article, you have learned how to create an HDInsight cluster by using the Azure portal, and how to open the Hadoop command-line tool. To learn more, see the following articles:
In this article, you have learned how to create an HDInsight cluster by using the Azure Classic Portal, and how to open the Hadoop command-line tool. To learn more, see the following articles:

* [Administer HDInsight Using Azure PowerShell](hdinsight-administer-use-powershell.md)
* [Administer HDInsight Using Azure CLI](hdinsight-administer-use-command-line.md)
Expand Down
32 changes: 16 additions & 16 deletions articles/hdinsight/hdinsight-administer-use-management-portal.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<properties
pageTitle="Manage Hadoop clusters in HDInsight using the Azure preview portal | Microsoft Azure"
pageTitle="Manage Hadoop clusters in HDInsight using the Azure Portal | Microsoft Azure"
description="Learn how to administer HDInsight Service. Create an HDInsight cluster, open the interactive JavaScript console, and open the Hadoop command console."
services="hdinsight"
documentationCenter=""
Expand All @@ -17,11 +17,11 @@
ms.date="11/24/2015"
ms.author="jgao"/>

# Manage Hadoop clusters in HDInsight by using the Azure preview portal
# Manage Hadoop clusters in HDInsight by using the Azure Portal

[AZURE.INCLUDE [selector](../../includes/hdinsight-portal-management-selector.md)]

Using the [Azure preview portal][azure-portal], you can create Hadoop clusters in Azure HDInsight, change Hadoop user password, and enable Remote Desktop Protocol (RDP) so you can access the Hadoop command console on the cluster.
Using the [Azure Portal][azure-portal], you can create Hadoop clusters in Azure HDInsight, change Hadoop user password, and enable Remote Desktop Protocol (RDP) so you can access the Hadoop command console on the cluster.

The information in this article only applies to Window-based HDInsight clusters. For information on managing Linux-based clusters, click the tab selector above.

Expand All @@ -38,7 +38,7 @@ Before you begin this article, you must have the following:
- **An Azure subscription**. See [Get Azure free trial](http://azure.microsoft.com/documentation/videos/get-azure-free-trial-for-testing-hadoop-in-hdinsight/).
- **Azure Storage account** - An HDInsight cluster uses an Azure Blob storage container as the default file system. For more information about how Azure Blob storage provides a seamless experience with HDInsight clusters, see [Use Azure Blob Storage with HDInsight](../hdinsight-use-blob-storage.md). For details on creating an Azure Storage account, see [How to Create a Storage Account](../storage-create-storage-account.md).

##Open the Preview portal
##Open the Portal

1. Sign in to [https://portal.azure.com](https://portal.azure.com).
2. After you open the portal, you can:
Expand All @@ -56,7 +56,7 @@ Before you begin this article, you must have the following:

##Create clusters

For the creation instructions using the preview portal, see [Create HDInsight clusters](hdinsight-provision-clusters.md#create-using-the-preview-portal).
For the creation instructions using the Portal, see [Create HDInsight clusters](hdinsight-provision-clusters.md#create-using-the-preview-portal).

HDInsight works with a wide range of Hadoop components. For the list of the components that have been verified and supported,
see [What version of Hadoop is in Azure HDInsight](hdinsight-component-versioning.md). You can customize HDInsight by using one of the following options:
Expand Down Expand Up @@ -149,7 +149,7 @@ Installation of custom software on the cluster by using Remote Desktop Connectio

Delete a cluster will not delete the default storange account or any linked storage accounts. You can re-create the cluster by using the same storage accounts and the same metastores.

1. Sign in to the [preview portal][azure-portal].
1. Sign in to the [Portal][azure-portal].
2. Click **Browse All** from the left menu, click **HDInsight Clusters**, click your cluster name.
3. Click **Delete** from the top menu, and then follow the instructions.

Expand Down Expand Up @@ -203,7 +203,7 @@ The impact of changing the number of data nodes for each type of cluster support

**To scale clusters**

1. Sign in to the [preview portal][azure-portal].
1. Sign in to the [Portal][azure-portal].
2. Click **Browse All** from the left menu, click **HDInsight Clusters**, click your cluster name.
3. Click **Settings** from the top menu, and then click **Scale Cluster**.
4. Enter **Number of Worker nodes**. The limit on the number of cluster node varies among Azure subscriptions. You can contact billing support to increase the limit. The cost information will reflect the changes you have made to the number of nodes.
Expand All @@ -222,15 +222,15 @@ There are many ways you can program the process:
- Use Azure CLI. See [Manage HDInsight clusters using Azure CLI](hdinsight-administer-use-command-line.md).
- Use HDInsight .NET SDK. See [Submit Hadoop jobs](hdinsight-submit-hadoop-jobs-programmatically.md).

For the pricing information, see [HDInsight pricing](https://azure.microsoft.com/pricing/details/hdinsight/). To delete a cluster from the Preview portal, see [Delete clusters](#delete-clusters)
For the pricing information, see [HDInsight pricing](https://azure.microsoft.com/pricing/details/hdinsight/). To delete a cluster from the Portal, see [Delete clusters](#delete-clusters)

##Change cluster username

An HDInsight cluster can have two user accounts. The HDInsight cluster user account is created during the creation process. You can also create an RDP user account for accessing the cluster via RDP. See [Enable remote desktop](#connect-to-hdinsight-clusters-by-using-rdp).

**To change the HDInsight cluster user name and password**

1. Sign in to the [preview portal][azure-portal].
1. Sign in to the [Portal][azure-portal].
2. Click **Browse All** from the left menu, click **HDInsight Clusters**, click your cluster name.
3. Click **Settings** from the top menu, and then click **Cluster Login**.
4. If **Cluster login** has been enabled, you must click **Disable**, and then click **Enable** before you can change the username and password..
Expand All @@ -248,13 +248,13 @@ HDInsight clusters have the following HTTP web services (all of these services h
- Oozie
- Templeton

By default, these services are granted for access. You can revoke/grant the access from the Azure Preview portal.
By default, these services are granted for access. You can revoke/grant the access from the Azure Portal.

>[AZURE.NOTE] By granting/revoking the access, you will reset the cluster user name and password.
**To grant/revoke HTTP web services access**

1. Sign in to the [preview portal][azure-portal].
1. Sign in to the [Portal][azure-portal].
2. Click **Browse All** from the left menu, click **HDInsight Clusters**, click your cluster name.
3. Click **Settings** from the top menu, and then click **Cluster Login**.
4. If **Cluster login** has been enabled, you must click **Disable**, and then click **Enable** before you can change the username and password..
Expand Down Expand Up @@ -313,11 +313,11 @@ The HDInsight Query console includes the following features:

##Run Hive queries

To ran Hive jobs from the Preview portal, click **Hive Editor** in the HDInsight Query console. See [Open HDInsight Query console](#open-hdinsight-query-console).
To ran Hive jobs from the Portal, click **Hive Editor** in the HDInsight Query console. See [Open HDInsight Query console](#open-hdinsight-query-console).

##Monitor jobs

To monitor jobs from the Preview portal, click **Job History** in the HDInsight Query console. See [Open HDInsight Query console](#open-hdinsight-query-console).
To monitor jobs from the Portal, click **Job History** in the HDInsight Query console. See [Open HDInsight Query console](#open-hdinsight-query-console).

##Browse files

Expand Down Expand Up @@ -348,7 +348,7 @@ The credentials for the cluster that you provided at its creation give access to

**To enable Remote Desktop**

1. Sign in to the [preview portal][azure-portal].
1. Sign in to the [Portal][azure-portal].
2. Click **Browse All** from the left menu, click **HDInsight Clusters**, click your cluster name.
3. Click **Settings** from the top menu, and then click **Remote Desktop**.
4. Enter **Expires On**, **Remote Desktop Username** and **Remote Desktop Password**, and then click **Enable**.
Expand All @@ -360,7 +360,7 @@ The credentials for the cluster that you provided at its creation give access to
**To connect to a cluster by using RDP**

1. Sign in to the [preview portal][azure-portal].
1. Sign in to the [Portal][azure-portal].
2. Click **Browse All** from the left menu, click **HDInsight Clusters**, click your cluster name.
3. Click **Settings** from the top menu, and then click **Remote Desktop**.
4. Click **Connect** and follow the instructions. If Connect is disable, you must enable it first. Make sure using the Remote Desktop user username and password. You can't use the Cluster user credentials.
Expand Down Expand Up @@ -389,7 +389,7 @@ In the previous screenshot, the folder name has the Hadoop version number embedd
cd %hcatalog_home%

##Next steps
In this article, you have learned how to create an HDInsight cluster by using the preview portal, and how to open the Hadoop command-line tool. To learn more, see the following articles:
In this article, you have learned how to create an HDInsight cluster by using the Portal, and how to open the Hadoop command-line tool. To learn more, see the following articles:

* [Administer HDInsight Using Azure PowerShell](hdinsight-administer-use-powershell.md)
* [Administer HDInsight Using Azure CLI](hdinsight-administer-use-command-line.md)
Expand Down
Loading

0 comments on commit 3dcf350

Please sign in to comment.