Skip to content

Commit

Permalink
Merge branch 'master' into apache-default
Browse files Browse the repository at this point in the history
  • Loading branch information
ruflin authored Mar 28, 2018
2 parents e8076c9 + 2b58e4a commit cb7cb82
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 24 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,10 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Add experimental module to collect metrics from munin nodes. {pull}6517[6517]
- Add support for wildcards and explicit metrics grouping in jolokia/jmx. {pull}6462[6462]
- 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}[]
- Set `status` as default metricset in Apache module. {pull}6673[6673]
- Set `namespace` as default metricset in Aerospike module. {pull}6669[6669]

*Packetbeat*

Expand Down
5 changes: 1 addition & 4 deletions metricbeat/docs/modules/aerospike.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This file is generated! See scripts/docs_collector.py

beta[]

The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics.
The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics. The default metricset is `namespace`.

[float]
=== Compatibility
Expand All @@ -25,9 +25,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
----
metricbeat.modules:
- module: aerospike
metricsets: ["namespace"]
enabled: false
period: 10s
hosts: ["localhost:3000"]
----

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/docs/modules/zookeeper.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-module-zookeeper]]
== ZooKeeper module

The ZooKeeper module fetches statistics from the ZooKeeper service.
The ZooKeeper module fetches statistics from the ZooKeeper service. The default
metricset is `mntr`.

[float]
=== Compatibility
Expand All @@ -24,7 +25,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
----
metricbeat.modules:
- module: zookeeper
metricsets: ["mntr"]
period: 10s
hosts: ["localhost:2181"]
----
Expand Down
3 changes: 2 additions & 1 deletion metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ metricbeat.modules:
#------------------------------ Aerospike Module -----------------------------
- module: aerospike
metricsets: ["namespace"]
enabled: false
enabled: true
period: 10s
hosts: ["localhost:3000"]

Expand Down Expand Up @@ -502,6 +502,7 @@ metricbeat.modules:

#------------------------------ ZooKeeper Module -----------------------------
- module: zookeeper
enabled: true
metricsets: ["mntr"]
period: 10s
hosts: ["localhost:2181"]
Expand Down
5 changes: 5 additions & 0 deletions metricbeat/module/aerospike/_meta/config.reference.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- module: aerospike
metricsets: ["namespace"]
enabled: true
period: 10s
hosts: ["localhost:3000"]
3 changes: 0 additions & 3 deletions metricbeat/module/aerospike/_meta/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
- module: aerospike
metricsets: ["namespace"]
enabled: false
period: 10s
hosts: ["localhost:3000"]
2 changes: 1 addition & 1 deletion metricbeat/module/aerospike/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics.
The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics. The default metricset is `namespace`.

[float]
=== Compatibility
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/aerospike/namespace/namespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,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("aerospike", "namespace", New); err != nil {
panic(err)
}
mb.Registry.MustAddMetricSet("aerospike", "namespace", New,
mb.DefaultMetricSet(),
)
}

// MetricSet type defines all fields of the MetricSet
Expand Down
5 changes: 5 additions & 0 deletions metricbeat/module/zookeeper/_meta/config.reference.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- module: zookeeper
enabled: true
metricsets: ["mntr"]
period: 10s
hosts: ["localhost:2181"]
1 change: 0 additions & 1 deletion metricbeat/module/zookeeper/_meta/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
- module: zookeeper
metricsets: ["mntr"]
period: 10s
hosts: ["localhost:2181"]
3 changes: 2 additions & 1 deletion metricbeat/module/zookeeper/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
The ZooKeeper module fetches statistics from the ZooKeeper service.
The ZooKeeper module fetches statistics from the ZooKeeper service. The default
metricset is `mntr`.

[float]
=== Compatibility
Expand Down
7 changes: 4 additions & 3 deletions metricbeat/module/zookeeper/mntr/mntr.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ import (
)

func init() {
if err := mb.Registry.AddMetricSet("zookeeper", "mntr", New, parse.PassThruHostParser); err != nil {
panic(err)
}
mb.Registry.MustAddMetricSet("zookeeper", "mntr", New,
mb.WithHostParser(parse.PassThruHostParser),
mb.DefaultMetricSet(),
)
}

// MetricSet for fetching ZooKeeper health metrics.
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/modules.d/aerospike.yml.disabled
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
- module: aerospike
metricsets: ["namespace"]
enabled: false
period: 10s
hosts: ["localhost:3000"]
1 change: 0 additions & 1 deletion metricbeat/modules.d/zookeeper.yml.disabled
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
- module: zookeeper
metricsets: ["mntr"]
period: 10s
hosts: ["localhost:2181"]

0 comments on commit cb7cb82

Please sign in to comment.