amorfo77/parsedmarc
1
0
Fork 0
mirror of https://github.com/domainaware/parsedmarc.git synced 2026-05-19 10:25:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #236 from drawks/issue_235

Browse Source 
Resolves Issue #235 - Apply index suffix to pre-insert search
This commit is contained in:
Sean Whalen
2021-05-12 21:35:34 -04:00
committed by GitHub
parent 50b7b5f28e 1b61156d50
commit 0d680edd31
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parsedmarc/elastic.py
+8 -2
View File
@@ -320,7 +320,10 @@ def save_aggregate_report_to_elasticsearch(aggregate_report,
begin_date_query = Q(dict(match=dict(date_range=begin_date)))
end_date_query = Q(dict(match=dict(date_range=end_date)))
search = Search(index="dmarc_aggregate*")
if index_suffix is not None:
search = Search(index="dmarc_aggregate_{0}*".format(index_suffix))
else:
search = Search(index="dmarc_aggregate*")
query = org_name_query & report_id_query & domain_query
query = query & begin_date_query & end_date_query
search.query = query
@@ -437,7 +440,10 @@ def save_forensic_report_to_elasticsearch(forensic_report,
arrival_date_human = forensic_report["arrival_date_utc"]
arrival_date = human_timestamp_to_datetime(arrival_date_human)
search = Search(index="dmarc_forensic*")
if index_suffix is not None:
search = Search(index="dmarc_forensic_{0}*".format(index_suffix))
else:
search = Search(index="dmarc_forensic*")
arrival_query = {"match": {"arrival_date": arrival_date}}
q = Q(arrival_query)