Set default metricsets for redis module (#6742)

metricbeat/docs/modules/redis.asciidoc

@@ -7,6 +7,8 @@ This file is generated! See scripts/docs_collector.py
 
 This module periodically fetches metrics from http://redis.io/[Redis] servers.
 
+The defaut metricsets are `info` and `keyspace`.
+
 [float]
 === Module-specific configuration notes
 
@@ -41,34 +43,7 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: redis
-  metricsets: ["info", "keyspace"]
-  period: 10s
-
-  # Redis hosts
   hosts: ["127.0.0.1:6379"]
-
-  # Timeout after which time a metricset should return an error
-  # Timeout is by default defined as period, as a fetch of a metricset
-  # should never take longer then period, as otherwise calls can pile up.
-  #timeout: 1s
-
-  # Optional fields to be added to each event
-  #fields:
-  #  datacenter: west
-
-  # Network type to be used for redis connection. Default: tcp
-  #network: tcp
-
-  # Max number of concurrent connections. Default: 10
-  #maxconn: 10
-
-  # Filters can be used to reduce the number of fields sent.
-  #processors:
-  #  - include_fields:
-  #      fields: ["beat", "metricset", "redis.info.stats"]
-
-  # Redis AUTH password. Empty by default.
-  #password: foobared
 ----
 
 [float]

metricbeat/metricbeat.reference.yml

@@ -444,6 +444,7 @@ metricbeat.modules:
 #-------------------------------- Redis Module -------------------------------
 - module: redis
   metricsets: ["info", "keyspace"]
+  enabled: true
   period: 10s
 
   # Redis hosts

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

@@ -0,0 +1,30 @@
+- module: redis
+  metricsets: ["info", "keyspace"]
+  enabled: true
+  period: 10s
+
+  # Redis hosts
+  hosts: ["127.0.0.1:6379"]
+
+  # Timeout after which time a metricset should return an error
+  # Timeout is by default defined as period, as a fetch of a metricset
+  # should never take longer then period, as otherwise calls can pile up.
+  #timeout: 1s
+
+  # Optional fields to be added to each event
+  #fields:
+  #  datacenter: west
+
+  # Network type to be used for redis connection. Default: tcp
+  #network: tcp
+
+  # Max number of concurrent connections. Default: 10
+  #maxconn: 10
+
+  # Filters can be used to reduce the number of fields sent.
+  #processors:
+  #  - include_fields:
+  #      fields: ["beat", "metricset", "redis.info.stats"]
+
+  # Redis AUTH password. Empty by default.
+  #password: foobared

metricbeat/module/redis/_meta/config.yml

@@ -1,29 +1,2 @@
 - module: redis
-  metricsets: ["info", "keyspace"]
-  period: 10s
-
-  # Redis hosts
   hosts: ["127.0.0.1:6379"]
-
-  # Timeout after which time a metricset should return an error
-  # Timeout is by default defined as period, as a fetch of a metricset
-  # should never take longer then period, as otherwise calls can pile up.
-  #timeout: 1s
-
-  # Optional fields to be added to each event
-  #fields:
-  #  datacenter: west
-
-  # Network type to be used for redis connection. Default: tcp
-  #network: tcp
-
-  # Max number of concurrent connections. Default: 10
-  #maxconn: 10
-
-  # Filters can be used to reduce the number of fields sent.
-  #processors:
-  #  - include_fields:
-  #      fields: ["beat", "metricset", "redis.info.stats"]
-
-  # Redis AUTH password. Empty by default.
-  #password: foobared

metricbeat/module/redis/_meta/docs.asciidoc

@@ -1,5 +1,7 @@
 This module periodically fetches metrics from http://redis.io/[Redis] servers.
 
+The defaut metricsets are `info` and `keyspace`.
+
 [float]
 === Module-specific configuration notes
 

metricbeat/module/redis/info/info.go

@@ -17,9 +17,10 @@ var (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("redis", "info", New, parse.PassThruHostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("redis", "info", New,
+		mb.WithHostParser(parse.PassThruHostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet for fetching Redis server information and statistics.

metricbeat/module/redis/keyspace/keyspace.go

@@ -17,9 +17,10 @@ var (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("redis", "keyspace", New, parse.PassThruHostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("redis", "keyspace", New,
+		mb.WithHostParser(parse.PassThruHostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet for fetching Redis server information and statistics.

metricbeat/modules.d/redis.yml.disabled

@@ -1,29 +1,2 @@
 - module: redis
-  metricsets: ["info", "keyspace"]
-  period: 10s
-
-  # Redis hosts
   hosts: ["127.0.0.1:6379"]
-
-  # Timeout after which time a metricset should return an error
-  # Timeout is by default defined as period, as a fetch of a metricset
-  # should never take longer then period, as otherwise calls can pile up.
-  #timeout: 1s
-
-  # Optional fields to be added to each event
-  #fields:
-  #  datacenter: west
-
-  # Network type to be used for redis connection. Default: tcp
-  #network: tcp
-
-  # Max number of concurrent connections. Default: 10
-  #maxconn: 10
-
-  # Filters can be used to reduce the number of fields sent.
-  #processors:
-  #  - include_fields:
-  #      fields: ["beat", "metricset", "redis.info.stats"]
-
-  # Redis AUTH password. Empty by default.
-  #password: foobared