Remove prospector support in Filebeat
#8909
Conversation
|
There is a bit more changes in the PR that I would like to, mainly due to the trailing chars, please review it with |
| "close_eof": true, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "input overrides", | ||
| fcfg: FilesetConfig{}, |
There was a problem hiding this comment.
There is another test for inputs.
There was a problem hiding this comment.
Did a review even though it's still in progress. Overall LGTM.
The files that you adjusted with the whitespaces are auto genereated. Did you modify them manually? To just generated them run
INTEGRATION_TESTS=1 GENERATE=1 nosetests system/tests/test_modules.py
Make sure to have an Elasticsearch instance running.
| @@ -64,3 +63,23 @@ func CheckRemoved5xSetting(cfg *common.Config, setting string) error { | |||
|
|
|||
| return fmt.Errorf("setting '%v' has been removed", current.PathOf(name)) | |||
| } | |||
|
|
|||
| // CheckRemoved5xSettings prints a warning if the obsolete setting is used. | |||
| func CheckRemoved5xSettings(cfg *common.Config, settings ...string) error { | |||
There was a problem hiding this comment.
Should we remove now in master all 5.x warnings? I don't expect people to upgrade from 5.x to 7.x directly.
There was a problem hiding this comment.
Yes I wanted to do it in another PR
No I did a quick search/replace with my editor.. and the save just fix the whitespace, I will regenerate them. |
|
@ruflin I've recreated the modules expected files for Filebeat, I also removed the mention of prospector for Surricata in xpack/filebeat. It's ready for a review. |
|
hold on.. I need to generate the file with a ES master |
|
@ruflin I've regenerated the expectation with a ES snapshot The tests passed locally so we will see on CI. |
Add new methods to verify obsolete configuration for 7.0, added missing test for them.
In 6.3 we have deprecated the usage of the 'prospector' options, in 7.0 its now obsolete. This commit does the following: - Remove any backward compatibility fixes. - Add warning when using the prospector key in configuration. - Remove any usage of prospector in tests. - Remove any usage or prospector in module expectation files. - Adjust any integration tests to not check for prospector.type. - Remove the prospector type from the fields. - Remove any shims created by the prospector package.
Co-Authored-By: ph <[email protected]>
ph
force-pushed
the
fix/remove-prospector-support-filebeat
branch
from
79fc8a4 to
5b6e247
Compare
|
jenkins test this please |
|
@ph I merged this one as it conflicts with all my current PR's and I would like to continue with my PR's. Hope it's ok for you. |
|
🤗 @ruflin All is OK I was waiting for a Jenkins build to complete. |
Add CheckRemoved6xSettings and CheckRemoved6xSettings
Add new methods to verify obsolete configuration for 7.0,
added missing test for them.
Remove the prospector option in the configuration.
In 6.3 we have deprecated the usage of the 'prospector' options, in 7.0
its now obsolete.
This commit does the following: