Return-Path: 
 <chukwa-commits-return-652-apmail-incubator-chukwa-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-chukwa-commits-archive@www.apache.org
Received: (qmail 82289 invoked from network); 24 Nov 2010 16:54:18 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 24 Nov 2010 16:54:18 -0000
Received: (qmail 79720 invoked by uid 500); 24 Nov 2010 16:54:49 -0000
Delivered-To: apmail-incubator-chukwa-commits-archive@incubator.apache.org
Received: (qmail 79697 invoked by uid 500); 24 Nov 2010 16:54:49 -0000
Mailing-List: contact chukwa-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:chukwa-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:chukwa-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:chukwa-commits@incubator.apache.org>
List-Id: <chukwa-commits.incubator.apache.org>
Reply-To: chukwa-dev@incubator.apache.org
Delivered-To: mailing list chukwa-commits@incubator.apache.org
Received: (qmail 79689 invoked by uid 99); 24 Nov 2010 16:54:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Nov 2010 16:54:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Nov 2010 16:54:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F1D9B23888E8; Wed, 24 Nov 2010 16:53:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1038689 - in /incubator/chukwa/trunk/conf:
 chukwa-demux-conf.xml.template hadoop-metrics-log4j.properties
 hadoop-metrics.properties.template initial_adaptors.template
Date: Wed, 24 Nov 2010 16:53:16 -0000
To: chukwa-commits@incubator.apache.org
From: eyang@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101124165316.F1D9B23888E8@eris.apache.org>

Author: eyang
Date: Wed Nov 24 16:53:16 2010
New Revision: 1038689

URL: http://svn.apache.org/viewvc?rev=1038689&view=rev
Log:
CHUKWA-558. Update default Chukwa configuration files to use SocketAdaptor for Hadoop metrics streaming. (Eric Yang)

Removed:
    incubator/chukwa/trunk/conf/hadoop-metrics-log4j.properties
Modified:
    incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template
    incubator/chukwa/trunk/conf/hadoop-metrics.properties.template
    incubator/chukwa/trunk/conf/initial_adaptors.template

Modified: incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template?rev=1038689&r1=1038688&r2=1038689&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template (original)
+++ incubator/chukwa/trunk/conf/chukwa-demux-conf.xml.template Wed Nov 24 16:53:16 2010
@@ -120,36 +120,12 @@
 <!-- Demux aliases -->
 
   <property>
-    <name>HadoopMetricsProcessor</name>
+    <name>HadoopMetrics</name>
     <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.HadoopMetricsProcessor</value>
     <description>Parser class for Hadoop Metrics </description>
   </property>
 
   <property>
-    <name>jvm</name>
-    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.HadoopMetricsProcessor</value>
-    <description>Parser class for </description>
-  </property>
-
-  <property>
-    <name>mapred</name>
-    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.HadoopMetricsProcessor</value>
-    <description>Parser class for </description>
-  </property>
-
-  <property>
-    <name>rpc</name>
-    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.HadoopMetricsProcessor</value>
-    <description>Parser class for </description>
-  </property>
-
-  <property>
-    <name>dfs</name>
-    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.HadoopMetricsProcessor</value>
-    <description>Parser class for </description>
-  </property>
-  
-  <property>
     <name>SysLog</name>
     <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.SysLog</value>
     <description>Parser class for </description>
@@ -234,24 +210,12 @@
    </property>
 
    <property>
-    <name>chukwaAgent</name>
-    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.Log4JMetricsContextProcessor</value>
+    <name>chukwa</name>
+    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.ChukwaMetricsProcessor</value>
     <description></description>
    </property>
 
    <property>
-    <name>chunkQueue</name>
-    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.Log4JMetricsContextProcessor</value>
-    <description></description>
-   </property>
-
-   <property>
-    <name>chukwaHttpSender</name>
-    <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.Log4JMetricsContextProcessor</value>
-    <description></description>
-   </property>
-   
-   <property>
     <name>SystemMetrics</name>
     <value>org.apache.hadoop.chukwa.extraction.demux.processor.mapper.SystemMetrics</value>
     <description></description>

Modified: incubator/chukwa/trunk/conf/hadoop-metrics.properties.template
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/hadoop-metrics.properties.template?rev=1038689&r1=1038688&r2=1038689&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/hadoop-metrics.properties.template (original)
+++ incubator/chukwa/trunk/conf/hadoop-metrics.properties.template Wed Nov 24 16:53:16 2010
@@ -15,33 +15,26 @@
 
 chukwaAgent.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
 chukwaAgent.period=60
-chukwaAgent.directory=@TODO-CHUKWA_LOG_DIR@/metrics/
+chukwaAgent.host=localhost
+chukwaAgent.port=9096
  
-chukwaHttpSender.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-chukwaHttpSender.period=60
-chukwaHttpSender.directory=@TODO-CHUKWA_LOG_DIR@/metrics/
-
-chunkQueue.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-chunkQueue.period=60
-chunkQueue.directory=@TODO-CHUKWA_LOG_DIR@/metrics/
-
 dfs.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
 dfs.period=60
-dfs.directory=@TODO-CHUKWA_LOG_DIR@/metrics/
-dfs.uuid=true
+dfs.host=localhost
+dfs.port=9095
 
 jvm.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
 jvm.period=60
-jvm.directory=@TODO-CHUKWA_LOG_DIR@/metrics/
-jvm.uuid=true
+jvm.host=localhost
+jvm.port=9095
 
 mapred.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
 mapred.period=60
-mapred.directory=@TODO-CHUKWA_LOG_DIR@/metrics/
-mapred.uuid=true
+mapred.host=localhost
+mapred.port=9095
 
 rpc.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
 rpc.period=60
-rpc.directory=@TODO-CHUKWA_LOG_DIR@/metrics/
-rpc.uuid=true
+rpc.host=localhost
+rpc.port=9095
 

Modified: incubator/chukwa/trunk/conf/initial_adaptors.template
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/conf/initial_adaptors.template?rev=1038689&r1=1038688&r2=1038689&view=diff
==============================================================================
--- incubator/chukwa/trunk/conf/initial_adaptors.template (original)
+++ incubator/chukwa/trunk/conf/initial_adaptors.template Wed Nov 24 16:53:16 2010
@@ -1,4 +1,3 @@
-add org.apache.hadoop.chukwa.datacollection.adaptor.ExecAdaptor Iostat 60 /usr/bin/iostat -x -k 55 2 0
-add org.apache.hadoop.chukwa.datacollection.adaptor.ExecAdaptor Df 60 /bin/df -l 0
-add org.apache.hadoop.chukwa.datacollection.adaptor.ExecAdaptor Sar 60 /usr/bin/sar -q -r -n ALL 55 0
-add org.apache.hadoop.chukwa.datacollection.adaptor.ExecAdaptor Top 60 /usr/bin/top -b -n 1 -c 0
+add sigar.SystemMetrics SystemMetrics 60 0
+add SocketAdaptor HadoopMetrics 9095 0
+add SocketAdaptor Hadoop 9096 0