From 4d7c49372c73882a44c3e8ff4caeb5a8b32a1b90 Mon Sep 17 00:00:00 2001 From: Christian Adams Date: Thu, 27 Jun 2019 12:28:31 -0400 Subject: [PATCH] Fix collection datetime for isolated instance info * 'last_isolated_check' was a non JSON-serializable object and needed to be a str --- awx/main/analytics/collectors.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index 1b5a0710a2..dbe5e928ab 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -153,6 +153,12 @@ def projects_by_scm_type(since): return counts +def _get_isolated_datetime(last_check): + if last_check: + return last_check.isoformat() + return last_check + + @register('instance_info') def instance_info(since): info = {} @@ -166,7 +172,7 @@ def instance_info(since): 'cpu': instance['cpu'], 'memory': instance['memory'], 'managed_by_policy': instance['managed_by_policy'], - 'last_isolated_check': instance['last_isolated_check'], + 'last_isolated_check': _get_isolated_datetime(instance['last_isolated_check']), 'enabled': instance['enabled'] } info[instance['uuid']] = instance_info