Skip to content

Upstream pull #6

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

Merged
synhershko merged 2 commits into from
Jun 2, 2021
Merged

Upstream pull #6

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
a47e570
Adjusting elastalert/ruletypes.py so that the functions 'append' and …
gminog-opap Apr 24, 2020
7fcd170
fix attribute error is raised when query ran for future
Swapnil811 Jun 23, 2020
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
7 changes: 4 additions & 3 deletions elastalert/elastalert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,15 +876,16 @@ def run_rule(self, rule, endtime, starttime=None):
rule['original_starttime'] = rule['starttime']
rule['scrolling_cycle'] = 0

self.thread_data.num_hits = 0
self.thread_data.num_dupes = 0
self.thread_data.cumulative_hits = 0

# Don't run if starttime was set to the future
if ts_now() <= rule['starttime']:
logging.warning("Attempted to use query start time in the future (%s), sleeping instead" % (starttime))
return 0

# Run the rule. If querying over a large time period, split it up into segments
self.thread_data.num_hits = 0
self.thread_data.num_dupes = 0
self.thread_data.cumulative_hits = 0
segment_size = self.get_segment_size(rule)

tmp_endtime = rule['starttime']
Expand Down
12 changes: 8 additions & 4 deletions elastalert/ruletypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,14 @@ def append(self, event):
This will also pop the oldest events and call onRemoved on them until the
window size is less than timeframe. """
self.data.add(event)
self.running_count += event[1]
if event and event[1]:
self.running_count += event[1]

while self.duration() >= self.timeframe:
oldest = self.data[0]
self.data.remove(oldest)
self.running_count -= oldest[1]
if oldest and oldest[1]:
self.running_count -= oldest[1]
self.onRemoved and self.onRemoved(oldest)

def duration(self):
Expand Down Expand Up @@ -363,7 +365,8 @@ def append_middle(self, event):
# Append left if ts is earlier than first event
if self.get_ts(self.data[0]) > ts:
self.data.appendleft(event)
self.running_count += event[1]
if event and event[1]:
self.running_count += event[1]
return

# Rotate window until we can insert event
Expand All @@ -374,7 +377,8 @@ def append_middle(self, event):
# This should never happen
return
self.data.append(event)
self.running_count += event[1]
if event and event[1]:
self.running_count += event[1]
self.data.rotate(-rotation)


Expand Down