Skip to content

Commit

Permalink
Don't stop Filebeat when modules + logstash are used together (#3929) (
Browse files Browse the repository at this point in the history
…#3999)

To simplify the migration from Ingest Node to Logstash, we replace the
hard error ("Filebeat modules require an Elasticsearch output defined") with
a warning.
(cherry picked from commit 12c69b3)
  • Loading branch information
tsg authored and ruflin committed Apr 12, 2017
1 parent d456d45 commit e67fe07
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion filebeat/beater/filebeat.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ func New(b *beat.Beat, rawConfig *common.Config) (beat.Beater, error) {
func (fb *Filebeat) modulesSetup(b *beat.Beat) error {
esConfig := b.Config.Output["elasticsearch"]
if esConfig == nil || !esConfig.Enabled() {
return fmt.Errorf("Filebeat modules configured but the Elasticsearch output is not configured/enabled")
logp.Warn("Filebeat is unable to load the Ingest Node pipelines for the configured" +
" modules because the Elasticsearch output is not configured/enabled. If you have" +
" already loaded the Ingest Node pipelines or are using Logstash pipelines, you" +
" can ignore this warning.")
return nil
}
esClient, err := elasticsearch.NewConnectedClient(esConfig)
if err != nil {
Expand Down

0 comments on commit e67fe07

Please sign in to comment.