Skip to content

Commit

Permalink
Add event filtering for data generation with V2 reporters (#10367)
Browse files Browse the repository at this point in the history
Add #6958 also for V2 reporters.

When destination path is not a directory, use it as file.
  • Loading branch information
jsoriano authored Jan 28, 2019
1 parent 3a9d3fb commit 91490d0
Showing 1 changed file with 48 additions and 16 deletions.
64 changes: 48 additions & 16 deletions metricbeat/mb/testing/data_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,29 +77,25 @@ func WriteEventsCond(f mb.EventsFetcher, t testing.TB, cond func(e common.MapStr
return fmt.Errorf("no events were generated")
}

var event *common.MapStr
if cond == nil {
event = &events[0]
} else {
for _, e := range events {
if cond(e) {
event = &e
break
}
}
if event == nil {
return fmt.Errorf("no events satisfied the condition")
}
event, err := SelectEvent(events, cond)
if err != nil {
return err
}

fullEvent := CreateFullEvent(f, *event)
fullEvent := CreateFullEvent(f, event)
WriteEventToDataJSON(t, fullEvent, "")
return nil
}

// WriteEventsReporterV2 fetches events and writes the first event to a ./_meta/data.json
// file.
func WriteEventsReporterV2(f mb.ReportingMetricSetV2, t testing.TB, path string) error {
return WriteEventsReporterV2Cond(f, t, path, nil)
}

// WriteEventsReporterV2Cond fetches events and writes the first event that matches
// the condition to a file.
func WriteEventsReporterV2Cond(f mb.ReportingMetricSetV2, t testing.TB, path string, cond func(common.MapStr) bool) error {
if !*dataFlag {
t.Skip("skip data generation tests")
}
Expand All @@ -113,7 +109,12 @@ func WriteEventsReporterV2(f mb.ReportingMetricSetV2, t testing.TB, path string)
return fmt.Errorf("no events were generated")
}

e := StandardizeEvent(f, events[0], mb.AddMetricSetInfo)
match, err := SelectEventV2(f, events, cond)
if err != nil {
return err
}

e := StandardizeEvent(f, match, mb.AddMetricSetInfo)

WriteEventToDataJSON(t, e, path)
return nil
Expand Down Expand Up @@ -169,7 +170,11 @@ func WriteEventToDataJSON(t testing.TB, fullEvent beat.Event, postfixPath string
t.Fatal(err)
}

p = path.Join(p, postfixPath, "_meta", "data.json")
if stat, err := os.Stat(postfixPath); err == nil && stat.IsDir() {
p = path.Join(p, postfixPath, "_meta", "data.json")
} else {
p = postfixPath
}

fields := fullEvent.Fields
fields["@timestamp"] = fullEvent.Timestamp
Expand All @@ -183,3 +188,30 @@ func WriteEventToDataJSON(t testing.TB, fullEvent beat.Event, postfixPath string
t.Fatal(err)
}
}

// SelectEvent selects the first event that matches an specific condition
func SelectEvent(events []common.MapStr, cond func(e common.MapStr) bool) (common.MapStr, error) {
if cond == nil && len(events) > 0 {
return events[0], nil
}
for _, e := range events {
if cond(e) {
return e, nil
}
}
return nil, fmt.Errorf("no events satisfied the condition")
}

// SelectEventV2 selects the first event that matches an specific condition
func SelectEventV2(f mb.ReportingMetricSetV2, events []mb.Event, cond func(e common.MapStr) bool) (mb.Event, error) {
if cond == nil && len(events) > 0 {
return events[0], nil
}
for _, e := range events {
fields := StandardizeEvent(f, e, mb.AddMetricSetInfo).Fields
if cond(fields) {
return e, nil
}
}
return mb.Event{}, fmt.Errorf("no events satisfied the condition")
}

0 comments on commit 91490d0

Please sign in to comment.