Apply fileset overrides before checking enabled

Disable other filesets in a module while testing.
elastic · Mar 17, 2017 · c945fb7 · c945fb7
1 parent b9b05bb
commit c945fb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/filebeat/fileset/modules.go b/filebeat/fileset/modules.go
@@ -44,15 +44,15 @@ func newModuleRegistry(modulesPath string,
 				fcfg = &defaultFilesetConfig
 			}
 
-			if fcfg.Enabled != nil && (*fcfg.Enabled) == false {
-				continue
-			}
-
 			fcfg, err = applyOverrides(fcfg, mcfg.Module, filesetName, overrides)
 			if err != nil {
 				return nil, fmt.Errorf("Error applying overrides on fileset %s/%s: %v", mcfg.Module, filesetName, err)
 			}
 
+			if fcfg.Enabled != nil && (*fcfg.Enabled) == false {
+				continue
+			}
+
 			fileset, err := New(modulesPath, filesetName, &mcfg, fcfg)
 			if err != nil {
 				return nil, err

diff --git a/filebeat/tests/system/test_modules.py b/filebeat/tests/system/test_modules.py
@@ -74,6 +74,8 @@ def run_on_file(self, module, fileset, test_file, cfgfile):
             "-e", "-d", "*", "-once",
             "-c", cfgfile,
             "-modules={}".format(module),
+            "-M", "{module}.*.enabled=false".format(module=module),
+            "-M", "{module}.{fileset}.enabled=true".format(module=module, fileset=fileset),
             "-M", "{module}.{fileset}.var.paths=[{test_file}]".format(
                 module=module, fileset=fileset, test_file=test_file),
             "-M", "*.*.prospector.close_eof=true",