Set default metricsets for postgresql module (#6761)

metricbeat/docs/modules/postgresql.asciidoc

@@ -8,6 +8,8 @@ This file is generated! See scripts/docs_collector.py
 This module periodically fetches metrics from
 https://www.postgresql.org/[PostgreSQL] servers.
 
+Default metricsets are `activity`, `bgwriter` and `database`.
+
 [float]
 === Module-specific configuration notes
 
@@ -64,29 +66,7 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: postgresql
-  metricsets:
-    # Stats about every PostgreSQL database
-    - database
-
-    # Stats about the background writer process's activity
-    - bgwriter
-
-    # Stats about every PostgreSQL process
-    - activity
-
-  period: 10s
-
-  # The host must be passed as PostgreSQL URL. Example:
-  # postgres://localhost:5432?sslmode=disable
-  # The available parameters are documented here:
-  # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters
   hosts: ["postgres://localhost:5432"]
-
-  # Username to use when connecting to PostgreSQL. Empty by default.
-  #username: user
-
-  # Password to use when connecting to PostgreSQL. Empty by default.
-  #password: pass
 ----
 
 [float]

metricbeat/metricbeat.reference.yml

@@ -424,6 +424,7 @@ metricbeat.modules:
 
 #----------------------------- PostgreSQL Module -----------------------------
 - module: postgresql
+  enabled: true
   metricsets:
     # Stats about every PostgreSQL database
     - database

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

@@ -0,0 +1,25 @@
+- module: postgresql
+  enabled: true
+  metricsets:
+    # Stats about every PostgreSQL database
+    - database
+
+    # Stats about the background writer process's activity
+    - bgwriter
+
+    # Stats about every PostgreSQL process
+    - activity
+
+  period: 10s
+
+  # The host must be passed as PostgreSQL URL. Example:
+  # postgres://localhost:5432?sslmode=disable
+  # The available parameters are documented here:
+  # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters
+  hosts: ["postgres://localhost:5432"]
+
+  # Username to use when connecting to PostgreSQL. Empty by default.
+  #username: user
+
+  # Password to use when connecting to PostgreSQL. Empty by default.
+  #password: pass

metricbeat/module/postgresql/_meta/config.yml

@@ -1,24 +1,2 @@
 - module: postgresql
-  metricsets:
-    # Stats about every PostgreSQL database
-    - database
-
-    # Stats about the background writer process's activity
-    - bgwriter
-
-    # Stats about every PostgreSQL process
-    - activity
-
-  period: 10s
-
-  # The host must be passed as PostgreSQL URL. Example:
-  # postgres://localhost:5432?sslmode=disable
-  # The available parameters are documented here:
-  # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters
   hosts: ["postgres://localhost:5432"]
-
-  # Username to use when connecting to PostgreSQL. Empty by default.
-  #username: user
-
-  # Password to use when connecting to PostgreSQL. Empty by default.
-  #password: pass

metricbeat/module/postgresql/_meta/docs.asciidoc

@@ -1,6 +1,8 @@
 This module periodically fetches metrics from
 https://www.postgresql.org/[PostgreSQL] servers.
 
+Default metricsets are `activity`, `bgwriter` and `database`.
+
 [float]
 === Module-specific configuration notes
 

metricbeat/module/postgresql/activity/activity.go

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

metricbeat/module/postgresql/bgwriter/bgwriter.go

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

metricbeat/module/postgresql/database/database.go

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

metricbeat/modules.d/postgresql.yml.disabled

@@ -1,24 +1,2 @@
 - module: postgresql
-  metricsets:
-    # Stats about every PostgreSQL database
-    - database
-
-    # Stats about the background writer process's activity
-    - bgwriter
-
-    # Stats about every PostgreSQL process
-    - activity
-
-  period: 10s
-
-  # The host must be passed as PostgreSQL URL. Example:
-  # postgres://localhost:5432?sslmode=disable
-  # The available parameters are documented here:
-  # https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters
   hosts: ["postgres://localhost:5432"]
-
-  # Username to use when connecting to PostgreSQL. Empty by default.
-  #username: user
-
-  # Password to use when connecting to PostgreSQL. Empty by default.
-  #password: pass