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

Require the config.json file to be in dry-run tarballs

Browse Source
This commit is contained in:
Jeff Bradberry
2021-03-18 09:22:45 -04:00
parent 3568558571
commit 99daa4319e
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti
for name, func in inspect.getmembers(collector_module) for name, func in inspect.getmembers(collector_module)
if inspect.isfunction(func) and hasattr(func, '__awx_analytics_key__') and (not subset or name in subset) if inspect.isfunction(func) and hasattr(func, '__awx_analytics_key__') and (not subset or name in subset)
] ]
if collection_type != 'dry-run' and not any(c.__awx_analytics_key__ == 'config' for c in collector_list): if not any(c.__awx_analytics_key__ == 'config' for c in collector_list):
# In order to ship to analytics, we must include the output of the built-in 'config' collector. # In order to ship to analytics, we must include the output of the built-in 'config' collector.
collector_list.append(collectors.config) collector_list.append(collectors.config)
@@ -178,18 +178,21 @@ 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:
data[filename] = (func(last_run, collection_type=collection_type, until=until), func.__awx_analytics_version__) results = (func(last_run, collection_type=collection_type, until=until),
func.__awx_analytics_version__)
json.dumps(results) # throwaway check to see if the data is json-serializable
data[filename] = results
except Exception: except Exception:
logger.exception("Could not generate metric {}".format(filename)) logger.exception("Could not generate metric {}".format(filename))
if data: if data:
if data.get('config.json') is None:
logger.error("'config' collector data is missing.")
return None
tgzfile = package(dest.parent, data, until) tgzfile = package(dest.parent, data, until)
if tgzfile is not None: if tgzfile is not None:
tarfiles.append(tgzfile) tarfiles.append(tgzfile)
if collection_type != 'dry-run': if collection_type != 'dry-run':
if data.get('config.json') is None:
logger.error("'config' collector data is missing, and is required to ship.")
return None
ship(tgzfile) ship(tgzfile)
with disable_activity_stream(): with disable_activity_stream():
for filename in data: for filename in data:
@@ -214,11 +217,12 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti
continue continue
for fpath in files: for fpath in files:
payload = {filename: (fpath, func.__awx_analytics_version__)} payload = {filename: (fpath, func.__awx_analytics_version__)}
if collection_type != 'dry-run':
payload['config.json'] = data.get('config.json') payload['config.json'] = data.get('config.json')
if payload['config.json'] is None: if payload['config.json'] is None:
logger.error("'config' collector data is missing, and is required to ship.") logger.error("'config' collector data is missing, and is required to ship.")
return None return None
tgzfile = package(dest.parent, payload, until) tgzfile = package(dest.parent, payload, until)
if tgzfile is not None: if tgzfile is not None:
tarfiles.append(tgzfile) tarfiles.append(tgzfile)