Merge pull request #6683 from ruflin/couchbase-defaults

Set all couchbase metricsets as default in metricbeat module.

CHANGELOG.asciidoc

@@ -272,7 +272,8 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Set `namespace` as default metricset in Aerospike module. {pull}6669[6669]
 - Set `service` as default metricset in Windows module. {pull}6675[6675]
 - Set all metricsets as default metricsets in uwsgi module. {pull}6688[6688]
-- Mark kubernetes.event metricset as beta. {pull}[]
+- Mark kubernetes.event metricset as beta. {pull}6715[6715]
+- Set all metricsets as default metricsets in couchbase module. {pull}6683[6683]
 
 *Packetbeat*
 

metricbeat/docs/modules/couchbase.asciidoc

@@ -8,7 +8,7 @@ This file is generated! See scripts/docs_collector.py
 beta[]
 
 This module periodically fetches metrics from https://www.couchbase.com/[Couchbase]
-servers.
+servers. The default metricsets are `bucket`, `cluster`, `node`.
 
 
 [float]
@@ -21,8 +21,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: couchbase
-  metricsets: ["bucket", "cluster", "node"]
-  period: 10s
   hosts: ["localhost:8091"]
 ----
 

metricbeat/metricbeat.reference.yml

@@ -150,6 +150,7 @@ metricbeat.modules:
   metricsets: ["bucket", "cluster", "node"]
   period: 10s
   hosts: ["localhost:8091"]
+  enabled: true
 
 #------------------------------- Docker Module -------------------------------
 - module: docker

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

@@ -0,0 +1,5 @@
+- module: couchbase
+  metricsets: ["bucket", "cluster", "node"]
+  period: 10s
+  hosts: ["localhost:8091"]
+  enabled: true

metricbeat/module/couchbase/_meta/config.yml

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

metricbeat/module/couchbase/_meta/docs.asciidoc

@@ -1,2 +1,2 @@
 This module periodically fetches metrics from https://www.couchbase.com/[Couchbase]
-servers.
+servers. The default metricsets are `bucket`, `cluster`, `node`.

metricbeat/module/couchbase/bucket/bucket.go

@@ -23,9 +23,10 @@ var (
 // init registers the MetricSet with the central registry.
 // The New method will be called after the setup of the module and before starting to fetch data
 func init() {
-	if err := mb.Registry.AddMetricSet("couchbase", "bucket", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("couchbase", "bucket", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet type defines all fields of the MetricSet

metricbeat/module/couchbase/cluster/cluster.go

@@ -23,9 +23,10 @@ var (
 // init registers the MetricSet with the central registry.
 // The New method will be called after the setup of the module and before starting to fetch data
 func init() {
-	if err := mb.Registry.AddMetricSet("couchbase", "cluster", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("couchbase", "cluster", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet type defines all fields of the MetricSet

metricbeat/module/couchbase/node/node.go

@@ -23,9 +23,10 @@ var (
 // init registers the MetricSet with the central registry.
 // The New method will be called after the setup of the module and before starting to fetch data
 func init() {
-	if err := mb.Registry.AddMetricSet("couchbase", "node", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("couchbase", "node", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet type defines all fields of the MetricSet

metricbeat/modules.d/couchbase.yml.disabled

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