浏览代码

[core] Updating documentation

Adding a checkconfig for Hive warehouse.
Adding new tours.
Re-wording tour welcome message.
Romain Rigaux 11 年之前
父节点
当前提交
bac49acf1a

+ 8 - 0
apps/beeswax/src/beeswax/conf.py

@@ -21,6 +21,7 @@ import sys
 from django.utils.translation import ugettext_lazy as _t, ugettext as _
 
 from desktop.lib.conf import ConfigSection, Config, coerce_bool
+from hadoop import cluster
 
 from beeswax.settings import NICE_NAME
 
@@ -133,4 +134,11 @@ def config_validator(user):
   except:
     res.append((NICE_NAME, _("The application won't work without a running HiveServer2.")))
 
+  try:
+    warehouse = '/user/hive/warehouse'
+    fs = cluster.get_hdfs()
+    fs.stats(warehouse)
+  except Exception:
+    return [(NICE_NAME, _('Failed to access Hive warehouse: %s') % warehouse)]
+
   return res

+ 111 - 7
apps/beeswax/static/help/index.html

@@ -23,6 +23,110 @@
   </div>
 
 
+<p>Thanks to HiveServer2 integration, Hue is getting the benefits from <a href="http://cloudera.com/content/cloudera/en/campaign/introducing-sentry.html">Sentry</a> (How to <a href="https://blogs.apache.org/sentry/entry/getting_started">configure Sentry Video</a>). In addition to the <a href="http://sentry.incubator.apache.org"><span>security</span></a> provided, Hue’s interface becomes more consistent. For example, a user without permissions on a database or table won’t see it in the query editor or in the <a href="http://gethue.tumblr.com/tagged/metastore"><span>Metastore app</span></a>.</p>
+<p><br/><span></span></p>
+<p><span>HiveServer2 also provides performant access to the </span><a href="http://gethue.tumblr.com/tagged/metastore"><span>Metastore</span></a><span>.</span></p>
+<p><br/><span></span></p>
+<p><span>On top of this, the Beeswax Hive UI is a Web editor for increasing the productivity:</span></p>
+
+<ul><li>
+<p><span>Syntax highlighting and auto completion</span></p>
+</li>
+<li>
+<p><span>Submit several queries and check they progress later</span></p>
+</li>
+<li>
+<p><a href="http://gethue.tumblr.com/post/58711590309/hadoop-tutorial-hive-udf-in-1-minute"><span>UDF</span></a><span> integration</span></p>
+</li>
+<li>
+<p><span>Multiple queries execution</span></p>
+</li>
+<li>
+<p><span>Select and send a fraction of a query</span></p>
+</li>
+<li>
+<p><span>Download or save the query results</span></p>
+</li>
+<li>
+<p><span>Navigate through the metadata</span></p>
+</li>
+</ul><p><br/><span></span></p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/79883574" width="900"></iframe></p>
+<p><br/><span></span></p>
+<h2><span>Hue 2.x</span></h2>
+<p><span>We recommend to use the latest version of Hue (2.5). Have Hue point to HiveServer2 by updating the Beeswax section in the </span><a href="https://github.com/cloudera/hue/blob/branch-2.5.1/desktop/conf.dist/hue.ini#L384"><span>hue.ini</span></a><span>:</span></p>
+<p><br/><span></span></p>
+<pre class="code">[beeswax]
+  beeswax_server_host=&lt;FQDN of Beeswax server&gt;
+  server_interface=hiveserver2
+  beeswax_server_port=10000
+</pre>
+<p><br/><span></span></p>
+<h2><span>Hue 3.x</span></h2>
+<p><span>Hue 3 does not bundle Beeswaxd anymore, and is configured by default to use HiveServer2. If HiveServer2 is not on the same machine as Hue update </span><a href="https://github.com/cloudera/hue/blob/master/desktop/conf.dist/hue.ini#L438"><span>hue.ini</span></a><span> with:</span></p>
+<p><br/><span></span></p>
+<pre class="code">[beeswax]
+ hive_server_host=&lt;FQDN of HiveServer2&gt;
+</pre>
+<p><span>Other Hive specific settings (e.g. security, impersonation) are read from a local </span><a href="https://github.com/cloudera/hue/blob/master/desktop/conf.dist/hue.ini#L450"><span>/etc/hive/conf/hive-site.xml</span></a><span>. We recommend to keep this one in exact sync with the original Hive one (or put Hue and Hive on the same machine).</span></p>
+<p><span><strong><br/>Note</strong>:</span></p>
+<p>If you are using Hive 0.12 or later, Hue needs to have <a href="https://issues.cloudera.org/browse/HUE-1561">HUE-1561</a> (or use Hue 3.0 or later).</p>
+<h2><br/>With Sentry: Hue 2.x or 3.x</h2>
+<p>Hue will automatically work with a HiveServer2 configured with Sentry.</p>
+<p>Notice that HiveServer2 impersonation (described below) should be turned off in case of Sentry. Permissions of the impersonated user (e.g. ‘bob’) will be used instead of the ones of the ‘hue’ user. Also we need the warehouse permissions to be owned by hive:hive with 770 so that only super users in hive group can read, write.</p>
+<p>HiveServer2 needs to be using strong authentication like Kerberos/LDAP for Sentry to work.</p>
+
+<p><br/><span></span></p>
+<h1><span>Troubleshooting without Sentry</span></h1>
+
+<pre class="code">org.apache.hive.service.cli.HiveSQLException: Error while processing statement: FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. MetaException(message:Got exception: org.apache.hadoop.security.AccessControlException Permission denied: user=hive, access=WRITE, inode="/user/test/data":test:supergroup:drwxr-xr-x
+</pre>
+<p><br/><span></span></p>
+<p><span>By default HiveServer2 now owns the Hive warehouse (default ‘</span><span>/user/hive/warehouse</span><span>’), meaning the data files need to belong to the ‘hive’ user. If you get this error when creating a table, change the permission of the data directory (here </span><span>/user/test/data</span><span>) to ‘write’ for everybody or revert HiveServer2 to the old Beeswax behavior by authorizing ‘hive’ to impersonate the user. </span></p>
+<p>Adding ‘hive’ as a Hadoop <a href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Security-Guide/cdh4sg_topic_9_1.html?scroll=topic_9_1_3_unique_1__title_140_unique_1">proxy user</a> and edit your hive-site.xml:</p>
+<pre class="code"> &lt;property&gt;
+   &lt;name&gt;hive.server2.enable.doAs&lt;/name&gt;
+   &lt;value&gt;true&lt;/value&gt;
+ &lt;/property&gt;
+</pre>
+<p><span>Then restart HiveServer2:</span><span></span></p>
+<pre class="code">sudo service hive-server2 restart
+</pre>
+<p><br/><span></span><br/><span></span></p>
+<p><span>Another common error when using YARN is:</span></p>
+<pre class="code">Cannot initialize Cluster. Please check your configuration for mapreduce.framework.name and the correspond server addresses.
+</pre>
+<p>It means that the HADOOP_MAPRED_HOME environment variable is not set to:</p>
+<pre class="code">export HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce
+</pre>
+<p><span>HADOOP_HOME could also be wrong.</span></p>
+<p><br/><span></span></p>
+<pre class="code">TTransportException('Could not start SASL: Error in sasl_client_start (-4) SASL(-4): no mechanism available: No worthy mechs found',)
+</pre>
+<p><span>Hue is missing a </span><a href="https://github.com/cloudera/hue#development-prerequisites"><span>SASL lib</span></a><span> in your system.</span></p>
+
+<p><span>HiveServer2 supports 3 authentication modes specified by the &#8216;hive.server2.authentication&#8217; in hive-site.xml:</span></p>
+<ul><li>
+<p><span>NOSASL</span></p>
+</li>
+<li>
+<p><span>NONE (default)</span></p>
+</li>
+<li>
+<p><span>KERBEROS</span></p>
+</li>
+</ul><p><br/>Only NOSASL does not require SASL, so you either switch to it or install the missing packages.</p>
+<p>Hue will pick the value from its local <a href="https://github.com/cloudera/hue/blob/master/desktop/conf.dist/hue.ini#L471">/etc/hive/conf/hive-site.xml</a> so make sure it is synced with the original hive-site.xml (manually or via CM Beeswax safety valve).</p>
+<p><br/><span></span></p>
+<pre class="code">Error while compiling statement: FAILED: RuntimeException org.apache.hadoop.security.AccessControlException: Permission denied: user=admin, access=WRITE, inode="/tmp/hive-hive":hive:hdfs:drwxr-xr-x at org.apache.hadoop.hdfs.server.namenode.FSPermissionChecker.check(FSPermissionChecker.java:234) at org.apache.hadoop.hdfs.server.namenode.FSPermissionChecker.check(FSPermissionChecker.java:214) at org.apache.hadoop.hdfs.server.namenode.FSPermissionChecker.checkPermission(FSPermissionChecker.java:158)<br/></pre>
+<p>The Hive HDFS workspace &#8216;/tmp/hive-hive&#8217; would need to be set to 1777 permissions.</p>
+
+<p></p>
+<h1>Troubleshooting with Sentry</h1>
+<pre class="code">AuthorizationException: User 'hue/test.com' does not have privileges to execute 'CREATE' on: default.sample_08"
+</pre>
+<p>The user ‘hue’ is not configured in Sentry and have not the CREATE table permission. </p>
+
   <div class="topic concept nested1" xml:lang="en-US" lang="en-US" id="topic_4_1"><a name="topic_4_1"><!-- --></a>
 
     <h2 class="title topictitle2">Beeswax and Hive Installation and
@@ -228,7 +332,7 @@
 
       <div class="body conbody">
         <div class="note important"><span class="importanttitle"><img src="/static/art/help/important.jpg"/> 
-      <b>Important</b>:</span> 
+      <b>Important</b>:</span>
           <a name="concept_axp_mgb_zj__ul_p4w_yx1_zj"><!-- --></a><ul class="ul" id="concept_axp_mgb_zj__ul_p4w_yx1_zj">
             <li class="li">You can only save results to a file when the results were
               generated by a MapReduce job.</li>
@@ -282,10 +386,10 @@
           following options: </p>
 
 
-        
+
 <div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" class="table" frame="hsides" border="1" rules="all">
-            
-            
+
+
             <thead class="thead" align="left">
               <tr class="row">
                 <th class="entry" valign="top" width="16.666666666666664%" id="d5062e390">
@@ -520,10 +624,10 @@
           clicking <strong class="ph b">Saved Queries</strong>. You can copy any query, but you
           can edit, delete, and view the history of only your own queries. </p>
 
-        
+
 <div class="tablenoborder"><a name="topic_4_3_4__table_rxy_gdh_b3"><!-- --></a><table cellpadding="4" cellspacing="0" summary="" id="topic_4_3_4__table_rxy_gdh_b3" class="table" frame="hsides" border="1" rules="all">
-            
-            
+
+
             <thead class="thead" align="left">
               <tr class="row">
                 <th class="entry" valign="top" width="25%" id="d5062e719">Saved Query</th>

+ 21 - 0
apps/filebrowser/src/filebrowser/static/help/index.html

@@ -21,6 +21,27 @@
       System (HDFS) while using Hue. With File Browser, you can:
     </p>
 
+<p>
+                    <p>Managing and viewing data in <a href="http://hadoop.apache.org/docs/r1.0.4/hdfs_user_guide.html">HDFS</a> is an important part of Big Data analytics. <a href="http://cloudera.github.com/hue">Hue</a>, the open source web-based interface that makes <a href="http://hadoop.apache.org/">Apache Hadoop</a> easier to use, helps you do that through a GUI in your browser —  instead of logging into a Hadoop gateway host with a terminal program and using the command line.</p>
+<p>The first episode in a new series of Hue demos, the video below demonstrates how to get up and running quickly with HDFS file operations via Hue’s File Browser application.</p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/63343487" width="900"></iframe></p>
+<h3>Other Features</h3>
+<p>In addition to the above scenario, File Browser lets you perform more advanced file operations:</p>
+<ul><li>Download</li>
+<li>Rename</li>
+<li>Move</li>
+<li>Copy</li>
+<li>Recursive change of permissions</li>
+<li>Recursive change of ownership</li>
+<li>Sort by attributes (e.g. name, size, date…)</li>
+<li>View content of zip/gz text</li>
+<li>View content of huge files</li>
+<li>Drag &amp; drop files to upload</li>
+</ul>
+<h3>What’s Next?</h3>
+<p>Thanks to File Browser, file operations in HDFS are only a few clicks away. Hue’s other apps leverage the File Browser as well and offer direct links to the outputs of your MapReduce jobs, Hive queries, or Pig scripts so that you can share or take a glance/visualize in no time.</p>
+<p>Thank you for watching, and stay tuned for upcoming episodes! Feel free to ask questions in comments or via the <a href="https://groups.google.com/a/cloudera.org/forum/?fromgroups#%21forum/hue-user">Hue group</a>.</p>
+                </p>
 
     <ul class="ul">
 

+ 2 - 5
apps/hbase/src/hbase/conf.py

@@ -14,10 +14,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""
-Configuration options for the hbase application.
-"""
-import re
+
 
 from desktop.lib.conf import Config
 
@@ -31,4 +28,4 @@ TRUNCATE_LIMIT = Config(
   key="truncate_limit",
   default="500",
   help="Hard limit of rows or columns per row fetched before truncating.",
-  type=int)
+  type=int)

+ 3 - 0
apps/hbase/static/help/index.html

@@ -2,6 +2,9 @@
 <h1>HBase Browser</h1>
 <p>We'll take a look at the new <a href="http://gethue.tumblr.com/post/59071544309/the-web-ui-for-hbase-hbase-browser">HBase Browser App</a>
 added in Hue 2.5 and improved significantly since.</p>
+
+<iframe frameborder="0" height="495" src="http://player.vimeo.com/video/72357888" width="900"></iframe>
+
 <p>Prerequisites before using the app:</p>
 <p>1. Have HBase and Thrift Service 1 initiated (Thrift can be configured)</p>
 <p>2. Configure your list of HBase Clusters in

+ 48 - 20
apps/impala/static/help/index.html

@@ -5,41 +5,69 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <link rel="stylesheet" type="text/css" href="commonltr.css"/>
-<title>Cloudera Impala Query UI</title>
+<title>Impala Query UI</title>
 </head>
 <body id="topic_5"><a name="topic_5"><!-- --></a>
 
 
 
-  <h1 class="title topictitle1">Cloudera Impala Query UI </h1>
+  <h1 class="title topictitle1">Impala Query UI </h1>
 
 
   <div class="body conbody">
 
-    <p class="p"> The Cloudera Impala Query UI application enables you to perform queries
-      on Apache Hadoop data stored in HDFS or HBase using Cloudera Impala. For information about
-      Cloudera Impala, see <a class="xref" href="../../../../content/support/en/documentation/cloudera-impala/cloudera-impala-documentation-v1-latest.html" target="_blank">Installing and
-        Using Cloudera Impala</a>. You can create, run, and manage queries, and download the
+    <p class="p"> The Impala Query UI application enables you to perform queries
+      on Apache Hadoop data stored in HDFS or HBase using Impala. For information about
+      Impala, see <a class="xref" href="http://impala.io" target="_blank">Installing and
+        Using Impala</a>. You can create, run, and manage queries, and download the
       results in a Microsoft Office Excel worksheet file or a comma-separated values file. </p>
+  </div>
 
+<span>Hue, </span><a href="http://gethue.com"><span>the Hadoop UI</span></a><span>, has been supporting </span><a href="https://github.com/cloudera/impala"><span>Impala</span></a><span> closely since its first version and brings fast interactive queries within your browser. If not familiar with </span><a href="http://blog.cloudera.com/blog/2012/10/cloudera-impala-real-time-queries-in-apache-hadoop-for-real/"><span>Impala</span></a><span>, we recommend you to check the documentation of the fastest </span><a href="http://www.cloudera.com/content/support/en/documentation/cloudera-impala/cloudera-impala-documentation-v1-latest.html"><span>SQL engine</span></a><span> for Hadoop.</span></p>
 
-  </div>
+<h1><span>Impala App</span></h1>
+<p><span>Most of Hive SQL is compatible with Impala and we are going to compare the queries of </span><a href="http://gethue.tumblr.com/post/60376973455/hadoop-tutorials-ii-1-prepare-the-data-for-analysis"><span>episode one</span></a><span> in both Hive and Impala applications. Notice that this comparison is not 100% scientific but it demonstrates what would happen in common cases.</span></p>
+<p><br/><span></span></p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/75493693" width="900"></iframe></p>
+<p><span>Using Impala through the Hue app is easier in many ways than using it through the command-line impala-shell. For example, table names, databases, columns, built-in functions are auto-completable and the syntax highlighting shows the potential typos in your queries. Multiple queries or a selected portion of a query can be executed from the editor. Parameterized queries are supported and the user will be prompted for values at submission time. Impala queries can be saved and shared between users or deleted and then restored from trash in case of mistakes. </span></p>
+<p><br/><span></span></p>
+<p><span>Impala uses the same Metastore as Hive so you can browse tables with the </span><a href="http://gethue.tumblr.com/post/56804308712/hadoop-tutorial-how-to-access-hive-in-pig-with"><span>Metastore app</span></a><span>. You can also pick a database with a drop-down in the editor. After submission, progress and logs are reported and you can browse the result with infinite scroll or download the data with your browser.</span></p>
+
+<h1><span>Query speed comparison </span></h1>
+<p><span>Let’s start with the Hue examples as they are easily accessible. They are very small but show the lightning speed of Impala and the inefficiency of the series of MapReduce jobs created by Hive.</span></p>
+
+<p><span>Make sure the Hive and Impala examples are installed in Hue and then in each app, go to ‘</span><span>Saved Queries</span><span>’, copy the query ‘</span><span>Sample: Top salaries</span><span>’ and submit it.</span></p>
+
+<p><span>Then we are back to our Yelp data. Let’s take the query from </span><a href="http://gethue.tumblr.com/post/60376973455/hadoop-tutorials-ii-1-prepare-the-data-for-analysis"><span>episode one</span></a><span> and execute it in both apps:</span></p>
+
+<pre class="code">SELECT r.business_id, name, SUM(cool) AS coolness
+FROM review r JOIN business b
+ON (r.business_id = b.business_id)
+WHERE categories LIKE '%Restaurants%'
+AND `date` = '$date'
+GROUP BY r.business_id, name
+ORDER BY coolness DESC
+LIMIT 10
+</pre>
+<p><span> </span></p>
+<p><span>Again, you can see the benefits of Impala’s </span><a href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/Impala/latest/Installing-and-Using-Impala/ciiu_concepts.html"><span>architecture and optimization</span></a><span>.</span></p>
+<p><span> </span></p>
 
 
   <div class="topic concept nested1" xml:lang="en-US" lang="en-US" id="topic_5_1"><a name="topic_5_1"><!-- --></a>
 
-    <h2 class="title topictitle2">Cloudera Impala Query UI and Installation and Configuration
+    <h2 class="title topictitle2">Impala Query UI and Installation and Configuration
     </h2>
 
 
     <div class="body conbody">
 
-      <p class="p"> The Cloudera Impala Query UI application is one of the applications
+      <p class="p"> The Impala Query UI application is one of the applications
         installed as part of Hue. <span class="ph">For information about installing and configuring Hue,
         see Hue Installation in <a class="xref" href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html" target="_blank">http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html</a>.</span></p>
 
 
-      <p class="p"> The Cloudera Impala Query UI assumes an existing Cloudera Impala
+      <p class="p"> The Impala Query UI assumes an existing Impala
         installation. The Hue installation instructions include the configuration necessary for
         Impala. You can view the current configuration from the <strong class="ph b">Settings</strong> tab. </p>
 
@@ -52,13 +80,13 @@
 
   <div class="topic concept nested1" xml:lang="en-US" lang="en-US" id="topic_5_2"><a name="topic_5_2"><!-- --></a>
 
-    <h2 class="title topictitle2">Starting Cloudera Impala Query UI
+    <h2 class="title topictitle2">Starting Impala Query UI
     </h2>
 
 
     <div class="body conbody">
 
-      <p class="p">Click the <strong class="ph b">Cloudera Impala Query UI</strong>
+      <p class="p">Click the <strong class="ph b">Impala Query UI</strong>
         icon (<img class="image" src="/impala/static/art/icon_impala_24.png"/>) in the navigation bar at the top of the Hue browser page. </p>
 
 
@@ -80,7 +108,7 @@
 
       <p class="p"> When you change the metastore using one of these applications, you must click the
           <span class="ph uicontrol">Refresh</span> button under METASTORE CATALOG in the pane to the left of
-        the Query Editor to make the metastore update visible to the Cloudera Impala server. </p>
+        the Query Editor to make the metastore update visible to the Impala server. </p>
 
     </div>
 
@@ -99,7 +127,7 @@
 <li class="li">Click <strong class="ph b">Step 2:
             Examples</strong>.</li>
 
-        <li class="li">Click <strong class="ph b">Cloudera Impala Query
+        <li class="li">Click <strong class="ph b">Impala Query
           UI</strong>.</li>
 
       </ol>
@@ -116,10 +144,10 @@
 
     <div class="body conbody">
 
-      <p class="p"> The Query Editor view lets you create queries in the Cloudera Impala
+      <p class="p"> The Query Editor view lets you create queries in the Impala
         Query Language, which is based on the Hive Standard Query Language (HiveQL) and described in
-        the Cloudera Impala Language Reference topic in <a class="xref" href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/Impala/latest/Installing-and-Using-Impala/Installing-and-Using-Impala.html" target="_blank">Installing and
-          Using Cloudera Impala</a>. </p>
+        the Impala Language Reference topic in <a class="xref" href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/Impala/latest/Installing-and-Using-Impala/Installing-and-Using-Impala.html" target="_blank">Installing and
+          Using Impala</a>. </p>
 
       <p class="p">You can name and save your queries to use later. </p>
 
@@ -127,7 +155,7 @@
         or return later to find the queries in the <strong class="ph b">History</strong> view. </p>
 
       <p class="p">In the box to the left of the Query field, you can select a database,
-        override the default Cloudera Impala settings, enable users to enter parameters at run-time.
+        override the default Impala settings, enable users to enter parameters at run-time.
         See <a class="xref" href="#topic_5_3_2">Advanced Query Settings</a> for details on using these settings. </p>
 
 
@@ -283,11 +311,11 @@
                 </td>
 
                 <td class="entry" valign="top" width="75%" headers="d7221e313 ">
-                  <div class="p">Override Cloudera Impala default settings. To configure a
+                  <div class="p">Override Impala default settings. To configure a
                     new setting: <a name="topic_5_3_2__ol_k5v_hcc_zj"><!-- --></a><ol class="ol" id="topic_5_3_2__ol_k5v_hcc_zj">
                       <li class="li">Click <strong class="ph b">Add</strong>.</li>
 
-                      <li class="li">For <strong class="ph b">Key</strong>, enter a Cloudera Impala
+                      <li class="li">For <strong class="ph b">Key</strong>, enter a Impala
                         configuration variable name. </li>
 
                       <li class="li">For <strong class="ph b">Value</strong>, enter the value you want to

+ 0 - 1
apps/jobbrowser/src/jobbrowser/conf.py

@@ -14,7 +14,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Configuration for the job browser application"""
 
 from desktop.lib.conf import Config, coerce_bool
 from django.utils.translation import ugettext_lazy as _

+ 51 - 0
apps/jobbrowser/static/help/index.html

@@ -23,6 +23,57 @@
       time, and output size. To troubleshoot failed jobs, you can also view the logs of each attempt.
     </p>
 
+ <p id="docs-internal-guid-15de28ba-8cb7-247f-caf6-d0f1c5b75f25"><span>Hue now defaults to using </span><a href="https://hadoop.apache.org/docs/current2/hadoop-yarn/hadoop-yarn-site/YARN.html"><span>Yarn</span></a><span> since </span><a href="http://gethue.tumblr.com/post/69115755563/hue-3-5-and-its-redesign-are-out"><span>version 3</span></a><span>.</span></p>
+<p><br/><span></span></p>
+<p>First, it is a bit simpler to configure Hue with MR2 than in MR1 as Hue does not need to use the <a href="http://cloudera.github.io/hue/docs-3.5.0/manual.html#_configure_mapreduce_0_20_mr1">Job Tracker plugin</a> since Yarn provides a REST API. Yarn is also going to provide an equivalent of <a href="http://gethue.tumblr.com/post/71637613809/jobtracker-high-availability-ha-in-mr1" target="_blank">Job Tracker HA</a> with <a href="https://issues.apache.org/jira/browse/YARN-149"><span>YARN-149</span></a>.</p>
+
+<p></p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/84027054" width="900"></iframe></p>
+
+<p></p>
+<p>Here is how to configure the clusters in <a href="https://github.com/cloudera/hue/blob/master/desktop/conf/pseudo-distributed.ini.tmpl#L433">hue.ini</a>. Mainly, if you are using a pseudo distributed cluster it will work by default. If not, you will just need to update all the localhost to the hostnames of the Resource Manager and History Server:</p>
+<p><br/><span></span></p>
+<pre class="code">[hadoop]
+  ...
+
+  # Configuration for YARN (MR2)
+  # ------------------------------------------------------------------------
+  [[yarn_clusters]]
+
+    [[[default]]]
+      # Enter the host on which you are running the ResourceManager
+      resourcemanager_host=localhost
+
+      # The port where the ResourceManager IPC listens on
+      resourcemanager_port=8032
+
+      # Whether to submit jobs to this cluster
+      submit_to=True
+
+      # URL of the ResourceManager API
+      resourcemanager_api_url=http://localhost:8088
+
+      # URL of the ProxyServer API
+      proxy_api_url=http://localhost:8088
+
+      # URL of the HistoryServer API
+      history_server_api_url=http://localhost:19888
+
+  # Configuration for MapReduce (MR1)
+  # ------------------------------------------------------------------------
+  [[mapred_clusters]]
+
+    [[[default]]]
+   
+      # Whether to submit jobs to this cluster
+      submit_to=False
+</pre>
+
+<p><br/><span></span><br/><span></span></p>
+<p><span>And that’s it! You can now look at jobs in Job Browser, get logs and submit jobs to Yarn!</span></p>
+<p><br/><span></span></p>
+<p><span>As usual feel free to comment on the</span><a href="http://groups.google.com/a/cloudera.org/group/hue-user"><span> </span><span>hue-user</span></a><span> list or</span><a href="https://twitter.com/gethue"><span> </span><span>@gethue</span></a><span>!</span></p>
+                </p>
 
   </div>
 

+ 18 - 0
apps/metastore/static/help/index.html

@@ -2,6 +2,24 @@
 
 <p>The Table Browser application enables you to browse tables and partitions of a Hive database. For information about Hive, see <a href="http://archive.cloudera.com/cdh4/cdh/4/hive/">Hive Documentation</a>. You can create Hive tables, view Hive tables, and load data into Hive tables.</p>
 
+  <p>
+                    <p id="docs-internal-guid-69d034aa-9ae7-82e8-1c00-5068cd66771e">Hue makes it easy to create Hive tables.</p>
+<p>With <a href="https://issues.cloudera.org/browse/HUE-1746">HUE-1746</a>, Hue guesses the columns names and types (int, string, float&#8230;) directly by looking at your data. If your data starts with a header, this one will automatically be used and <strong>skipped</strong> while creating the table.</p>
+<p>Quoted CSV fields are also compatible thanks to <a href="https://issues.cloudera.org/browse/HUE-1747">HUE-1747</a>.</p>
+<p><br/><br/></p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/80460405" width="900"></iframe></p>
+
+<p>Here is the data file used:</p>
+<p><a href="http://www.fdic.gov/bank/individual/failed/banklist.html"><span><a href="http://www.fdic.gov/bank/individual/failed/banklist.html">http://www.fdic.gov/bank/individual/failed/banklist.html</a></span></a><span></span></p>
+<p><br/><span></span></p>
+<p><span>This is the </span><a href="https://cwiki.apache.org/confluence/display/Hive/SerDe"><span>SerDe</span></a><span> for reading quoted CSV:</span></p>
+<p><a href="https://github.com/ogrodnek/csv-serde"><span><a href="https://github.com/ogrodnek/csv-serde">https://github.com/ogrodnek/csv-serde</a></span></a><span></span></p>
+<p><br/><span></span></p>
+<p><span>And the command to switch the SerDe used by the table:</span></p>
+<pre class="code">ALTER TABLE banks SET SERDE 'com.bizo.hive.serde.csv.CSVSerde'
+</pre>
+<p><br/><span></span><br/><span></span><span>Now go analyze the data with the </span><a href="http://gethue.tumblr.com/post/64916325309/hadoop-tutorial-hive-query-editor-with-hiveserver2-and"><span>Hive</span></a><span>, </span><a href="http://gethue.tumblr.com/post/62452792255/fast-sql-with-the-impala-query-editor"><span>Impala</span></a><span> or </span><a href="http://gethue.tumblr.com/post/64707633719/hadoop-tutorial-use-pig-and-hive-with-hbase"><span>Pig</span></a><span> editors!</span></p>
+                </p>
 
 <h2><a name="Metastore-Contents"></a>Contents</h2>
 

+ 5 - 0
apps/oozie/static/help/index.html

@@ -20,6 +20,11 @@
       workflow, coordinator, and bundle applications, run workflow, coordinator, and bundle jobs,
       and view the status of jobs. For information about Oozie, see <a class="xref" href="http://archive.cloudera.com/cdh4/cdh/4/oozie/" target="_blank">Oozie Documentation</a>. </p>
 
+                    <p id="docs-internal-guid--8202e43-0da7-b45c-578a-06e670bbcee9"><span>In the </span><a href="http://gethue.tumblr.com/post/60376973455/hadoop-tutorials-ii-1-prepare-the-data-for-analysis"><span>previous</span></a><span> episode, we saw how to to transfer some file data into Apache Hadoop. In order to interrogate easily the data, the next step is to create some Hive tables. This will enable quick interaction with high level languages like SQL and </span><a href="http://gethue.tumblr.com/post/51559235973/tutorial-apache-pig-editor-in-hue-2-3"><span>Pig</span></a><span>.</span></p>
+<p><span> </span></p>
+<p><span>We experiment with the SQL queries, then parameterize them and insert them into a workflow in order to run them together in parallel. Including Hive queries in an Oozie workflow is a pretty common use case with recurrent pitfalls as seen on the user group. We can do it with </span><a href="http://gethue.com">Hue</a><span> in a few clicks.</span></p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/74215175" width="900"></iframe></p>
+</p>
 
     <div class="p">A <dfn class="term">workflow application</dfn> is a collection of actions arranged in
       a directed acyclic graph (DAG). It includes two types of nodes:<a name="topic_9__ul_fyv_mnr_2k"><!-- --></a><ul class="ul" id="topic_9__ul_fyv_mnr_2k">

+ 20 - 0
apps/pig/static/help/index.html

@@ -19,6 +19,26 @@
 
   </div>
 
+<p id="docs-internal-guid-0ab02ef5-c3a4-c1fe-509c-31f69bf4beb7"><span>In Hue 3.5, a new assistant was added to the </span><a href="http://gethue.tumblr.com/post/51559235973/tutorial-apache-pig-editor-in-hue-2-3"><span>Pig Editor</span></a><span>: Navigator.</span></p>
+<p><br/><span></span></p>
+<p><span>Similarly to the </span><a href="http://gethue.tumblr.com/post/64916325309/hadoop-tutorial-hive-query-editor-with-hiveserver2-and"><span>Hive</span></a><span> and </span><a href="http://gethue.tumblr.com/post/62452792255/fast-sql-with-the-impala-query-editor"><span>Impala</span></a><span> Editors, functions and Pig statements are made directly available from within the editor:</span></p>
+<p><br/><span></span></p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/81111082" width="900"></iframe></p>
+<p><br/><span></span></p>
+<p><span>Navigator is:</span></p>
+<ul><li>
+<p><span>Sorted by category</span></p>
+</li>
+<li>
+<p><span>Searchable</span></p>
+</li>
+<li>
+<p><span>Auto-completable (as well as HDFS paths and Metastore tables)</span></p>
+</li>
+</ul><p><br/><span></span><span>So now, get started with </span><a href="http://pig.apache.org/"><span>Apache Pig</span></a><span>!</span></p>
+                </p>
+                
+
   <div class="topic concept nested1" id="concept_u25_g2v_yj"><a name="concept_u25_g2v_yj"><!-- --></a>
     <h2 class="title topictitle2">Pig Editor Installation and Configuration </h2>
 

+ 4 - 636
apps/rdbms/static/help/index.html

@@ -11,653 +11,21 @@
 
 
 
-  <h1 class="title topictitle1">Beeswax </h1>
+  <h1 class="title topictitle1">DB Query</h1>
 
 
   <div class="body conbody">
-    <p class="p">The Beeswax application enables you to perform queries on Apache Hive, a
-      data warehousing system designed to work with Hadoop. For information about Hive, see <a class="xref" href="http://archive.cloudera.com/cdh4/cdh/4/hive/" target="_blank">Hive Documentation</a>. You can create Hive databases, tables and
-      partitions, load data, create, run, and manage queries, and download the results in a
-      Microsoft Office Excel worksheet file or a comma-separated values file. </p>
+      A brand new application that enables viewing data in MySQL, PostgreSQL, Oracle and Sqlite has been committed.</p>
+    <p><br/> Inspired from the Beeswax application, it allows you to query a relational database and view it in a table.</p>
 
   </div>
 
 
   <div class="topic concept nested1" xml:lang="en-US" lang="en-US" id="topic_4_1"><a name="topic_4_1"><!-- --></a>
 
-    <h2 class="title topictitle2">Beeswax and Hive Installation and
-      Configuration </h2>
-
-
-    <div class="body conbody">
-
-      <p class="p">Beeswax is installed and configured as part of Hue. <span class="ph">For information about installing and configuring Hue,
-        see Hue Installation in <a class="xref" href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html" target="_blank">http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/CDH4-Installation-Guide.html</a>.</span>
-      </p>
-
-
-      <p class="p">Beeswax assumes an existing Hive installation. The Hue installation
-        instructions include the configuration necessary for Beeswax to access Hive. You can view
-        the current Hive configuration from the <strong class="ph b">Settings</strong> tab in
-        the Beeswax application. </p>
-
-
-      <p class="p">By default, a Beeswax user can see the saved queries for all users –
-        both his/her own queries and those of other Beeswax users. To restrict viewing saved queries
-        to the query owner and Hue administrators, set the <samp class="ph codeph">share_saved_queries</samp> property under the <samp class="ph codeph">[beeswax]</samp> section in the Hue configuration file to <samp class="ph codeph">false</samp>. </p>
-
-
-    </div>
-
-
-  </div>
-
-
-  <div class="topic concept nested1" xml:lang="en-US" lang="en-US" id="topic_4_2"><a name="topic_4_2"><!-- --></a>
-
-    <h2 class="title topictitle2">Starting Beeswax </h2>
-
-
-    <div class="body conbody">
-
-      <p class="p">Click the <strong class="ph b">Beeswax</strong> icon (<img class="image" src="/beeswax/static/art/icon_beeswax_24.png"/>)
-        in the navigation bar at the top of the Hue browser page. </p>
-
-
-    </div>
-
-
-  </div>
-
-  <div class="topic concept nested1" id="concept_xvg_nzh_dk"><a name="concept_xvg_nzh_dk"><!-- --></a>
-    <h2 class="title topictitle2">Managing Databases, Tables, and Partitions</h2>
-
-    <div class="body conbody">
-      <p class="p" id="concept_xvg_nzh_dk__p_ygl_m13_dk"><a name="concept_xvg_nzh_dk__p_ygl_m13_dk"><!-- --></a>You can create databases, tables, partitions, and load data by executing
-          <a class="xref" href="http://archive.cloudera.com/cdh4/cdh/4/hive/language_manual/data-manipulation-statements.html" target="_blank">Hive data manipulation
-          statements</a> in the Beeswax application.</p>
-
-      <p class="p" id="concept_xvg_nzh_dk__p_pdp_m13_dk"><a name="concept_xvg_nzh_dk__p_pdp_m13_dk"><!-- --></a>You can also use the <a class="xref" href="metastoremanager.html#xd_583c10bfdbd326ba-3ca24a24-13d80143249--7f9b">Metastore Manager</a> application to manage the
-        databases, tables, and partitions and load data.</p>
-
-    </div>
-
-  </div>
-
-  <div class="topic concept nested1" xml:lang="en-US" lang="en-US" id="topic_4_2_1"><a name="topic_4_2_1"><!-- --></a>
-    <h2 class="title topictitle2">Installing Example Queries and
-      Tables</h2>
-
-    <div class="body conbody">
-      <div class="note note" id="topic_4_2_1__note_sb1_dlk_2k"><a name="topic_4_2_1__note_sb1_dlk_2k"><!-- --></a><span class="notetitle"><img src="/static/art/help/note.jpg"/> 
-      <b>Note</b>:</span> You must be a superuser to perform this task.</div>
-
-      <a name="topic_4_2_1__ol_kss_btp_wj"><!-- --></a><ol class="ol" id="topic_4_2_1__ol_kss_btp_wj">
-        <li class="li" id="topic_4_2_1__li_src_z3t_yj"><a name="topic_4_2_1__li_src_z3t_yj"><!-- --></a>Click <a name="topic_4_2_1__image_vv5_hnv_wj"><!-- --></a><img class="image" id="topic_4_2_1__image_vv5_hnv_wj" src="/static/art/hue-logo-mini.png"/>. The Quick Start Wizard opens.</li>
-
-        <li class="li" id="topic_4_2_1__li_zgj_z3t_yj"><a name="topic_4_2_1__li_zgj_z3t_yj"><!-- --></a>Click <strong class="ph b">Step 2:
-            Examples</strong>.</li>
-
-        <li class="li">Click <strong class="ph b">Beeswax (Hive UI)</strong>.</li>
-
-      </ol>
-
-    </div>
-
-  </div>
-
-
-  <div class="topic concept nested1" xml:lang="en-US" lang="en-US" id="topic_4_3"><a name="topic_4_3"><!-- --></a>
-
-    <h2 class="title topictitle2">Query Editor</h2>
-
-
-    <div class="body conbody">
-
-      <p class="p">The Query Editor view lets you create, save, and submit queries in the
-          <a class="xref" href="http://wiki.apache.org/hadoop/Hive/LanguageManual" target="_blank">Hive Query Language (HQL)</a>,
-        which is similar to Structured Query Language (SQL).  When you submit a query, the Beeswax
-        Server uses Hive to run the queries. You can either wait for the query to complete, or
-        return later to find the queries in the History view. You can also request to receive an
-        email message after the query is completed.</p>
-
-      <p class="p">In the box to the left of the Query field, you can select a database,
-        override the default Hive and Hadoop settings, specify file resources and user-defined
-        functions, enable users to enter parameters at run-time, and request email notification when
-        the job is complete. See <a class="xref" href="#topic_4_3_2">Advanced Query Settings</a> for details on using these settings. </p>
-
-
-    </div>
-
-
-    <div class="topic concept nested2" xml:lang="en-US" lang="en-US" id="topic_4_3_1"><a name="topic_4_3_1"><!-- --></a>
-
-      <h3 class="title topictitle3">Creating Queries </h3>
-
-
-      <div class="body conbody">
-
-        <ol class="ol">
-          <li class="li" id="topic_4_3_1__li_v2d_p5k_xj"><a name="topic_4_3_1__li_v2d_p5k_xj"><!-- --></a>In the Query Editor window, type a query or
-            multiple queries separated by a semicolon ";".  To be presented with a drop-down of
-            autocomplete options, type <span class="ph uicontrol">CTRL+spacebar</span> when entering a query.  </li>
-
-          <li class="li" id="topic_4_3_1__li_ilk_p5k_xj"><a name="topic_4_3_1__li_ilk_p5k_xj"><!-- --></a>To save your query and advanced settings to use
-            again later, click <strong class="ph b">Save As</strong>, enter a name and
-            description, and then click <strong class="ph b">OK</strong>. To save changes to an
-            existing query, click <strong class="ph b">Save.</strong>
-          </li>
-
-          <li class="li">If you want to view the execution plan for the query, click <strong class="ph b">Explain</strong>. For more information, see <a class="xref" href="http://wiki.apache.org/hadoop/Hive/LanguageManual/Explain" target="_blank">http://wiki.apache.org/hadoop/Hive/LanguageManual/Explain</a>.</li>
-
-        </ol>
-
-
-      </div>
-
-
-    </div>
-
-    <div class="topic concept nested2" id="concept_ch1_5gb_zj"><a name="concept_ch1_5gb_zj"><!-- --></a>
-      <h3 class="title topictitle3">Loading Queries into the Query Editor</h3>
-
-      <div class="body conbody">
-        <a name="concept_ch1_5gb_zj__ol_kkg_vgb_zj"><!-- --></a><ol class="ol" id="concept_ch1_5gb_zj__ol_kkg_vgb_zj">
-          <li class="li">Do one of the following:<a name="concept_ch1_5gb_zj__ul_xlq_jqb_zj"><!-- --></a><ul class="ul" id="concept_ch1_5gb_zj__ul_xlq_jqb_zj">
-              <li class="li">Click the <span class="ph uicontrol">My Queries</span>  tab.<a name="concept_ch1_5gb_zj__ol_qhz_lqb_zj"><!-- --></a><ol class="ol" type="a" id="concept_ch1_5gb_zj__ol_qhz_lqb_zj">
-                  <li class="li">Click the <span class="ph uicontrol">Recent Saved Queries</span> or <span class="ph uicontrol">Recent Run
-                      Queries</span> tab to display the respective queries. </li>
-
-                </ol>
-</li>
-
-              <li class="li">Click the <span class="ph uicontrol">Saved Queries</span> tab.</li>
-
-            </ul>
-</li>
-
-          <li class="li">Click a query name. The query is loaded into the Query Editor.</li>
-
-        </ol>
-
-      </div>
-
-    </div>
-
-    <div class="topic concept nested2" id="concept_xsr_yx1_zj"><a name="concept_xsr_yx1_zj"><!-- --></a>
-      <h3 class="title topictitle3">Running Queries </h3>
-
-      <div class="body conbody">
-        <div class="note note" id="concept_xsr_yx1_zj__note_vbn_4xk_xj"><a name="concept_xsr_yx1_zj__note_vbn_4xk_xj"><!-- --></a><span class="notetitle"><img src="/static/art/help/note.jpg"/> 
-      <b>Note</b>:</span> To run a query, you must be logged in to
-          Hue as a user that also has a Unix user account on the remote server. </div>
-
-        <a name="concept_xsr_yx1_zj__ol_rnw_yx1_zj"><!-- --></a><ol class="ol" id="concept_xsr_yx1_zj__ol_rnw_yx1_zj">
-          <li class="li">To execute a portion of the query, highlight one or more query
-            statements.</li>
-
-          <li class="li">Click <strong class="ph b">Execute</strong>. The Query Results
-            window appears with the results of your query. <a name="concept_xsr_yx1_zj__ul_f4w_yx1_zj"><!-- --></a><ul class="ul" id="concept_xsr_yx1_zj__ul_f4w_yx1_zj">
-              <li class="li">To view a log of the query execution, click <strong class="ph b">Log</strong> at the top of the results display. You can use
-                the information in this tab to debug your query.</li>
-
-              <li class="li">To view the query that generated these results, click <strong class="ph b">Query</strong> at the top of the results display.</li>
-
-              <li class="li">To view the columns of the query, click <strong class="ph b">Columns</strong>.</li>
-
-              <li class="li">To return to the query in the Query Editor, click <strong class="ph b">Unsaved Query</strong>.</li>
-
-            </ul>
-</li>
-
-          <li class="li">If there are multiple statements in the query, click <span class="ph uicontrol">Next</span> in
-            the Multi-statement query pane to execute the remaining statements.</li>
-
-        </ol>
-
-        <div class="note note"><span class="notetitle"><img src="/static/art/help/note.jpg"/> 
-      <b>Note</b>:</span> Under <strong class="ph b">MR JOBS</strong>, you can view any MapReduce jobs that
-          the query generated.</div>
-
-      </div>
-
-    </div>
-
-    <div class="topic concept nested2" id="concept_axp_mgb_zj"><a name="concept_axp_mgb_zj"><!-- --></a>
-      <h3 class="title topictitle3">Downloading and Saving Query Results</h3>
-
-      <div class="body conbody">
-        <div class="note important"><span class="importanttitle"><img src="/static/art/help/important.jpg"/> 
-      <b>Important</b>:</span> 
-          <a name="concept_axp_mgb_zj__ul_p4w_yx1_zj"><!-- --></a><ul class="ul" id="concept_axp_mgb_zj__ul_p4w_yx1_zj">
-            <li class="li">You can only save results to a file when the results were
-              generated by a MapReduce job.</li>
-
-            <li class="li">This is the preferred way to save when the result is large (for
-              example &gt; 1M rows).</li>
-
-          </ul>
-
-        </div>
-
-        <a name="concept_axp_mgb_zj__ol_agb_4gb_zj"><!-- --></a><ol class="ol" id="concept_axp_mgb_zj__ol_agb_4gb_zj">
-          <li class="li">Do any of the following to download or save the query results: <a name="concept_axp_mgb_zj__ul_i4w_yx1_zj"><!-- --></a><ul class="ul" id="concept_axp_mgb_zj__ul_i4w_yx1_zj">
-              <li class="li">Click <strong class="ph b">Download as CSV</strong> to
-                download the results in a comma-separated values file suitable for use in other
-                applications.</li>
-
-              <li class="li">Click <strong class="ph b">Download as XLS</strong> to
-                download the results in a Microsoft Office Excel worksheet file.</li>
-
-              <li class="li">Click <strong class="ph b">Save</strong> to save the
-                results in a table or HDFS file.<a name="concept_axp_mgb_zj__ul_m4w_yx1_zj"><!-- --></a><ul class="ul" id="concept_axp_mgb_zj__ul_m4w_yx1_zj">
-                  <li class="li">To save the results in a new table, select <strong class="ph b">In a new table</strong>, enter a table name, and then
-                    click <strong class="ph b">Save</strong>.</li>
-
-                  <li class="li">To save the results in an HDFS file, select <strong class="ph b">In an HDFS directory</strong>, enter a path and then
-                    click <strong class="ph b">Save</strong>. You can then download the file
-                    with <a class="xref" href="filebrowser.html#topic_6">File Browser</a>.  </li>
-
-                </ul>
-</li>
-
-            </ul>
-</li>
-
-        </ol>
-
-      </div>
-
-    </div>
-
-
-    <div class="topic concept nested2" xml:lang="en-US" lang="en-US" id="topic_4_3_2"><a name="topic_4_3_2"><!-- --></a>
-
-      <h3 class="title topictitle3">Advanced Query Settings </h3>
-
-
-      <div class="body conbody">
-
-        <p class="p">The pane to the left of the Query Editor lets you specify the
-          following options: </p>
-
-
-        
-<div class="tablenoborder"><table cellpadding="4" cellspacing="0" summary="" class="table" frame="hsides" border="1" rules="all">
-            
-            
-            <thead class="thead" align="left">
-              <tr class="row">
-                <th class="entry" valign="top" width="16.666666666666664%" id="d5062e390">
-                  <p class="p">
-                    <strong class="ph b">Option</strong>
-                  </p>
-
-                </th>
-
-                <th class="entry" valign="top" width="83.33333333333334%" id="d5062e399">
-                  <p class="p">
-                    <strong class="ph b">Description</strong>
-                  </p>
-
-                </th>
-
-              </tr>
-
-            </thead>
-
-            <tbody class="tbody">
-              <tr class="row">
-                <td class="entry" valign="top" width="16.666666666666664%" headers="d5062e390 ">
-                  <p class="p"><strong class="ph b">DATABASE</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="83.33333333333334%" headers="d5062e399 ">
-                  <p class="p">The database containing the table definitions. </p>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="16.666666666666664%" headers="d5062e390 ">
-                  <p class="p"><strong class="ph b">SETTINGS</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="83.33333333333334%" headers="d5062e399 ">
-                  <div class="p">Override the Hive and Hadoop default settings.  To configure
-                    a new setting: <a name="topic_4_3_2__ol_k5v_hcc_zj"><!-- --></a><ol class="ol" id="topic_4_3_2__ol_k5v_hcc_zj">
-                      <li class="li">Click <strong class="ph b">Add</strong>.</li>
-
-                      <li class="li">For <strong class="ph b">Key</strong>, enter a Hive or Hadoop
-                        configuration variable name. </li>
-
-                      <li class="li">For <strong class="ph b">Value</strong>, enter the value you want to
-                        use for the variable. </li>
-
-                    </ol>
-</div>
-
-                  <p class="p">For example, to override the directory where structured
-                    Hive query logs are created, you would enter <samp class="ph codeph">hive.querylog.location</samp> for <strong class="ph b">Key</strong>, and a path for <strong class="ph b">Value.</strong>
-                  </p>
-
-                  <p class="p">To view the default settings, click the <strong class="ph b">Settings</strong> tab at the top of the page. For
-                    information about Hive configuration variables, see: <a class="xref" href="http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration" target="_blank">http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration</a>. For
-                    information about Hadoop configuration variables, see: <a class="xref" href="http://hadoop.apache.org/docs/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml" target="_blank">http://hadoop.apache.org/docs/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml</a>.</p>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="16.666666666666664%" headers="d5062e390 ">
-                  <p class="p"><strong class="ph b">FILE RESOURCES</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="83.33333333333334%" headers="d5062e399 ">
-                  <div class="p">Make files locally accessible at query execution time
-                    available on the Hadoop cluster. Hive uses the Hadoop Distributed Cache to
-                    distribute the added files to all machines in the cluster at query execution
-                      time.<a name="topic_4_3_2__ol_flf_vfc_zj"><!-- --></a><ol class="ol" id="topic_4_3_2__ol_flf_vfc_zj">
-                      <li class="li">Click <strong class="ph b">Add</strong> to
-                        configure a new setting.</li>
-
-                      <li class="li">From the <strong class="ph b">Type</strong>
-                        drop-down menu, choose one of the following:<a name="topic_4_3_2__ul_bkb_wfc_zj"><!-- --></a><ul class="ul" id="topic_4_3_2__ul_bkb_wfc_zj">
-                          <li class="li">
-                            <strong class="ph b">jar</strong> — Adds the specified resources to
-                            the Java classpath.</li>
-
-                          <li class="li"><strong class="ph b">archive</strong> —
-                            Unarchives the specified resources when distributing them. </li>
-
-                          <li class="li"><strong class="ph b">file</strong> — Adds the
-                            specified resources to the distributed cache. Typically, this might be a
-                            transform script (or similar) to be executed. </li>
-
-                        </ul>
-</li>
-
-                      <li class="li">For <strong class="ph b">Path</strong>, enter the
-                        path to the file or click <a name="topic_4_3_2__image_sdp_cgc_zj"><!-- --></a><img class="image" id="topic_4_3_2__image_sdp_cgc_zj" src="/static/art/help/browse.png"/> to browse and select the file.  </li>
-
-                    </ol>
-</div>
-
-
-                  <div class="note note"><span class="notetitle"><img src="/static/art/help/note.jpg"/> 
-      <b>Note</b>:</span> It is not necessary to specify files used in a
-										transform script if the files are available in the same path
-										on all machines in the Hadoop cluster.</div>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="16.666666666666664%" headers="d5062e390 ">
-                  <p class="p"><strong class="ph b">USER-DEFINED FUNCTIONS</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="83.33333333333334%" headers="d5062e399 ">
-                  <p class="p">Specify user-defined functions. Click <strong class="ph b">Add</strong> to configure a new setting. Specify the
-                    function name in the <strong class="ph b">Name</strong> field, and specify
-                    the class name for <strong class="ph b">Class</strong>
-                    <strong class="ph b">name</strong>. </p>
-
-                  <p class="p">You <em class="ph i">must</em> specify a JAR file for the user-defined
-                    functions in <strong class="ph b"><strong class="ph b">FILE
-                        RESOURCES</strong></strong>. </p>
-
-                  <p class="p">To include a user-defined function in a query, add a $
-                    (dollar sign) before the function name in the query. For example, if <var class="keyword varname">MyTable</var> is a user-defined
-                    function name in the query, you would type: <samp class="ph codeph">SELECT * $</samp><samp class="ph codeph"><var class="keyword varname">MyTable</var></samp>
-                  </p>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="16.666666666666664%" headers="d5062e390 ">
-                  <p class="p"><strong class="ph b">PARAMETERIZATION</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="83.33333333333334%" headers="d5062e399 ">
-                  <p class="p">Indicate that a dialog box should display to enter parameter
-                    values when a query containing the string $<var class="keyword varname">parametername</var> is
-                    executed. Enabled by default. </p>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="16.666666666666664%" headers="d5062e390 ">
-                  <p class="p"><strong class="ph b">EMAIL NOTIFICATION</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="83.33333333333334%" headers="d5062e399 ">
-                  <p class="p">Indicate that an email message should be sent after a query
-                    completes. The email is sent to the email address specified in the logged-in
-                    user's profile. </p>
-
-                </td>
-
-              </tr>
-
-            </tbody>
-
-          </table>
-</div>
-
-
-      </div>
-
-
-    </div>
-
-
-    <div class="topic concept nested2" xml:lang="en-US" lang="en-US" id="topic_4_3_3"><a name="topic_4_3_3"><!-- --></a>
-
-      <h3 class="title topictitle3">Viewing Query History </h3>
-
-
-      <div class="body conbody">
-
-        <p class="p">You can view the history of queries that you have run previously.
-          Results for these queries are available for one week or until Hue is restarted. </p>
-
-
-        <ol class="ol">
-
-          <li class="li">Click <strong class="ph b">History</strong>. A list of your
-            saved and unsaved queries displays in the Query History window.</li>
-
-
-          <li class="li">To display the queries for all users, click <strong class="ph b">Show everyone's queries</strong>.
-						To display your queries only, click <strong class="ph b">Show my queries</strong>.</li>
-
-
-          <li class="li">To display the automatically generated actions performed on a
-            user's behalf, click <strong class="ph b">Show auto actions</strong>. To display
-            user queries again, click <strong class="ph b">Show user queries</strong>.</li>
-
-
-        </ol>
-
-
-      </div>
-
-
-    </div>
-
-
-    <div class="topic concept nested2" xml:lang="en-US" lang="en-US" id="topic_4_3_4"><a name="topic_4_3_4"><!-- --></a>
-
-      <h3 class="title topictitle3">Viewing, Editing, Copying, and Deleting
-        Saved Queries </h3>
-
-
-      <div class="body conbody">
-
-        <p class="p">You can view a list of saved queries of all users by clicking <strong class="ph b">My
-            Queries</strong> and then selecting either  <span class="ph uicontrol">Recent Saved Queries</span> or
-            <span class="ph uicontrol">Recent Run Queries</span> tab to display the respective queries or
-          clicking <strong class="ph b">Saved Queries</strong>. You can copy any query, but you
-          can edit, delete, and view the history of only your own queries. </p>
-
-        
-<div class="tablenoborder"><a name="topic_4_3_4__table_rxy_gdh_b3"><!-- --></a><table cellpadding="4" cellspacing="0" summary="" id="topic_4_3_4__table_rxy_gdh_b3" class="table" frame="hsides" border="1" rules="all">
-            
-            
-            <thead class="thead" align="left">
-              <tr class="row">
-                <th class="entry" valign="top" width="25%" id="d5062e719">Saved Query</th>
-
-                <th class="entry" valign="top" width="75%" id="d5062e722">Procedure</th>
-
-              </tr>
-
-            </thead>
-
-            <tbody class="tbody">
-              <tr class="row">
-                <td class="entry" valign="top" width="25%" headers="d5062e719 ">
-                  <p class="p">
-                    <strong class="ph b">Edit</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="75%" headers="d5062e722 ">
-                  <div class="p">
-                    <a name="topic_4_3_4__ol_hbl_xbh_dk"><!-- --></a><ol class="ol" id="topic_4_3_4__ol_hbl_xbh_dk">
-                      <li class="li">Click <strong class="ph b">Saved Queries</strong>.
-                        The Queries window displays.</li>
-
-                      <li class="li">Check the checkbox next to the query and click <strong class="ph b">Edit</strong>. The query displays in the Query
-                        Editor window.</li>
-
-                      <li class="li">Change the query and then click <strong class="ph b">Save.</strong> You can also click <strong class="ph b">Save As</strong>, enter a new name, and click <strong class="ph b">OK</strong> to save a copy of the query.</li>
-
-                    </ol>
-
-                  </div>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="25%" headers="d5062e719 ">
-                  <p class="p">
-                    <strong class="ph b">Copy</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="75%" headers="d5062e722 ">
-                  <div class="p">
-                    <a name="topic_4_3_4__ol_dqp_xbh_dk"><!-- --></a><ol class="ol" id="topic_4_3_4__ol_dqp_xbh_dk">
-                      <li class="li">Click <strong class="ph b">Saved Queries</strong>.
-                        The Queries window displays.</li>
-
-                      <li class="li">Check the checkbox next to the query and click <strong class="ph b">Copy</strong>. The query displays in the Query
-                        Editor window.</li>
-
-                      <li class="li">Change the query as necessary and then click <strong class="ph b">Save.</strong> You can also click <strong class="ph b">Save As</strong>, enter a new name, and click <strong class="ph b">OK</strong> to save a copy of the query.</li>
-
-                    </ol>
-
-                  </div>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="25%" headers="d5062e719 ">
-                  <p class="p">
-                    <strong class="ph b">Copy in Query History</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="75%" headers="d5062e722 ">
-                  <div class="p">
-                    <a name="topic_4_3_4__ol_ut5_xbh_dk"><!-- --></a><ol class="ol" id="topic_4_3_4__ol_ut5_xbh_dk">
-                      <li class="li">Click <strong class="ph b">History</strong>. The
-                        Query History window displays.</li>
-
-                      <li class="li">To display the queries for all users, click <strong class="ph b">Show everyone's queries</strong>. The queries for
-                        all users display in the History window.</li>
-
-                      <li class="li">Click the query you want to copy. A copy of the query
-                        displays in the Query Editor window.</li>
-
-                      <li class="li">Change the query, if necessary, and then click <strong class="ph b">Save As</strong>, enter a new name, and click <strong class="ph b">OK</strong> to save the query.</li>
-
-                    </ol>
-
-                  </div>
-
-                </td>
-
-              </tr>
-
-              <tr class="row">
-                <td class="entry" valign="top" width="25%" headers="d5062e719 ">
-                  <p class="p">
-                    <strong class="ph b">Delete</strong>
-                  </p>
-
-                </td>
-
-                <td class="entry" valign="top" width="75%" headers="d5062e722 ">
-                  <a name="topic_4_3_4__ol_fgh_1vc_zj"><!-- --></a><ol class="ol" id="topic_4_3_4__ol_fgh_1vc_zj">
-                    <li class="li">Click <strong class="ph b">Saved Queries</strong>.
-                      The Queries window displays.</li>
-
-                    <li class="li">Check the checkbox next to the query and click <strong class="ph b">Delete</strong>.</li>
-
-                    <li class="li">Click <strong class="ph b">Yes</strong> to confirm
-                      the deletion.</li>
-
-                  </ol>
-
-                </td>
-
-              </tr>
-
-            </tbody>
-
-          </table>
-</div>
-
-
-      </div>
-
-
-    </div>
-
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/79020016" width="900"></iframe></p>
 
   </div>
 
-
-
 </body>
 </html>

+ 12 - 0
apps/search/static/help/index.html

@@ -2,7 +2,19 @@
 
 <h1>Solr Search</h1>
 <p>The Solr Search application, which is based on  <a href="http://lucene.apache.org/solr/">Apache Solr</a>, allows you to perform keyword searches across Hadoop data. A wizard lets you style the result snippets, specify facets to group the results, sort the results, and highlight result fields.</p>
+
+                <h2 class="subhead"><a href="http://gethue.tumblr.com/post/66351828212/new-search-feature-graphical-facets">New Search feature: Graphical facets</a></h2>
+                
+                
+                <p>
+                    <p>This new feature completed in <a href="http://gethue.tumblr.com/post/66661140648/hue-team-retreat-thailand">Thailand</a> lets you search interactively:</p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/78887745" width="900"></iframe></p>
+<p>As usual feel free to comment on the <a href="https://groups.google.com/a/cloudera.org/group/hue-user/">hue-user</a> list or <a href="https://twitter.com/gethue">@gethue</a>!</p>
+                </p>
+                
+
 <h2>Solr Search Installation and Configuration</h2>
+
 <p>Solr Search is one of the applications installed as part of Hue. For information about installing and configuring Hue, see the Hue Installation
 manual.</p>
 <h2>Starting  Solr Search</h2>

+ 41 - 0
apps/spark/static/help/index.html

@@ -13,7 +13,48 @@
 
   <h1 class="title topictitle1">Spark</h1>
 
+<p><span>A </span><a href="http://gethue.com/"><span>Hue</span></a><span> Spark application was recently created. It lets users execute and monitor </span><a href="http://spark.incubator.apache.org/"><span>Spark</span></a><span> jobs directly from their browser and be more productive.</span></p>
 
+<p><span>We previously released the app with an Oozie submission </span><a href="https://dl.dropboxusercontent.com/u/730827/cloudera/spark-app.png"><span>backend</span></a><span> but switched to the Spark Job Server (</span><a href="https://spark-project.atlassian.net/browse/SPARK-818"><span>SPARK-818</span></a><span>) contributed by </span><a href="http://www.ooyala.com/"><span>Ooyala</span></a><span> and </span><a href="https://github.com/velvia"><span>Evan’s</span></a><span> team at the last </span><a href="http://spark-summit.org/talk/chan-the-spark-job-server/"><span>Spark Summit</span></a><span>. This new server will enable a real interactivity with Spark and is closer to the community.<br/><br/></span></p>
+
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/83192197" width="900"></iframe></p>
+<p><a href="http://vimeo.com/83192197"><span> </span></a></p>
+<p>We hope to work with the community and have support for Python, Java, direct script submission without compiling/uploading and other improvements in the future!</p>
+<p><br/><span></span></p>
+<p><span>As usual feel free to comment on the</span><a href="http://groups.google.com/a/cloudera.org/group/hue-user"><span> </span><span>hue-user</span></a><span> list or</span><a href="https://twitter.com/gethue"><span> </span><span>@gethue</span></a><span>! About questions directly related to Job Server, participate on the </span><a href="https://github.com/apache/incubator-spark/pull/222"><span>pull request</span></a><span>, </span><a href="https://spark-project.atlassian.net/browse/SPARK-818"><span>SPARK-818</span></a><span> or the Spark </span><a href="http://spark.incubator.apache.org/mailing-lists.html"><span>user list</span></a><span>!</span></p>
+<p><br/><span></span></p>
+<h2><span>Get Started!</span></h2>
+<p><span>Currently only Scala jobs are supported and programs need to implement this </span><a href="https://github.com/ooyala/incubator-spark/blob/jobserver-preview-2013-12/jobserver/src/main/scala/spark.jobserver/SparkJob.scala#L6"><span>trait</span></a><span> and be packaged into a jar. Here is a </span><a href="https://github.com/ooyala/incubator-spark/blob/jobserver-preview-2013-12/jobserver/src/test/scala/spark.jobserver/WordCountExample.scala#L16"><span>WordCount</span></a><span> example. To learn more about Spark Job Server, check its </span><a href="https://github.com/ooyala/incubator-spark/tree/jobserver-preview-2013-12/jobserver#features"><span>README</span></a><span>.</span></p>
+<p><br/><span></span></p>
+<h2><span>Requirements</span></h2>
+<p><span>We assume you have </span><a href="http://www.scala-lang.org/"><span>Scala</span></a><span> installed on your system. </span></p>
+<p><br/><span></span></p>
+<h2><span>Get Spark Job Server</span></h2>
+<p><span>Currently on github on this </span><a href="https://github.com/ooyala/incubator-spark/commits/jobserver-preview-2013-12"><span>branch</span></a><span>:</span></p>
+<pre class="code">git clone <a href="https://github.com/ooyala/incubator-spark.git">https://github.com/ooyala/incubator-spark.git</a> spark-server
+cd spark-server
+git checkout -b jobserver-preview-2013-12 origin/jobserver-preview-2013-12
+</pre>
+<p><br/><span></span></p>
+<p><span>Then type:</span></p>
+<pre class="code">sbt/sbt
+project jobserver
+re-start
+</pre>
+<p><br/><span></span></p>
+<h2><span>Get Hue</span></h2>
+<p><span>Currently only on github (will be in CDH5b2):</span></p>
+<p><a href="https://github.com/cloudera/hue#getting-started"><span><a href="https://github.com/cloudera/hue#getting-started">https://github.com/cloudera/hue#getting-started</a></span></a><span></span></p>
+<p><br/><span></span></p>
+<p><span>If Hue and Spark Job Server are not on the same machine update the </span><a href="https://github.com/cloudera/hue/blob/master/desktop/conf.dist/hue.ini"><span>hue.ini</span></a><span> property in desktop/conf/pseudo-distributed.ini:</span></p>
+
+<pre class="code">[spark]
+  # URL of the Spark Job Server.
+  server_url=http://localhost:8090/
+</pre>
+<h2><span>Get a Spark example to run</span></h2>
+<p><span>Then follow this </span><a href="https://github.com/ooyala/incubator-spark/tree/jobserver-preview-2013-12/jobserver#wordcountexample-walk-through"><span>walk-through</span></a><span> and create the example jar that is used in the video demo.</span></p>
+                </p>
 
 </body>
 </html>

+ 72 - 0
apps/sqoop/static/help/index.html

@@ -14,6 +14,78 @@
 <p>The Sqoop UI enables transfering data from a relational database
 to Hadoop and vice versa. The UI lives uses Apache Sqoop to do this.
 See the <a href="http://sqoop.apache.org/docs/1.99.2/index.html">Sqoop Documentation</a> for more details on Sqoop.</p>
+
+<p>
+<p>Hue, the <a href="http://gethue.com">open source Big Data UI</a>, has an application that enables transferring data between relational databases and <a href="http://hadoop.apache.org/">Hadoop</a>. This new application is driven by <a href="http://sqoop.apache.org/">Sqoop 2</a> and has several user experience improvements to boot.</p>
+<p><iframe frameborder="0" height="495" src="http://player.vimeo.com/video/76063637" width="900"></iframe></p>
+<p>Sqoop is a batch data migration tool for transferring data between traditional databases and Hadoop. The first version of Sqoop is a heavy client that drives and oversees data transfer via MapReduce. In Sqoop 2, the majority of the work was moved to a server that a thin client communicates with. Also, any client can communicate with the Sqoop 2 server over its JSON-REST protocol. Sqoop 2 was chosen instead of its predecessors because of its client-server design.</p>
+<h2>Importing from MySQL to HDFS</h2>
+<p>The following is the canonical import job example sourced from <a href="http://sqoop.apache.org/docs/1.99.2/Sqoop5MinutesDemo.html"><a href="http://sqoop.apache.org/docs/1.99.2/Sqoop5MinutesDemo.html">http://sqoop.apache.org/docs/1.99.2/Sqoop5MinutesDemo.html</a></a>. In Hue, this can be done in 3 easy steps:</p>
+<h3>Environment</h3>
+<ul><li>
+<p>CDH 4.4 or <span>Hue 3.0.0</span></p>
+</li>
+<li>
+<p>MySQL 5.1</p>
+</li>
+</ul><h3>Troubleshooting</h3>
+<p>If the new job button is not appearing, Sqoop2 is probably not starting. Make sure the MySql or other DB connectors are in the /usr/lib/sqoop/lib directory of Sqoop2. Make sure you have these properties in the Sqoop2 Server configuration:</p>
+<pre class="code">org.apache.sqoop.repository.schema.immutable=false
+org.apache.sqoop.connector.autoupgrade=true
+org.apache.sqoop.framework.autoupgrade=true 
+</pre>
+
+<h3>1. Create a Connection</h3>
+<p>In the Sqoop app, the connection manager is available from the “New Job” wizard. To get to the new job wizard, click on “New Job”. There may be a list of connections available if a few have been created before. For the purposes of this demo, we’ll go through the process of creating a new connection. Click “Add a new connection” and fill in the blanks with the data below. Then click save to return to the “New Job” wizard!</p>
+
+<div>
+<pre class="code">Connection Parameter                  Value
+
+Name                                  mysql-connection-demo 
+
+JDBC Driver Class                     com.mysql.jdbc.Driver 
+
+JDBC Connection String                jdbc:mysql://hue-demo/demo
+
+Username                              demo
+
+Password                              demo
+</pre>
+</div>
+<p><br/>Connection form values.<br/><br/></p>
+<h3>2. Create a Job</h3>
+<p>After creating a connection, follow the wizard and fill in the blanks with the information below.</p>
+
+<div>
+<pre class="code">Job Wizard Parameter              Value
+
+Name                              mysql-import-job-demo
+
+Type                              IMPORT
+
+Connection                        mysql-connection-demo
+
+Table name                        test
+
+Storage Type                      HDFS
+
+Output format                     TEXT_FILE
+
+Output directory                  /tmp/mysql-import-job-demo
+</pre>
+</div>
+<p><br/>Job wizard form values.</p>
+
+<h3>3. Save and Submit the Job</h3>
+<p>At the end of the Job wizard, click “Save and Run”! The job should automagically start after that and the job dashboard will be displayed. As the job is running, a progress bar below the job listing will be dynamically updated. Links to the HDFS output via the File Browser and Map Reduce logs via Job Browser will be available on the left hand side of the job edit page.</p>
+<h1>Sum Up</h1>
+<p>The new Sqoop application enables batch data migration from a more traditional databases to Hadoop and vice versa through Hue. Using Hue, a user can move data between storage systems in a distributed fashion with the click of a button.</p>
+
+<p>I’d like to send out a big thank you to the Sqoop community for the new client-server design!</p>
+
+<p>Both projects are undergoing heavy development and are welcoming external contributions! Have any suggestions? Feel free to tell us what you think through <a href="http://groups.google.com/a/cloudera.org/group/hue-user">hue-user</a> or <a href="https://twitter.com/gethue">@gethue</a>​!</p>
+                </p>
+
 <h2>Installation and Configuration</h2>
 <p>The Sqoop UI is one of the applications installed as part of
 Hue. For information about installing and configuring Hue, see the Hue Installation

+ 3 - 0
apps/zookeeper/static/help/index.html

@@ -5,6 +5,9 @@
 <li>Listing of the ZooKeeper cluster stats and clients</li>
 <li>Browsing and edition of the ZNode hierarchy</li>
 </ul>
+
+<iframe frameborder="0" height="495" src="http://player.vimeo.com/video/79795356" width="900"></iframe>
+
 <p>ZooKeeper Browser requires the <a href="https://github.com/apache/zookeeper/tree/trunk/src/contrib/rest">ZooKeeper
 REST</a>
 service to be running. Here is how to setup this one:</p>

+ 2 - 2
desktop/core/src/desktop/templates/common_footer.mako

@@ -190,10 +190,10 @@ from django.template.defaultfilters import escape, escapejs
       <div class="pull-left" style="color: #DDDDDD;font-size: 116px;margin: 10px; margin-right: 20px"><i class="fa fa-flag-checkered"></i></div>
       <div style="margin: 10px">
       <p>
-        ${_('There is one or more tours available for this page. These tours were created to guide you around.')}
+        ${_('There are one or more tours available for this page. These tours were created to guide you around.')}
       </p>
       <p>
-        ${_('You can see the list of the tours by clicking on the checkered flag icon on top right of this page.')} <span class="badge badge-info"><i class="fa fa-flag-checkered"></i></span>
+        ${_('You can see the list of tours by clicking on the checkered flag icon at the top right of this page.')} <span class="badge badge-info"><i class="fa fa-flag-checkered"></i></span>
       </p>
         </div>
     </div>

+ 50 - 1
desktop/core/src/desktop/templates/tours.mako

@@ -72,6 +72,34 @@ $.jHueTour({
       "video": "http://player.vimeo.com/video/78887745",
       "blog": "http://gethue.tumblr.com/post/66351828212/new-search-feature-graphical-facets"
     },
+    {
+      "name": "impalasentry",
+      "desc": "${_("Use Impala with Sentry")}",
+      "path": "/impala",
+      "video": "",
+      "blog": "http://gethue.tumblr.com/post/70206086469/use-the-impala-app-with-sentry-for-real-security"
+    },
+    {
+      "name": "ooziefb",
+      "desc": "${_("Submit Oozie jobs directly from HDFS")}",
+      "path": "/(oozie|filebrowser)",
+      "video": "http://player.vimeo.com/video/80749790",
+      "blog": "http://gethue.tumblr.com/post/68781982681/hadoop-tutorial-submit-any-oozie-jobs-directly-from"
+    },
+    {
+      "name": "jbyarn",
+      "desc": "${_("A Job Browser for Yarn")}",
+      "path": "/jobbrowser",
+      "video": "http://player.vimeo.com/video/84027054",
+      "blog": "http://gethue.tumblr.com/post/73219285865/using-hadoop-mr2-and-yarn-with-an-alternative-job"
+    },
+    {
+      "name": "jbyarnsecurity",
+      "desc": "${_("Security with Yarn")}",
+      "path": "/jobbrowser",
+      "video": "http://player.vimeo.com/video/85922379",
+      "blog": "http://gethue.tumblr.com/post/77939687768/secure-your-yarn-cluster-and-access-the-jobs"
+    },    
     {
       "name": "sentry",
       "desc": "${_("Hive Query editor with HiveServer2")}<br/>${_("and Sentry")}",
@@ -107,6 +135,13 @@ $.jHueTour({
       "video": "http://player.vimeo.com/video/73849021",
       "blog": "http://gethue.tumblr.com/post/60376973455/hadoop-tutorials-ii-1-prepare-the-data-for-analysis"
     },
+    {
+      "name": "hue35",
+      "desc": "${_("What's new in Hue 3.5")}",
+      "path": "/(about|home)",
+      "video": "",
+      "blog": "http://gethue.tumblr.com/post/69115755563/hue-3-5-and-its-redesign-are-out"
+    },
     {
       "name": "saml",
       "desc": "${_("SSO with SAML")}",
@@ -114,6 +149,20 @@ $.jHueTour({
       "video": "http://player.vimeo.com/video/76063637",
       "blog": "http://gethue.tumblr.com/post/62273866476/sso-with-hue-new-saml-backend"
     },
+    {
+      "name": "ldaphowto",
+      "desc": "${_("Integrating your company with LDAP: How To")}",
+      "path": "/(useradmin|about)",
+      "video": "",
+      "blog": "http://gethue.tumblr.com/post/75499679342/making-hadoop-accessible-to-your-employees-with-ldap"
+    },
+    {
+      "name": "sparkapp",
+      "desc": "${_("A new Spark UI")}",
+      "path": "/(spark)",
+      "video": "http://player.vimeo.com/video/78887745",
+      "blog": "http://gethue.tumblr.com/post/71963991256/a-new-spark-web-ui-spark-app"
+    },
     {
       "name": "impalavshive",
       "desc": "${_("Fast SQL with Impala")}",
@@ -194,7 +243,7 @@ $.jHueTour({
      {
        "name": "hue25",
        "desc": "${_("What's new in Hue 2.5")}",
-       "path": "/home",
+       "path": "/(about|home)",
        "video": "http://player.vimeo.com/video/70955652",
        "blog": "http://gethue.tumblr.com/post/55581863077/hue-2-5-and-its-hbase-app-is-out"
      },