Fix date check and accept multiple predicates

elastic · Nov 28, 2024 · d9d8004 · d9d8004
1 parent a798085
commit d9d8004
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/x-pack/filebeat/input/unifiedlogs/config.go b/x-pack/filebeat/input/unifiedlogs/config.go
@@ -15,7 +15,7 @@ import (
 type config struct {
 	ArchiveFile string   `config:"archive_file"`
 	TraceFile   string   `config:"trace_file"`
-	Predicate   string   `config:"predicate"`
+	Predicate   []string `config:"predicate"`
 	Process     []string `config:"process"`
 	Source      bool     `config:"source"`
 	Info        bool     `config:"info"`
@@ -45,6 +45,9 @@ func defaultConfig() config {
 }
 
 func checkDateFormat(date string) error {
+	if date == "" {
+		return nil
+	}
 	acceptedLayouts := []string{
 		"2006-01-02",
 		"2006-01-02 15:04:05",

diff --git a/x-pack/filebeat/input/unifiedlogs/input.go b/x-pack/filebeat/input/unifiedlogs/input.go
@@ -202,8 +202,10 @@ func newLogCmd(ctx context.Context, config config, resumeCursor inputcursor.Curs
 	if config.TraceFile != "" {
 		args = append(args, "--file", config.TraceFile)
 	}
-	if config.Predicate != "" {
-		args = append(args, "--predicate", config.Predicate)
+	if len(config.Predicate) > 0 {
+		for _, p := range config.Predicate {
+			args = append(args, "--predicate", p)
+		}
 	}
 	if len(config.Process) > 0 {
 		for _, p := range config.Process {