Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Metricbeat test modules #4656

Merged
merged 7 commits into from
Jul 21, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into test-modules
exekias committed Jul 20, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit d4b58ccb958373fb524c0b2865a29bd6c8f5ad5f
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
@@ -107,6 +107,7 @@ https://github.com/elastic/beats/compare/v6.0.0-alpha2...master[Check the HEAD d
- Add experimental Aerospike module. {pull}4560[4560]
- Vsphere module: collect custom fields from virtual machines. {issue}4464[4464]
- Add `test modules` command, to test modules expected output. {pull}4656[4656]
- Add `processors` setting to metricbeat modules. {pull}4699[4699]

*Packetbeat*

5 changes: 4 additions & 1 deletion metricbeat/beater/metricbeat.go
Original file line number Diff line number Diff line change
@@ -142,7 +142,10 @@ func (bt *Metricbeat) Stop() {
// Modules return a list of all configured modules, including anyone present
// under dynamic config settings
func (bt *Metricbeat) Modules() ([]*module.Wrapper, error) {
modules := bt.modules
var modules []*module.Wrapper
for _, m := range bt.modules {
modules = append(modules, m.module)
}

// Add dynamic modules
if bt.config.ConfigModules.Enabled() {
2 changes: 1 addition & 1 deletion metricbeat/mb/module/wrapper.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/libbeat/monitoring"
"github.com/elastic/beats/libbeat/processors"
"github.com/elastic/beats/libbeat/publisher/beat"
"github.com/elastic/beats/libbeat/testing"
"github.com/elastic/beats/metricbeat/mb"

You are viewing a condensed version of this merge commit. You can view the full changes here.