From cb9500a36d2d9005e9c7c54d9ddab27f8d975eba Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Thu, 9 Feb 2023 23:34:29 +0000 Subject: [PATCH] Rename match and aggs fields --- core/lib/rules.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/lib/rules.py b/core/lib/rules.py index a6ed4d3..a4ea864 100644 --- a/core/lib/rules.py +++ b/core/lib/rules.py @@ -379,7 +379,8 @@ class NotificationRuleData(object): pass # We hit the return above if we don't need to notify - meta["matched"] = self.format_matched(message) + if "matched" not in meta: + meta["matched"] = self.format_matched(message) if "aggs" in meta: aggs_formatted = self.format_aggs(meta["aggs"]) if aggs_formatted: @@ -415,9 +416,13 @@ class NotificationRuleData(object): pass # We hit the return above if we don't need to notify - meta["matched"] = self.format_matched(message) + if "matched" not in meta: + meta["matched"] = self.format_matched(message) if "aggs" in meta: - meta["format_aggs"] = self.format_aggs(meta["aggs"]) + aggs_formatted = self.format_aggs(meta["aggs"]) + if aggs_formatted: + meta["matched_aggs"] = aggs_formatted + rule_notify(self.object, index, message, meta) self.store_match(index, message) self.ingest_matches_sync(index, message, meta, mode)