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

Adjust datetimes to be aware when using awx-manage gather_analytics

Browse Source 
Also, make sure that an explicit `since` parameter will win over
default `until=now()` when calculating the 4-week data limit.
This commit is contained in:
Jeff Bradberry
2021-04-06 15:59:54 -04:00
parent 3742090d6f
commit 62c7554ec4
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/main/analytics/core.py
View File

@@ -149,11 +149,22 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti
from awx.main.signals import disable_activity_stream
_now = now()
until = _now if until is None else min(until, _now) # Make sure the end isn't in the future.
# Make sure that the endpoints are not in the future.
until = None if until is None else min(until, _now)
since = None if since is None else min(since, _now)
if since and not until:
# If `since` is explicit but not `until`, `since` should be used to calculate the 4-week limit
until = min(since + timedelta(weeks=4), _now)
else:
until = _now if until is None else until
horizon = until - timedelta(weeks=4)
if since is not None:
# Make sure the start isn't in the future or more than 4 weeks prior to `until`.
since = max(min(since, _now), horizon)
# Make sure the start isn't more than 4 weeks prior to `until`.
since = max(since, horizon)
if since and since >= until:
logger.warning("Start of the collection interval is later than the end, ignoring request.")
return None