Skip to content

Commit

Permalink
Fix kubernetes matcher registry lookup (elastic#5159) (elastic#5168)
Browse files Browse the repository at this point in the history
(cherry picked from commit a10ddfb)
  • Loading branch information
exekias authored and Steffen Siering committed Sep 12, 2017
1 parent e7bfe98 commit 2a46831
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
==== Breaking changes

*Affecting all Beats*
- Fix kubernetes matcher registry lookup. {pull}5159[5159]

*Auditbeat*

Expand Down
6 changes: 3 additions & 3 deletions libbeat/processors/add_kubernetes_metadata/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func init() {
p.MustRegisterLoader(indexerKey, func(ifc interface{}) error {
i, ok := ifc.(indexerPlugin)
if !ok {
return errors.New("plugin does not match output plugin type")
return errors.New("plugin does not match indexer plugin type")
}

name := i.name
Expand All @@ -49,11 +49,11 @@ func init() {
p.MustRegisterLoader(matcherKey, func(ifc interface{}) error {
m, ok := ifc.(matcherPlugin)
if !ok {
return errors.New("plugin does not match output plugin type")
return errors.New("plugin does not match matcher plugin type")
}

name := m.name
if Indexing.indexers[name] != nil {
if Indexing.matchers[name] != nil {
return fmt.Errorf("matcher type %v already registered", name)
}

Expand Down

0 comments on commit 2a46831

Please sign in to comment.