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

EQL: Refine repeatable queries #78895

Merged
merged 2 commits into from
Oct 10, 2021
Merged

EQL: Refine repeatable queries #78895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58458c3
EQL: Refine repeatable queries
costin Oct 10, 2021
64695ed
Fix error message
costin Oct 10, 2021
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
2 changes: 1 addition & 1 deletion x-pack/plugin/eql/qa/common/src/main/resources/additional_test_queries.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ expected_event_ids = [
name = "sequenceWithMoreThan10Results-Runs"
query = '''
sequence by unique_pid
[any where true] [runs=2]
[any where true] with runs=2
[any where serial_event_id < 72]
'''
expected_event_ids = [
Expand Down
36 changes: 18 additions & 18 deletions x-pack/plugin/eql/qa/common/src/main/resources/test_queries.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ name = "sequenceOneManyMany-Runs"
query = '''
sequence
[process where serial_event_id == 1]
[process where true] [runs=2]
[process where true] with runs=2
'''
expected_event_ids = [1, 2, 3]

Expand All @@ -582,7 +582,7 @@ name = "sequenceConditionManyMany-Runs"
query = '''
sequence
[process where serial_event_id <= 3]
[process where true] [runs=2]
[process where true] with runs=2
'''
expected_event_ids = [1, 2, 3,
2, 3, 4,
Expand Down Expand Up @@ -613,7 +613,7 @@ expected_event_ids = [1, 2, 3]
name = "sequenceManyManyCondition-Runs"
query = '''
sequence
[process where true] [runs=2]
[process where true] with runs=2
[process where serial_event_id <= 3]
'''
expected_event_ids = [1, 2, 3]
Expand All @@ -637,7 +637,7 @@ name = "sequenceThreeManyCondition1-Runs"
query = '''
sequence
[process where serial_event_id <= 4]
[process where true] [runs=3]
[process where true] with runs=3
'''
expected_event_ids = [1, 2, 3, 4,
2, 3, 4, 5,
Expand All @@ -663,7 +663,7 @@ query = '''
sequence
[process where true]
[process where serial_event_id <= 4]
[process where true] [runs=2]
[process where true] with runs=2
'''
expected_event_ids = [1, 2, 3, 4,
2, 3, 4, 5,
Expand All @@ -685,7 +685,7 @@ expected_event_ids = [1, 2, 3, 4,
name = "sequenceThreeManyCondition3-Runs"
query = '''
sequence
[process where true] [runs=2]
[process where true] with runs=2
[process where serial_event_id <= 4]
[process where true]
'''
Expand All @@ -707,7 +707,7 @@ expected_event_ids = [1, 2, 3, 4]
name = "sequenceThreeManyCondition4-Runs"
query = '''
sequence
[process where true] [runs=3]
[process where true] with runs=3
[process where serial_event_id <= 4]
'''
expected_event_ids = [1, 2, 3, 4]
Expand Down Expand Up @@ -754,7 +754,7 @@ name = "fourSequencesByPidWithUntil1-Runs"
query = '''
sequence
[process where opcode == 1] by unique_pid
[file where opcode == 0] by unique_pid [runs=3]
[file where opcode == 0] by unique_pid with runs=3
until
[file where opcode == 2] by unique_pid
'''
Expand All @@ -779,7 +779,7 @@ name = "fourSequencesByPidWithUntil2-Runs"
query = '''
sequence
[process where opcode == 1] by unique_pid
[file where opcode == 0] by unique_pid [runs=3]
[file where opcode == 0] by unique_pid with runs=3
until
[file where opcode == 200] by unique_pid
'''
Expand Down Expand Up @@ -813,7 +813,7 @@ name = "fourSequencesByPid-Runs"
query = '''
sequence
[process where opcode == 1] by unique_pid
[file where opcode == 0] by unique_pid [runs=3]
[file where opcode == 0] by unique_pid with runs=3
'''
expected_event_ids = [54, 55, 61, 67]

Expand All @@ -834,7 +834,7 @@ name = "fourSequencesByPidAndProcessPath1-Runs"
query = '''
sequence
[process where opcode == 1] by unique_pid, process_path
[file where opcode == 0] by unique_pid, process_path [runs=3]
[file where opcode == 0] by unique_pid, process_path with runs=3
'''
expected_event_ids = [54, 55, 61, 67]

Expand All @@ -856,7 +856,7 @@ name = "fourSequencesByPidAndProcessPathWithUntil-Runs"
query = '''
sequence
[process where opcode == 1] by unique_pid, process_path
[file where opcode == 0] by unique_pid, process_path [runs=3]
[file where opcode == 0] by unique_pid, process_path with runs=3
until
[file where opcode == 200] by unique_pid, process_path
'''
Expand All @@ -867,8 +867,8 @@ name = "fourSequencesByPidAndProcessPathWithUntil-RunsExtra"
query = '''
sequence
[process where opcode == 1] by unique_pid, process_path
[file where opcode == 0] by unique_pid, process_path [runs=2]
[file where opcode == 0] by unique_pid, process_path [runs=1]
[file where opcode == 0] by unique_pid, process_path with runs=2
[file where opcode == 0] by unique_pid, process_path with runs=1
until
[file where opcode == 200] by unique_pid, process_path
'''
Expand Down Expand Up @@ -1026,7 +1026,7 @@ expected_event_ids = [1, 2,
name = "doubleSameSequence-Runs"
query = '''
sequence
[process where serial_event_id < 5] [runs=2]
[process where serial_event_id < 5] with runs=2
'''
expected_event_ids = [1, 2,
2, 3,
Expand Down Expand Up @@ -1056,7 +1056,7 @@ expected_event_ids = [55, 61]
name = "doubleSameSequenceWithBy-Runs"
query = '''
sequence
[file where opcode==0] by unique_pid [runs=2]
[file where opcode==0] by unique_pid with runs=2
| head 1
'''
expected_event_ids = [55, 61]
Expand Down Expand Up @@ -1087,7 +1087,7 @@ expected_event_ids = [55, 61]
name = "doubleSameSequenceWithByUntilAndHead1-Runs"
query = '''
sequence
[file where opcode==0 and file_name:"*.exe"] by unique_pid [runs=2]
[file where opcode==0 and file_name:"*.exe"] by unique_pid with runs=2
until [process where opcode==5000] by unique_ppid
| head 1
'''
Expand All @@ -1108,7 +1108,7 @@ expected_event_ids = []
name = "doubleSameSequenceWithByUntilAndHead2-Runs"
query = '''
sequence
[file where opcode==0 and file_name:"*.exe"] by unique_pid [runs=2]
[file where opcode==0 and file_name:"*.exe"] by unique_pid with runs=2
until [process where opcode==1] by unique_ppid
| head 1
'''
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/eql/qa/correctness/src/javaRestTest/resources/queries.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ filters = [
]
query = '''
sequence by source_address, hostname with maxspan=5s
[security where hostname != "newyork" and event_id == 4625] [runs=4]
[security where hostname != "newyork" and event_id == 4625] with runs=4
'''
time = 2.8286166191101074
type = "sequence"
Expand Down Expand Up @@ -433,7 +433,7 @@ filters = [
]
query = '''
sequence by source_address, hostname with maxspan=10s
[security where hostname != "newyork" and event_id == 4625] [runs=3]
[security where hostname != "newyork" and event_id == 4625] with runs=3
'''
time = 2.765869617462158
type = "sequence"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/eql/src/main/antlr/EqlBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ joinTerm
;

sequenceTerm
: subquery (by=joinKeys)? (LB key=IDENTIFIER ASGN value=number RB)?
: subquery (by=joinKeys)? (WITH key=IDENTIFIER ASGN value=number)?
;

subquery
Expand Down
Loading