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

Send job & org data

Browse Source
This commit is contained in:
Christian Adams
2019-08-13 11:52:55 -04:00
committed by Christian Adams
parent 9baa9eee96
commit cd3645eb4d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,6 +240,8 @@ def copy_tables(since, full_path):
unified_job_query = '''COPY (SELECT main_unifiedjob.id, unified_job_query = '''COPY (SELECT main_unifiedjob.id,
main_unifiedjob.polymorphic_ctype_id, main_unifiedjob.polymorphic_ctype_id,
django_content_type.model, django_content_type.model,
main_project.organization_id,
main_organization.name as organization_name,
main_unifiedjob.created, main_unifiedjob.created,
main_unifiedjob.name, main_unifiedjob.name,
main_unifiedjob.unified_job_template_id, main_unifiedjob.unified_job_template_id,
@@ -255,10 +257,13 @@ def copy_tables(since, full_path):
main_unifiedjob.elapsed, main_unifiedjob.elapsed,
main_unifiedjob.job_explanation, main_unifiedjob.job_explanation,
main_unifiedjob.instance_group_id main_unifiedjob.instance_group_id
FROM main_unifiedjob, django_content_type FROM main_unifiedjob
WHERE main_unifiedjob.created > {} AND JOIN main_job ON main_unifiedjob.id = main_job.unifiedjob_ptr_id
main_unifiedjob.polymorphic_ctype_id = django_content_type.id AND JOIN django_content_type ON main_unifiedjob.polymorphic_ctype_id = django_content_type.id
main_unifiedjob.launch_type != 'sync' JOIN main_project ON main_project.unifiedjobtemplate_ptr_id = main_job.project_id
JOIN main_organization ON main_organization.id = main_project.organization_id
WHERE main_unifiedjob.created > {}
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'")) ORDER BY main_unifiedjob.id ASC) TO STDOUT WITH CSV HEADER'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'"))
_copy_table(table='unified_jobs', query=unified_job_query, path=full_path) _copy_table(table='unified_jobs', query=unified_job_query, path=full_path)
@@ -282,4 +287,3 @@ def copy_tables(since, full_path):
ORDER BY main_unifiedjobtemplate.id ASC) TO STDOUT WITH CSV HEADER'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'")) ORDER BY main_unifiedjobtemplate.id ASC) TO STDOUT WITH CSV HEADER'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'"))
_copy_table(table='unified_job_template', query=unified_job_template_query, path=full_path) _copy_table(table='unified_job_template', query=unified_job_template_query, path=full_path)
return return