Filebeat: Error on startup for unconfigured module

adriansr · adriansr · commit 03348603bfc9 · 2021-11-04T18:06:08.000+01:00
Since #27526 and #27762, Filebeat will have all filesets disabled by default. To prevent user confusion, a warning message to alert the user of a configured module without any enabled filesets was added. However, due to Filebeat internals, this message will only appear for modules configured from the command-line (--modules flag). This updates the code to ensure it works also for modules configured via modules.d directory and turns the warning into a hard-error that prevents startup.
diff --git a/filebeat/beater/filebeat.go b/filebeat/beater/filebeat.go
@@ -111,22 +111,6 @@ func newBeater(b *beat.Beat, plugins PluginFactory, rawConfig *common.Config) (b
 	if err != nil {
 		return nil, err
 	}
-	if !moduleRegistry.Empty() {
-		logp.Info("Enabled modules/filesets: %s", moduleRegistry.InfoString())
-		for _, mod := range moduleRegistry.ModuleNames() {
-			if mod == "" {
-				continue
-			}
-			filesets, err := moduleRegistry.ModuleConfiguredFilesets(mod)
-			if err != nil {
-				logp.Err("Failed listing filesets for module %s", mod)
-				continue
-			}
-			if len(filesets) == 0 {
-				logp.Warn("Module %s is enabled but has no enabled filesets", mod)
-			}
-		}
-	}
 
 	moduleInputs, err := moduleRegistry.GetInputConfigs()
 	if err != nil {
diff --git a/filebeat/fileset/modules.go b/filebeat/fileset/modules.go
@@ -100,6 +100,20 @@ func newModuleRegistry(modulesPath string,
 		}
 	}
 
+	logp.Info("Enabled modules/filesets: %s", reg.InfoString())
+	for _, mod := range reg.ModuleNames() {
+		if mod == "" {
+			continue
+		}
+		filesets, err := reg.ModuleConfiguredFilesets(mod)
+		if err != nil {
+			logp.Err("Failed listing filesets for module %s", mod)
+			continue
+		}
+		if len(filesets) == 0 {
+			return nil, errors.Errorf("module %s is configured but has no enabled filesets", mod)
+		}
+	}
 	return &reg, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,20 @@ func newModuleRegistry(modulesPath string,`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ logp.Info("Enabled modules/filesets: %s", reg.InfoString())`
	`104`	`+ for _, mod := range reg.ModuleNames() {`
	`105`	`+ if mod == "" {`
	`106`	`+ continue`
	`107`	`+ }`
	`108`	`+ filesets, err := reg.ModuleConfiguredFilesets(mod)`
	`109`	`+ if err != nil {`
	`110`	`+ logp.Err("Failed listing filesets for module %s", mod)`
	`111`	`+ continue`
	`112`	`+ }`
	`113`	`+ if len(filesets) == 0 {`
	`114`	`+ return nil, errors.Errorf("module %s is configured but has no enabled filesets", mod)`
	`115`	`+ }`
	`116`	`+ }`
`103`	`117`	`return &reg, nil`
`104`	`118`	`}`
`105`	`119`