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

replace null unicode with nothing in analytics collection

Browse Source
This commit is contained in:
Ryan Petrello
2021-04-06 14:15:53 -04:00
parent 62be41036c
commit f694cd14d7
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,8 @@ from django.contrib.sessions.models import Session
from django.utils.timezone import now, timedelta from django.utils.timezone import now, timedelta
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from psycopg2.errors import UntranslatableCharacter
from awx.conf.license import get_license from awx.conf.license import get_license
from awx.main.utils import get_awx_version, get_custom_venv_choices, camelcase_to_underscore, datetime_hook from awx.main.utils import get_awx_version, get_custom_venv_choices, camelcase_to_underscore, datetime_hook
from awx.main import models from awx.main import models
@@ -344,35 +346,37 @@ def _copy_table(table, query, path):
@register('events_table', '1.2', format='csv', description=_('Automation task records'), expensive=events_slicing) @register('events_table', '1.2', format='csv', description=_('Automation task records'), expensive=events_slicing)
def events_table(since, full_path, until, **kwargs): def events_table(since, full_path, until, **kwargs):
events_query = '''COPY (SELECT main_jobevent.id, def query(event_data):
main_jobevent.created, return f'''COPY (SELECT main_jobevent.id,
main_jobevent.modified, main_jobevent.created,
main_jobevent.uuid, main_jobevent.modified,
main_jobevent.parent_uuid, main_jobevent.uuid,
main_jobevent.event, main_jobevent.parent_uuid,
main_jobevent.event_data::json->'task_action' AS task_action, main_jobevent.event,
(CASE WHEN event = 'playbook_on_stats' THEN event_data END) as playbook_on_stats, {event_data}->'task_action' AS task_action,
main_jobevent.failed, (CASE WHEN event = 'playbook_on_stats' THEN event_data END) as playbook_on_stats,
main_jobevent.changed, main_jobevent.failed,
main_jobevent.playbook, main_jobevent.changed,
main_jobevent.play, main_jobevent.playbook,
main_jobevent.task, main_jobevent.play,
main_jobevent.role, main_jobevent.task,
main_jobevent.job_id, main_jobevent.role,
main_jobevent.host_id, main_jobevent.job_id,
main_jobevent.host_name, main_jobevent.host_id,
CAST(main_jobevent.event_data::json->>'start' AS TIMESTAMP WITH TIME ZONE) AS start, main_jobevent.host_name,
CAST(main_jobevent.event_data::json->>'end' AS TIMESTAMP WITH TIME ZONE) AS end, CAST({event_data}->>'start' AS TIMESTAMP WITH TIME ZONE) AS start,
main_jobevent.event_data::json->'duration' AS duration, CAST({event_data}->>'end' AS TIMESTAMP WITH TIME ZONE) AS end,
main_jobevent.event_data::json->'res'->'warnings' AS warnings, {event_data}->'duration' AS duration,
main_jobevent.event_data::json->'res'->'deprecations' AS deprecations {event_data}->'res'->'warnings' AS warnings,
FROM main_jobevent {event_data}->'res'->'deprecations' AS deprecations
WHERE (main_jobevent.id > {} AND main_jobevent.id <= {}) FROM main_jobevent
ORDER BY main_jobevent.id ASC) TO STDOUT WITH CSV HEADER WHERE (main_jobevent.id > {since} AND main_jobevent.id <= {until})
'''.format( ORDER BY main_jobevent.id ASC) TO STDOUT WITH CSV HEADER'''
since, until
) try:
return _copy_table(table='events', query=events_query, path=full_path) return _copy_table(table='events', query=query("main_jobevent.event_data::json"), path=full_path)
except UntranslatableCharacter as exc:
return _copy_table(table='events', query=query("replace(main_jobevent.event_data::text, '\\u0000', '')::json"), path=full_path)
@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)