diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee4a9ad0f5b7..ddb7388b50fe1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ changed to just run docker commands in the Makefile. See `make docker-run` and
 - [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive!
 - [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter!
 - [#338](https://github.com/influxdb/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac!
+- [#337](https://github.com/influxdb/telegraf/pull/337): Jolokia plugin, thanks @saiello!
 
 ### Bugfixes
 - [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin.
diff --git a/README.md b/README.md
index 4b6bd636fa0a2..ae89e57d24475 100644
--- a/README.md
+++ b/README.md
@@ -173,6 +173,7 @@ Telegraf currently has support for collecting metrics from:
 * exec (generic JSON-emitting executable plugin)
 * haproxy
 * httpjson (generic JSON-emitting http service plugin)
+* jolokia (remote JMX with JSON over HTTP)
 * kafka_consumer
 * leofs
 * lustre2
diff --git a/plugins/jolokia/README.md b/plugins/jolokia/README.md
new file mode 100644
index 0000000000000..bda0c5f93b40d
--- /dev/null
+++ b/plugins/jolokia/README.md
@@ -0,0 +1,51 @@
+# Telegraf plugin: Jolokia
+
+#### Plugin arguments:
+- **context** string: Context root used of jolokia url
+- **servers** []Server: List of servers
+  + **name** string: Server's logical name
+  + **host** string: Server's ip address or hostname
+  + **port** string: Server's listening port
+- **metrics** []Metric
+  + **name** string: Name of the measure
+  + **jmx** string: Jmx path that identifies mbeans attributes
+  + **pass** []string: Attributes to retain when collecting values
+  + **drop** []string: Attributes to drop when collecting values
+
+#### Description
+
+The Jolokia plugin collects JVM metrics exposed as MBean's attributes through jolokia REST endpoint. All metrics
+are collected for each server configured.
+
+See: https://jolokia.org/
+
+# Measurements:
+Jolokia plugin produces one measure for each metric configured, adding Server's `name`, `host` and `port` as tags.
+
+Given a configuration like:
+
+```ini
+[jolokia]
+
+[[jolokia.servers]]
+  name = "as-service-1"
+  host = "127.0.0.1"
+  port = "8080"
+
+[[jolokia.servers]]
+  name = "as-service-2"
+  host = "127.0.0.1"
+  port = "8180"
+
+[[jolokia.metrics]]
+  name = "heap_memory_usage"
+  jmx  = "/java.lang:type=Memory/HeapMemoryUsage"
+  pass = ["used", "max"]
+```
+
+The collected metrics will be:
+
+```
+jolokia_heap_memory_usage name=as-service-1,host=127.0.0.1,port=8080 used=xxx,max=yyy
+jolokia_heap_memory_usage name=as-service-2,host=127.0.0.1,port=8180 used=vvv,max=zzz
+```
diff --git a/plugins/jolokia/jolokia.go b/plugins/jolokia/jolokia.go
index a9ec11635a421..1ece12cf13438 100644
--- a/plugins/jolokia/jolokia.go
+++ b/plugins/jolokia/jolokia.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
-	// "sync"
 
 	"github.com/influxdb/telegraf/plugins"
 )
@@ -48,31 +47,42 @@ type Jolokia struct {
 
 func (j *Jolokia) SampleConfig() string {
 	return `
+	# This is the context root used to compose the jolokia url
   context = "/jolokia/read"
 
+	# Tags added to each measurements
 	[jolokia.tags]
 		group = "as"
 
+	# List of servers exposing jolokia read service
   [[jolokia.servers]]
-        name = "stable"
-        host = "192.168.103.2"
-        port = "8180"
+    name = "stable"
+    host = "192.168.103.2"
+    port = "8180"
 
+	# List of metrics collected on above servers
+	# Each metric consists in a name, a jmx path and either a pass or drop slice attributes
+	# This collect all heap memory usage metrics
   [[jolokia.metrics]]
-        name = "heap_memory_usage"
-        jmx  = "/java.lang:type=Memory/HeapMemoryUsage"
-        pass = ["used"]
+    name = "heap_memory_usage"
+    jmx  = "/java.lang:type=Memory/HeapMemoryUsage"
 
+
+  # This drops the 'committed' value from Eden space measurement
   [[jolokia.metrics]]
-        name = "memory_eden"
-        jmx  = "/java.lang:type=MemoryPool,name=PS Eden Space/Usage"
-        pass = ["used"]
+    name = "memory_eden"
+    jmx  = "/java.lang:type=MemoryPool,name=PS Eden Space/Usage"
+    drop = [ "committed" ]
+
 
+	# This passes only DaemonThreadCount and ThreadCount
   [[jolokia.metrics]]
-        name = "heap_threads"
-        jmx  = "/java.lang:type=Threading"
- #      drop = ["AllThread"]
-        pass = ["CurrentThreadCpuTime","CurrentThreadUserTime","DaemonThreadCount","ThreadCount","TotalStartedThreadCount"]
+		name = "heap_threads"
+    jmx  = "/java.lang:type=Threading"
+    pass = [
+			"DaemonThreadCount",
+			"ThreadCount"
+		]
 `
 }