diff --git a/metricbeat/Makefile b/metricbeat/Makefile
index cd076d91a7f..3586ee355d8 100644
--- a/metricbeat/Makefile
+++ b/metricbeat/Makefile
@@ -10,6 +10,7 @@ ES_BEATS?=..
 GOX_OS=netbsd linux windows
 GOX_FLAGS=-arch="amd64 386 arm ppc64 ppc64le"
 
+DOCS_BRANCH=$(shell grep doc-branch ../libbeat/docs/version.asciidoc | cut -c 14-)
 
 include ${ES_BEATS}/libbeat/scripts/Makefile
 
@@ -41,8 +42,8 @@ configs: python-env
 	@cat ${ES_BEATS}/metricbeat/_meta/setup.yml >> _meta/beat.yml
 	@cat ${ES_BEATS}/metricbeat/_meta/common.reference.yml > _meta/beat.reference.yml
 	@${PYTHON_ENV}/bin/python ${ES_BEATS}/script/config_collector.py --beat ${BEAT_NAME} --full $(PWD) >> _meta/beat.reference.yml
-	@rm -rf modules.d && mkdir -p modules.d
-	@for MODULE in `find module -maxdepth 1 -mindepth 1 -type d -exec basename {} \;`; do cp -a $(PWD)/module/$$MODULE/_meta/config.yml modules.d/$$MODULE.yml.disabled; done
+	@rm -rf modules.d
+	${PYTHON_ENV}/bin/python ${ES_BEATS}/metricbeat/scripts/modules_collector.py --docs_branch=$(DOCS_BRANCH)
 	@chmod go-w modules.d/*
 	@# Enable system by default:
 	@if [ -f modules.d/system.yml.disabled ]; then mv modules.d/system.yml.disabled modules.d/system.yml; fi
diff --git a/metricbeat/docs/modules/golang.asciidoc b/metricbeat/docs/modules/golang.asciidoc
index d23b3cb2654..c662a666534 100644
--- a/metricbeat/docs/modules/golang.asciidoc
+++ b/metricbeat/docs/modules/golang.asciidoc
@@ -20,7 +20,9 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: golang
-  metricsets: ["expvar","heap"]
+  #metricsets:
+  #  - expvar
+  #  - heap
   period: 10s
   hosts: ["localhost:6060"]
   heap.path: "/debug/vars"
diff --git a/metricbeat/docs/modules/http.asciidoc b/metricbeat/docs/modules/http.asciidoc
index d23e3b3dee2..6e1953b233a 100644
--- a/metricbeat/docs/modules/http.asciidoc
+++ b/metricbeat/docs/modules/http.asciidoc
@@ -26,7 +26,8 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: http
-  metricsets: ["json"]
+  #metricsets:
+  #  - json
   period: 10s
   hosts: ["localhost:80"]
   namespace: "json_namespace"
@@ -39,15 +40,16 @@ metricbeat.modules:
   #dedot.enabled: false
 
 - module: http
-  metricsets: ["server"]
+  #metricsets:
+  #  - server
   host: "localhost"
   port: "8080"
   enabled: false
-#  paths:
-#    - path: "/foo"
-#      namespace: "foo"
-#      fields: # added to the the response in root. overwrites existing fields
-#        key: "value"
+  #paths:
+  #  - path: "/foo"
+  #    namespace: "foo"
+  #    fields: # added to the the response in root. overwrites existing fields
+  #      key: "value"
 ----
 
 This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>.
diff --git a/metricbeat/docs/modules/jolokia.asciidoc b/metricbeat/docs/modules/jolokia.asciidoc
index a5c80a2a390..abf127325db 100644
--- a/metricbeat/docs/modules/jolokia.asciidoc
+++ b/metricbeat/docs/modules/jolokia.asciidoc
@@ -19,28 +19,32 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: jolokia
-  metricsets: ["jmx"]
+  #metricsets: ["jmx"]
   period: 10s
   hosts: ["localhost"]
   namespace: "metrics"
+  #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
   jmx.mappings:
-    - mbean: 'java.lang:type=Runtime'
-      attributes:
-        - attr: Uptime
-          field: uptime
-    - mbean: 'java.lang:type=Memory'
-      attributes:
-        - attr: HeapMemoryUsage
-          field: memory.heap_usage
-        - attr: NonHeapMemoryUsage
-          field: memory.non_heap_usage
+    #- mbean: 'java.lang:type=Runtime'
+    #  attributes:
+    #    - attr: Uptime
+    #      field: uptime
+    #- mbean: 'java.lang:type=Memory'
+    #  attributes:
+    #    - attr: HeapMemoryUsage
+    #      field: memory.heap_usage
+    #    - attr: NonHeapMemoryUsage
+    #      field: memory.non_heap_usage
     # GC Metrics - this depends on what is available on your JVM
-    # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
-    #   attributes:
-    #     - attr: CollectionTime
-    #       field: gc.cms_collection_time
-    #     - attr: CollectionCount
-    #       field: gc.cms_collection_count
+    #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
+    #  attributes:
+    #    - attr: CollectionTime
+    #      field: gc.cms_collection_time
+    #    - attr: CollectionCount
+    #      field: gc.cms_collection_count
+
+  jmx.application:
+  jmx.instance:
 ----
 
 This module supports TLS connection when using `ssl` config field, as described in <<configuration-ssl>>.
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
index 63b6a004ae3..b9d0278c112 100644
--- a/metricbeat/metricbeat.reference.yml
+++ b/metricbeat/metricbeat.reference.yml
@@ -212,7 +212,9 @@ metricbeat.modules:
 
 #------------------------------- Golang Module -------------------------------
 - module: golang
-  metricsets: ["expvar","heap"]
+  #metricsets:
+  #  - expvar
+  #  - heap
   period: 10s
   hosts: ["localhost:6060"]
   heap.path: "/debug/vars"
@@ -253,7 +255,8 @@ metricbeat.modules:
 
 #-------------------------------- HTTP Module --------------------------------
 - module: http
-  metricsets: ["json"]
+  #metricsets:
+  #  - json
   period: 10s
   hosts: ["localhost:80"]
   namespace: "json_namespace"
@@ -266,40 +269,45 @@ metricbeat.modules:
   #dedot.enabled: false
 
 - module: http
-  metricsets: ["server"]
+  #metricsets:
+  #  - server
   host: "localhost"
   port: "8080"
   enabled: false
-#  paths:
-#    - path: "/foo"
-#      namespace: "foo"
-#      fields: # added to the the response in root. overwrites existing fields
-#        key: "value"
+  #paths:
+  #  - path: "/foo"
+  #    namespace: "foo"
+  #    fields: # added to the the response in root. overwrites existing fields
+  #      key: "value"
 
 #------------------------------- Jolokia Module ------------------------------
 - module: jolokia
-  metricsets: ["jmx"]
+  #metricsets: ["jmx"]
   period: 10s
   hosts: ["localhost"]
   namespace: "metrics"
+  #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
   jmx.mappings:
-    - mbean: 'java.lang:type=Runtime'
-      attributes:
-        - attr: Uptime
-          field: uptime
-    - mbean: 'java.lang:type=Memory'
-      attributes:
-        - attr: HeapMemoryUsage
-          field: memory.heap_usage
-        - attr: NonHeapMemoryUsage
-          field: memory.non_heap_usage
+    #- mbean: 'java.lang:type=Runtime'
+    #  attributes:
+    #    - attr: Uptime
+    #      field: uptime
+    #- mbean: 'java.lang:type=Memory'
+    #  attributes:
+    #    - attr: HeapMemoryUsage
+    #      field: memory.heap_usage
+    #    - attr: NonHeapMemoryUsage
+    #      field: memory.non_heap_usage
     # GC Metrics - this depends on what is available on your JVM
-    # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
-    #   attributes:
-    #     - attr: CollectionTime
-    #       field: gc.cms_collection_time
-    #     - attr: CollectionCount
-    #       field: gc.cms_collection_count
+    #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
+    #  attributes:
+    #    - attr: CollectionTime
+    #      field: gc.cms_collection_time
+    #    - attr: CollectionCount
+    #      field: gc.cms_collection_count
+
+  jmx.application:
+  jmx.instance:
 
 #-------------------------------- Kafka Module -------------------------------
 - module: kafka
diff --git a/metricbeat/module/aerospike/_meta/config.yml b/metricbeat/module/aerospike/_meta/config.yml
index 0a4a883f474..a4e7384ed55 100644
--- a/metricbeat/module/aerospike/_meta/config.yml
+++ b/metricbeat/module/aerospike/_meta/config.yml
@@ -1,2 +1,5 @@
 - module: aerospike
+  #metricsets:
+  #  - namespace
+  period: 10s
   hosts: ["localhost:3000"]
diff --git a/metricbeat/module/apache/_meta/config.yml b/metricbeat/module/apache/_meta/config.yml
index 17815f93344..070eec24463 100644
--- a/metricbeat/module/apache/_meta/config.yml
+++ b/metricbeat/module/apache/_meta/config.yml
@@ -1,2 +1,5 @@
 - module: apache
+  #metricsets:
+  #  - status
+  period: 10s
   hosts: ["http://127.0.0.1"]
diff --git a/metricbeat/module/ceph/_meta/config.yml b/metricbeat/module/ceph/_meta/config.yml
index ba19a8fa59f..d84cf3c8c5c 100644
--- a/metricbeat/module/ceph/_meta/config.yml
+++ b/metricbeat/module/ceph/_meta/config.yml
@@ -1,7 +1,16 @@
 - module: ceph
-  metricsets: ["cluster_health", "cluster_status", "monitor_health"]
+  #metricsets:
+  #  - cluster_health
+  #  - cluster_status
+  #  - monitor_health
   period: 10s
+  hosts: ["localhost:5000"]
 
 - module: ceph
-  metricsets: ["cluster_disk", "osd_tree", "pool_disk"]
+  #metricsets:
+  #  - cluster_disk
+  #  - osd_tree
+  #  - osd_df
+  #  - pool_disk
   period: 1m
+  hosts: ["localhost:5000"]
diff --git a/metricbeat/module/couchbase/_meta/config.yml b/metricbeat/module/couchbase/_meta/config.yml
index ea168be3971..74840343019 100644
--- a/metricbeat/module/couchbase/_meta/config.yml
+++ b/metricbeat/module/couchbase/_meta/config.yml
@@ -1,2 +1,7 @@
 - module: couchbase
+  #metricsets:
+  #  - bucket
+  #  - cluster
+  #  - node
+  period: 10s
   hosts: ["localhost:8091"]
diff --git a/metricbeat/module/docker/_meta/config.yml b/metricbeat/module/docker/_meta/config.yml
index 5b25e17f678..58e0880b8e4 100644
--- a/metricbeat/module/docker/_meta/config.yml
+++ b/metricbeat/module/docker/_meta/config.yml
@@ -1,5 +1,20 @@
 - module: docker
+  #metricsets:
+  #  - container
+  #  - cpu
+  #  - diskio
+  #  - healthcheck
+  #  - info
+  #  - memory
+  #  - network
+  period: 10s
   hosts: ["unix:///var/run/docker.sock"]
 
   # Replace dots in labels with `_`. Set to false to keep dots
   labels.dedot: true
+
+  # To connect to Docker over TLS you must specify a client and CA certificate.
+  #ssl:
+    #certificate_authority: "/etc/pki/root/ca.pem"
+    #certificate:           "/etc/pki/client/cert.pem"
+    #key:                   "/etc/pki/client/cert.key"
diff --git a/metricbeat/module/dropwizard/_meta/config.yml b/metricbeat/module/dropwizard/_meta/config.yml
index 8f4bb7d0dc7..cf04a3365f9 100644
--- a/metricbeat/module/dropwizard/_meta/config.yml
+++ b/metricbeat/module/dropwizard/_meta/config.yml
@@ -1,4 +1,7 @@
 - module: dropwizard
+  #metricsets:
+  #  - collector
+  period: 10s
   hosts: ["localhost:8080"]
   metrics_path: /metrics/metrics
   namespace: example
diff --git a/metricbeat/module/elasticsearch/_meta/config.yml b/metricbeat/module/elasticsearch/_meta/config.yml
index bbb7ff0c47d..96844963529 100644
--- a/metricbeat/module/elasticsearch/_meta/config.yml
+++ b/metricbeat/module/elasticsearch/_meta/config.yml
@@ -1,2 +1,6 @@
 - module: elasticsearch
+  #metricsets:
+  #  - node
+  #  - node_stats
+  period: 10s
   hosts: ["localhost:9200"]
diff --git a/metricbeat/module/etcd/_meta/config.yml b/metricbeat/module/etcd/_meta/config.yml
index 38142c4a03a..86e1e58fcc9 100644
--- a/metricbeat/module/etcd/_meta/config.yml
+++ b/metricbeat/module/etcd/_meta/config.yml
@@ -1,2 +1,7 @@
 - module: etcd
+  #metricsets:
+  #  - leader
+  #  - self
+  #  - store
+  period: 10s
   hosts: ["localhost:2379"]
diff --git a/metricbeat/module/golang/_meta/config.yml b/metricbeat/module/golang/_meta/config.yml
index ba9db8e1089..fe5805b1e51 100644
--- a/metricbeat/module/golang/_meta/config.yml
+++ b/metricbeat/module/golang/_meta/config.yml
@@ -1,5 +1,7 @@
 - module: golang
-  metricsets: ["expvar","heap"]
+  #metricsets:
+  #  - expvar
+  #  - heap
   period: 10s
   hosts: ["localhost:6060"]
   heap.path: "/debug/vars"
diff --git a/metricbeat/module/graphite/_meta/config.yml b/metricbeat/module/graphite/_meta/config.yml
index 2c6ac0e784b..21c7c3a329b 100644
--- a/metricbeat/module/graphite/_meta/config.yml
+++ b/metricbeat/module/graphite/_meta/config.yml
@@ -1 +1,9 @@
 - module: graphite
+  #metricsets:
+  #  - server
+  #protocol: "udp"
+  #templates:
+  #  - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats
+  #    namespace: "test"
+  #    template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash
+  #    delimiter: "_"
diff --git a/metricbeat/module/haproxy/_meta/config.yml b/metricbeat/module/haproxy/_meta/config.yml
index 203e1cc772f..0da97519923 100644
--- a/metricbeat/module/haproxy/_meta/config.yml
+++ b/metricbeat/module/haproxy/_meta/config.yml
@@ -1,2 +1,6 @@
 - module: haproxy
+  #metricsets:
+  #  - info
+  #  - stat
+  period: 10s
   hosts: ["tcp://127.0.0.1:14567"]
diff --git a/metricbeat/module/http/_meta/config.yml b/metricbeat/module/http/_meta/config.yml
index 286bddb897b..a66e9429513 100644
--- a/metricbeat/module/http/_meta/config.yml
+++ b/metricbeat/module/http/_meta/config.yml
@@ -1,5 +1,6 @@
 - module: http
-  metricsets: ["json"]
+  #metricsets:
+  #  - json
   period: 10s
   hosts: ["localhost:80"]
   namespace: "json_namespace"
@@ -12,12 +13,13 @@
   #dedot.enabled: false
 
 - module: http
-  metricsets: ["server"]
+  #metricsets:
+  #  - server
   host: "localhost"
   port: "8080"
   enabled: false
-#  paths:
-#    - path: "/foo"
-#      namespace: "foo"
-#      fields: # added to the the response in root. overwrites existing fields
-#        key: "value"
+  #paths:
+  #  - path: "/foo"
+  #    namespace: "foo"
+  #    fields: # added to the the response in root. overwrites existing fields
+  #      key: "value"
diff --git a/metricbeat/module/jolokia/_meta/config.yml b/metricbeat/module/jolokia/_meta/config.yml
index af6de7b42d4..de48ae161fd 100644
--- a/metricbeat/module/jolokia/_meta/config.yml
+++ b/metricbeat/module/jolokia/_meta/config.yml
@@ -1,23 +1,27 @@
 - module: jolokia
-  metricsets: ["jmx"]
+  #metricsets: ["jmx"]
   period: 10s
   hosts: ["localhost"]
   namespace: "metrics"
+  #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
   jmx.mappings:
-    - mbean: 'java.lang:type=Runtime'
-      attributes:
-        - attr: Uptime
-          field: uptime
-    - mbean: 'java.lang:type=Memory'
-      attributes:
-        - attr: HeapMemoryUsage
-          field: memory.heap_usage
-        - attr: NonHeapMemoryUsage
-          field: memory.non_heap_usage
+    #- mbean: 'java.lang:type=Runtime'
+    #  attributes:
+    #    - attr: Uptime
+    #      field: uptime
+    #- mbean: 'java.lang:type=Memory'
+    #  attributes:
+    #    - attr: HeapMemoryUsage
+    #      field: memory.heap_usage
+    #    - attr: NonHeapMemoryUsage
+    #      field: memory.non_heap_usage
     # GC Metrics - this depends on what is available on your JVM
-    # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
-    #   attributes:
-    #     - attr: CollectionTime
-    #       field: gc.cms_collection_time
-    #     - attr: CollectionCount
-    #       field: gc.cms_collection_count
+    #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
+    #  attributes:
+    #    - attr: CollectionTime
+    #      field: gc.cms_collection_time
+    #    - attr: CollectionCount
+    #      field: gc.cms_collection_count
+
+  jmx.application:
+  jmx.instance:
diff --git a/metricbeat/module/kafka/_meta/config.yml b/metricbeat/module/kafka/_meta/config.yml
index f9db371184a..9ed476ffe6f 100644
--- a/metricbeat/module/kafka/_meta/config.yml
+++ b/metricbeat/module/kafka/_meta/config.yml
@@ -1,2 +1,27 @@
 - module: kafka
+  #metricsets:
+  #  - partition
+  #  - consumergroup
+  period: 10s
   hosts: ["localhost:9092"]
+
+  #client_id: metricbeat
+  #retries: 3
+  #backoff: 250ms
+
+  # List of Topics to query metadata for. If empty, all topics will be queried.
+  #topics: []
+
+  # Optional SSL. By default is off.
+  # List of root certificates for HTTPS server verifications
+  #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+
+  # Certificate for SSL client authentication
+  #ssl.certificate: "/etc/pki/client/cert.pem"
+
+  # Client Certificate Key
+  #ssl.key: "/etc/pki/client/cert.key"
+
+  # SASL authentication
+  #username: ""
+  #password: ""
diff --git a/metricbeat/module/kibana/_meta/config.yml b/metricbeat/module/kibana/_meta/config.yml
index a1252a5d9bc..db546c95829 100644
--- a/metricbeat/module/kibana/_meta/config.yml
+++ b/metricbeat/module/kibana/_meta/config.yml
@@ -1,2 +1,5 @@
 - module: kibana
+  #metricsets:
+  #  - status
+  period: 10s
   hosts: ["localhost:5601"]
diff --git a/metricbeat/module/kubernetes/_meta/config.yml b/metricbeat/module/kubernetes/_meta/config.yml
index 1bd81376021..ab04d158cee 100644
--- a/metricbeat/module/kubernetes/_meta/config.yml
+++ b/metricbeat/module/kubernetes/_meta/config.yml
@@ -1,8 +1,30 @@
+# Node metrics, from kubelet:
 - module: kubernetes
-  metricsets:
-    - container
-    - node
-    - pod
-    - system
-    - volume
+  #metricsets:
+  #  - node
+  #  - system
+  #  - pod
+  #  - container
+  #  - volume
+  period: 10s
   hosts: ["localhost:10255"]
+  #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+  #ssl.certificate: "/etc/pki/client/cert.pem"
+  #ssl.key: "/etc/pki/client/cert.key"
+
+# State metrics from kube-state-metrics service:
+#- module: kubernetes
+#  metricsets:
+#    - state_node
+#    - state_deployment
+#    - state_replicaset
+#    - state_statefulset
+#    - state_pod
+#    - state_container
+#  period: 10s
+#  hosts: ["kube-state-metrics:8080"]
+
+# Kubernetes events
+#- module: kubernetes
+#  metricsets:
+#    - event
diff --git a/metricbeat/module/kvm/_meta/config.yml b/metricbeat/module/kvm/_meta/config.yml
index cbed13e7fdd..cddd5e78cf8 100644
--- a/metricbeat/module/kvm/_meta/config.yml
+++ b/metricbeat/module/kvm/_meta/config.yml
@@ -1,2 +1,5 @@
 - module: kvm
+  #metricsets:
+  #  - dommemstat
+  period: 10s
   hosts: ["localhost"]
diff --git a/metricbeat/module/logstash/_meta/config.yml b/metricbeat/module/logstash/_meta/config.yml
index 73b63b016e1..4e4f828e179 100644
--- a/metricbeat/module/logstash/_meta/config.yml
+++ b/metricbeat/module/logstash/_meta/config.yml
@@ -1,2 +1,6 @@
 - module: logstash
+  #metricsets:
+  #  - node
+  #  - node_stats
+  period: 10s
   hosts: ["localhost:9600"]
diff --git a/metricbeat/module/memcached/_meta/config.yml b/metricbeat/module/memcached/_meta/config.yml
index f1f6533d677..3e6ae607139 100644
--- a/metricbeat/module/memcached/_meta/config.yml
+++ b/metricbeat/module/memcached/_meta/config.yml
@@ -1,2 +1,4 @@
 - module: memcached
+#  metricsets: ["stats"]
+  period: 10s
   hosts: ["localhost:11211"]
diff --git a/metricbeat/module/mongodb/_meta/config.yml b/metricbeat/module/mongodb/_meta/config.yml
index f22fc37872d..18589bb4ef7 100644
--- a/metricbeat/module/mongodb/_meta/config.yml
+++ b/metricbeat/module/mongodb/_meta/config.yml
@@ -1,2 +1,18 @@
 - module: mongodb
+  #metricsets:
+  #  - dbstats
+  #  - status
+  period: 10s
+
+  # The hosts must be passed as MongoDB URLs in the format:
+  # [mongodb://][user:pass@]host[:port].
+  # The username and password can also be set using the respective configuration
+  # options. The credentials in the URL take precedence over the username and
+  # password configuration options.
   hosts: ["localhost:27017"]
+
+  # Username to use when connecting to MongoDB. Empty by default.
+  #username: user
+
+  # Password to use when connecting to MongoDB. Empty by default.
+  #password: pass
diff --git a/metricbeat/module/munin/_meta/config.yml b/metricbeat/module/munin/_meta/config.yml
index 1ea9bf8c854..c8267c385dd 100644
--- a/metricbeat/module/munin/_meta/config.yml
+++ b/metricbeat/module/munin/_meta/config.yml
@@ -1,3 +1,6 @@
 - module: munin
+  #metricsets:
+  #  - node
+  period: 10s
   hosts: ["localhost:4949"]
   node.namespace: node
diff --git a/metricbeat/module/mysql/_meta/config.yml b/metricbeat/module/mysql/_meta/config.yml
index 8855531cdca..b1417fe8d5c 100644
--- a/metricbeat/module/mysql/_meta/config.yml
+++ b/metricbeat/module/mysql/_meta/config.yml
@@ -1,2 +1,15 @@
 - module: mysql
-  hosts: ["tcp(127.0.0.1:3306)/"]
+  #metricsets:
+  #  - status
+  period: 10s
+
+  # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/"
+  # The username and password can either be set in the DSN or using the username
+  # and password config options. Those specified in the DSN take precedence.
+  hosts: ["root:secret@tcp(127.0.0.1:3306)/"]
+
+  # Username of hosts. Empty by default.
+  #username: root
+
+  # Password of hosts. Empty by default.
+  #password: secret
\ No newline at end of file
diff --git a/metricbeat/module/nginx/_meta/config.yml b/metricbeat/module/nginx/_meta/config.yml
index e24bd89b965..d2f66a7c455 100644
--- a/metricbeat/module/nginx/_meta/config.yml
+++ b/metricbeat/module/nginx/_meta/config.yml
@@ -1,2 +1,10 @@
 - module: nginx
+  #metricsets:
+  #  - stubstatus
+  period: 10s
+
+  # Nginx hosts
   hosts: ["http://127.0.0.1"]
+
+  # Path to server status. Default server-status
+  #server_status_path: "server-status"
diff --git a/metricbeat/module/php_fpm/_meta/config.yml b/metricbeat/module/php_fpm/_meta/config.yml
index 508aba58bda..87d98c3b4b8 100644
--- a/metricbeat/module/php_fpm/_meta/config.yml
+++ b/metricbeat/module/php_fpm/_meta/config.yml
@@ -1,2 +1,6 @@
 - module: php_fpm
+  #metricsets:
+  #  - pool
+  period: 10s
   hosts: ["localhost:8080"]
+  status_path: "/status"
diff --git a/metricbeat/module/postgresql/_meta/config.yml b/metricbeat/module/postgresql/_meta/config.yml
index 8adc44083fc..bf897fd7b06 100644
--- a/metricbeat/module/postgresql/_meta/config.yml
+++ b/metricbeat/module/postgresql/_meta/config.yml
@@ -1,2 +1,9 @@
 - module: postgresql
+  #metricsets:
+  #  - database
+  #  - bgwriter
+  #  - activity
+  period: 10s
   hosts: ["postgres://localhost:5432"]
+  #username: user
+  #password: pass
diff --git a/metricbeat/module/prometheus/_meta/config.yml b/metricbeat/module/prometheus/_meta/config.yml
index 4990104ef41..e343f58df38 100644
--- a/metricbeat/module/prometheus/_meta/config.yml
+++ b/metricbeat/module/prometheus/_meta/config.yml
@@ -1,4 +1,7 @@
 - module: prometheus
+  #metricsets:
+  #  - stats
   period: 10s
   hosts: ["localhost:9090"]
+  metrics_path: /metrics
   #namespace: example
diff --git a/metricbeat/module/rabbitmq/_meta/config.yml b/metricbeat/module/rabbitmq/_meta/config.yml
index b5912718c76..68dee136571 100644
--- a/metricbeat/module/rabbitmq/_meta/config.yml
+++ b/metricbeat/module/rabbitmq/_meta/config.yml
@@ -1,2 +1,9 @@
 - module: rabbitmq
+  #metricsets:
+  #  - node
+  #  - queue
+  #  - connection
+  period: 10s
   hosts: ["localhost:15672"]
+  #username: guest
+  #password: guest
diff --git a/metricbeat/module/redis/_meta/config.yml b/metricbeat/module/redis/_meta/config.yml
index e4ad9bb95e3..3ececd56686 100644
--- a/metricbeat/module/redis/_meta/config.yml
+++ b/metricbeat/module/redis/_meta/config.yml
@@ -1,2 +1,17 @@
 - module: redis
+  #metricsets:
+  #  - info
+  #  - keyspace
+  period: 10s
+
+  # Redis hosts
   hosts: ["127.0.0.1:6379"]
+
+  # Network type to be used for redis connection. Default: tcp
+  #network: tcp
+
+  # Max number of concurrent connections. Default: 10
+  #maxconn: 10
+
+  # Redis AUTH password. Empty by default.
+  #password: foobared
diff --git a/metricbeat/module/system/_meta/config.yml b/metricbeat/module/system/_meta/config.yml
index 82a6338cea4..532faff31a1 100644
--- a/metricbeat/module/system/_meta/config.yml
+++ b/metricbeat/module/system/_meta/config.yml
@@ -1,14 +1,19 @@
 - module: system
+  period: 10s
+  metricsets:
+    - cpu
+    - load
+    - memory
+    - network
+    - process
+    - process_summary
+    #- core
+    #- diskio
+    #- socket
   process.include_top_n:
     by_cpu: 5      # include top 5 processes by CPU
     by_memory: 5   # include top 5 processes by memory
 
-#- module: system
-#  metricsets:
-#    - core
-#    - diskio
-#    - socket
-
 - module: system
   period: 1m
   metricsets:
diff --git a/metricbeat/module/uwsgi/_meta/config.yml b/metricbeat/module/uwsgi/_meta/config.yml
index e16ad9be6d1..42ee93c1899 100644
--- a/metricbeat/module/uwsgi/_meta/config.yml
+++ b/metricbeat/module/uwsgi/_meta/config.yml
@@ -1,2 +1,5 @@
 - module: uwsgi
+  #metricsets:
+  #  - status
+  period: 10s
   hosts: ["tcp://127.0.0.1:9191"]
diff --git a/metricbeat/module/vsphere/_meta/config.yml b/metricbeat/module/vsphere/_meta/config.yml
index d2badbc4c0e..6862012209b 100644
--- a/metricbeat/module/vsphere/_meta/config.yml
+++ b/metricbeat/module/vsphere/_meta/config.yml
@@ -1,4 +1,8 @@
 - module: vsphere
+  #metricsets:
+  #  - datastore
+  #  - host
+  #  - virtualmachine
   period: 10s
   hosts: ["https://localhost/sdk"]
 
@@ -8,4 +12,3 @@
   insecure: false
   # Get custom fields when using virtualmachine metric set. Default false.
   # get_custom_fields: false
-  
diff --git a/metricbeat/module/windows/_meta/config.yml b/metricbeat/module/windows/_meta/config.yml
index 866e00010f8..3d3269a3b07 100644
--- a/metricbeat/module/windows/_meta/config.yml
+++ b/metricbeat/module/windows/_meta/config.yml
@@ -1,2 +1,22 @@
 - module: windows
-  period: 60s
+  #metricsets:
+  #  - service
+  period: 1m
+
+#- module: windows
+#  metricsets:
+#    - perfmon
+#  period: 10s
+#  perfmon.counters:
+#    - instance_label: processor.name
+#      instance_name: total
+#      measurement_label: processor.time.total.pct
+#      query: '\Processor Information(_Total)\% Processor Time'
+#
+#    - instance_label: physical_disk.name
+#      measurement_label: physical_disk.write.per_sec
+#      query: '\PhysicalDisk(*)\Disk Writes/sec'
+#
+#    - instance_label: physical_disk.name
+#      measurement_label: physical_disk.write.time.pct
+#      query: '\PhysicalDisk(*)\% Disk Write Time'
diff --git a/metricbeat/module/zookeeper/_meta/config.yml b/metricbeat/module/zookeeper/_meta/config.yml
index fb77d08fffa..17fb7135973 100644
--- a/metricbeat/module/zookeeper/_meta/config.yml
+++ b/metricbeat/module/zookeeper/_meta/config.yml
@@ -1,3 +1,5 @@
 - module: zookeeper
+  #metricsets:
+  #  - mntr
   period: 10s
   hosts: ["localhost:2181"]
diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled
index 0a4a883f474..a2fbdf83d2c 100644
--- a/metricbeat/modules.d/aerospike.yml.disabled
+++ b/metricbeat/modules.d/aerospike.yml.disabled
@@ -1,2 +1,8 @@
+# Module: aerospike
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-aerospike.html
+
 - module: aerospike
+  #metricsets:
+  #  - namespace
+  period: 10s
   hosts: ["localhost:3000"]
diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled
index 17815f93344..0f838b8d56c 100644
--- a/metricbeat/modules.d/apache.yml.disabled
+++ b/metricbeat/modules.d/apache.yml.disabled
@@ -1,2 +1,8 @@
+# Module: apache
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-apache.html
+
 - module: apache
+  #metricsets:
+  #  - status
+  period: 10s
   hosts: ["http://127.0.0.1"]
diff --git a/metricbeat/modules.d/ceph.yml.disabled b/metricbeat/modules.d/ceph.yml.disabled
index ba19a8fa59f..fafa2a69d71 100644
--- a/metricbeat/modules.d/ceph.yml.disabled
+++ b/metricbeat/modules.d/ceph.yml.disabled
@@ -1,7 +1,19 @@
+# Module: ceph
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ceph.html
+
 - module: ceph
-  metricsets: ["cluster_health", "cluster_status", "monitor_health"]
+  #metricsets:
+  #  - cluster_health
+  #  - cluster_status
+  #  - monitor_health
   period: 10s
+  hosts: ["localhost:5000"]
 
 - module: ceph
-  metricsets: ["cluster_disk", "osd_tree", "pool_disk"]
+  #metricsets:
+  #  - cluster_disk
+  #  - osd_tree
+  #  - osd_df
+  #  - pool_disk
   period: 1m
+  hosts: ["localhost:5000"]
diff --git a/metricbeat/modules.d/couchbase.yml.disabled b/metricbeat/modules.d/couchbase.yml.disabled
index ea168be3971..1c0b2035d08 100644
--- a/metricbeat/modules.d/couchbase.yml.disabled
+++ b/metricbeat/modules.d/couchbase.yml.disabled
@@ -1,2 +1,10 @@
+# Module: couchbase
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-couchbase.html
+
 - module: couchbase
+  #metricsets:
+  #  - bucket
+  #  - cluster
+  #  - node
+  period: 10s
   hosts: ["localhost:8091"]
diff --git a/metricbeat/modules.d/docker.yml.disabled b/metricbeat/modules.d/docker.yml.disabled
index 5b25e17f678..9200aa5eb77 100644
--- a/metricbeat/modules.d/docker.yml.disabled
+++ b/metricbeat/modules.d/docker.yml.disabled
@@ -1,5 +1,23 @@
+# Module: docker
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-docker.html
+
 - module: docker
+  #metricsets:
+  #  - container
+  #  - cpu
+  #  - diskio
+  #  - healthcheck
+  #  - info
+  #  - memory
+  #  - network
+  period: 10s
   hosts: ["unix:///var/run/docker.sock"]
 
   # Replace dots in labels with `_`. Set to false to keep dots
   labels.dedot: true
+
+  # To connect to Docker over TLS you must specify a client and CA certificate.
+  #ssl:
+    #certificate_authority: "/etc/pki/root/ca.pem"
+    #certificate:           "/etc/pki/client/cert.pem"
+    #key:                   "/etc/pki/client/cert.key"
diff --git a/metricbeat/modules.d/dropwizard.yml.disabled b/metricbeat/modules.d/dropwizard.yml.disabled
index 8f4bb7d0dc7..d2607d7b7f0 100644
--- a/metricbeat/modules.d/dropwizard.yml.disabled
+++ b/metricbeat/modules.d/dropwizard.yml.disabled
@@ -1,4 +1,10 @@
+# Module: dropwizard
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-dropwizard.html
+
 - module: dropwizard
+  #metricsets:
+  #  - collector
+  period: 10s
   hosts: ["localhost:8080"]
   metrics_path: /metrics/metrics
   namespace: example
diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled
index bbb7ff0c47d..cebc667e85c 100644
--- a/metricbeat/modules.d/elasticsearch.yml.disabled
+++ b/metricbeat/modules.d/elasticsearch.yml.disabled
@@ -1,2 +1,9 @@
+# Module: elasticsearch
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-elasticsearch.html
+
 - module: elasticsearch
+  #metricsets:
+  #  - node
+  #  - node_stats
+  period: 10s
   hosts: ["localhost:9200"]
diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled
index 38142c4a03a..0039ea9b50e 100644
--- a/metricbeat/modules.d/etcd.yml.disabled
+++ b/metricbeat/modules.d/etcd.yml.disabled
@@ -1,2 +1,10 @@
+# Module: etcd
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-etcd.html
+
 - module: etcd
+  #metricsets:
+  #  - leader
+  #  - self
+  #  - store
+  period: 10s
   hosts: ["localhost:2379"]
diff --git a/metricbeat/modules.d/golang.yml.disabled b/metricbeat/modules.d/golang.yml.disabled
index ba9db8e1089..8bb65e090e1 100644
--- a/metricbeat/modules.d/golang.yml.disabled
+++ b/metricbeat/modules.d/golang.yml.disabled
@@ -1,5 +1,10 @@
+# Module: golang
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-golang.html
+
 - module: golang
-  metricsets: ["expvar","heap"]
+  #metricsets:
+  #  - expvar
+  #  - heap
   period: 10s
   hosts: ["localhost:6060"]
   heap.path: "/debug/vars"
diff --git a/metricbeat/modules.d/graphite.yml.disabled b/metricbeat/modules.d/graphite.yml.disabled
index 2c6ac0e784b..78f7c32b304 100644
--- a/metricbeat/modules.d/graphite.yml.disabled
+++ b/metricbeat/modules.d/graphite.yml.disabled
@@ -1 +1,12 @@
+# Module: graphite
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-graphite.html
+
 - module: graphite
+  #metricsets:
+  #  - server
+  #protocol: "udp"
+  #templates:
+  #  - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats
+  #    namespace: "test"
+  #    template: ".host.shell.metric*" # test.localhost.bash.stats would become metric=stats and tags host=localhost,shell=bash
+  #    delimiter: "_"
diff --git a/metricbeat/modules.d/haproxy.yml.disabled b/metricbeat/modules.d/haproxy.yml.disabled
index 203e1cc772f..2c61ee0c55d 100644
--- a/metricbeat/modules.d/haproxy.yml.disabled
+++ b/metricbeat/modules.d/haproxy.yml.disabled
@@ -1,2 +1,9 @@
+# Module: haproxy
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-haproxy.html
+
 - module: haproxy
+  #metricsets:
+  #  - info
+  #  - stat
+  period: 10s
   hosts: ["tcp://127.0.0.1:14567"]
diff --git a/metricbeat/modules.d/http.yml.disabled b/metricbeat/modules.d/http.yml.disabled
index 286bddb897b..fb4b5787b46 100644
--- a/metricbeat/modules.d/http.yml.disabled
+++ b/metricbeat/modules.d/http.yml.disabled
@@ -1,5 +1,9 @@
+# Module: http
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-http.html
+
 - module: http
-  metricsets: ["json"]
+  #metricsets:
+  #  - json
   period: 10s
   hosts: ["localhost:80"]
   namespace: "json_namespace"
@@ -12,12 +16,13 @@
   #dedot.enabled: false
 
 - module: http
-  metricsets: ["server"]
+  #metricsets:
+  #  - server
   host: "localhost"
   port: "8080"
   enabled: false
-#  paths:
-#    - path: "/foo"
-#      namespace: "foo"
-#      fields: # added to the the response in root. overwrites existing fields
-#        key: "value"
+  #paths:
+  #  - path: "/foo"
+  #    namespace: "foo"
+  #    fields: # added to the the response in root. overwrites existing fields
+  #      key: "value"
diff --git a/metricbeat/modules.d/jolokia.yml.disabled b/metricbeat/modules.d/jolokia.yml.disabled
index af6de7b42d4..38a6adbf9e8 100644
--- a/metricbeat/modules.d/jolokia.yml.disabled
+++ b/metricbeat/modules.d/jolokia.yml.disabled
@@ -1,23 +1,30 @@
+# Module: jolokia
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-jolokia.html
+
 - module: jolokia
-  metricsets: ["jmx"]
+  #metricsets: ["jmx"]
   period: 10s
   hosts: ["localhost"]
   namespace: "metrics"
+  #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
   jmx.mappings:
-    - mbean: 'java.lang:type=Runtime'
-      attributes:
-        - attr: Uptime
-          field: uptime
-    - mbean: 'java.lang:type=Memory'
-      attributes:
-        - attr: HeapMemoryUsage
-          field: memory.heap_usage
-        - attr: NonHeapMemoryUsage
-          field: memory.non_heap_usage
+    #- mbean: 'java.lang:type=Runtime'
+    #  attributes:
+    #    - attr: Uptime
+    #      field: uptime
+    #- mbean: 'java.lang:type=Memory'
+    #  attributes:
+    #    - attr: HeapMemoryUsage
+    #      field: memory.heap_usage
+    #    - attr: NonHeapMemoryUsage
+    #      field: memory.non_heap_usage
     # GC Metrics - this depends on what is available on your JVM
-    # - mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
-    #   attributes:
-    #     - attr: CollectionTime
-    #       field: gc.cms_collection_time
-    #     - attr: CollectionCount
-    #       field: gc.cms_collection_count
+    #- mbean: 'java.lang:type=GarbageCollector,name=ConcurrentMarkSweep'
+    #  attributes:
+    #    - attr: CollectionTime
+    #      field: gc.cms_collection_time
+    #    - attr: CollectionCount
+    #      field: gc.cms_collection_count
+
+  jmx.application:
+  jmx.instance:
diff --git a/metricbeat/modules.d/kafka.yml.disabled b/metricbeat/modules.d/kafka.yml.disabled
index f9db371184a..106e7fec680 100644
--- a/metricbeat/modules.d/kafka.yml.disabled
+++ b/metricbeat/modules.d/kafka.yml.disabled
@@ -1,2 +1,30 @@
+# Module: kafka
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kafka.html
+
 - module: kafka
+  #metricsets:
+  #  - partition
+  #  - consumergroup
+  period: 10s
   hosts: ["localhost:9092"]
+
+  #client_id: metricbeat
+  #retries: 3
+  #backoff: 250ms
+
+  # List of Topics to query metadata for. If empty, all topics will be queried.
+  #topics: []
+
+  # Optional SSL. By default is off.
+  # List of root certificates for HTTPS server verifications
+  #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+
+  # Certificate for SSL client authentication
+  #ssl.certificate: "/etc/pki/client/cert.pem"
+
+  # Client Certificate Key
+  #ssl.key: "/etc/pki/client/cert.key"
+
+  # SASL authentication
+  #username: ""
+  #password: ""
diff --git a/metricbeat/modules.d/kibana.yml.disabled b/metricbeat/modules.d/kibana.yml.disabled
index a1252a5d9bc..37a1e8f9ed8 100644
--- a/metricbeat/modules.d/kibana.yml.disabled
+++ b/metricbeat/modules.d/kibana.yml.disabled
@@ -1,2 +1,8 @@
+# Module: kibana
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kibana.html
+
 - module: kibana
+  #metricsets:
+  #  - status
+  period: 10s
   hosts: ["localhost:5601"]
diff --git a/metricbeat/modules.d/kubernetes.yml.disabled b/metricbeat/modules.d/kubernetes.yml.disabled
index 1bd81376021..a446b381ec1 100644
--- a/metricbeat/modules.d/kubernetes.yml.disabled
+++ b/metricbeat/modules.d/kubernetes.yml.disabled
@@ -1,8 +1,33 @@
+# Module: kubernetes
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kubernetes.html
+
+# Node metrics, from kubelet:
 - module: kubernetes
-  metricsets:
-    - container
-    - node
-    - pod
-    - system
-    - volume
+  #metricsets:
+  #  - node
+  #  - system
+  #  - pod
+  #  - container
+  #  - volume
+  period: 10s
   hosts: ["localhost:10255"]
+  #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
+  #ssl.certificate: "/etc/pki/client/cert.pem"
+  #ssl.key: "/etc/pki/client/cert.key"
+
+# State metrics from kube-state-metrics service:
+#- module: kubernetes
+#  metricsets:
+#    - state_node
+#    - state_deployment
+#    - state_replicaset
+#    - state_statefulset
+#    - state_pod
+#    - state_container
+#  period: 10s
+#  hosts: ["kube-state-metrics:8080"]
+
+# Kubernetes events
+#- module: kubernetes
+#  metricsets:
+#    - event
diff --git a/metricbeat/modules.d/kvm.yml.disabled b/metricbeat/modules.d/kvm.yml.disabled
index cbed13e7fdd..56d087a191a 100644
--- a/metricbeat/modules.d/kvm.yml.disabled
+++ b/metricbeat/modules.d/kvm.yml.disabled
@@ -1,2 +1,8 @@
+# Module: kvm
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-kvm.html
+
 - module: kvm
+  #metricsets:
+  #  - dommemstat
+  period: 10s
   hosts: ["localhost"]
diff --git a/metricbeat/modules.d/logstash.yml.disabled b/metricbeat/modules.d/logstash.yml.disabled
index 73b63b016e1..fa6a2351560 100644
--- a/metricbeat/modules.d/logstash.yml.disabled
+++ b/metricbeat/modules.d/logstash.yml.disabled
@@ -1,2 +1,9 @@
+# Module: logstash
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-logstash.html
+
 - module: logstash
+  #metricsets:
+  #  - node
+  #  - node_stats
+  period: 10s
   hosts: ["localhost:9600"]
diff --git a/metricbeat/modules.d/memcached.yml.disabled b/metricbeat/modules.d/memcached.yml.disabled
index f1f6533d677..7037988cc35 100644
--- a/metricbeat/modules.d/memcached.yml.disabled
+++ b/metricbeat/modules.d/memcached.yml.disabled
@@ -1,2 +1,7 @@
+# Module: memcached
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-memcached.html
+
 - module: memcached
+#  metricsets: ["stats"]
+  period: 10s
   hosts: ["localhost:11211"]
diff --git a/metricbeat/modules.d/mongodb.yml.disabled b/metricbeat/modules.d/mongodb.yml.disabled
index f22fc37872d..b9bfe31b814 100644
--- a/metricbeat/modules.d/mongodb.yml.disabled
+++ b/metricbeat/modules.d/mongodb.yml.disabled
@@ -1,2 +1,21 @@
+# Module: mongodb
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mongodb.html
+
 - module: mongodb
+  #metricsets:
+  #  - dbstats
+  #  - status
+  period: 10s
+
+  # The hosts must be passed as MongoDB URLs in the format:
+  # [mongodb://][user:pass@]host[:port].
+  # The username and password can also be set using the respective configuration
+  # options. The credentials in the URL take precedence over the username and
+  # password configuration options.
   hosts: ["localhost:27017"]
+
+  # Username to use when connecting to MongoDB. Empty by default.
+  #username: user
+
+  # Password to use when connecting to MongoDB. Empty by default.
+  #password: pass
diff --git a/metricbeat/modules.d/munin.yml.disabled b/metricbeat/modules.d/munin.yml.disabled
index 1ea9bf8c854..a86e6df767f 100644
--- a/metricbeat/modules.d/munin.yml.disabled
+++ b/metricbeat/modules.d/munin.yml.disabled
@@ -1,3 +1,9 @@
+# Module: munin
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-munin.html
+
 - module: munin
+  #metricsets:
+  #  - node
+  period: 10s
   hosts: ["localhost:4949"]
   node.namespace: node
diff --git a/metricbeat/modules.d/mysql.yml.disabled b/metricbeat/modules.d/mysql.yml.disabled
index 8855531cdca..6442da42bed 100644
--- a/metricbeat/modules.d/mysql.yml.disabled
+++ b/metricbeat/modules.d/mysql.yml.disabled
@@ -1,2 +1,18 @@
+# Module: mysql
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-mysql.html
+
 - module: mysql
-  hosts: ["tcp(127.0.0.1:3306)/"]
+  #metricsets:
+  #  - status
+  period: 10s
+
+  # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/"
+  # The username and password can either be set in the DSN or using the username
+  # and password config options. Those specified in the DSN take precedence.
+  hosts: ["root:secret@tcp(127.0.0.1:3306)/"]
+
+  # Username of hosts. Empty by default.
+  #username: root
+
+  # Password of hosts. Empty by default.
+  #password: secret
\ No newline at end of file
diff --git a/metricbeat/modules.d/nginx.yml.disabled b/metricbeat/modules.d/nginx.yml.disabled
index e24bd89b965..dcb7e1ffb2c 100644
--- a/metricbeat/modules.d/nginx.yml.disabled
+++ b/metricbeat/modules.d/nginx.yml.disabled
@@ -1,2 +1,13 @@
+# Module: nginx
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-nginx.html
+
 - module: nginx
+  #metricsets:
+  #  - stubstatus
+  period: 10s
+
+  # Nginx hosts
   hosts: ["http://127.0.0.1"]
+
+  # Path to server status. Default server-status
+  #server_status_path: "server-status"
diff --git a/metricbeat/modules.d/php_fpm.yml.disabled b/metricbeat/modules.d/php_fpm.yml.disabled
index 508aba58bda..3f88f99471e 100644
--- a/metricbeat/modules.d/php_fpm.yml.disabled
+++ b/metricbeat/modules.d/php_fpm.yml.disabled
@@ -1,2 +1,9 @@
+# Module: php_fpm
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-php_fpm.html
+
 - module: php_fpm
+  #metricsets:
+  #  - pool
+  period: 10s
   hosts: ["localhost:8080"]
+  status_path: "/status"
diff --git a/metricbeat/modules.d/postgresql.yml.disabled b/metricbeat/modules.d/postgresql.yml.disabled
index 8adc44083fc..14ee2fc7aca 100644
--- a/metricbeat/modules.d/postgresql.yml.disabled
+++ b/metricbeat/modules.d/postgresql.yml.disabled
@@ -1,2 +1,12 @@
+# Module: postgresql
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-postgresql.html
+
 - module: postgresql
+  #metricsets:
+  #  - database
+  #  - bgwriter
+  #  - activity
+  period: 10s
   hosts: ["postgres://localhost:5432"]
+  #username: user
+  #password: pass
diff --git a/metricbeat/modules.d/prometheus.yml.disabled b/metricbeat/modules.d/prometheus.yml.disabled
index 4990104ef41..061ba9fde05 100644
--- a/metricbeat/modules.d/prometheus.yml.disabled
+++ b/metricbeat/modules.d/prometheus.yml.disabled
@@ -1,4 +1,10 @@
+# Module: prometheus
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-prometheus.html
+
 - module: prometheus
+  #metricsets:
+  #  - stats
   period: 10s
   hosts: ["localhost:9090"]
+  metrics_path: /metrics
   #namespace: example
diff --git a/metricbeat/modules.d/rabbitmq.yml.disabled b/metricbeat/modules.d/rabbitmq.yml.disabled
index b5912718c76..990c55ee816 100644
--- a/metricbeat/modules.d/rabbitmq.yml.disabled
+++ b/metricbeat/modules.d/rabbitmq.yml.disabled
@@ -1,2 +1,12 @@
+# Module: rabbitmq
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-rabbitmq.html
+
 - module: rabbitmq
+  #metricsets:
+  #  - node
+  #  - queue
+  #  - connection
+  period: 10s
   hosts: ["localhost:15672"]
+  #username: guest
+  #password: guest
diff --git a/metricbeat/modules.d/redis.yml.disabled b/metricbeat/modules.d/redis.yml.disabled
index e4ad9bb95e3..d2ad5abda48 100644
--- a/metricbeat/modules.d/redis.yml.disabled
+++ b/metricbeat/modules.d/redis.yml.disabled
@@ -1,2 +1,20 @@
+# Module: redis
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-redis.html
+
 - module: redis
+  #metricsets:
+  #  - info
+  #  - keyspace
+  period: 10s
+
+  # Redis hosts
   hosts: ["127.0.0.1:6379"]
+
+  # Network type to be used for redis connection. Default: tcp
+  #network: tcp
+
+  # Max number of concurrent connections. Default: 10
+  #maxconn: 10
+
+  # Redis AUTH password. Empty by default.
+  #password: foobared
diff --git a/metricbeat/modules.d/system.yml b/metricbeat/modules.d/system.yml
index 82a6338cea4..b4d38cc520b 100644
--- a/metricbeat/modules.d/system.yml
+++ b/metricbeat/modules.d/system.yml
@@ -1,14 +1,22 @@
+# Module: system
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-system.html
+
 - module: system
+  period: 10s
+  metricsets:
+    - cpu
+    - load
+    - memory
+    - network
+    - process
+    - process_summary
+    #- core
+    #- diskio
+    #- socket
   process.include_top_n:
     by_cpu: 5      # include top 5 processes by CPU
     by_memory: 5   # include top 5 processes by memory
 
-#- module: system
-#  metricsets:
-#    - core
-#    - diskio
-#    - socket
-
 - module: system
   period: 1m
   metricsets:
diff --git a/metricbeat/modules.d/uwsgi.yml.disabled b/metricbeat/modules.d/uwsgi.yml.disabled
index e16ad9be6d1..f758061b65a 100644
--- a/metricbeat/modules.d/uwsgi.yml.disabled
+++ b/metricbeat/modules.d/uwsgi.yml.disabled
@@ -1,2 +1,8 @@
+# Module: uwsgi
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-uwsgi.html
+
 - module: uwsgi
+  #metricsets:
+  #  - status
+  period: 10s
   hosts: ["tcp://127.0.0.1:9191"]
diff --git a/metricbeat/modules.d/vsphere.yml.disabled b/metricbeat/modules.d/vsphere.yml.disabled
index d2badbc4c0e..c56a9b1ac33 100644
--- a/metricbeat/modules.d/vsphere.yml.disabled
+++ b/metricbeat/modules.d/vsphere.yml.disabled
@@ -1,4 +1,11 @@
+# Module: vsphere
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-vsphere.html
+
 - module: vsphere
+  #metricsets:
+  #  - datastore
+  #  - host
+  #  - virtualmachine
   period: 10s
   hosts: ["https://localhost/sdk"]
 
@@ -8,4 +15,3 @@
   insecure: false
   # Get custom fields when using virtualmachine metric set. Default false.
   # get_custom_fields: false
-  
diff --git a/metricbeat/modules.d/windows.yml.disabled b/metricbeat/modules.d/windows.yml.disabled
index 866e00010f8..059667d82f3 100644
--- a/metricbeat/modules.d/windows.yml.disabled
+++ b/metricbeat/modules.d/windows.yml.disabled
@@ -1,2 +1,25 @@
+# Module: windows
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-windows.html
+
 - module: windows
-  period: 60s
+  #metricsets:
+  #  - service
+  period: 1m
+
+#- module: windows
+#  metricsets:
+#    - perfmon
+#  period: 10s
+#  perfmon.counters:
+#    - instance_label: processor.name
+#      instance_name: total
+#      measurement_label: processor.time.total.pct
+#      query: '\Processor Information(_Total)\% Processor Time'
+#
+#    - instance_label: physical_disk.name
+#      measurement_label: physical_disk.write.per_sec
+#      query: '\PhysicalDisk(*)\Disk Writes/sec'
+#
+#    - instance_label: physical_disk.name
+#      measurement_label: physical_disk.write.time.pct
+#      query: '\PhysicalDisk(*)\% Disk Write Time'
diff --git a/metricbeat/modules.d/zookeeper.yml.disabled b/metricbeat/modules.d/zookeeper.yml.disabled
index fb77d08fffa..253de00d3e2 100644
--- a/metricbeat/modules.d/zookeeper.yml.disabled
+++ b/metricbeat/modules.d/zookeeper.yml.disabled
@@ -1,3 +1,8 @@
+# Module: zookeeper
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-zookeeper.html
+
 - module: zookeeper
+  #metricsets:
+  #  - mntr
   period: 10s
   hosts: ["localhost:2181"]
diff --git a/metricbeat/scripts/modules_collector.py b/metricbeat/scripts/modules_collector.py
new file mode 100644
index 00000000000..0ee891a8bcc
--- /dev/null
+++ b/metricbeat/scripts/modules_collector.py
@@ -0,0 +1,48 @@
+import os
+import argparse
+import yaml
+import six
+
+# Collects module configs to modules.d
+
+
+def collect(docs_branch):
+
+    base_dir = "module"
+    path = os.path.abspath("module")
+
+    # TODO add module release status if beta or experimental
+    header = """# Module: {module}
+# Docs: https://www.elastic.co/guide/en/beats/metricbeat/{docs_branch}/metricbeat-module-{module}.html
+
+"""
+
+    # Create directory for module confs
+    os.mkdir(os.path.abspath('modules.d'))
+
+    # Iterate over all modules
+    for module in sorted(os.listdir(base_dir)):
+
+        module_conf = path + '/' + module + '/_meta/config.yml'
+        if os.path.isfile(module_conf) == False:
+            continue
+
+        module_file = header.format(module=module, docs_branch=docs_branch)
+
+        with open(module_conf) as f:
+            module_file += f.read()
+
+        # Write disabled module conf
+        with open(os.path.abspath('modules.d/') + '/' + module + '.yml.disabled', 'w') as f:
+            f.write(module_file)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Collects modules confs")
+    parser.add_argument("--docs_branch", help="Docs branch")
+
+    args = parser.parse_args()
+    docs_branch = args.docs_branch
+
+    collect(docs_branch)