Set stats as default metricset for memcached module (#6765)

elastic · Apr 4, 2018 · f8b9ec7 · f8b9ec7
1 parent f3a5982
commit f8b9ec7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/metricbeat/docs/modules/memcached.asciidoc b/metricbeat/docs/modules/memcached.asciidoc
@@ -9,6 +9,7 @@ beta[]
 
 This is the Memcached module. These metricsets were tested with Memcached version 1.4.35.
 
+The default metricset is `stats`.
 
 
 [float]
@@ -21,8 +22,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: memcached
-  metricsets: ["stats"]
-  period: 10s
   hosts: ["localhost:11211"]
 ----
 

diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
@@ -363,6 +363,7 @@ metricbeat.modules:
   metricsets: ["stats"]
   period: 10s
   hosts: ["localhost:11211"]
+  enabled: true
 
 #------------------------------- MongoDB Module ------------------------------
 - module: mongodb

diff --git a/metricbeat/module/memcached/_meta/config.reference.yml b/metricbeat/module/memcached/_meta/config.reference.yml
@@ -0,0 +1,5 @@
+- module: memcached
+  metricsets: ["stats"]
+  period: 10s
+  hosts: ["localhost:11211"]
+  enabled: true
diff --git a/metricbeat/module/memcached/_meta/config.yml b/metricbeat/module/memcached/_meta/config.yml
@@ -1,4 +1,2 @@
 - module: memcached
-  metricsets: ["stats"]
-  period: 10s
   hosts: ["localhost:11211"]
diff --git a/metricbeat/module/memcached/_meta/docs.asciidoc b/metricbeat/module/memcached/_meta/docs.asciidoc
@@ -1,2 +1,3 @@
 This is the Memcached module. These metricsets were tested with Memcached version 1.4.35.
 
+The default metricset is `stats`.
diff --git a/metricbeat/module/memcached/stats/stats.go b/metricbeat/module/memcached/stats/stats.go
@@ -11,9 +11,9 @@ import (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("memcached", "stats", New); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("memcached", "stats", New,
+		mb.DefaultMetricSet(),
+	)
 }
 
 type MetricSet struct {

diff --git a/metricbeat/modules.d/memcached.yml.disabled b/metricbeat/modules.d/memcached.yml.disabled
@@ -1,4 +1,2 @@
 - module: memcached
-  metricsets: ["stats"]
-  period: 10s
   hosts: ["localhost:11211"]
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@
		This is the Memcached module. These metricsets were tested with Memcached version 1.4.35.

		The default metricset is `stats`.