External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-06 18:49:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Deal with datetimes in AUTOMATION_ANALYTICS_LAST_ENTRIES

Browse Source
This commit is contained in:
Jeff Bradberry
2021-03-22 14:56:12 -04:00
parent 99daa4319e
commit 39886da4b6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import tarfile
import tempfile import tempfile
from django.conf import settings from django.conf import settings
from django.core.serializers.json import DjangoJSONEncoder
from django.utils.timezone import now, timedelta from django.utils.timezone import now, timedelta
from rest_framework.exceptions import PermissionDenied from rest_framework.exceptions import PermissionDenied
import requests import requests
@@ -178,8 +179,7 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti
key = func.__awx_analytics_key__ key = func.__awx_analytics_key__
filename = f'{key}.json' filename = f'{key}.json'
try: try:
results = (func(last_run, collection_type=collection_type, until=until), results = (func(last_run, collection_type=collection_type, until=until), func.__awx_analytics_version__)
func.__awx_analytics_version__)
json.dumps(results) # throwaway check to see if the data is json-serializable json.dumps(results) # throwaway check to see if the data is json-serializable
data[filename] = results data[filename] = results
except Exception: except Exception:
@@ -197,7 +197,7 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti
with disable_activity_stream(): with disable_activity_stream():
for filename in data: for filename in data:
last_entries[filename.replace('.json', '')] = until last_entries[filename.replace('.json', '')] = until
settings.AUTOMATION_ANALYTICS_LAST_ENTRIES = json.dumps(last_entries) settings.AUTOMATION_ANALYTICS_LAST_ENTRIES = json.dumps(last_entries, cls=DjangoJSONEncoder)
for func in csv_collectors: for func in csv_collectors:
key = func.__awx_analytics_key__ key = func.__awx_analytics_key__
@@ -213,7 +213,7 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti
if collection_type != 'dry-run': if collection_type != 'dry-run':
with disable_activity_stream(): with disable_activity_stream():
last_entries[key] = end last_entries[key] = end
settings.AUTOMATION_ANALYTICS_LAST_ENTRIES = json.dumps(last_entries) settings.AUTOMATION_ANALYTICS_LAST_ENTRIES = json.dumps(last_entries, cls=DjangoJSONEncoder)
continue continue
for fpath in files: for fpath in files:
payload = {filename: (fpath, func.__awx_analytics_version__)} payload = {filename: (fpath, func.__awx_analytics_version__)}
@@ -231,7 +231,7 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti
ship(tgzfile) ship(tgzfile)
with disable_activity_stream(): with disable_activity_stream():
last_entries[key] = end last_entries[key] = end
settings.AUTOMATION_ANALYTICS_LAST_ENTRIES = json.dumps(last_entries) settings.AUTOMATION_ANALYTICS_LAST_ENTRIES = json.dumps(last_entries, cls=DjangoJSONEncoder)
except Exception: except Exception:
logger.exception("Could not generate metric {}".format(filename)) logger.exception("Could not generate metric {}".format(filename))