Set all metricsets as default for Logstash module

elastic · Apr 4, 2018 · fd17ae5 · fd17ae5
1 parent b5dc679
commit fd17ae5
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 17 deletions.
diff --git a/metricbeat/docs/modules/logstash.asciidoc b/metricbeat/docs/modules/logstash.asciidoc
@@ -9,6 +9,7 @@ beta[]
 
 This is the Logstash module.
 
+The default metricsets are `node` and `node_stats`.
 
 
 [float]
@@ -21,11 +22,7 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: logstash
-  metricsets: ["node", "node_stats"]
-  enabled: false
-  period: 10s
   hosts: ["localhost:9600"]
-
 ----
 
 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
@@ -351,11 +351,10 @@ metricbeat.modules:
 #------------------------------ Logstash Module ------------------------------
 - module: logstash
   metricsets: ["node", "node_stats"]
-  enabled: false
+  enabled: true
   period: 10s
   hosts: ["localhost:9600"]
 
-
 #------------------------------ Memcached Module -----------------------------
 - module: memcached
   metricsets: ["stats"]

diff --git a/metricbeat/module/logstash/_meta/config.reference.yml b/metricbeat/module/logstash/_meta/config.reference.yml
@@ -0,0 +1,5 @@
+- module: logstash
+  metricsets: ["node", "node_stats"]
+  enabled: true
+  period: 10s
+  hosts: ["localhost:9600"]
diff --git a/metricbeat/module/logstash/_meta/config.yml b/metricbeat/module/logstash/_meta/config.yml
@@ -1,6 +1,2 @@
 - module: logstash
-  metricsets: ["node", "node_stats"]
-  enabled: false
-  period: 10s
   hosts: ["localhost:9600"]
-
diff --git a/metricbeat/module/logstash/_meta/docs.asciidoc b/metricbeat/module/logstash/_meta/docs.asciidoc
@@ -1,2 +1,3 @@
 This is the Logstash module.
 
+The default metricsets are `node` and `node_stats`.
diff --git a/metricbeat/module/logstash/node/node.go b/metricbeat/module/logstash/node/node.go
@@ -11,9 +11,10 @@ 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("logstash", "node", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("logstash", "node", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 var (

diff --git a/metricbeat/module/logstash/node_stats/node_stats.go b/metricbeat/module/logstash/node_stats/node_stats.go
@@ -20,6 +20,7 @@ func init() {
 	mb.Registry.MustAddMetricSet(moduleName, metricsetName, New,
 		mb.WithHostParser(hostParser),
 		mb.WithNamespace(namespace),
+		mb.DefaultMetricSet(),
 	)
 }
 

diff --git a/metricbeat/modules.d/logstash.yml.disabled b/metricbeat/modules.d/logstash.yml.disabled
@@ -1,6 +1,2 @@
 - module: logstash
-  metricsets: ["node", "node_stats"]
-  enabled: false
-  period: 10s
   hosts: ["localhost:9600"]
-
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@
		This is the Logstash module.

		The default metricsets are `node` and `node_stats`.