From c9ac18db242d3c08341a06a8bd1b5a9da6dfb099 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 25 May 2021 15:37:33 -0400 Subject: [PATCH] Update branding to match guidelines --- awx/main/analytics/core.py | 6 ++-- awx/main/conf.py | 16 +++++------ .../MiscSystemDetail.test.jsx | 10 +++++-- .../SubscriptionEdit/AnalyticsStep.jsx | 14 ++++++---- .../shared/data.allSettingOptions.json | 28 +++++++++---------- 5 files changed, 40 insertions(+), 34 deletions(-) diff --git a/awx/main/analytics/core.py b/awx/main/analytics/core.py index 056215986d..36c6b97b4b 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 not enabled. Use --dry-run to gather locally without sending.") + logger.log(log_level, "Insights for Ansible Automation Platform 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('Insights for Ansible TAR not found') + logger.error('Insights for Ansible Automation Platform TAR not found') return False if not os.path.exists(path): - logger.error('Insights for Ansible TAR {} not found'.format(path)) + logger.error('Insights for Ansible Automation Platform 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 644045a79a..e463291556 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 Insights for Ansible'), + help_text=_('This username is used to send data to Insights for Ansible Automation Platform'), 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 Insights for Ansible'), + help_text=_('This password is used to send data to Insights for Ansible Automation Platform'), 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=_('Insights for Ansible upload URL'), - help_text=_('This setting is used to to configure data collection for the Red Hat Insights for Ansible dashboard'), + 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.'), category=_('System'), category_slug='system', ) @@ -265,7 +265,7 @@ register( 'INSIGHTS_TRACKING_STATE', field_class=fields.BooleanField, default=False, - label=_('Gather data for Insights for Ansible'), + 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.'), category=_('System'), category_slug='system', @@ -636,7 +636,7 @@ register( register( 'AUTOMATION_ANALYTICS_LAST_GATHER', field_class=fields.DateTimeField, - label=_('Last gather date for Insights for Ansible.'), + label=_('Last gather date for Insights for Ansible Automation Platform.'), 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 Insights for Ansible collectors.'), + label=_('Last gathered entries for expensive collectors for Insights for Ansible Automation Platform.'), default='', allow_blank=True, category=_('System'), @@ -655,7 +655,7 @@ register( register( 'AUTOMATION_ANALYTICS_GATHER_INTERVAL', field_class=fields.IntegerField, - label=_('Insights for Ansible Gather Interval'), + label=_('Insights for Ansible Automation Platform 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 998fc1c61c..e02f0680a0 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,21 @@ describe('', () => { assertDetail(wrapper, 'Authorization Code Expiration', '2 seconds'); assertDetail( wrapper, - 'Insights for Ansible Gather Interval', + 'Insights for Ansible Automation Platform Gather Interval', '14400 seconds' ); assertDetail( wrapper, - 'Insights for Ansible upload URL', + 'Insights for Ansible Automation Platform 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 Insights for Ansible', 'Off'); + assertDetail( + wrapper, + 'Gather data for Insights for Ansible Automation Platform', + '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 aa1f1693af..5f55166564 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 for Ansible. + Insights for Ansible Automation Platform.

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 ac1724eb77..7a729474d5 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 Insights for Ansible", + "help_text": "This username is used to send data to Insights for Ansible Automation Platform", "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 Insights for Ansible", + "help_text": "This password is used to send data to Insights for Ansible Automation Platform", "category": "System", "category_slug": "system", "defined_in_file": false @@ -109,8 +109,8 @@ }, "AUTOMATION_ANALYTICS_URL": { "type": "string", - "label": "Insights for Ansible upload URL", - "help_text": "This setting is used to to configure data collection for the Insights for Ansible dashboard", + "label": "Insights for Ansible Automation Platform upload URL", + "help_text": "This setting is used to to configure data collection for the Insights for Ansible Automation Platform dashboard", "category": "System", "category_slug": "system", "defined_in_file": false @@ -198,7 +198,7 @@ }, "INSIGHTS_TRACKING_STATE": { "type": "boolean", - "label": "Gather data for Insights for Ansible", + "label": "Gather data for Insights for Ansible Automation Platform", "help_text": "Enables gathering of data on automation for Red Hat Insights.", "category": "System", "category_slug": "system", @@ -527,14 +527,14 @@ }, "AUTOMATION_ANALYTICS_LAST_GATHER": { "type": "datetime", - "label": "Last gather date for Insights for Ansible.", + "label": "Last gather date for Insights for Ansible Automation Platform.", "category": "System", "category_slug": "system", "defined_in_file": false }, "AUTOMATION_ANALYTICS_GATHER_INTERVAL": { "type": "integer", - "label": "Insights for Ansible Gather Interval", + "label": "Insights for Ansible Automation Platform Gather Interval", "help_text": "Interval (in seconds) between data gathering.", "min_value": 1800, "category": "System", @@ -2941,7 +2941,7 @@ "type": "string", "required": false, "label": "Red Hat customer username", - "help_text": "This username is used to send data to Insights for Ansible", + "help_text": "This username is used to send data to Insights for Ansible Automation Platform", "category": "System", "category_slug": "system", "default": "" @@ -2950,7 +2950,7 @@ "type": "string", "required": false, "label": "Red Hat customer password", - "help_text": "This password is used to send data to Insights for Ansible", + "help_text": "This password is used to send data to Insights for Ansible Automation Platform", "category": "System", "category_slug": "system", "default": "" @@ -2976,8 +2976,8 @@ "AUTOMATION_ANALYTICS_URL": { "type": "string", "required": false, - "label": "Insights for Ansible upload URL", - "help_text": "This setting is used to to configure data collection for the Insights for Ansible dashboard", + "label": "Insights for Ansible Automation Platform upload URL", + "help_text": "This setting is used to to configure data collection for the Insights for Ansible Automation Platform dashboard", "category": "System", "category_slug": "system", "default": "https://example.com" @@ -3096,7 +3096,7 @@ "INSIGHTS_TRACKING_STATE": { "type": "boolean", "required": false, - "label": "Gather data for Insights for Ansible", + "label": "Gather data for Insights for Ansible Automation Platform", "help_text": "Enables the service to gather data on automation for Red Hat Insights.", "category": "System", "category_slug": "system", @@ -3465,7 +3465,7 @@ "AUTOMATION_ANALYTICS_LAST_GATHER": { "type": "datetime", "required": true, - "label": "Last gather date for Insights for Ansible.", + "label": "Last gather date for Insights for Ansible Automation Platform.", "category": "System", "category_slug": "system", "default": null @@ -3473,7 +3473,7 @@ "AUTOMATION_ANALYTICS_GATHER_INTERVAL": { "type": "integer", "required": false, - "label": "Insights for Ansible Gather Interval", + "label": "Insights for Ansible Automation Platform Gather Interval", "help_text": "Interval (in seconds) between data gathering.", "min_value": 1800, "category": "System",