Set default metricset in zookeeper module

CHANGELOG.asciidoc

@@ -261,6 +261,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Add experimental module to collect metrics from munin nodes. {pull}6517[6517]
 - Add support for wildcards and explicit metrics grouping in jolokia/jmx. {pull}6462[6462]
 - Set `collector` as default metricset in Prometheus module. {pull}6636[6636]
+- Set `mntr` as default metricset in Zookeeper module. {pull}6674[6674]
 
 *Packetbeat*
 

metricbeat/docs/modules/zookeeper.asciidoc

@@ -5,7 +5,8 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-zookeeper]]
 == ZooKeeper module
 
-The ZooKeeper module fetches statistics from the ZooKeeper service.
+The ZooKeeper module fetches statistics from the ZooKeeper service. The default
+metricset is `mntr`.
 
 [float]
 === Compatibility
@@ -24,7 +25,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: zookeeper
-  metricsets: ["mntr"]
   period: 10s
   hosts: ["localhost:2181"]
 ----

metricbeat/metricbeat.reference.yml

@@ -501,6 +501,7 @@ metricbeat.modules:
 
 #------------------------------ ZooKeeper Module -----------------------------
 - module: zookeeper
+  enabled: true
   metricsets: ["mntr"]
   period: 10s
   hosts: ["localhost:2181"]

metricbeat/module/zookeeper/_meta/config.reference.yml

@@ -0,0 +1,5 @@
+- module: zookeeper
+  enabled: true
+  metricsets: ["mntr"]
+  period: 10s
+  hosts: ["localhost:2181"]

metricbeat/module/zookeeper/_meta/config.yml

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

metricbeat/module/zookeeper/_meta/docs.asciidoc

@@ -1,4 +1,5 @@
-The ZooKeeper module fetches statistics from the ZooKeeper service.
+The ZooKeeper module fetches statistics from the ZooKeeper service. The default
+metricset is `mntr`.
 
 [float]
 === Compatibility

metricbeat/module/zookeeper/mntr/mntr.go

@@ -36,9 +36,10 @@ import (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("zookeeper", "mntr", New, parse.PassThruHostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("zookeeper", "mntr", New,
+		mb.WithHostParser(parse.PassThruHostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet for fetching ZooKeeper health metrics.

metricbeat/modules.d/zookeeper.yml.disabled

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