Make conditions in autodiscovery configs optional #9029
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrewvc
force-pushed
the
allow-no-conditions
branch
from
0e157c2
to
210f6a6
Compare
exekias
suggested changes
Nov 12, 2018
| @@ -42,20 +42,20 @@ type MapperSettings []*struct { | |||
| } | |||
|
|
|||
| // NewConfigMapper builds a template Mapper from given settings | |||
| func NewConfigMapper(configs MapperSettings) (*Mapper, error) { | |||
| var mapper Mapper | |||
| func NewConfigMapper(configs MapperSettings) (mapper Mapper, err error) { | |||
There was a problem hiding this comment.
are you using the named return values? I think that's not needed from code
There was a problem hiding this comment.
It prevents me having to declare mapper on line 55 in the call to append.
|
This would close #6084, as it would make it trivial to add a last "conditionless" config. Added the |
exekias
added
the
needs_backport
andrewvc
added
the
Team:obs-ds-hosted-services
andrewvc
force-pushed
the
allow-no-conditions
branch
from
210f6a6
to
b7e916a
Compare
|
@exekias I've rebased and added a small change to the docs. We never really documented conditions before, I don't think we need to explicitly say much here. |
exekias
approved these changes
Nov 27, 2018
|
Uhm, I just saw tests are not passing, it seems related to this change |
This change lets users leave the `condition` option undeclared when writing autodiscover configurations. When not declared all configurations will match all events.
andrewvc
force-pushed
the
allow-no-conditions
branch
from
d8b0235
to
a5cf04c
Compare
|
@exekias I believe I've fixed the issue causing the tests to fail. I've also rebased off master. |
exekias
approved these changes
Nov 28, 2018
andrewvc
added a commit
to andrewvc/beats
that referenced
this pull request
Dec 4, 2018
* Make conditions in autodiscovery configs optional This change lets users leave the `condition` option undeclared when writing autodiscover configurations. When not declared all configurations will match all events. * Cleanup * Fix fmt * Fix changelog * Fix failing conditions test (cherry picked from commit a1bec73)
andrewvc
added
v6.6.0
and removed
needs_backport
andrewvc
added a commit
that referenced
this pull request
Dec 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change lets users leave the
conditionoption undeclared when writing autodiscover configurations. When not declared all configurations will match all events.This also changes the type of the autodiscovery
Mapperfrom*MappertoMapper. Since this type is backed by a slice, which is internally a pointer, there's no need to make it a pointer type, as it it makes the append operation awkward. If we internally mutated the slice via method's it'd make sense to keep the pointer, but we don't.This takes over from #8897 .