External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 18:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

implement ryanp suggestion

Browse Source
This commit is contained in:
James Tanner
2020-11-18 09:57:22 -05:00
parent a1c2d458de
commit 9cf294f3d7
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/main/analytics/collectors.py
View File

@@ -288,6 +288,7 @@ def events_table(since, full_path, until, **kwargs):
main_jobevent.parent_uuid, main_jobevent.parent_uuid,
main_jobevent.event, main_jobevent.event,
main_jobevent.event_data::json->'task_action' AS task_action, main_jobevent.event_data::json->'task_action' AS task_action,
(CASE WHEN event = 'playbook_on_stats' THEN event_data END),
main_jobevent.failed, main_jobevent.failed,
main_jobevent.changed, main_jobevent.changed,
main_jobevent.playbook, main_jobevent.playbook,
@@ -309,25 +310,6 @@ def events_table(since, full_path, until, **kwargs):
return _copy_table(table='events', query=events_query, path=full_path) return _copy_table(table='events', query=events_query, path=full_path)
@register('events_table_playbook_stats', '1.1', format='csv', description=_('playbook on stats records'), expensive=True)
def events_table_playbook_stats(since, full_path, until, **kwargs):
events_query = '''COPY (SELECT main_jobevent.id,
main_jobevent.created,
main_jobevent.uuid,
main_jobevent.parent_uuid,
main_jobevent.event,
main_jobevent.failed,
main_jobevent.changed,
main_jobevent.playbook,
main_jobevent.job_id,
main_jobevent.event_data
FROM main_jobevent
WHERE (main_jobevent.created > '{}' AND main_jobevent.created <= '{}' AND event='playbook_on_stats')
ORDER BY main_jobevent.id ASC) TO STDOUT WITH CSV HEADER
'''.format(since.isoformat(),until.isoformat())
return _copy_table(table='events_playbook_stats', query=events_query, path=full_path)
@register('unified_jobs_table', '1.1', format='csv', description=_('Data on jobs run'), expensive=True) @register('unified_jobs_table', '1.1', format='csv', description=_('Data on jobs run'), expensive=True)
def unified_jobs_table(since, full_path, until, **kwargs): def unified_jobs_table(since, full_path, until, **kwargs):
unified_job_query = '''COPY (SELECT main_unifiedjob.id, unified_job_query = '''COPY (SELECT main_unifiedjob.id,