Skip to content

Commit

Permalink
Deprecate loading more than one output
Browse files Browse the repository at this point in the history
  • Loading branch information
urso committed Aug 15, 2017
1 parent 5f8230f commit 55a8a87
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ https://github.com/elastic/beats/compare/v5.4.1...master[Check the HEAD diff]
==== Deprecated

*Affecting all Beats*
- Loading more than one output is deprecated. {pull}4907[4907]

*Filebeat*
- Deprecate `document_type` prospector config option as _type is removed in elasticsearch 6.0. Use fields instead. {pull}4225[4225]
Expand Down
7 changes: 6 additions & 1 deletion libbeat/publisher/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import (
"sync/atomic"
"time"

"github.com/nranchev/go-libGeoIP"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/op"
"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/libbeat/outputs"
"github.com/elastic/beats/libbeat/processors"
"github.com/nranchev/go-libGeoIP"

// load supported output plugins
_ "github.com/elastic/beats/libbeat/outputs/console"
Expand Down Expand Up @@ -223,6 +224,10 @@ func (publisher *BeatPublisher) init(
publisher.wsPublisher.Init()
publisher.wsOutput.Init()

if len(configs) > 1 {
logp.Warn("Support for loading more than one output is deprecated and will not be supported in version 6.0.")
}

if !publisher.disabled {
plugins, err := outputs.InitOutputs(beatName, configs, shipper.TopologyExpire)
if err != nil {
Expand Down

0 comments on commit 55a8a87

Please sign in to comment.