From 2bea435f4398817a3643e03a2ded202316a49d83 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Thu, 24 Sep 2015 17:55:39 -0700 Subject: [PATCH 1/3] CHUKWA-783 Update documentation within the Quickstart to ease publication --- pom.xml | 40 +++++++++---------- ...art_Guide.apt => Quick_Start_Guide.apt.vm} | 0 2 files changed, 20 insertions(+), 20 deletions(-) rename src/site/apt/{Quick_Start_Guide.apt => Quick_Start_Guide.apt.vm} (100%) diff --git a/pom.xml b/pom.xml index 79c6c39f8..f8f5b4514 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,10 @@ 64 10 /chukwa + 1.1 + 3.4.5 + 1.0.0 + 2.6.0 @@ -147,7 +151,7 @@ com.googlecode.json-simple json-simple - 1.1 + ${json-simpleVersion} org.apache.activemq @@ -262,7 +266,7 @@ org.apache.zookeeper zookeeper - 3.4.5 + ${zookeeperVersion} com.sun.jersey @@ -945,15 +949,11 @@ !hbase.profile - - 1.0.0 - 2.6.0 - org.apache.hbase hbase-common - ${hbase.version} + ${hbaseVersion} com.sun.jersey @@ -1000,7 +1000,7 @@ org.apache.hbase hbase-server - ${hbase.version} + ${hbaseVersion} org.mortbay.jetty @@ -1040,14 +1040,14 @@ org.apache.hbase hbase-common tests - ${hbase.version} + ${hbaseVersion} test org.apache.hbase hbase-server tests - ${hbase.version} + ${hbaseVersion} test @@ -1076,20 +1076,20 @@ org.apache.hbase hbase-hadoop-compat tests - ${hbase.version} + ${hbaseVersion} test org.apache.hbase hbase-hadoop2-compat tests - ${hbase.version} + ${hbaseVersion} test org.apache.hadoop hadoop-common - ${hadoop.version} + ${hadoopVersion} javax.servlet.jsp @@ -1112,38 +1112,38 @@ org.apache.hadoop hadoop-auth - ${hadoop.version} + ${hadoopVersion} org.apache.hadoop hadoop-client - ${hadoop.version} + ${hadoopVersion} org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} + ${hadoopVersion} org.apache.hadoop hadoop-yarn-common - ${hadoop.version} + ${hadoopVersion} org.apache.hadoop hadoop-hdfs - ${hadoop.version} + ${hadoopVersion} org.apache.hadoop hadoop-yarn-server-tests - ${hadoop.version} + ${hadoopVersion} test org.apache.hadoop hadoop-minicluster - ${hadoop.version} + ${hadoopVersion} diff --git a/src/site/apt/Quick_Start_Guide.apt b/src/site/apt/Quick_Start_Guide.apt.vm similarity index 100% rename from src/site/apt/Quick_Start_Guide.apt rename to src/site/apt/Quick_Start_Guide.apt.vm From 7464a28db8424734b1295d5ceec4c75f01ed0e9b Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Thu, 24 Sep 2015 17:57:06 -0700 Subject: [PATCH 2/3] CHUKWA-783 Update documentation within the Quickstart to ease publication --- src/site/apt/Quick_Start_Guide.apt.vm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/site/apt/Quick_Start_Guide.apt.vm b/src/site/apt/Quick_Start_Guide.apt.vm index 2def29ba5..784deb3f7 100644 --- a/src/site/apt/Quick_Start_Guide.apt.vm +++ b/src/site/apt/Quick_Start_Guide.apt.vm @@ -24,7 +24,7 @@ Pre-requisites Chukwa should work on any POSIX platform, but GNU/Linux is the only production platform that has been tested extensively. Chukwa has also been used successfully on Mac OS X, which several members of the Chukwa team use for development. - The only absolute software requirements are Java 1.6 or better, ZooKeeper 3.4.5, HBase 1.0.0 and Hadoop 2.6.0. + The only absolute software requirements are Java 1.6 or better, ZooKeeper {{${zookeeperVersion}}}, HBase {{${hbaseVersion}}} and Hadoop {{${hadoopVersion}}}. The Chukwa cluster management scripts rely on ssh; these scripts, however, are not required if you have some alternate mechanism for starting and stopping daemons. @@ -45,11 +45,11 @@ Installing Chukwa [] -[./images/chukwa_architecture.png] Chukwa 0.6.0 Architecture +[./images/chukwa_architecture.png] Chukwa ${VERSION} Architecture First Steps - * Obtain a copy of Chukwa. You can find the latest release on the Chukwa release page. + * Obtain a copy of Chukwa. You can find the latest release on the Chukwa {{{http://www.apache.org/dyn/closer.cgi/chukwa/}release page}} (or alternatively check the source code out from SCM). * Un-tar the release, via tar xzf. @@ -64,24 +64,24 @@ Setting Up Chukwa Cluster [[1]] Copy Chukwa files to Hadoop and HBase directories: --- -cp $CHUKWA_CONF_DIR/hadoop-log4j.properties $HADOOP_CONF_DIR/log4j.properties +cp $CHUKWA_HOME/etc/chukwa/hadoop-log4j.properties $HADOOP_CONF_DIR/log4j.properties cp $CHUKWA_HOME/etc/chukwa/hadoop-metrics2.properties $HADOOP_CONF_DIR/hadoop-metrics2.properties -cp $CHUKWA_HOME/share/chukwa/chukwa-0.7.0-client.jar $HADOOP_HOME/share/hadoop/common/lib -cp $CHUKWA_HOME/share/chukwa/lib/json-simple-1.1.jar $HADOOP_HOME/share/hadoop/common/lib -cp $CHUKWA_CONF_DIR/hbase-log4j.properties $HBASE_CONF_DIR/log4j.properties +cp $CHUKWA_HOME/share/chukwa/chukwa-${VERSION}-client.jar $HADOOP_HOME/share/hadoop/common/lib +cp $CHUKWA_HOME/share/chukwa/lib/json-simple-${json-simpleVersion}.jar $HADOOP_HOME/share/hadoop/common/lib +cp $CHUKWA_HOME/etc/chukwa/hbase-log4j.properties $HBASE_CONF_DIR/log4j.properties cp $CHUKWA_HOME/etc/chukwa/hadoop-metrics2-hbase.properties $HBASE_CONF_DIR/hadoop-metrics2-hbase.properties -cp $CHUKWA_HOME/share/chukwa/chukwa-0.7.0-client.jar $HBASE_HOME/lib -cp $CHUKWA_HOME/share/chukwa/lib/json-simple-1.1.jar $HBASE_HOME/lib +cp $CHUKWA_HOME/share/chukwa/chukwa-${VERSION}-client.jar $HBASE_HOME/lib +cp $CHUKWA_HOME/share/chukwa/lib/json-simple-${json-simpleVersion}.jar $HBASE_HOME/lib --- - [[2]] Restart your Hadoop Cluster. General Hadoop configuration is available at: {{{http://hadoop.apache.org/common/docs/current/cluster_setup.html}Hadoop Configuration}} + [[2]] Restart your Hadoop Cluster. General Hadoop configuration is available at: {{{http://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/ClusterSetup.html}Hadoop Configuration}}. <> You may see some additional logging messages at this stage which looks as if error(s) are present. These messages are showing up because the log4j socket appender writes to stderr for warn messages when it is unable to stream logs to a log4j socket server. If the Chukwa agent is started with socket adaptors prior to Hadoop and HBase, those messages will not show up. For the time being do not worry about these messages, they will disappear once Chukwa agent is started with socket adaptors. - [[3]] Make sure HBase is started. General HBASE configuration is available at: {{{http://hbase.apache.org/docs/current/api/overview-summary.html#overview_description}HBase Configuration}} + [[3]] Make sure HBase is started. General HBASE configuration is available at: {{{http://hbase.apache.org/book.html#configuration}HBase Configuration}} [[4]] After Hadoop and HBase are started, run: --- -bin/hbase shell < CHUKWA_HOME/etc/chukwa/hbase.schema +bin/hbase shell < $CHUKWA_HOME/etc/chukwa/hbase.schema --- This procedure initializes the default Chukwa HBase schema. @@ -127,7 +127,7 @@ jar cf $CHUKWA_HOME/hbase-env.jar $HBASE_CONF_DIR [[4]] Setup a cron job or Hudson job for analytics script to run periodically: --- -pig -Dpig.additional.jars=${HBASE_HOME}/hbase-0.90.4.jar:${HBASE_HOME}/lib/zookeeper-3.3.2.jar:${PIG_PATH}/pig.jar:${CHUKWA_HOME}/hbase-env.jar ${CHUKWA_HOME}/script/pig/ClusterSummary.pig +pig -Dpig.additional.jars=${HBASE_HOME}/hbase-{{${hbaseVersion}}}.jar:${HBASE_HOME}/lib/zookeeper-{{${zookeeperVersion}}}.jar:${PIG_PATH}/pig.jar:${CHUKWA_HOME}/hbase-env.jar ${CHUKWA_HOME}/script/pig/ClusterSummary.pig --- * Start HICC From def370afab3d40686360650bd8ea6198f21c68f6 Mon Sep 17 00:00:00 2001 From: Lewis John McGibbney Date: Thu, 24 Sep 2015 18:41:19 -0700 Subject: [PATCH 3/3] CHUKWA-783 Update documentation within the Quickstart to ease publication --- src/site/apt/Quick_Start_Guide.apt.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/apt/Quick_Start_Guide.apt.vm b/src/site/apt/Quick_Start_Guide.apt.vm index 784deb3f7..0019d1f62 100644 --- a/src/site/apt/Quick_Start_Guide.apt.vm +++ b/src/site/apt/Quick_Start_Guide.apt.vm @@ -127,7 +127,7 @@ jar cf $CHUKWA_HOME/hbase-env.jar $HBASE_CONF_DIR [[4]] Setup a cron job or Hudson job for analytics script to run periodically: --- -pig -Dpig.additional.jars=${HBASE_HOME}/hbase-{{${hbaseVersion}}}.jar:${HBASE_HOME}/lib/zookeeper-{{${zookeeperVersion}}}.jar:${PIG_PATH}/pig.jar:${CHUKWA_HOME}/hbase-env.jar ${CHUKWA_HOME}/script/pig/ClusterSummary.pig +pig -Dpig.additional.jars=${HBASE_HOME}/hbase-${hbaseVersion}.jar:${HBASE_HOME}/lib/zookeeper-${zookeeperVersion}.jar:${PIG_PATH}/pig.jar:${CHUKWA_HOME}/hbase-env.jar ${CHUKWA_HOME}/script/pig/ClusterSummary.pig --- * Start HICC