Skip to content
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.

Sign up for GitHub

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

Fix and extend logging of light modules load errors #14706

Merged
merged 11 commits into from
Mar 3, 2020
Merged

Fix and extend logging of light modules load errors #14706

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e2a0676
Fix and extend logging of light modules load errors
jsoriano Nov 22, 2019
944218b
Add BEAT_STRICT_PERMS to beat container in metricbeat docker compose
jsoriano Nov 22, 2019
f228833
Merge remote-tracking branch 'origin/master' into fix-lightmodules-pe…
jsoriano Mar 2, 2020
79dd64d
Add changelog
jsoriano Mar 2, 2020
224fa8e
Use local logger, and fix error messages
jsoriano Mar 2, 2020
794433c
Ignore errors if module directory doesn't exist
jsoriano Mar 2, 2020
10abf94
Fix issue when modules directory contains regular files
jsoriano Mar 2, 2020
c7a391b
Remove empty line
jsoriano Mar 2, 2020
62e282b
Add test for issue with files listed as modules
jsoriano Mar 2, 2020
84cb5df
Merge remote-tracking branch 'origin/master' into fix-lightmodules-pe…
jsoriano Mar 3, 2020
d794fe0
Merge remote-tracking branch 'origin/master' into fix-lightmodules-pe…
jsoriano Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions metricbeat/mb/lightmodules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (s *LightModulesSource) Modules() ([]string, error) {
func (s *LightModulesSource) HasModule(moduleName string) bool {
names, err := s.moduleNames()
if err != nil {
logp.Error(errors.Wrap(err, "failed to get list of light module names"))
logp.Err("failed to get list of light module names: %v", err)
return false
}
for _, name := range names {
Expand Down Expand Up @@ -104,7 +104,7 @@ func (s *LightModulesSource) HasMetricSet(moduleName, metricSetName string) bool

moduleConfig, err := s.loadModuleConfig(modulePath)
if err != nil {
logp.Error(errors.Wrapf(err, "failed to load module config for module '%s'", moduleName))
logp.Err("failed to load module config for module '%s': %v", moduleName, err)
return false
}

Expand Down Expand Up @@ -134,9 +134,15 @@ func (s *LightModulesSource) MetricSetRegistration(register *Register, moduleNam
// String returns a string representation of this source, with a list of known metricsets
func (s *LightModulesSource) String() string {
var metricSets []string
modules, _ := s.Modules()
modules, err := s.Modules()
if err != nil {
logp.Err("failed to list modules: %s", err)
}
for _, module := range modules {
moduleMetricSets, _ := s.MetricSets(module)
moduleMetricSets, err := s.MetricSets(module)
if err != nil {
logp.Err("failed to list light metricsets for module %s: %v", module, err)
}
for _, name := range moduleMetricSets {
metricSets = append(metricSets, fmt.Sprintf("%s/%s", module, name))
}
Expand Down