From 6a503e152a217073e56003b7809907dbed2cf828 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Thu, 5 Mar 2020 14:49:49 +0100 Subject: [PATCH] Send also workflows as part of unified jobs Workflows do not have a record in main_job, therefore the JOIN was ignoring those. We need to do LEFT JOIN to include also workflows. It also seems like we are not able to get a link to organizations from workflows? When looking at: #/organizations?organization_search=page_size:20;order_by:name We don't seem to list a relation to workflows. Is it possible to get it from somewhere? --- 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 0f15538567..601ad039b6 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -276,7 +276,7 @@ def copy_tables(since, full_path): main_unifiedjob.instance_group_id FROM main_unifiedjob JOIN django_content_type ON main_unifiedjob.polymorphic_ctype_id = django_content_type.id - JOIN main_organization ON main_organization.id = main_unifiedjob.organization_id + LEFT JOIN main_organization ON main_organization.id = main_unifiedjob.organization_id WHERE main_unifiedjob.modified > {} AND main_unifiedjob.launch_type != 'sync' ORDER BY main_unifiedjob.id ASC) TO STDOUT WITH CSV HEADER'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'"))