External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 21:37:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

conditionally project job_created

Browse Source 
* Old, _unpartitioned_main_jobevent table does not have the job_created
column
* New, main_jobevent does.
* Always in clude the job_created column. NULL if old, job_created if
new
* Bump events_table schema version from 1.2 to 1.3 because of the
job_created field
This commit is contained in:
Chris Meyers
2021-04-24 13:47:10 -04:00
committed by Jim Ladd
parent ecdf6cccf8
commit 4f058245e4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,13 +356,15 @@ def _copy_table(table, query, path):
return file.file_list() return file.file_list()
def _events_table(since, full_path, until, tbl, **kwargs): def _events_table(since, full_path, until, tbl, project_job_created=False, **kwargs):
def query(event_data): def query(event_data):
# TODO: conditional job_created based on if the column exists or not in the table # TODO: conditional job_created based on if the column exists or not in the table
# {tbl}.job_created, # {tbl}.job_created,
return f'''COPY (SELECT {tbl}.id, return f'''COPY (SELECT {tbl}.id,
{tbl}.created, {tbl}.created,
{tbl}.modified, {tbl}.modified,
{tbl + '.job_created' if project_job_created else 'NULL'} as job_created,
{tbl}.uuid, {tbl}.uuid,
{tbl}.parent_uuid, {tbl}.parent_uuid,
{tbl}.event, {tbl}.event,
@@ -392,14 +394,14 @@ def _events_table(since, full_path, until, tbl, **kwargs):
return _copy_table(table='events', query=query(f"replace({tbl}.event_data::text, '\\u0000', '')::json"), path=full_path) return _copy_table(table='events', query=query(f"replace({tbl}.event_data::text, '\\u0000', '')::json"), path=full_path)
@register('events_table', '1.2', format='csv', description=_('Automation task records'), expensive=events_slicing_unpartitioned) @register('events_table', '1.3', format='csv', description=_('Automation task records'), expensive=events_slicing_unpartitioned)
def events_table_unpartitioned(since, full_path, until, **kwargs): def events_table_unpartitioned(since, full_path, until, **kwargs):
return _events_table(since, full_path, until, '_unpartitioned_main_jobevent', **kwargs) return _events_table(since, full_path, until, '_unpartitioned_main_jobevent', **kwargs)
@register('events_table', '1.2', format='csv', description=_('Automation task records'), expensive=events_slicing_partitioned_modified) @register('events_table', '1.3', format='csv', description=_('Automation task records'), expensive=events_slicing_partitioned_modified)
def events_table_partitioned_modified(since, full_path, until, **kwargs): def events_table_partitioned_modified(since, full_path, until, **kwargs):
return _events_table(since, full_path, until, 'main_jobevent', **kwargs) return _events_table(since, full_path, until, 'main_jobevent', project_job_created=True, **kwargs)
@register('unified_jobs_table', '1.2', format='csv', description=_('Data on jobs run'), expensive=four_hour_slicing) @register('unified_jobs_table', '1.2', format='csv', description=_('Data on jobs run'), expensive=four_hour_slicing)