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

Compare commits

base: Pathogen:cb9500a36d2d9005e9c7c54d9ddab27f8d975eba
Branches Tags
Pathogen:master
Pathogen:modern-tables
Pathogen:prod
..
compare: Pathogen:56b268bd7760f1d27270c1f5c32939ae53fc0c1f
Branches Tags
Pathogen:master
Pathogen:modern-tables
Pathogen:prod

No commits in common. "cb9500a36d2d9005e9c7c54d9ddab27f8d975eba" and "56b268bd7760f1d27270c1f5c32939ae53fc0c1f" have entirely different histories.
cb9500a36d ... 56b268bd77

2 changed files with 4 additions and 9 deletions
Show Stats Expand all files Collapse all files

7
core/lib/rules.py
View File

@ -379,7 +379,6 @@ class NotificationRuleData(object):
pass pass
# We hit the return above if we don't need to notify # We hit the return above if we don't need to notify
if "matched" not in meta:
meta["matched"] = self.format_matched(message) meta["matched"] = self.format_matched(message)
if "aggs" in meta: if "aggs" in meta:
aggs_formatted = self.format_aggs(meta["aggs"]) aggs_formatted = self.format_aggs(meta["aggs"])
@ -416,13 +415,9 @@ class NotificationRuleData(object):
pass pass
# We hit the return above if we don't need to notify # We hit the return above if we don't need to notify
if "matched" not in meta:
meta["matched"] = self.format_matched(message) meta["matched"] = self.format_matched(message)
if "aggs" in meta: if "aggs" in meta:
aggs_formatted = self.format_aggs(meta["aggs"]) meta["format_aggs"] = self.format_aggs(meta["aggs"])
if aggs_formatted:
meta["matched_aggs"] = aggs_formatted
rule_notify(self.object, index, message, meta) rule_notify(self.object, index, message, meta)
self.store_match(index, message) self.store_match(index, message)
self.ingest_matches_sync(index, message, meta, mode) self.ingest_matches_sync(index, message, meta, mode)

2
core/templates/partials/results_table.html
View File

@ -259,7 +259,7 @@
"channel": "{{ row.cells.channel|escapejs }}", "channel": "{{ row.cells.channel|escapejs }}",
"time": "{{ row.cells.time|escapejs }}", "time": "{{ row.cells.time|escapejs }}",
"date": "{{ row.cells.date|escapejs }}", "date": "{{ row.cells.date|escapejs }}",
"index": "{% if row.cells.index != '—' %}{{row.cells.index}}{% else %}{{ params.index }}{% endif %}", "index": "{{ params.index }}",
"type": "{{ row.cells.type }}", "type": "{{ row.cells.type }}",
"mtype": "{{ row.cells.mtype }}", "mtype": "{{ row.cells.mtype }}",
"nick": "{{ row.cells.nick|escapejs }}", "nick": "{{ row.cells.nick|escapejs }}",