Set all metricsets as default in etcd module (#6756)

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

Hide file tree

Showing 9 changed files with 18 additions and 21 deletions.
diff --git a/metricbeat/docs/modules/etcd.asciidoc b/metricbeat/docs/modules/etcd.asciidoc
@@ -9,7 +9,7 @@ beta[]
 
 This is the Etcd Module. The Etcd module uses https://coreos.com/etcd/docs/latest/v2/api.html [Etcd v2 API] to collect metrics.
 
-
+The default metricsets are `leader`, `self` and `store`.
 
 
 [float]
@@ -22,10 +22,7 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: etcd
-  metricsets: ["leader", "self", "store"]
-  period: 10s
   hosts: ["localhost:2379"]
-
 ----
 
 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
@@ -202,7 +202,6 @@ metricbeat.modules:
   period: 10s
   hosts: ["localhost:2379"]
 
-
 #------------------------------- Golang Module -------------------------------
 - module: golang
   metricsets: ["expvar","heap"]

diff --git a/metricbeat/module/etcd/_meta/config.reference.yml b/metricbeat/module/etcd/_meta/config.reference.yml
@@ -0,0 +1,4 @@
+- module: etcd
+  metricsets: ["leader", "self", "store"]
+  period: 10s
+  hosts: ["localhost:2379"]
diff --git a/metricbeat/module/etcd/_meta/config.yml b/metricbeat/module/etcd/_meta/config.yml
@@ -1,5 +1,2 @@
 - module: etcd
-  metricsets: ["leader", "self", "store"]
-  period: 10s
   hosts: ["localhost:2379"]
-
diff --git a/metricbeat/module/etcd/_meta/docs.asciidoc b/metricbeat/module/etcd/_meta/docs.asciidoc
@@ -1,3 +1,3 @@
 This is the Etcd Module. The Etcd module uses https://coreos.com/etcd/docs/latest/v2/api.html [Etcd v2 API] to collect metrics.
 
-
+The default metricsets are `leader`, `self` and `store`.
diff --git a/metricbeat/module/etcd/leader/leader.go b/metricbeat/module/etcd/leader/leader.go
@@ -21,9 +21,10 @@ var (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("etcd", "leader", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("etcd", "leader", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 type MetricSet struct {

diff --git a/metricbeat/module/etcd/self/self.go b/metricbeat/module/etcd/self/self.go
@@ -21,9 +21,10 @@ var (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("etcd", "self", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("etcd", "self", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 type MetricSet struct {

diff --git a/metricbeat/module/etcd/store/store.go b/metricbeat/module/etcd/store/store.go
@@ -21,9 +21,10 @@ var (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("etcd", "store", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("etcd", "store", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 type MetricSet struct {

diff --git a/metricbeat/modules.d/etcd.yml.disabled b/metricbeat/modules.d/etcd.yml.disabled
@@ -1,5 +1,2 @@
 - module: etcd
-  metricsets: ["leader", "self", "store"]
-  period: 10s
   hosts: ["localhost:2379"]
-
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@
		This is the Etcd Module. The Etcd module uses https://coreos.com/etcd/docs/latest/v2/api.html [Etcd v2 API] to collect metrics.


		The default metricsets are `leader`, `self` and `store`.