Set default metricset in windows module to service

CHANGELOG.asciidoc

@@ -268,6 +268,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Set default metricsets in vSphere module. {pull}6676[6676]
 - Set `status` as default metricset in Apache module. {pull}6673[6673]
 - Set `namespace` as default metricset in Aerospike module. {pull}6669[6669]
+- Set `service` as default metricset in Windows module. {pull}6675[6675]
 
 *Packetbeat*
 

metricbeat/docs/modules/windows.asciidoc

@@ -7,7 +7,8 @@ This file is generated! See scripts/docs_collector.py
 
 beta[]
 
-This is the Windows module.
+This is the Windows module. It collects metrics from Windows systems,
+by default metricset `service` is enabled.
 
 
 [float]
@@ -20,12 +21,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: windows
-  metricsets: ["perfmon"]
-  period: 10s
-  perfmon.counters:
-
-- module: windows
-  metricsets: ["service"]
   period: 60s
 ----
 

metricbeat/metricbeat.reference.yml

@@ -493,11 +493,18 @@ metricbeat.modules:
 #------------------------------- Windows Module ------------------------------
 - module: windows
   metricsets: ["perfmon"]
+  enabled: true
   period: 10s
+  perfmon.ignore_non_existent_counters: true
   perfmon.counters:
+  #  - instance_label: processor.name
+  #    instance_name: total
+  #    measurement_label: processor.time.total.pct
+  #    query: '\Processor Information(_Total)\% Processor Time'
 
 - module: windows
   metricsets: ["service"]
+  enabled: true
   period: 60s
 
 #------------------------------ ZooKeeper Module -----------------------------

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

@@ -0,0 +1,15 @@
+- module: windows
+  metricsets: ["perfmon"]
+  enabled: true
+  period: 10s
+  perfmon.ignore_non_existent_counters: true
+  perfmon.counters:
+  #  - instance_label: processor.name
+  #    instance_name: total
+  #    measurement_label: processor.time.total.pct
+  #    query: '\Processor Information(_Total)\% Processor Time'
+
+- module: windows
+  metricsets: ["service"]
+  enabled: true
+  period: 60s

metricbeat/module/windows/_meta/config.yml

@@ -1,8 +1,2 @@
 - module: windows
-  metricsets: ["perfmon"]
-  period: 10s
-  perfmon.counters:
-
-- module: windows
-  metricsets: ["service"]
   period: 60s

metricbeat/module/windows/_meta/docs.asciidoc

@@ -1 +1,2 @@
-This is the Windows module.
+This is the Windows module. It collects metrics from Windows systems,
+by default metricset `service` is enabled.

metricbeat/module/windows/perfmon/perfmon.go

@@ -28,9 +28,7 @@ type Config struct {
 }
 
 func init() {
-	if err := mb.Registry.AddMetricSet("windows", "perfmon", New); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("windows", "perfmon", New)
 }
 
 type MetricSet struct {

metricbeat/module/windows/service/service.go

@@ -11,9 +11,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("windows", "service", New); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("windows", "service", New,
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet type defines all fields of the MetricSet

metricbeat/modules.d/windows.yml.disabled

@@ -1,8 +1,2 @@
 - module: windows
-  metricsets: ["perfmon"]
-  period: 10s
-  perfmon.counters:
-
-- module: windows
-  metricsets: ["service"]
   period: 60s