Merge pull request #6673 from ruflin/apache-default

Set `status` as default metricset in Apache module
elastic · Mar 28, 2018 · 150c3a4 · 150c3a4
2 parents 2b58e4a + cb7cb82
commit 150c3a4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 17 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -266,6 +266,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Set `collector` as default metricset in Prometheus module. {pull}6636[6636]
 - Set `mntr` as default metricset in Zookeeper module. {pull}6674[6674]
 - 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]
 
 *Packetbeat*

diff --git a/metricbeat/docs/modules/apache.asciidoc b/metricbeat/docs/modules/apache.asciidoc
@@ -6,7 +6,7 @@ This file is generated! See scripts/docs_collector.py
 == Apache module
 
 This module periodically fetches metrics from https://httpd.apache.org/[Apache
-HTTPD] servers.
+HTTPD] servers. The default metricset is `status`.
 
 [float]
 === Compatibility
@@ -33,10 +33,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: apache
-  metricsets: ["status"]
-  period: 10s
-
-  # Apache hosts
   hosts: ["http://127.0.0.1"]
 ----
 

diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
@@ -125,6 +125,7 @@ metricbeat.modules:
 - module: apache
   metricsets: ["status"]
   period: 10s
+  enabled: true
 
   # Apache hosts
   hosts: ["http://127.0.0.1"]

diff --git a/metricbeat/module/apache/_meta/config.reference.yml b/metricbeat/module/apache/_meta/config.reference.yml
@@ -1,6 +1,7 @@
 - module: apache
   metricsets: ["status"]
   period: 10s
+  enabled: true
 
   # Apache hosts
   hosts: ["http://127.0.0.1"]

diff --git a/metricbeat/module/apache/_meta/config.yml b/metricbeat/module/apache/_meta/config.yml
@@ -1,6 +1,2 @@
 - module: apache
-  metricsets: ["status"]
-  period: 10s
-
-  # Apache hosts
   hosts: ["http://127.0.0.1"]
diff --git a/metricbeat/module/apache/_meta/docs.asciidoc b/metricbeat/module/apache/_meta/docs.asciidoc
@@ -1,5 +1,5 @@
 This module periodically fetches metrics from https://httpd.apache.org/[Apache
-HTTPD] servers.
+HTTPD] servers. The default metricset is `status`.
 
 [float]
 === Compatibility

diff --git a/metricbeat/module/apache/status/status.go b/metricbeat/module/apache/status/status.go
@@ -35,9 +35,10 @@ var (
 )
 
 func init() {
-	if err := mb.Registry.AddMetricSet("apache", "status", New, hostParser); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("apache", "status", New,
+		mb.WithHostParser(hostParser),
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet for fetching Apache HTTPD server status.

diff --git a/metricbeat/modules.d/apache.yml.disabled b/metricbeat/modules.d/apache.yml.disabled
@@ -1,6 +1,2 @@
 - module: apache
-  metricsets: ["status"]
-  period: 10s
-
-  # Apache hosts
   hosts: ["http://127.0.0.1"]