diff --git a/.gitignore b/.gitignore
index 43c013a..163ca9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .vagrant
 Berksfile.lock
+.project
diff --git a/Berksfile b/Berksfile
index e288587..41cd3e7 100644
--- a/Berksfile
+++ b/Berksfile
@@ -2,6 +2,7 @@ metadata
 cookbook 'hostsfile', '= 1.0.1'
 cookbook 'mon_api', git: 'git@git.hpcloud.net:mon/cookbooks-mon_api'
 cookbook 'kafka', git: 'git@git.hpcloud.net:mon/cookbooks-kafka'
+cookbook 'mon_agent', git: 'git@git.hpcloud.net:mon/cookbooks-mon_agent'
 cookbook 'mon_notification', git: 'git@git.hpcloud.net:mon/cookbooks-mon_notification'
 cookbook 'mon_persister', git: 'git@git.hpcloud.net:mon/cookbooks-mon_persister'
 cookbook 'mon_thresh', git: 'git@git.hpcloud.net:mon/cookbooks-mon_thresh'
diff --git a/data_bags/mon_agent/mon_agent.json b/data_bags/mon_agent/mon_agent.json
new file mode 100644
index 0000000..7538c05
--- /dev/null
+++ b/data_bags/mon_agent/mon_agent.json
@@ -0,0 +1,64 @@
+{
+  "id" : "mon_agent",
+  "tags" : "Origin:Mini-mon, Environment:Dev",
+  "log_level" : "DEBUG",
+  "send_to_datadog": "false",
+  "dd_url": "https://app.datadoghq.com",
+  "api_key": "",
+  "send_to_mon_api": "true",
+  "api" : {
+    "mon_api_url" : "http://192.168.10.4:8080/v2.0/metrics",
+    "mon_api_project_id" : "82510970543135",
+    "use_keystone" : "false",
+    "aggregate_metrics" : "true"
+  },
+  "metric_name_map" : {
+    "agentVersion_mapping": "DISCARD",
+    "apiKey_mapping": "DISCARD",
+    "collection_timestamp_mapping": "DISCARD",
+    "cpuIdle_mapping" : "cpu_idle_perc",
+    "cpuStolen_mapping" : "cpu_stolen_perc",
+    "cpuSystem_mapping" : "cpu_system_perc",
+    "cpuWait_mapping" : "cpu_iowait_perc",
+    "events_mapping": "DISCARD",
+    "host-tags_mapping": "DISCARD",
+    "internalHostname_mapping" : "DISCARD",
+    "rkB/s_mapping" : "io_read_kbytes_sec",
+    "avgrq-sz_mapping" : "DISCARD",
+    "%util_mapping" : "DISCARD",
+    "svctm_mapping" : "DISCARD",
+    "r/s_mapping" : "io_read_req_sec",
+    "wrqm/s_mapping" : "DISCARD",
+    "wkB/s_mapping" : "io_write_kbytes_sec",
+    "r_await_mapping" : "DISCARD",
+    "w_await_mapping" : "DISCARD",
+    "rrqm/s_mapping" : "DISCARD",
+    "w/s_mapping" : "io_write_req_sec",
+    "await_mapping" : "DISCARD",
+    "avgqu-sz_mapping" : "DISCARD",
+    "memPhysTotal_mapping" : "mem_total_mb",
+    "memPhysFree_mapping" : "mem_free_mb",
+    "memPhysUsable_mapping" : "mem_usable_mb",
+    "memPhysPctUsable_mapping" : "mem_usable_perc",
+    "memPhysUsed_mapping" : "mem_usable_perc",
+    "memBuffers_mapping" : "mem_used_buffers",
+    "memCached_mapping" : "mem_used_cached",
+    "memShared_mapping" : "mem_used_shared",
+    "memSwapPctFree_mapping" : "mem_swap_free_perc",
+    "memSwapTotal_mapping" : "mem_swap_total_mb",
+    "memSwapUsed_mapping" : "mem_swap_used_mb",
+    "memSwapFree_mapping" : "mem_swap_free_mb",
+    "meta_mapping": "DISCARD",
+    "os_mapping": "DISCARD",
+    "processes_mapping": "DISCARD",
+    "python_mapping": "DISCARD",
+    "system.load.1_mapping" : "load_avg_1_min",
+    "system.load.5_mapping" : "load_avg_5_min",
+    "system.load.15_mapping" : "load_avg_15_min",
+    "system.load.norm.1_mapping": "DISCARD",
+    "system.load.norm.5_mapping": "DISCARD",
+    "system.load.norm.15_mapping": "DISCARD",
+    "systemStats_mapping": "DISCARD",
+    "uuid_mapping": "DISCARD"
+  }
+}
diff --git a/roles/Basenode.json b/roles/Basenode.json
index 59f6666..5e00c5b 100644
--- a/roles/Basenode.json
+++ b/roles/Basenode.json
@@ -11,7 +11,8 @@
   },
   "chef_type": "role",
   "run_list": [
-    "recipe[mini-mon]"
+    "recipe[mini-mon]",
+    "recipe[mon_agent]"
   ],
   "env_run_lists": {
   }