From 1e57c843833ae9352164eb951fad05301bd83fb3 Mon Sep 17 00:00:00 2001 From: Lila Date: Fri, 1 Jul 2022 10:30:48 -0400 Subject: [PATCH 1/2] Added forks to unified jobs table. Co-authored-by: sarabrajsingh --- awx/main/analytics/collectors.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index 60cb8560f5..0cae39a7d3 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -415,7 +415,8 @@ def unified_jobs_table(since, full_path, until, **kwargs): main_unifiedjob.job_explanation, main_unifiedjob.instance_group_id, main_unifiedjob.installed_collections, - main_unifiedjob.ansible_version + main_unifiedjob.ansible_version, + main_job.forks FROM main_unifiedjob JOIN django_content_type ON main_unifiedjob.polymorphic_ctype_id = django_content_type.id LEFT JOIN main_job ON main_unifiedjob.id = main_job.unifiedjob_ptr_id From aeffd6f393f6a8761dcc82aa130496620675b412 Mon Sep 17 00:00:00 2001 From: Lila Date: Fri, 1 Jul 2022 15:23:36 -0400 Subject: [PATCH 2/2] Bumped up version number of the collector. --- awx/main/analytics/collectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index 551430768b..27a41e9dff 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -396,7 +396,7 @@ def events_table_partitioned_modified(since, full_path, until, **kwargs): return _events_table(since, full_path, until, 'main_jobevent', 'modified', project_job_created=True, **kwargs) -@register('unified_jobs_table', '1.3', format='csv', description=_('Data on jobs run'), expensive=four_hour_slicing) +@register('unified_jobs_table', '1.4', format='csv', description=_('Data on jobs run'), expensive=four_hour_slicing) def unified_jobs_table(since, full_path, until, **kwargs): unified_job_query = '''COPY (SELECT main_unifiedjob.id, main_unifiedjob.polymorphic_ctype_id,