External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

update setting wording & add instance-enabled field

Browse Source
This commit is contained in:
Christian Adams
2019-03-20 15:08:29 -04:00
parent a7368cec43
commit 40dbe70854
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/analytics/collectors.py
View File

@@ -142,7 +142,7 @@ def projects_by_scm_type(since):
def instance_info(since): def instance_info(since):
info = {} info = {}
instances = models.Instance.objects.values_list('hostname').annotate().values( instances = models.Instance.objects.values_list('hostname').annotate().values(
'uuid', 'version', 'capacity', 'cpu', 'memory', 'managed_by_policy', 'hostname', 'last_isolated_check') 'uuid', 'version', 'capacity', 'cpu', 'memory', 'managed_by_policy', 'hostname', 'last_isolated_check', 'enabled')
for instance in instances: for instance in instances:
info = {'uuid': instance['uuid'], info = {'uuid': instance['uuid'],
'version': instance['version'], 'version': instance['version'],
@@ -151,6 +151,7 @@ def instance_info(since):
'memory': instance['memory'], 'memory': instance['memory'],
'managed_by_policy': instance['managed_by_policy'], 'managed_by_policy': instance['managed_by_policy'],
'last_isolated_check': instance['last_isolated_check'], 'last_isolated_check': instance['last_isolated_check'],
'enabled': instance['enabled']
} }
return info return info
@@ -195,7 +196,7 @@ def copy_tables(since, full_path):
main_jobevent.uuid, main_jobevent.uuid,
main_jobevent.parent_uuid, main_jobevent.parent_uuid,
main_jobevent.event, main_jobevent.event,
main_jobevent.event_data::json->'task_action' main_jobevent.event_data::json->'task_action',
main_jobevent.failed, main_jobevent.failed,
main_jobevent.changed, main_jobevent.changed,
main_jobevent.playbook, main_jobevent.playbook,
@@ -204,7 +205,7 @@ def copy_tables(since, full_path):
main_jobevent.role, main_jobevent.role,
main_jobevent.job_id, main_jobevent.job_id,
main_jobevent.host_id, main_jobevent.host_id,
main_jobevent.host_name, main_jobevent.host_name
FROM main_jobevent FROM main_jobevent
WHERE main_jobevent.created > {} WHERE main_jobevent.created > {}
ORDER BY main_jobevent.id ASC) to stdout'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'")) ORDER BY main_jobevent.id ASC) to stdout'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'"))

4
awx/main/conf.py
View File

@@ -305,8 +305,8 @@ register(
'INSIGHTS_DATA_ENABLED', 'INSIGHTS_DATA_ENABLED',
field_class=fields.BooleanField, field_class=fields.BooleanField,
default=False, default=False,
label=_('Insights Analytics Data'), label=_('Gather data for Automation Insights'),
help_text=_('Enables Tower to gather analytics data about itself and send it to Insights.'), help_text=_('Enables Tower to gather data on automation and send it to Red Hat Insights.'),
category=_('System'), category=_('System'),
category_slug='system', category_slug='system',
) )