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

Document Beater Interface / Minor behavioral changes #1249

Merged
merged 1 commit into from
Mar 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ https://github.com/elastic/beats/compare/v1.1.2...master[Check the HEAD diff]
- Run function to start a beat no returns an error instead of directly exiting. {pull}771[771]
- Move event preprocessor applying GeoIP to packetbeat {pull}772[772]
- Add include_fields and drop_fields as part of generic filtering {pull}1120[1120]
- The method signature of HandleFlags() was changed to allow returning an error {pull}1249[1249]

*Packetbeat*
- Rename output fields in the dns package. Former flag `recursion_allowed` becomes `recursion_available`. {pull}803[803]
Expand Down Expand Up @@ -83,6 +84,7 @@ https://github.com/elastic/beats/compare/v1.1.2...master[Check the HEAD diff]
- Ensure proper shutdown of libbeat. {pull}1075[1075]
- Add `fields` and `fields_under_root` options under the `shipper` configuration {pull}1092[1092]
- Add the ability to use a SOCKS5 proxy with the Logstash output {issue}823[823]
- The `-configtest` flag will now print "Config OK" to stdout on success {pull}1249[1249]

*Packetbeat*
- Change the DNS library used throughout the dns package to github.com/miekg/dns. {pull}803[803]
Expand Down
3 changes: 1 addition & 2 deletions filebeat/beater/filebeat.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"

"github.com/elastic/beats/libbeat/beat"
"github.com/elastic/beats/libbeat/cfgfile"
"github.com/elastic/beats/libbeat/logp"

cfg "github.com/elastic/beats/filebeat/config"
Expand Down Expand Up @@ -32,7 +31,7 @@ func New() *Filebeat {
func (fb *Filebeat) Config(b *beat.Beat) error {

// Load Base config
err := cfgfile.Read(&fb.FbConfig, "")
err := b.RawConfig.Unpack(&fb.FbConfig)

if err != nil {
return fmt.Errorf("Error reading config file: %v", err)
Expand Down
4 changes: 2 additions & 2 deletions filebeat/tests/system/test_prospector.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def test_shutdown_no_prospectors(self):

self.wait_until(
lambda: self.log_contains(
"shutting down"),
"Exiting"),
max_timeout=10)

filebeat.check_kill_and_wait(exit_code=1)
Expand All @@ -273,7 +273,7 @@ def test_no_paths_defined(self):

self.wait_until(
lambda: self.log_contains(
"shutting down"),
"Exiting"),
max_timeout=10)

filebeat.check_kill_and_wait(exit_code=1)
Expand Down
Loading