From a296f64696e3149d6ffbb6d67032ccc65e8dd9f9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 14 Apr 2020 10:53:57 -0400 Subject: [PATCH 1/2] Cast the start/end times with timezone. --- awx/main/analytics/collectors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index 4073a77328..5afa30374a 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -249,8 +249,8 @@ def copy_tables(since, full_path): main_jobevent.job_id, main_jobevent.host_id, main_jobevent.host_name, - CAST(main_jobevent.event_data::json->>'start' AS TIMESTAMP) AS start, - CAST(main_jobevent.event_data::json->>'end' AS TIMESTAMP) AS end, + CAST(main_jobevent.event_data::json->>'start' AS TIMESTAMP WITH TIME ZONE) AS start, + CAST(main_jobevent.event_data::json->>'end' AS TIMESTAMP WITH TIME ZONE) AS end, main_jobevent.event_data::json->'duration' AS duration, main_jobevent.event_data::json->'res'->'warnings' AS warnings, main_jobevent.event_data::json->'res'->'deprecations' AS deprecations From cd6d2ed53af9a88b6bd90459e27f18753c438982 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 14 Apr 2020 13:12:03 -0400 Subject: [PATCH 2/2] Move the comma so unit test can filter things properly. --- awx/main/analytics/collectors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py index 5afa30374a..567a650d52 100644 --- a/awx/main/analytics/collectors.py +++ b/awx/main/analytics/collectors.py @@ -248,8 +248,8 @@ def copy_tables(since, full_path): main_jobevent.role, main_jobevent.job_id, main_jobevent.host_id, - main_jobevent.host_name, - CAST(main_jobevent.event_data::json->>'start' AS TIMESTAMP WITH TIME ZONE) AS start, + main_jobevent.host_name + , CAST(main_jobevent.event_data::json->>'start' AS TIMESTAMP WITH TIME ZONE) AS start, CAST(main_jobevent.event_data::json->>'end' AS TIMESTAMP WITH TIME ZONE) AS end, main_jobevent.event_data::json->'duration' AS duration, main_jobevent.event_data::json->'res'->'warnings' AS warnings,