From 8683872927d38b7bc37f3493ab7e8bf60af0a857 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 11 May 2021 15:02:24 -0400 Subject: [PATCH] Update analytics branding --- awx/main/analytics/core.py | 6 ++-- awx/main/conf.py | 16 +++++------ .../MiscSystemDetail.test.jsx | 6 ++-- .../SubscriptionEdit/AnalyticsStep.jsx | 14 +++++----- .../shared/data.allSettingOptions.json | 28 +++++++++---------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/awx/main/analytics/core.py b/awx/main/analytics/core.py index 936a2bed28..056215986d 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, "Automation Analytics not enabled. Use --dry-run to gather locally without sending.") + logger.log(log_level, "Insights for Ansible 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): @@ -330,10 +330,10 @@ def ship(path): Ship gathered metrics to the Insights API """ if not path: - logger.error('Automation Analytics TAR not found') + logger.error('Insights for Ansible TAR not found') return False if not os.path.exists(path): - logger.error('Automation Analytics TAR {} not found'.format(path)) + logger.error('Insights for Ansible 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 c0fc86c63c..644045a79a 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -113,7 +113,7 @@ register( encrypted=False, read_only=False, label=_('Red Hat customer username'), - help_text=_('This username is used to send data to Automation Analytics'), + help_text=_('This username is used to send data to Insights for Ansible'), category=_('System'), category_slug='system', ) @@ -126,7 +126,7 @@ register( encrypted=True, read_only=False, label=_('Red Hat customer password'), - help_text=_('This password is used to send data to Automation Analytics'), + help_text=_('This password is used to send data to Insights for Ansible'), category=_('System'), category_slug='system', ) @@ -163,8 +163,8 @@ register( default='https://example.com', schemes=('http', 'https'), allow_plain_hostname=True, # Allow hostname only without TLD. - label=_('Automation Analytics upload URL'), - help_text=_('This setting is used to to configure data collection for the Automation Analytics dashboard'), + label=_('Insights for Ansible upload URL'), + help_text=_('This setting is used to to configure data collection for the Red Hat Insights for Ansible dashboard'), category=_('System'), category_slug='system', ) @@ -265,7 +265,7 @@ register( 'INSIGHTS_TRACKING_STATE', field_class=fields.BooleanField, default=False, - label=_('Gather data for Automation Analytics'), + label=_('Gather data for Insights for Ansible'), help_text=_('Enables the service to gather data on automation and send it to Red Hat Insights.'), category=_('System'), category_slug='system', @@ -636,7 +636,7 @@ register( register( 'AUTOMATION_ANALYTICS_LAST_GATHER', field_class=fields.DateTimeField, - label=_('Last gather date for Automation Analytics.'), + label=_('Last gather date for Insights for Ansible.'), allow_null=True, category=_('System'), category_slug='system', @@ -644,7 +644,7 @@ register( register( 'AUTOMATION_ANALYTICS_LAST_ENTRIES', field_class=fields.CharField, - label=_('Last gathered entries for expensive Automation Analytics collectors.'), + label=_('Last gathered entries for expensive Insights for Ansible collectors.'), default='', allow_blank=True, category=_('System'), @@ -655,7 +655,7 @@ register( register( 'AUTOMATION_ANALYTICS_GATHER_INTERVAL', field_class=fields.IntegerField, - label=_('Automation Analytics Gather Interval'), + label=_('Insights for Ansible 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_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.jsx b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.jsx index bbcc4a6d67..998fc1c61c 100644 --- a/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.jsx +++ b/awx/ui_next/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.jsx @@ -86,17 +86,17 @@ describe('', () => { assertDetail(wrapper, 'Authorization Code Expiration', '2 seconds'); assertDetail( wrapper, - 'Automation Analytics Gather Interval', + 'Insights for Ansible Gather Interval', '14400 seconds' ); assertDetail( wrapper, - 'Automation Analytics upload URL', + 'Insights for Ansible upload URL', 'https://example.com' ); assertDetail(wrapper, 'Base URL of the service', 'https://towerhost'); assertDetail(wrapper, 'Enable HTTP Basic Auth', 'On'); - assertDetail(wrapper, 'Gather data for Automation Analytics', 'Off'); + assertDetail(wrapper, 'Gather data for Insights for Ansible', 'Off'); assertDetail(wrapper, 'Idle Time Force Log Out', '30000000000 seconds'); assertDetail( wrapper, diff --git a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx index 83085b17c2..aa1f1693af 100644 --- a/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx +++ b/awx/ui_next/src/screens/Setting/Subscription/SubscriptionEdit/AnalyticsStep.jsx @@ -79,12 +79,12 @@ function AnalyticsStep() { {requireCredentialFields && ( @@ -93,7 +93,7 @@ function AnalyticsStep() {

Provide your Red Hat or Red Hat Satellite credentials to enable - Insights Analytics. + Insights for Ansible.

diff --git a/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json b/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json index 25a9ecd58e..63ae8212fc 100644 --- a/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json +++ b/awx/ui_next/src/screens/Setting/shared/data.allSettingOptions.json @@ -78,7 +78,7 @@ "REDHAT_USERNAME": { "type": "string", "label": "Red Hat customer username", - "help_text": "This username is used to send data to Automation Analytics", + "help_text": "This username is used to send data to Insights for Ansible", "category": "System", "category_slug": "system", "defined_in_file": false @@ -86,7 +86,7 @@ "REDHAT_PASSWORD": { "type": "string", "label": "Red Hat customer password", - "help_text": "This password is used to send data to Automation Analytics", + "help_text": "This password is used to send data to Insights for Ansible", "category": "System", "category_slug": "system", "defined_in_file": false @@ -109,8 +109,8 @@ }, "AUTOMATION_ANALYTICS_URL": { "type": "string", - "label": "Automation Analytics upload URL", - "help_text": "This setting is used to to configure data collection for the Automation Analytics dashboard", + "label": "Insights for Ansible upload URL", + "help_text": "This setting is used to to configure data collection for the Insights for Ansible dashboard", "category": "System", "category_slug": "system", "defined_in_file": false @@ -260,7 +260,7 @@ }, "INSIGHTS_TRACKING_STATE": { "type": "boolean", - "label": "Gather data for Automation Analytics", + "label": "Gather data for Insights for Ansible", "help_text": "Enables gathering of data on automation for Red Hat Insights.", "category": "System", "category_slug": "system", @@ -589,14 +589,14 @@ }, "AUTOMATION_ANALYTICS_LAST_GATHER": { "type": "datetime", - "label": "Last gather date for Automation Analytics.", + "label": "Last gather date for Insights for Ansible.", "category": "System", "category_slug": "system", "defined_in_file": false }, "AUTOMATION_ANALYTICS_GATHER_INTERVAL": { "type": "integer", - "label": "Automation Analytics Gather Interval", + "label": "Insights for Ansible Gather Interval", "help_text": "Interval (in seconds) between data gathering.", "min_value": 1800, "category": "System", @@ -3003,7 +3003,7 @@ "type": "string", "required": false, "label": "Red Hat customer username", - "help_text": "This username is used to send data to Automation Analytics", + "help_text": "This username is used to send data to Insights for Ansible", "category": "System", "category_slug": "system", "default": "" @@ -3012,7 +3012,7 @@ "type": "string", "required": false, "label": "Red Hat customer password", - "help_text": "This password is used to send data to Automation Analytics", + "help_text": "This password is used to send data to Insights for Ansible", "category": "System", "category_slug": "system", "default": "" @@ -3038,8 +3038,8 @@ "AUTOMATION_ANALYTICS_URL": { "type": "string", "required": false, - "label": "Automation Analytics upload URL", - "help_text": "This setting is used to to configure data collection for the Automation Analytics dashboard", + "label": "Insights for Ansible upload URL", + "help_text": "This setting is used to to configure data collection for the Insights for Ansible dashboard", "category": "System", "category_slug": "system", "default": "https://example.com" @@ -3200,7 +3200,7 @@ "INSIGHTS_TRACKING_STATE": { "type": "boolean", "required": false, - "label": "Gather data for Automation Analytics", + "label": "Gather data for Insights for Ansible", "help_text": "Enables the service to gather data on automation for Red Hat Insights.", "category": "System", "category_slug": "system", @@ -3569,7 +3569,7 @@ "AUTOMATION_ANALYTICS_LAST_GATHER": { "type": "datetime", "required": true, - "label": "Last gather date for Automation Analytics.", + "label": "Last gather date for Insights for Ansible.", "category": "System", "category_slug": "system", "default": null @@ -3577,7 +3577,7 @@ "AUTOMATION_ANALYTICS_GATHER_INTERVAL": { "type": "integer", "required": false, - "label": "Automation Analytics Gather Interval", + "label": "Insights for Ansible Gather Interval", "help_text": "Interval (in seconds) between data gathering.", "min_value": 1800, "category": "System",