Pathogen
/
neptune
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ingest no matches

This commit is contained in:
Mark Veidemanis 2023-02-09 07:20:07 +00:00
parent 2c12854a55
commit 66232c8260
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/lib/rules.py
View File

@ -247,7 +247,10 @@ class NotificationRuleData(object):
if index is None: if index is None:
# Check if we have any matches on all indices # Check if we have any matches on all indices
return any(self.object.match.values()) values = self.object.match.values()
if not values:
return None
return any(values)
# Check if it's the same hash # Check if it's the same hash
if match is not None: if match is not None:
@ -348,7 +351,7 @@ class NotificationRuleData(object):
self.ingest_matches_sync(index, message, meta, mode) self.ingest_matches_sync(index, message, meta, mode)
# No async helper for this one as we only need it for schedules # No async helper for this one as we only need it for schedules
async def rule_no_match(self, index=None): async def rule_no_match(self, index=None, message=None):
""" """
A rule has not matched. A rule has not matched.
If the previous run did match, send a notification if configured to notify If the previous run did match, send a notification if configured to notify
@ -364,7 +367,7 @@ class NotificationRuleData(object):
rule_notify(self.object, index, "no_match", None) rule_notify(self.object, index, "no_match", None)
self.store_match(index, False) self.store_match(index, False)
await self.ingest_matches( await self.ingest_matches(
index=index, message={}, meta={"msg": "No matches"}, mode="schedule" index=index, message={}, meta={"msg": message}, mode="schedule"
) )
async def run_schedule(self): async def run_schedule(self):
@ -376,11 +379,12 @@ class NotificationRuleData(object):
response = await self.db.schedule_query_results(self) response = await self.db.schedule_query_results(self)
if not response: if not response:
# No results in the result_map # No results in the result_map
await self.rule_no_match() print("No results in result_map")
await self.rule_no_match(message="No response from database")
for index, (meta, results) in response.items(): for index, (meta, results) in response.items():
if not results: if not results:
# Falsy results, no matches # Falsy results, no matches
await self.rule_no_match(index) await self.rule_no_match(index, message="No results for index")
# Add the match values of all aggregations to a list # Add the match values of all aggregations to a list
aggs_for_index = [] aggs_for_index = []
@ -398,7 +402,7 @@ class NotificationRuleData(object):
) )
continue continue
# Default branch, since the happy path has a continue keyword # Default branch, since the happy path has a continue keyword
await self.rule_no_match(index) await self.rule_no_match(index, message="Aggregation did not match")
def test_schedule(self): def test_schedule(self):
""" """