Skip to content
This repository was archived by the owner on Jan 28, 2022. It is now read-only.
Merged
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions hpcbench/export/es.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@ def index_mapping(self):

@property
def _documents(self):
for run in self._runs:
yield dict(index=dict(_type=self.ES_DOC_TYPE, _id=self.document_id(run)))
run['campaign_id'] = self.campaign.campaign_id
yield run
for metric in self._metrics:
yield dict(index=dict(_type=self.ES_DOC_TYPE, _id=self.document_id(metric)))
metric['campaign_id'] = self.campaign.campaign_id
yield metric

def document_id(self, doc):
return doc['id'] + '/' + str(hash(frozenset(doc['context'].items())))

@property
def _get_document_mapping(self):
fields = {}
for run in self._runs:
dict_merge(fields, ESExporter._get_dict_mapping(self.ES_DOC_TYPE, run))
for metric in self._metrics:
dict_merge(fields, ESExporter._get_dict_mapping(self.ES_DOC_TYPE, metric))
return fields

@classmethod
Expand Down Expand Up @@ -160,6 +160,12 @@ def _get_field_mapping(cls, name, value, root):
def _runs(self):
for attrs, runs in get_metrics(self.campaign, self.report):
for run in runs:
yield attrs, run

@property
def _metrics(self):
for attrs, run in self._runs:
if run.get('command_succeeded', False):
metrics = run.pop('metrics')
for metric in metrics:
eax = dict(metric)
Expand Down