diff --git a/hadoop-plugin.xml b/hadoop-plugin.xml
new file mode 100644
index 0000000..1b1eda4
--- /dev/null
+++ b/hadoop-plugin.xml
@@ -0,0 +1,460 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE plugin [
+  <!ENTITY process-metrics SYSTEM "/pdk/plugins/process-metrics.xml">
+]>
+
+<plugin>
+  <classpath>
+    <include name="pdk/lib/mx4j"/>
+  </classpath>
+
+  <filter name="template"
+          value="${OBJECT_NAME}:${alias}"/>
+
+  <metrics name="rpc">
+    <metric name="Availability" indicator="true"/>
+
+    <metric name="Num Open Connections" indicator="true"/>
+
+    <metric name="Call Queue Len"/>
+
+    <metric name="Rpc Ops Avg Processing Time" units="ms"/>
+
+    <metric name="Rpc Ops Avg Processing Time Max" units="ms"/>
+
+    <metric name="Rpc Ops Avg Processing Time Min" units="ms"/>
+
+    <metric name="Rpc Ops Avg Queue Time" units="ms" indicator="true"/>
+
+    <metric name="Rpc Ops Avg Queue Time Max" units="ms"/>
+
+    <metric name="Rpc Ops Avg Queue Time Min" units="ms"/>
+
+    <metric name="Rpc Ops Number"/>
+  </metrics>
+
+  <filter name="threading"
+          value="java.lang:type=Threading:${alias}"/>
+
+  <filter name="memory"
+          value="java.lang:type=Memory"/>
+
+  <metrics name="jvm">
+    <metric name="Availability"
+            indicator="true"
+            template="${memory}:${alias}"/>
+
+    <metric name="Heap Memory Free"
+            indicator="true"
+            units="B"
+            template="${memory}:Composite.HeapMemoryUsage.free"/>
+
+    <metric name="Thread Count"
+            indicator="true"
+            template="${threading}"/>
+
+    <metric name="Total HotSpot Compilation Time"
+            indicator="true"
+            units="ms"
+            category="PERFORMANCE"
+            template="java.lang:type=Compilation:TotalCompilationTime"/>
+  </metrics>
+
+  <server name="Hadoop Name Node">
+    <property name="PROC_MAIN_CLASS"
+              value="org.apache.hadoop.hdfs.server.namenode.NameNode"/>
+
+    <property name="PROC_HOME_PROPERTY"
+              value="hadoop.home.dir"/>
+
+    <property name="INVENTORY_ID" value="${PROC_MAIN_CLASS}"/>
+
+    <plugin type="autoinventory"
+            class="org.hyperic.hq.product.jmx.MxServerDetector"/>
+
+    <plugin type="measurement"
+            class="org.hyperic.hq.product.jmx.MxMeasurementPlugin"/>
+
+    <plugin type="log_track"
+            class="org.hyperic.hq.product.Log4JLogTrackPlugin"/>
+    
+    <plugin type="config_track"
+            class="org.hyperic.hq.product.ConfigFileTrackPlugin"/>
+
+    <property name="process.query"
+              value="State.Name.eq=java,Args.*.eq=${PROC_MAIN_CLASS}"/>
+
+    <property name="jmx.url"
+              value="ptql:${process.query}"/>
+
+    <config include="jmx">
+      <option name="process.query" description="Process query" default="${process.query}"/>
+    </config>
+
+    <properties>
+      <property name="VmVersion" description="Vm Version"/>
+      <property name="VmVendor" description="Vm Vendor"/>
+      <property name="VmName" description="Vm Name"/>
+    </properties>
+
+    &process-metrics;
+
+    <property name="OBJECT_NAME"
+              value="java.lang:type=Runtime"/>
+
+    <metrics include="jvm"/>
+
+    <service name="RPC">
+      <config>
+        <option name="name" description="Name"/>
+      </config>
+
+      <property name="MBEAN_CLASS"
+                value="org.apache.hadoop.ipc.metrics.RpcMgt"/>
+
+      <property name="OBJECT_NAME"
+                value="hadoop.dfs:service=NameNode,name=*"/>
+
+      <plugin type="autoinventory"/>
+
+      <metrics include="rpc"/>
+    </service>
+
+    <service name="Stats">
+      <property name="OBJECT_NAME"
+                value="hadoop.dfs:service=NameNode,name=NameNodeStatistics"/>
+
+      <plugin type="autoinventory"/>
+
+      <metric name="Availability" indicator="true"/>
+
+      <metric name="Block Report Average Time" units="ms" indicator="true"/>
+
+      <metric name="Block Report Max Time" units="ms"/>
+
+      <metric name="Block Report Min Time" units="ms"/>
+
+      <metric name="Block Report Num" collectionType="trendsup"/>
+
+      <metric name="Journal Transaction Average Time" units="ms" indicator="true"/>
+
+      <metric name="Journal Transaction Num" collectionType="trendsup"/>
+
+      <metric name="Journal Transaction Max Time" units="ms"/>
+
+      <metric name="Journal Transaction Min Time" units="ms"/>
+
+      <metric name="Journal Sync Average Time" units="ms"/>
+
+      <metric name="Journal Sync Max Time" units="ms"/>
+
+      <metric name="Journal Sync Min Time" units="ms"/>
+
+      <metric name="Journal Sync Num" collectionType="trendsup"/>
+
+      <metric name="Safemode Time" units="ms"/>
+
+      <metric name="FS Image Load Time" units="ms"/>
+
+      <metric name="Num Files Created" collectionType="trendsup"/>
+
+      <metric name="Num Files Listed" collectionType="trendsup"/>
+
+      <metric name="Num Get Listing Ops" collectionType="trendsup"/>
+
+      <metric name="Num Create File Ops" collectionType="trendsup"/>
+
+      <metric name="Num Delete File Ops" collectionType="trendsup"/>
+
+      <metric name="Num Add Block Ops" collectionType="trendsup"/>
+
+      <metric name="Num Get Block Locations" collectionType="trendsup"/>
+
+      <metric name="Num Files Renamed" collectionType="trendsup"/>
+    </service>
+
+    <service name="FS Namesystem">
+      <property name="MBEAN_CLASS"
+                value="hadoop.dfs:service=NameNode,name=FSNamesystemStatus"/>
+
+      <property name="OBJECT_NAME"
+                value="hadoop.dfs:name=FSNamesystemStatus,service=*"/>
+
+      <plugin type="autoinventory"/>
+
+      <config>
+        <option name="service" description="service"/>
+      </config>
+
+      <metric name="Availability" indicator="true"/>
+
+      <metric name="Capacity Total" units="B"/>
+
+      <metric name="Capacity Used" units="B"/>
+
+      <metric name="Capacity Remaining" units="B" indicator="true"/>
+
+      <metric name="Total Load" indicator="true"/>
+
+      <metric name="Blocks Total"/>
+
+      <metric name="Files Total"/>
+
+      <metric name="Pending Replication Blocks" indicator="true"/>
+
+      <metric name="Under Replicated Blocks"/>
+
+      <metric name="Scheduled Replication Blocks"/>
+
+    </service>
+  </server>
+
+  <server name="Hadoop Data Node">
+    <property name="PROC_MAIN_CLASS"
+              value="org.apache.hadoop.hdfs.server.datanode.DataNode"/>
+
+    <property name="PROC_HOME_PROPERTY"
+              value="hadoop.home.dir"/>
+
+    <property name="INVENTORY_ID" value="${PROC_MAIN_CLASS}"/>
+
+    <plugin type="autoinventory"
+            class="org.hyperic.hq.product.jmx.MxServerDetector"/>
+
+    <plugin type="measurement"
+            class="org.hyperic.hq.product.jmx.MxMeasurementPlugin"/>
+
+    <plugin type="log_track"
+            class="org.hyperic.hq.product.Log4JLogTrackPlugin"/>
+    
+    <plugin type="config_track"
+            class="org.hyperic.hq.product.ConfigFileTrackPlugin"/>
+
+    <property name="process.query"
+              value="State.Name.eq=java,Args.*.eq=${PROC_MAIN_CLASS}"/>
+
+    <property name="jmx.url"
+              value="ptql:${process.query}"/>
+
+    <config include="jmx">
+      <option name="process.query" description="Process query" default="${process.query}"/>
+    </config>
+
+    <properties>
+      <property name="VmVersion" description="Vm Version"/>
+      <property name="VmVendor" description="Vm Vendor"/>
+      <property name="VmName" description="Vm Name"/>
+    </properties>
+
+    &process-metrics;
+
+    <property name="OBJECT_NAME"
+              value="java.lang:type=Runtime"/>
+
+    <metrics include="jvm"/>
+
+    <service name="RPC">
+      <config>
+        <option name="name" description="Name"/>
+      </config>
+
+      <property name="MBEAN_CLASS"
+                value="org.apache.hadoop.ipc.metrics.RpcMgt"/>
+
+      <property name="OBJECT_NAME"
+                value="hadoop.dfs:service=DataNode,name=*"/>
+
+      <plugin type="autoinventory"/>
+
+      <metrics include="rpc"/>
+    </service>
+
+    <service name="Stats">
+      <property name="MBEAN_CLASS"
+                value="org.apache.hadoop.hdfs.server.datanode.metrics.DataNodeStatistics"/>
+
+      <property name="OBJECT_NAME"
+                value="hadoop.dfs:name=DataNodeStatistics,service=*"/>
+
+      <plugin type="autoinventory"/>
+
+      <config>
+        <option name="service" description="service"/>
+      </config>
+
+      <metric name="Availability" indicator="true"/>
+
+      <metric name="Bytes Read" units="B" collectionType="trendsup" indicator="true"/> 
+
+      <metric name="Bytes Written" units="B" collectionType="trendsup" indicator="true"/>
+
+      <metric name="Blocks Read" collectionType="trendsup"/>
+
+      <metric name="Blocks Removed" collectionType="trendsup"/>
+
+      <metric name="Blocks Replicated" collectionType="trendsup"/>
+
+      <metric name="Blocks Written" collectionType="trendsup"/>
+
+      <metric name="Block Verification Failures" collectionType="trendsup"/>
+
+      <metric name="Blocks Verified" collectionType="trendsup"/>
+
+      <metric name="Reads From Local Client" collectionType="trendsup"/>
+
+      <metric name="Reads From Remote Client" collectionType="trendsup"/>
+
+      <metric name="Writes From Local Client" collectionType="trendsup"/>
+
+      <metric name="Writes From Remote Client" collectionType="trendsup"/>
+
+      <metric name="Read Block Op Average Time"/>
+
+      <metric name="Read Block Op Max Time"/>
+
+      <metric name="Read Block Op Min Time"/>
+
+      <metric name="Read Block Op Num"/>
+
+      <metric name="Read Metadata Op Average Time"/>
+
+      <metric name="Read Metadata Op Max Time"/>
+
+      <metric name="Read Metadata Op Min Time"/>
+
+      <metric name="Read Metadata Op Num"/>
+
+      <metric name="Block Checksum Op Average Time"/>
+
+      <metric name="Block Checksum Op Max Time"/>
+
+      <metric name="Block Checksum Op Min Time"/>
+
+      <metric name="Block Checksum Op Num"/>
+
+      <metric name="Replace Block Op Average Time"/>
+
+      <metric name="Replace Block Op Max Time"/>
+
+      <metric name="Replace Block Op Min Time"/>
+
+      <metric name="Replace Block Op Num"/>
+
+      <metric name="Write Block Op Average Time"/>
+
+      <metric name="Write Block Op Max Time"/>
+
+      <metric name="Write Block Op Min Time"/>
+
+      <metric name="Write Block Op Num"/>
+
+      <metric name="Copy Block Op Average Time"/>
+
+      <metric name="Copy Block Op Max Time"/>
+
+      <metric name="Copy Block Op Min Time"/>
+
+      <metric name="Copy Block Op Num"/>
+
+      <metric name="Block Reports Average Time"/>
+
+      <metric name="Block Reports Max Time"/>
+
+      <metric name="Block Reports Min Time"/>
+
+      <metric name="Block Reports Num"/>
+
+      <metric name="Heartbeats Average Time"/>
+
+      <metric name="Heartbeats Max Time"/>
+
+      <metric name="Heartbeats Min Time"/>
+
+      <metric name="Heartbeats Num"/>
+    </service>
+
+    <service name="FS Dataset">
+      <property name="MBEAN_CLASS"
+                value="org.apache.hadoop.hdfs.server.datanode.FSDataset"/>
+
+      <property name="OBJECT_NAME"
+                value="hadoop.dfs:name=FSDatasetStatus,service=*"/>
+
+      <plugin type="autoinventory"/>
+
+      <config>
+        <option name="service" description="service"/>
+      </config>
+
+      <metric name="Availability" indicator="true"/>
+
+      <metric name="Remaining" units="B" indicator="true"/>
+
+      <metric name="Capacity" units="B" indicator="true"/>
+
+      <metric name="DfsUsed" units="B" indicator="true"/>
+    </service>
+  </server>
+
+  <server name="Hadoop Job Tracker">
+    <property name="PROC_MAIN_CLASS"
+              value="org.apache.hadoop.mapred.JobTracker"/>
+
+    <property name="PROC_HOME_PROPERTY"
+              value="hadoop.home.dir"/>
+
+    <property name="INVENTORY_ID" value="${PROC_MAIN_CLASS}"/>
+
+    <plugin type="autoinventory"
+            class="org.hyperic.hq.product.jmx.MxServerDetector"/>
+
+    <plugin type="measurement"
+            class="org.hyperic.hq.product.jmx.MxMeasurementPlugin"/>
+
+    <plugin type="log_track"
+            class="org.hyperic.hq.product.Log4JLogTrackPlugin"/>
+    
+    <plugin type="config_track"
+            class="org.hyperic.hq.product.ConfigFileTrackPlugin"/>
+
+    <property name="process.query"
+              value="State.Name.eq=java,Args.*.eq=${PROC_MAIN_CLASS}"/>
+
+    <property name="jmx.url"
+              value="ptql:${process.query}"/>
+
+    <config include="jmx">
+      <option name="process.query" description="Process query" default="${process.query}"/>
+    </config>
+
+    <properties>
+      <property name="VmVersion" description="Vm Version"/>
+      <property name="VmVendor" description="Vm Vendor"/>
+      <property name="VmName" description="Vm Name"/>
+    </properties>
+
+    &process-metrics;
+
+    <property name="OBJECT_NAME"
+              value="java.lang:type=Runtime"/>
+
+    <metrics include="jvm"/>
+
+    <service name="RPC">
+      <config>
+        <option name="name" description="Name"/>
+      </config>
+
+      <property name="MBEAN_CLASS"
+                value="org.apache.hadoop.ipc.metrics.RpcMgt"/>
+
+      <property name="OBJECT_NAME"
+                value="hadoop.dfs:service=JobTracker,name=*"/>
+
+      <plugin type="autoinventory"/>
+
+      <metrics include="rpc"/>
+    </service>
+  </server>
+</plugin>