From f9b66c8e82db4827867e4bcfa4aa5c7370a6d0d5 Mon Sep 17 00:00:00 2001
From: ruflin <spam@ruflin.com>
Date: Tue, 27 Mar 2018 08:22:49 +0200
Subject: [PATCH] Set namespace as default metricset in Aerospike module

* Remove metricset config from short config
* Document default
---
 CHANGELOG.asciidoc                                     | 1 +
 metricbeat/docs/modules/aerospike.asciidoc             | 5 +----
 metricbeat/metricbeat.reference.yml                    | 2 +-
 metricbeat/module/aerospike/_meta/config.reference.yml | 5 +++++
 metricbeat/module/aerospike/_meta/config.yml           | 3 ---
 metricbeat/module/aerospike/_meta/docs.asciidoc        | 2 +-
 metricbeat/module/aerospike/namespace/namespace.go     | 6 +++---
 metricbeat/modules.d/aerospike.yml.disabled            | 3 ---
 8 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 metricbeat/module/aerospike/_meta/config.reference.yml

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a6de63efb79..6cc91e965a7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -265,6 +265,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - 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 default metricsets in vSphere module. {pull}6676[6676]
+- Set `namespace` as default metricset in Aerospike module. {pull}6669[6669]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/modules/aerospike.asciidoc b/metricbeat/docs/modules/aerospike.asciidoc
index a1fde6987db..c25c33db964 100644
--- a/metricbeat/docs/modules/aerospike.asciidoc
+++ b/metricbeat/docs/modules/aerospike.asciidoc
@@ -7,7 +7,7 @@ This file is generated! See scripts/docs_collector.py
 
 beta[]
 
-The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics.
+The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics. The default metricset is `namespace`.
 
 [float]
 === Compatibility
@@ -25,9 +25,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: aerospike
-  metricsets: ["namespace"]
-  enabled: false
-  period: 10s
   hosts: ["localhost:3000"]
 ----
 
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
index 73d26d2e3f3..524867b4089 100644
--- a/metricbeat/metricbeat.reference.yml
+++ b/metricbeat/metricbeat.reference.yml
@@ -117,7 +117,7 @@ metricbeat.modules:
 #------------------------------ Aerospike Module -----------------------------
 - module: aerospike
   metricsets: ["namespace"]
-  enabled: false
+  enabled: true
   period: 10s
   hosts: ["localhost:3000"]
 
diff --git a/metricbeat/module/aerospike/_meta/config.reference.yml b/metricbeat/module/aerospike/_meta/config.reference.yml
new file mode 100644
index 00000000000..38aca68f951
--- /dev/null
+++ b/metricbeat/module/aerospike/_meta/config.reference.yml
@@ -0,0 +1,5 @@
+- module: aerospike
+  metricsets: ["namespace"]
+  enabled: true
+  period: 10s
+  hosts: ["localhost:3000"]
diff --git a/metricbeat/module/aerospike/_meta/config.yml b/metricbeat/module/aerospike/_meta/config.yml
index 787e314dc60..0a4a883f474 100644
--- a/metricbeat/module/aerospike/_meta/config.yml
+++ b/metricbeat/module/aerospike/_meta/config.yml
@@ -1,5 +1,2 @@
 - module: aerospike
-  metricsets: ["namespace"]
-  enabled: false
-  period: 10s
   hosts: ["localhost:3000"]
diff --git a/metricbeat/module/aerospike/_meta/docs.asciidoc b/metricbeat/module/aerospike/_meta/docs.asciidoc
index 9d1f59230d3..3cbf6660edf 100644
--- a/metricbeat/module/aerospike/_meta/docs.asciidoc
+++ b/metricbeat/module/aerospike/_meta/docs.asciidoc
@@ -1,4 +1,4 @@
-The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics.
+The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics. The default metricset is `namespace`.
 
 [float]
 === Compatibility
diff --git a/metricbeat/module/aerospike/namespace/namespace.go b/metricbeat/module/aerospike/namespace/namespace.go
index 1dafef5eae6..e36519fef1c 100644
--- a/metricbeat/module/aerospike/namespace/namespace.go
+++ b/metricbeat/module/aerospike/namespace/namespace.go
@@ -16,9 +16,9 @@ import (
 // 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("aerospike", "namespace", New); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("aerospike", "namespace", New,
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet type defines all fields of the MetricSet
diff --git a/metricbeat/modules.d/aerospike.yml.disabled b/metricbeat/modules.d/aerospike.yml.disabled
index 787e314dc60..0a4a883f474 100644
--- a/metricbeat/modules.d/aerospike.yml.disabled
+++ b/metricbeat/modules.d/aerospike.yml.disabled
@@ -1,5 +1,2 @@
 - module: aerospike
-  metricsets: ["namespace"]
-  enabled: false
-  period: 10s
   hosts: ["localhost:3000"]