You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by ey...@apache.org on 2009/04/16 06:47:49 UTC
svn commit: r765463 - in /hadoop/chukwa/branches/chukwa-0.1: bin/ conf/
Author: eyang
Date: Thu Apr 16 04:47:48 2009
New Revision: 765463
URL: http://svn.apache.org/viewvc?rev=765463&view=rev
Log:
CHUKWA-112. Changed configuration filenames to be consistent. (Eric Yang)
Added:
hadoop/chukwa/branches/chukwa-0.1/conf/alert.template (props changed)
- copied unchanged from r763009, hadoop/chukwa/branches/chukwa-0.1/conf/alert.conf.template
hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-demux-conf.xml
- copied unchanged from r764541, hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-demux-conf.xml.template
hadoop/chukwa/branches/chukwa-0.1/conf/database_create_tables.sql (props changed)
- copied unchanged from r765028, hadoop/chukwa/branches/chukwa-0.1/conf/database_create_tables
hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics-log4j.properties (contents, props changed)
- copied, changed from r763009, hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-hadoop-metrics-log4j.properties
hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties (contents, props changed)
- copied, changed from r763009, hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties.template
hadoop/chukwa/branches/chukwa-0.1/conf/mdl.xml (props changed)
- copied unchanged from r765028, hadoop/chukwa/branches/chukwa-0.1/conf/mdl.xml.template
Removed:
hadoop/chukwa/branches/chukwa-0.1/conf/alert.conf.template
hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-demux-conf.xml.template
hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-hadoop-metrics-log4j.properties
hadoop/chukwa/branches/chukwa-0.1/conf/database_create_tables
hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties.template
hadoop/chukwa/branches/chukwa-0.1/conf/mdl.xml.template
Modified:
hadoop/chukwa/branches/chukwa-0.1/bin/chukwa-daemon.sh
hadoop/chukwa/branches/chukwa-0.1/bin/slaves.sh
hadoop/chukwa/branches/chukwa-0.1/bin/start-agents.sh
hadoop/chukwa/branches/chukwa-0.1/bin/stop-agents.sh
Modified: hadoop/chukwa/branches/chukwa-0.1/bin/chukwa-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/bin/chukwa-daemon.sh?rev=765463&r1=765462&r2=765463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/bin/chukwa-daemon.sh (original)
+++ hadoop/chukwa/branches/chukwa-0.1/bin/chukwa-daemon.sh Thu Apr 16 04:47:48 2009
@@ -96,7 +96,7 @@
case $startStop in
(start)
- MAIL=`cat ${CHUKWA_CONF_DIR}/alert.conf`
+ MAIL=`cat ${CHUKWA_CONF_DIR}/alert`
RANDOM=`date '+%s'`
PARTROL_HOUR=$[($RANDOM % 24)]
Modified: hadoop/chukwa/branches/chukwa-0.1/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/bin/slaves.sh?rev=765463&r1=765462&r2=765463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/bin/slaves.sh (original)
+++ hadoop/chukwa/branches/chukwa-0.1/bin/slaves.sh Thu Apr 16 04:47:48 2009
@@ -21,7 +21,7 @@
# Environment Variables
#
# CHUKWA_SLAVES File naming remote hosts.
-# Default is ${CHUKWA_CONF_DIR}/chukwa-agents.
+# Default is ${CHUKWA_CONF_DIR}/agents.
# CHUKWA_CONF_DIR Alternate conf dir. Default is ${CHUKWA_HOME}/conf.
# CHUKWA_SLAVE_SLEEP Seconds to sleep between spawning remote commands.
# CHUKWA_SSH_OPTS Options passed to ssh when running remote commands.
@@ -51,7 +51,7 @@
if [ "$HOSTLIST" = "" ]; then
if [ "$CHUKWA_SLAVES" = "" ]; then
- export HOSTLIST="${CHUKWA_CONF_DIR}/chukwa-agents"
+ export HOSTLIST="${CHUKWA_CONF_DIR}/agents"
else
export HOSTLIST="${CHUKWA_SLAVES}"
fi
Modified: hadoop/chukwa/branches/chukwa-0.1/bin/start-agents.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/bin/start-agents.sh?rev=765463&r1=765462&r2=765463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/bin/start-agents.sh (original)
+++ hadoop/chukwa/branches/chukwa-0.1/bin/start-agents.sh Thu Apr 16 04:47:48 2009
@@ -28,4 +28,4 @@
. "$bin"/chukwa-config.sh
# start chukwa agents
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts chukwa-agents start agent.sh
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents start agent.sh
Modified: hadoop/chukwa/branches/chukwa-0.1/bin/stop-agents.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/bin/stop-agents.sh?rev=765463&r1=765462&r2=765463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/bin/stop-agents.sh (original)
+++ hadoop/chukwa/branches/chukwa-0.1/bin/stop-agents.sh Thu Apr 16 04:47:48 2009
@@ -23,4 +23,4 @@
. "$bin"/chukwa-config.sh
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts chukwa-agents stop agent.sh
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents stop agent.sh
Propchange: hadoop/chukwa/branches/chukwa-0.1/conf/alert.template
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 04:47:48 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/alert.conf.template:713112
Propchange: hadoop/chukwa/branches/chukwa-0.1/conf/database_create_tables.sql
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics-log4j.properties (from r763009, hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-hadoop-metrics-log4j.properties)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics-log4j.properties?p2=hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics-log4j.properties&p1=hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-hadoop-metrics-log4j.properties&r1=763009&r2=765463&rev=765463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/conf/chukwa-hadoop-metrics-log4j.properties (original)
+++ hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics-log4j.properties Thu Apr 16 04:47:48 2009
@@ -0,0 +1,32 @@
+log4j.appender.chukwa.rpc.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.rpc.chukwaClientHostname=localhost
+log4j.appender.chukwa.rpc.chukwaClientPortNum=9093
+log4j.appender.chukwa.rpc.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.rpc.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.rpc.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.rpc.Dir=@CHUKWA_LOG_DIR@/metrics
+
+log4j.appender.chukwa.jvm.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.jvm.chukwaClientHostname=localhost
+log4j.appender.chukwa.jvm.chukwaClientPortNum=9093
+log4j.appender.chukwa.jvm.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.jvm.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.jvm.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.jvm.Dir=@CHUKWA_LOG_DIR@/metrics
+
+log4j.appender.chukwa.dfs.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.dfs.chukwaClientHostname=localhost
+log4j.appender.chukwa.dfs.chukwaClientPortNum=9093
+log4j.appender.chukwa.dfs.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.dfs.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.dfs.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.dfs.Dir=@CHUKWA_LOG_DIR@/metrics
+
+log4j.appender.chukwa.mapred.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.mapred.chukwaClientHostname=localhost
+log4j.appender.chukwa.mapred.chukwaClientPortNum=9093
+log4j.appender.chukwa.mapred.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.mapred.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.mapred.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.mapred.Dir=@CHUKWA_LOG_DIR@/metrics
+
Propchange: hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics-log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 04:47:48 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/chukwa-hadoop-metrics-log4j.properties:713112
Copied: hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties (from r763009, hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties.template)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties?p2=hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties&p1=hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties.template&r1=763009&r2=765463&rev=765463&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties.template (original)
+++ hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties Thu Apr 16 04:47:48 2009
@@ -1,31 +1,31 @@
-#chukwaAgent.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#chukwaAgent.period=60
-#chukwaAgent.directory=/tmp/
+chukwaAgent.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+chukwaAgent.period=60
+chukwaAgent.directory=@CHUKWA_LOG_DIR@/metrics/
-#chukwaHttpSender.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#chukwaHttpSender.period=60
-#chukwaHttpSender.directory=/tmp/
-
-#chunkQueue.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#chunkQueue.period=60
-#chunkQueue.directory=/tmp/
-
-#dfs.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#dfs.period=60
-#dfs.directory=/tmp/
-
-#jvm.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#jvm.period=60
-#jvm.directory=/tmp/
-#jvm.uuid=true
-
-#mapred.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#mapred.period=60
-#mapred.directory=/tmp/
-#mapred.uuid=true
-
-#rpc.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#rpc.period=60
-#rpc.directory=/tmp/
-#rpc.uuid=true
+chukwaHttpSender.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+chukwaHttpSender.period=60
+chukwaHttpSender.directory=@CHUKWA_LOG_DIR@/metrics/
+
+chunkQueue.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+chunkQueue.period=60
+chunkQueue.directory=@CHUKWA_LOG_DIR@/metrics/
+
+dfs.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+dfs.period=60
+dfs.directory=@CHUKWA_LOG_DIR@/metrics/
+
+jvm.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+jvm.period=60
+jvm.directory=@CHUKWA_LOG_DIR@/metrics/
+jvm.uuid=true
+
+mapred.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+mapred.period=60
+mapred.directory=@CHUKWA_LOG_DIR@/metrics/
+mapred.uuid=true
+
+rpc.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+rpc.period=60
+rpc.directory=@CHUKWA_LOG_DIR@/metrics/
+rpc.uuid=true
Propchange: hadoop/chukwa/branches/chukwa-0.1/conf/hadoop-metrics.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 04:47:48 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/hadoop-metrics.properties.template:713112
Propchange: hadoop/chukwa/branches/chukwa-0.1/conf/mdl.xml
------------------------------------------------------------------------------
svn:mergeinfo =