Updated Branches: refs/heads/master f7008ed6d -> a34142a7e
BIGTOP-1107. Update to the official Hue 2.5.1 release Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a34142a7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a34142a7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a34142a7 Branch: refs/heads/master Commit: a34142a7ea902f00c4e206387d42c32968bd463f Parents: f7008ed Author: Roman Shaposhnik <[email protected]> Authored: Thu Oct 3 17:41:49 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Fri Oct 4 12:12:11 2013 -0700 ---------------------------------------------------------------------- .../puppet/modules/hue/manifests/init.pp | 3 +- .../puppet/modules/hue/templates/hue.ini | 85 ++++++++++++++++++-- bigtop-deploy/puppet/modules/hue/tests/init.pp | 3 + .../src/common/hue/do-component-build | 2 +- bigtop-packages/src/rpm/hue/SPECS/hue.spec | 2 +- bigtop.mk | 2 +- 6 files changed, 88 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/a34142a7/bigtop-deploy/puppet/modules/hue/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hue/manifests/init.pp b/bigtop-deploy/puppet/modules/hue/manifests/init.pp index 7d0fcce..f4c6f95 100644 --- a/bigtop-deploy/puppet/modules/hue/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hue/manifests/init.pp @@ -14,7 +14,8 @@ # limitations under the License. class hue { - define server($webhdfs_url, $rm_host, $rm_port, $oozie_url, $rm_url, $rm_proxy_url, $history_server_url, + define server($sqoop_url, $solr_url, $hbase_thrift_url, + $webhdfs_url, $rm_host, $rm_port, $oozie_url, $rm_url, $rm_proxy_url, $history_server_url, $hue_host = "0.0.0.0", $hue_port = "8888", $default_fs = "hdfs://localhost:8020", $kerberos_realm = "") { if ($kerberos_realm) { http://git-wip-us.apache.org/repos/asf/bigtop/blob/a34142a7/bigtop-deploy/puppet/modules/hue/templates/hue.ini ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hue/templates/hue.ini b/bigtop-deploy/puppet/modules/hue/templates/hue.ini index 35b90f2..44e011f 100644 --- a/bigtop-deploy/puppet/modules/hue/templates/hue.ini +++ b/bigtop-deploy/puppet/modules/hue/templates/hue.ini @@ -137,7 +137,7 @@ ## nt_domain=mycompany.com # URL of the LDAP server - ## ldap_url=ldap://auth.mycompany.com + ldap_url=ldap://auth.mycompany.com # A PEM-format file containing certificates for the CA's that # Hue will trust for authentication over TLS. @@ -257,6 +257,7 @@ # Configuration for HDFS NameNode # ------------------------------------------------------------------------ [[hdfs_clusters]] + # HA support by using HttpFs [[[default]]] # Enter the filesystem uri @@ -347,6 +348,9 @@ # URL of the HistoryServer API history_server_api_url=<%= history_server_url %> + # URL of the NodeManager API + node_manager_api_url=http://localhost:8042 + ########################################################################### # Settings to configure liboozie @@ -396,7 +400,13 @@ # required, even if the Thrift daemon is running on the same host as Hue. ## beeswax_server_host=<FQDN of Beeswax Server> + # The type of Thrift interface used for contacting the backend for sending + # queries/metadata requests. + # Choices are 'beeswax' (default), 'hiveserver2'. + ## server_interface=beeswax + # Port where Beeswax Thrift server runs on. + # Use 10000 when using the HiveServer2 interface. ## beeswax_server_port=8002 # Host where internal metastore Thrift daemon is running. @@ -427,14 +437,79 @@ # visible only to the owner and administrators. ## share_saved_queries=true - # The backend to contact for queries/metadata requests - # Choices are 'beeswax' (default), 'hiveserver2'. - ## server_interface=beeswax - # Time in milliseconds for Beeswax to persist queries in its cache. # 7*24*60*60*1000 = 1 week ## beeswax_running_query_lifetime=604800000L + # Set a LIMIT clause when browsing a partitioned table. + # A positive value will be set as the LIMIT. If 0 or negative, do not set any limit. + ## browse_partitioned_table_limit=250 + + +########################################################################### +# Settings to configure Pig +########################################################################### + +[pig] + # Location of piggybank.jar on local filesystem. + ## local_sample_dir=/usr/share/hue/apps/pig/examples + + # Location piggybank.jar will be copied to in HDFS. + ## remote_data_dir=/user/hue/pig/examples + + +########################################################################### +# Settings to configure Sqoop +########################################################################### + +[sqoop] + # Sqoop server URL + server_url=<%= sqoop_url %> + + +########################################################################### +# Settings to configure Proxy +########################################################################### + +[proxy] + # Comma-separated list of regular expressions, + # which match 'host:port' of requested proxy target. + ## whitelist=(localhost|127\.0\.0\.1):(50030|50070|50060|50075) + + # Comma-separated list of regular expressions, + # which match any prefix of 'host:port/path' of requested proxy target. + # This does not support matching GET parameters. + ## blacklist=() + + +########################################################################### +# Settings to configure Hbase +########################################################################### + +[hbase] + # Comma-separated list of HBase Thrift servers for + # clusters in the format of '(name|host:port)'. + hbase_clusters=(Bigtop|<%= hbase_thrift_url %>) + + # Hard limit of rows or columns per row fetched before truncating. + ## truncate_limit = 500 + + +########################################################################### +# Settings to configure Solr Search +########################################################################### + +[search] + + # URL of the Solr Server + solr_url=<%= solr_url %> + + # Requires FQDN in solr_url if enabled + ## security_enabled=false + + ## Query sent when no term is entered + empty_query=*:* + ########################################################################### # Settings to configure Job Designer http://git-wip-us.apache.org/repos/asf/bigtop/blob/a34142a7/bigtop-deploy/puppet/modules/hue/tests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hue/tests/init.pp b/bigtop-deploy/puppet/modules/hue/tests/init.pp index 09cd4c2..7007ea0 100644 --- a/bigtop-deploy/puppet/modules/hue/tests/init.pp +++ b/bigtop-deploy/puppet/modules/hue/tests/init.pp @@ -14,6 +14,9 @@ # limitations under the License. hue::server { "test-hue-server": + sqoop_url => "http://localhost:12000/sqoop";, + solr_url => "http://localhost:8983/solr/";, + hbase_thrift_url => "localhost:9090", webhdfs_url => "http://localhost:14000/webhdfs/v1";, rm_host => "localhost", rm_port => "8032", http://git-wip-us.apache.org/repos/asf/bigtop/blob/a34142a7/bigtop-packages/src/common/hue/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hue/do-component-build b/bigtop-packages/src/common/hue/do-component-build index c81958c..6c13e5f 100644 --- a/bigtop-packages/src/common/hue/do-component-build +++ b/bigtop-packages/src/common/hue/do-component-build @@ -17,7 +17,7 @@ set -ex #FIXME: this needs to be fixed upstream -sed -i -e 's#2.5.0-SNAPSHOT#'${FULL_VERSION}'#g' `grep -lR 2.5.0-SNAPSHOT .` +sed -i -e "s#${FULL_VERSION}-SNAPSHOT#${FULL_VERSION}#g" `grep -lR ${FULL_VERSION}-SNAPSHOT .` make MAVEN_VERSION='$(DESKTOP_VERSION)' apps http://git-wip-us.apache.org/repos/asf/bigtop/blob/a34142a7/bigtop-packages/src/rpm/hue/SPECS/hue.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hue/SPECS/hue.spec b/bigtop-packages/src/rpm/hue/SPECS/hue.spec index de42aee..6b9aab6 100644 --- a/bigtop-packages/src/rpm/hue/SPECS/hue.spec +++ b/bigtop-packages/src/rpm/hue/SPECS/hue.spec @@ -138,7 +138,7 @@ It supports a file browser, job tracker interface, cluster health monitor, and m %__rm -rf $RPM_BUILD_ROOT %prep -%setup -n %{name}-branch-%{hue_base_version} +%setup -n %{name}-release-%{hue_base_version} ######################################## # Build http://git-wip-us.apache.org/repos/asf/bigtop/blob/a34142a7/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 4cefcf7..f7235d5 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -191,7 +191,7 @@ HUE_BASE_VERSION=2.5.1 HUE_PKG_VERSION=2.5.1 HUE_RELEASE_VERSION=1 HUE_TARBALL_DST=hue-$(HUE_BASE_VERSION).tar.gz -HUE_TARBALL_SRC=branch-2.5.1.tar.gz +HUE_TARBALL_SRC=release-$(HUE_BASE_VERSION).tar.gz HUE_SITE=https://github.com/cloudera/hue/archive HUE_ARCHIVE=$(HUE_SITE) $(eval $(call PACKAGE,hue,HUE))
