External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 00:40:11 -02:30
Code Issues Packages Projects Releases Wiki Activity

allow users to test log aggregration if awx isn't in the loggers list

Browse Source
This commit is contained in:
Ryan Petrello
2020-04-23 15:15:37 -04:00
parent c0e07198cf
commit 31c6b3337c
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/utils/formatters.py
+6 -6
View File
@@ -127,14 +127,14 @@ class LogstashFormatter(LogstashFormatterBase):
pass # best effort here, if it's not valid JSON, then meh
return raw_data
elif kind == 'system_tracking':
data = copy(raw_data['ansible_facts'])
data = copy(raw_data.get('ansible_facts', {}))
else:
data = copy(raw_data)
if isinstance(data, str):
data = json.loads(data)
data_for_log = {}
if kind == 'job_events':
if kind == 'job_events' and raw_data.get('python_objects', {}).get('job_event'):
job_event = raw_data['python_objects']['job_event']
for field_object in job_event._meta.fields:
@@ -165,10 +165,10 @@ class LogstashFormatter(LogstashFormatterBase):
data['ansible_python'].pop('version_info', None)
data_for_log['ansible_facts'] = data
data_for_log['ansible_facts_modified'] = raw_data['ansible_facts_modified']
data_for_log['inventory_id'] = raw_data['inventory_id']
data_for_log['host_name'] = raw_data['host_name']
data_for_log['job_id'] = raw_data['job_id']
data_for_log['ansible_facts_modified'] = raw_data.get('ansible_facts_modified')
data_for_log['inventory_id'] = raw_data.get('inventory_id')
data_for_log['host_name'] = raw_data.get('host_name')
data_for_log['job_id'] = raw_data.get('job_id')
elif kind == 'performance':
def convert_to_type(t, val):
if t is float: