From 9cf294f3d70b2adb432751c87ff66ee0cd9cfd18 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Wed, 18 Nov 2020 09:57:22 -0500 Subject: [PATCH] implement ryanp suggestion --- awx/main/analytics/collectors.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index db58395a63..18ffcd680c 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -288,6 +288,7 @@ def events_table(since, full_path, until, **kwargs): main_jobevent.parent_uuid, main_jobevent.event, 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.changed, 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) -@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) def unified_jobs_table(since, full_path, until, **kwargs): unified_job_query = '''COPY (SELECT main_unifiedjob.id,