From bbb9770a97ee1144eb79b253ff633a77f5f8550c Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 12 Apr 2022 14:23:13 -0400 Subject: [PATCH] change back to Automation Analytics name (#12022) --- awx/main/analytics/core.py | 6 ++-- awx/main/conf.py | 18 +++++----- .../MiscSystemDetail/MiscSystemDetail.test.js | 12 +++---- .../SubscriptionEdit/AnalyticsStep.js | 22 ++++++------ .../SubscriptionEdit/SubscriptionEdit.js | 2 +- .../SubscriptionEdit/SubscriptionEdit.test.js | 4 +-- .../shared/data.allSettingOptions.json | 36 +++++++++---------- 7 files changed, 47 insertions(+), 53 deletions(-) diff --git a/awx/main/analytics/core.py b/awx/main/analytics/core.py index 6aa2f5090e..77f6108205 100644 --- a/awx/main/analytics/core.py +++ b/awx/main/analytics/core.py @@ -177,7 +177,7 @@ def gather(dest=None, module=None, subset=None, since=None, until=None, collecti if collection_type != 'dry-run': if not settings.INSIGHTS_TRACKING_STATE: - logger.log(log_level, "Insights for Ansible Automation Platform not enabled. Use --dry-run to gather locally without sending.") + logger.log(log_level, "Automation Analytics not enabled. Use --dry-run to gather locally without sending.") return None if not (settings.AUTOMATION_ANALYTICS_URL and settings.REDHAT_USERNAME and settings.REDHAT_PASSWORD): @@ -332,10 +332,10 @@ def ship(path): Ship gathered metrics to the Insights API """ if not path: - logger.error('Insights for Ansible Automation Platform TAR not found') + logger.error('Automation Analytics TAR not found') return False if not os.path.exists(path): - logger.error('Insights for Ansible Automation Platform TAR {} not found'.format(path)) + logger.error('Automation Analytics TAR {} not found'.format(path)) return False if "Error:" in str(path): return False diff --git a/awx/main/conf.py b/awx/main/conf.py index 4a617d87b0..5d89ec8ca2 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -112,7 +112,7 @@ register( encrypted=False, read_only=False, label=_('Red Hat customer username'), - help_text=_('This username is used to send data to Insights for Ansible Automation Platform'), + help_text=_('This username is used to send data to Automation Analytics'), category=_('System'), category_slug='system', ) @@ -125,7 +125,7 @@ register( encrypted=True, read_only=False, label=_('Red Hat customer password'), - help_text=_('This password is used to send data to Insights for Ansible Automation Platform'), + help_text=_('This password is used to send data to Automation Analytics'), category=_('System'), category_slug='system', ) @@ -162,8 +162,8 @@ register( default='https://example.com', schemes=('http', 'https'), allow_plain_hostname=True, # Allow hostname only without TLD. - label=_('Insights for Ansible Automation Platform upload URL'), - help_text=_('This setting is used to to configure the upload URL for data collection for Red Hat Insights.'), + label=_('Automation Analytics upload URL'), + help_text=_('This setting is used to to configure the upload URL for data collection for Automation Analytics.'), category=_('System'), category_slug='system', ) @@ -299,8 +299,8 @@ register( 'INSIGHTS_TRACKING_STATE', field_class=fields.BooleanField, default=False, - label=_('Gather data for Insights for Ansible Automation Platform'), - help_text=_('Enables the service to gather data on automation and send it to Red Hat Insights.'), + label=_('Gather data for Automation Analytics'), + help_text=_('Enables the service to gather data on automation and send it to Automation Analytics.'), category=_('System'), category_slug='system', ) @@ -727,7 +727,7 @@ register( register( 'AUTOMATION_ANALYTICS_LAST_GATHER', field_class=fields.DateTimeField, - label=_('Last gather date for Insights for Ansible Automation Platform.'), + label=_('Last gather date for Automation Analytics.'), allow_null=True, category=_('System'), category_slug='system', @@ -735,7 +735,7 @@ register( register( 'AUTOMATION_ANALYTICS_LAST_ENTRIES', field_class=fields.CharField, - label=_('Last gathered entries from the data collection service of Insights for Ansible Automation Platform'), + label=_('Last gathered entries from the data collection service of Automation Analytics'), default='', allow_blank=True, category=_('System'), @@ -746,7 +746,7 @@ register( register( 'AUTOMATION_ANALYTICS_GATHER_INTERVAL', field_class=fields.IntegerField, - label=_('Insights for Ansible Automation Platform Gather Interval'), + label=_('Automation Analytics Gather Interval'), help_text=_('Interval (in seconds) between data gathering.'), default=14400, # every 4 hours min_value=1800, # every 30 minutes diff --git a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js index 5993878f63..0a15b3bdad 100644 --- a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js +++ b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js @@ -84,20 +84,16 @@ describe('', () => { assertDetail(wrapper, 'All Users Visible to Organization Admins', 'On'); assertDetail( wrapper, - 'Insights for Ansible Automation Platform Gather Interval', + 'Automation Analytics Gather Interval', '14400 seconds' ); assertDetail( wrapper, - 'Insights for Ansible Automation Platform upload URL', + 'Automation Analytics upload URL', 'https://example.com' ); assertDetail(wrapper, 'Base URL of the service', 'https://towerhost'); - assertDetail( - wrapper, - 'Gather data for Insights for Ansible Automation Platform', - 'Off' - ); + assertDetail(wrapper, 'Gather data for Automation Analytics', 'Off'); assertDetail( wrapper, 'Organization Admins Can Manage Users and Teams', @@ -111,7 +107,7 @@ describe('', () => { assertDetail(wrapper, 'Red Hat or Satellite username', 'name2'); assertVariableDetail( wrapper, - 'Last gathered entries from the data collection service of Insights for Ansible Automation Platform', + 'Last gathered entries from the data collection service of Automation Analytics', '{\n "foo": "2021-11-24R06:35:15.179Z"\n}' ); assertVariableDetail(wrapper, 'Remote Host Headers', '[]'); diff --git a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js index e14baa1ae9..f331c1e975 100644 --- a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js +++ b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.js @@ -31,12 +31,12 @@ function AnalyticsStep() { spaceItems={{ default: 'spaceItemsMd' }} direction={{ default: 'column' }} > - User and Insights analytics + User and Automation Analytics

- By default, we collect and transmit analytics data on the serice usage - to Red Hat. There are two categories of data collected by the service. - For more information, see{' '} + By default, we collect and transmit analytics data on the service + usage to Red Hat. There are two categories of data collected by the + service. For more information, see{' '} diff --git a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js index c4b826cf29..1ad850408e 100644 --- a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js +++ b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.js @@ -199,7 +199,7 @@ function SubscriptionEdit() { ...(!hasValidKey ? [ { - name: t`User and Insights analytics`, + name: t`User and Automation Analytics`, id: 'analytics-step', component: , }, diff --git a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.js b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.js index 231a59f7ba..eba1891c6e 100644 --- a/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.js +++ b/awx/ui/src/screens/Setting/Subscription/SubscriptionEdit/SubscriptionEdit.test.js @@ -88,7 +88,7 @@ describe('', () => { wrapper.find('WizardNavItem[content="Mock Subscription"]').length ).toBe(1); expect( - wrapper.find('WizardNavItem[content="User and Insights analytics"]') + wrapper.find('WizardNavItem[content="User and Automation Analytics"]') .length ).toBe(1); expect( @@ -254,7 +254,7 @@ describe('', () => { wrapper.find('WizardNavItem[content="Subscription Management"]').length ).toBe(1); expect( - wrapper.find('WizardNavItem[content="User and Insights analytics"]') + wrapper.find('WizardNavItem[content="User and Automation Analytics"]') .length ).toBe(0); expect( diff --git a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json index a82a8d7229..baa343c826 100644 --- a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json +++ b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json @@ -79,7 +79,7 @@ "type": "string", "required": false, "label": "Red Hat customer username", - "help_text": "This username is used to send data to Insights for Ansible Automation Platform", + "help_text": "This username is used to send data to Automation Analytics", "category": "System", "category_slug": "system", "default": "" @@ -88,7 +88,7 @@ "type": "string", "required": false, "label": "Red Hat customer password", - "help_text": "This password is used to send data to Insights for Ansible Automation Platform", + "help_text": "This password is used to send data to Automation Analytics", "category": "System", "category_slug": "system", "default": "" @@ -114,8 +114,8 @@ "AUTOMATION_ANALYTICS_URL": { "type": "string", "required": false, - "label": "Insights for Ansible Automation Platform upload URL", - "help_text": "This setting is used to to configure the upload URL for data collection for Red Hat Insights.", + "label": "Automation Analytics upload URL", + "help_text": "This setting is used to to configure the upload URL for data collection for Automation Analytics.", "category": "System", "category_slug": "system", "default": "https://example.com" @@ -254,8 +254,8 @@ "INSIGHTS_TRACKING_STATE": { "type": "boolean", "required": false, - "label": "Gather data for Insights for Ansible Automation Platform", - "help_text": "Enables the service to gather data on automation and send it to Red Hat Insights.", + "label": "Gather data for Automation Analytics", + "help_text": "Enables the service to gather data on automation and send it to Automation Analytics.", "category": "System", "category_slug": "system", "default": false @@ -605,7 +605,7 @@ "AUTOMATION_ANALYTICS_LAST_GATHER": { "type": "datetime", "required": true, - "label": "Last gather date for Insights for Ansible Automation Platform.", + "label": "Last gather date for Automation Analytics.", "category": "System", "category_slug": "system", "default": null @@ -613,7 +613,7 @@ "AUTOMATION_ANALYTICS_LAST_ENTRIES": { "type": "string", "required": false, - "label": "Last gathered entries from the data collection service of Insights for Ansible Automation Platform", + "label": "Last gathered entries from the data collection service of Automation Analytics", "category": "System", "category_slug": "system", "default": "" @@ -621,7 +621,7 @@ "AUTOMATION_ANALYTICS_GATHER_INTERVAL": { "type": "integer", "required": false, - "label": "Insights for Ansible Automation Platform Gather Interval", + "label": "Automation Analytics Gather Interval", "help_text": "Interval (in seconds) between data gathering.", "min_value": 1800, "category": "System", @@ -3845,7 +3845,7 @@ "REDHAT_USERNAME": { "type": "string", "label": "Red Hat customer username", - "help_text": "This username is used to send data to Insights for Ansible Automation Platform", + "help_text": "This username is used to send data to Automation Analytics", "category": "System", "category_slug": "system", "defined_in_file": false @@ -3853,7 +3853,7 @@ "REDHAT_PASSWORD": { "type": "string", "label": "Red Hat customer password", - "help_text": "This password is used to send data to Insights for Ansible Automation Platform", + "help_text": "This password is used to send data to Automation Analytics", "category": "System", "category_slug": "system", "defined_in_file": false @@ -3876,8 +3876,8 @@ }, "AUTOMATION_ANALYTICS_URL": { "type": "string", - "label": "Insights for Ansible Automation Platform upload URL", - "help_text": "This setting is used to to configure the upload URL for data collection for Red Hat Insights.", + "label": "Automation Analytics upload URL", + "help_text": "This setting is used to to configure the upload URL for data collection for Automation Analytics.", "category": "System", "category_slug": "system", "defined_in_file": false @@ -3984,8 +3984,8 @@ }, "INSIGHTS_TRACKING_STATE": { "type": "boolean", - "label": "Gather data for Insights for Ansible Automation Platform", - "help_text": "Enables the service to gather data on automation and send it to Red Hat Insights.", + "label": "Gather data for Automation Analytics", + "help_text": "Enables the service to gather data on automation and send it to Automation Analytics.", "category": "System", "category_slug": "system", "defined_in_file": false @@ -4298,21 +4298,21 @@ }, "AUTOMATION_ANALYTICS_LAST_GATHER": { "type": "datetime", - "label": "Last gather date for Insights for Ansible Automation Platform.", + "label": "Last gather date for Automation Analytics.", "category": "System", "category_slug": "system", "defined_in_file": false }, "AUTOMATION_ANALYTICS_LAST_ENTRIES": { "type": "string", - "label": "Last gathered entries from the data collection service of Insights for Ansible Automation Platform", + "label": "Last gathered entries from the data collection service of Automation Analytics", "category": "System", "category_slug": "system", "defined_in_file": false }, "AUTOMATION_ANALYTICS_GATHER_INTERVAL": { "type": "integer", - "label": "Insights for Ansible Automation Platform Gather Interval", + "label": "Automation Analytics Gather Interval", "help_text": "Interval (in seconds) between data gathering.", "min_value": 1800, "category": "System",