Coment metricsets when they are the default

metricbeat/docs/modules/golang.asciidoc

@@ -20,9 +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"

metricbeat/docs/modules/jolokia.asciidoc

@@ -19,11 +19,11 @@ 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"
+#  path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
   jmx.mappings:
     # - mbean: 'java.lang:type=Runtime'
     #   attributes:

metricbeat/metricbeat.reference.yml

@@ -210,9 +210,9 @@ metricbeat.modules:
 
 #------------------------------- Golang Module -------------------------------
 - module: golang
-  metricsets:
-    - expvar
-    - heap
+#  metricsets:
+#    - expvar
+#    - heap
   period: 10s
   hosts: ["localhost:6060"]
   heap.path: "/debug/vars"
@@ -278,11 +278,11 @@ metricbeat.modules:
 
 #------------------------------- Jolokia Module ------------------------------
 - module: jolokia
-  metricsets: ["jmx"]
+#  metricsets: ["jmx"]
   period: 10s
   hosts: ["localhost"]
   namespace: "metrics"
-  #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
+#  path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
   jmx.mappings:
     # - mbean: 'java.lang:type=Runtime'
     #   attributes:

metricbeat/module/aerospike/_meta/config.yml

@@ -1,4 +1,4 @@
 - module: aerospike
-  metricsets: ["namespace"]
+#  metricsets: ["namespace"]
   period: 10s
   hosts: ["localhost:3000"]

metricbeat/module/apache/_meta/config.yml

@@ -1,4 +1,4 @@
 - module: apache
-  metricsets: ["status"]
+#  metricsets: ["status"]
   period: 10s
   hosts: ["http://127.0.0.1"]

metricbeat/module/ceph/_meta/config.yml

@@ -1,16 +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
-    - osd_df
-    - pool_disk
+#  metricsets:
+#    - cluster_disk
+#    - osd_tree
+#    - osd_df
+#    - pool_disk
   period: 1m
   hosts: ["localhost:5000"]

metricbeat/module/couchbase/_meta/config.yml

@@ -1,7 +1,7 @@
 - module: couchbase
-  metricsets:
-    - bucket
-    - cluster
-    - node
+#  metricsets:
+#    - bucket
+#    - cluster
+#    - node
   period: 10s
   hosts: ["localhost:8091"]

metricbeat/module/docker/_meta/config.yml

@@ -1,12 +1,12 @@
 - module: docker
-  metricsets:
-    - container
-    - cpu
-    - diskio
-    - healthcheck
-    - info
-    - memory
-    - network
+#  metricsets:
+#    - container
+#    - cpu
+#    - diskio
+#    - healthcheck
+#    - info
+#    - memory
+#    - network
   period: 10s
   hosts: ["unix:///var/run/docker.sock"]
 

metricbeat/module/dropwizard/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: dropwizard
-  metricsets: ["collector"]
+#  metricsets: ["collector"]
   period: 10s
   hosts: ["localhost:8080"]
   metrics_path: /metrics/metrics

metricbeat/module/elasticsearch/_meta/config.yml

@@ -1,6 +1,6 @@
 - module: elasticsearch
-  metricsets:
-    - node
-    - node_stats
+#  metricsets:
+#    - node
+#    - node_stats
   period: 10s
   hosts: ["localhost:9200"]

metricbeat/module/etcd/_meta/config.yml

@@ -1,7 +1,7 @@
 - module: etcd
-  metricsets:
-    - leader
-    - self
-    - store
+#  metricsets:
+#    - leader
+#    - self
+#    - store
   period: 10s
   hosts: ["localhost:2379"]

metricbeat/module/golang/_meta/config.yml

@@ -1,7 +1,7 @@
 - module: golang
-  metricsets:
-    - expvar
-    - heap
+#  metricsets:
+#    - expvar
+#    - heap
   period: 10s
   hosts: ["localhost:6060"]
   heap.path: "/debug/vars"

metricbeat/module/graphite/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: graphite
-  metricsets: ["server"]
+#  metricsets: ["server"]
 #  protocol: "udp"
 #  templates:
 #    - filter: "test.*.bash.*" # This would match metrics like test.localhost.bash.stats

metricbeat/module/haproxy/_meta/config.yml

@@ -1,6 +1,6 @@
 - module: haproxy
-  metricsets:
-    - info
-    - stat
+#  metricsets:
+#    - info
+#    - stat
   period: 10s
   hosts: ["tcp://127.0.0.1:14567"]

metricbeat/module/jolokia/_meta/config.yml

@@ -1,9 +1,9 @@
 - module: jolokia
-  metricsets: ["jmx"]
+#  metricsets: ["jmx"]
   period: 10s
   hosts: ["localhost"]
   namespace: "metrics"
-  #path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
+#  path: "/jolokia/?ignoreErrors=true&canonicalNaming=false"
   jmx.mappings:
     # - mbean: 'java.lang:type=Runtime'
     #   attributes:

metricbeat/module/kafka/_meta/config.yml

@@ -1,7 +1,7 @@
 - module: kafka
-  metricsets:
-    - partition
-    - consumergroup
+#  metricsets:
+#    - partition
+#    - consumergroup
   period: 10s
   hosts: ["localhost:9092"]
 

metricbeat/module/kibana/_meta/config.yml

@@ -1,4 +1,4 @@
 - module: kibana
-  metricsets: ["status"]
+#  metricsets: ["status"]
   period: 10s
   hosts: ["localhost:5601"]

metricbeat/module/kubernetes/_meta/config.yml

@@ -1,11 +1,11 @@
 # Node metrics, from kubelet:
 - module: kubernetes
-  metricsets:
-    - node
-    - system
-    - pod
-    - container
-    - volume
+#  metricsets:
+#    - node
+#    - system
+#    - pod
+#    - container
+#    - volume
   period: 10s
   hosts: ["localhost:10255"]
   #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]

metricbeat/module/kvm/_meta/config.yml

@@ -1,4 +1,4 @@
 - module: kvm
-  metricsets: ["dommemstat"]
+#  metricsets: ["dommemstat"]
   period: 10s
   hosts: ["localhost"]

metricbeat/module/logstash/_meta/config.yml

@@ -1,6 +1,6 @@
 - module: logstash
-  metricsets:
-    - node
-    - node_stats
+#  metricsets:
+#    - node
+#    - node_stats
   period: 10s
   hosts: ["localhost:9600"]

metricbeat/module/memcached/_meta/config.yml

@@ -1,4 +1,4 @@
 - module: memcached
-  metricsets: ["stats"]
+#  metricsets: ["stats"]
   period: 10s
   hosts: ["localhost:11211"]

metricbeat/module/mongodb/_meta/config.yml

@@ -1,7 +1,7 @@
 - module: mongodb
-  metricsets:
-    - dbstats
-    - status
+#  metricsets:
+#    - dbstats
+#    - status
   period: 10s
 
   # The hosts must be passed as MongoDB URLs in the format:

metricbeat/module/munin/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: munin
-  metricsets: ["node"]
+#  metricsets: ["node"]
   period: 10s
   hosts: ["localhost:4949"]
   node.namespace: node

metricbeat/module/mysql/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: mysql
-  metricsets: ["status"]
+#  metricsets: ["status"]
   period: 10s
 
   # Host DSN should be defined as "user:pass@tcp(127.0.0.1:3306)/"

metricbeat/module/nginx/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: nginx
-  metricsets: ["stubstatus"]
+#  metricsets: ["stubstatus"]
   period: 10s
 
   # Nginx hosts

metricbeat/module/php_fpm/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: php_fpm
-  metricsets: ["pool"]
+#  metricsets: ["pool"]
   period: 10s
   hosts: ["localhost:8080"]
   status_path: "/status"

metricbeat/module/postgresql/_meta/config.yml

@@ -1,14 +1,11 @@
 - module: postgresql
-  metricsets:
-    # Stats about every PostgreSQL database
-    - database
-
-    # Stats about the background writer process's activity
-    - bgwriter
-
-    # Stats about every PostgreSQL process
-    - activity
-
+#  metricsets:
+#    # Stats about every PostgreSQL database
+#    - database
+#    # Stats about the background writer process's activity
+#    - bgwriter
+#    # Stats about every PostgreSQL process
+#    - activity
   period: 10s
 
   # The host must be passed as PostgreSQL URL. Example:

metricbeat/module/prometheus/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: prometheus
-  metricsets: ["stats"]
+#  metricsets: ["stats"]
   period: 10s
   hosts: ["localhost:9090"]
   metrics_path: /metrics

metricbeat/module/rabbitmq/_meta/config.yml

@@ -1,8 +1,8 @@
 - module: rabbitmq
-  metricsets:
-    - node
-    - queue
-    - connection
+#  metricsets:
+#    - node
+#    - queue
+#    - connection
   period: 10s
   hosts: ["localhost:15672"]
 

metricbeat/module/redis/_meta/config.yml

@@ -1,7 +1,7 @@
 - module: redis
-  metricsets:
-    - info
-    - keyspace
+#  metricsets:
+#    - info
+#    - keyspace
   period: 10s
 
   # Redis hosts

metricbeat/module/uwsgi/_meta/config.yml

@@ -1,4 +1,4 @@
 - module: uwsgi
-  metricsets: ["status"]
+#  metricsets: ["status"]
   period: 10s
   hosts: ["tcp://127.0.0.1:9191"]

metricbeat/module/vsphere/_meta/config.yml

@@ -1,5 +1,8 @@
 - module: vsphere
-  metricsets: ["datastore", "host", "virtualmachine"]
+#  metricsets:
+#    - datastore
+#    - host
+#    - virtualmachine
   period: 10s
   hosts: ["https://localhost/sdk"]
 
@@ -9,4 +12,3 @@
   insecure: false
   # Get custom fields when using virtualmachine metric set. Default false.
   # get_custom_fields: false
-

metricbeat/module/windows/_meta/config.yml

@@ -1,5 +1,5 @@
 - module: windows
-  metricsets: ["service"]
+#  metricsets: ["service"]
   period: 1m
 
 #- module: windows

metricbeat/module/zookeeper/_meta/config.yml

@@ -1,4 +1,4 @@
 - module: zookeeper
-  metricsets: ["mntr"]
+#  metricsets: ["mntr"]
   period: 10s
   hosts: ["localhost:2181"]

metricbeat/modules.d/aerospike.yml.disabled

@@ -2,6 +2,6 @@
 # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-aerospike.html
 
 - module: aerospike
-  metricsets: ["namespace"]
+#  metricsets: ["namespace"]
   period: 10s
   hosts: ["localhost:3000"]

metricbeat/modules.d/apache.yml.disabled

@@ -2,6 +2,6 @@
 # Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-apache.html
 
 - module: apache
-  metricsets: ["status"]
+#  metricsets: ["status"]
   period: 10s
   hosts: ["http://127.0.0.1"]