-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add filebeat.config.path as replacement for filebeat.config_dir #4051
Conversation
fe162cd
to
10fac21
Compare
jenkins, retest it |
filebeat/beater/filebeat.go
Outdated
if *once && config.ProspectorReload.Enabled() { | ||
return nil, errors.New("prospector reloading and -once cannot be used together.") | ||
if *once && config.ConfigProspector.Enabled() { | ||
return nil, errors.New("prospector configs and -once cannot be used together.") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[golint] reported by reviewdog 🐶
error strings should not be capitalized or end with punctuation or a newline
filebeat/crawler/crawler.go
Outdated
@@ -33,7 +33,7 @@ func New(out prospector.Outlet, prospectorConfigs []*common.Config, beatDone cha | |||
}, nil | |||
} | |||
|
|||
func (c *Crawler) Start(r *registrar.Registrar, reloaderConfig *common.Config) error { | |||
func (c *Crawler) Start(r *registrar.Registrar, configProspectors *common.Config) error { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[golint] reported by reviewdog 🐶
exported method Crawler.Start should have comment or be unexported
The reload feature can also be used to load configuration files once. This enables the feature to load config options once through `filebeat.config.path: ...`. The difference to config_dir is that only the prospectors have to be configured in the file and not the full filebeat config tree. `filebeat.config_dir` will be removed in a follow up PR. As the reloading is now also used for just loading, the code could use some refactoring in the future to make this more obvious.
jenkins, retest it |
This does not appear to be functional. |
@Prinzka Please open a topic on discuss and share your config files and filebeat logs there: https://discuss.elastic.co/c/beats/filebeat |
The reload feature can also be used to load configuration files once. This enables the feature to load config options once through
filebeat.config.path: ...
. The difference to config_dir is that only the prospectors have to be configured in the file and not the full filebeat config tree.filebeat.config_dir
will be removed in a follow up PR.As the reloading is now also used for just loading, the code could use some refactoring in the future to make this more obvious.