From 40dbe708545c400c01025047323f4588ad97406f Mon Sep 17 00:00:00 2001
From: Christian Adams <rooftopcellist@gmail.com>
Date: Wed, 20 Mar 2019 15:08:29 -0400
Subject: [PATCH] update setting wording & add instance-enabled field

---
 awx/main/analytics/collectors.py | 7 ++++---
 awx/main/conf.py                 | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py
index f7dcdbc5ad..60b28440bf 100644
--- a/awx/main/analytics/collectors.py
+++ b/awx/main/analytics/collectors.py
@@ -142,7 +142,7 @@ def projects_by_scm_type(since):
 def instance_info(since):
     info = {}
     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:
         info = {'uuid': instance['uuid'],
                 'version': instance['version'],
@@ -151,6 +151,7 @@ def instance_info(since):
                 'memory': instance['memory'],
                 'managed_by_policy': instance['managed_by_policy'],
                 'last_isolated_check': instance['last_isolated_check'],
+                'enabled': instance['enabled']
                 }
     return info
 
@@ -195,7 +196,7 @@ def copy_tables(since, full_path):
                               main_jobevent.uuid,
                               main_jobevent.parent_uuid,
                               main_jobevent.event, 
-                              main_jobevent.event_data::json->'task_action'
+                              main_jobevent.event_data::json->'task_action',
                               main_jobevent.failed, 
                               main_jobevent.changed, 
                               main_jobevent.playbook, 
@@ -204,7 +205,7 @@ def copy_tables(since, full_path):
                               main_jobevent.role, 
                               main_jobevent.job_id, 
                               main_jobevent.host_id, 
-                              main_jobevent.host_name, 
+                              main_jobevent.host_name
                               FROM main_jobevent 
                               WHERE main_jobevent.created > {}
                               ORDER BY main_jobevent.id ASC) to stdout'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'"))
diff --git a/awx/main/conf.py b/awx/main/conf.py
index a8ab03aad5..2ca631627d 100644
--- a/awx/main/conf.py
+++ b/awx/main/conf.py
@@ -305,8 +305,8 @@ register(
     'INSIGHTS_DATA_ENABLED',
     field_class=fields.BooleanField,
     default=False,
-    label=_('Insights Analytics Data'),
-    help_text=_('Enables Tower to gather analytics data about itself and send it to Insights.'),
+    label=_('Gather data for Automation Insights'),
+    help_text=_('Enables Tower to gather data on automation and send it to Red Hat Insights.'),
     category=_('System'),
     category_slug='system',
 )