External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-26 12:15:23 -02:30
Code Issues Packages Projects Releases Wiki Activity

change back to Automation Analytics name (#12022)

Browse Source
This commit is contained in:
John Mitchell
2022-04-12 14:23:13 -04:00
committed by GitHub
parent 4328b4cb67
commit bbb9770a97
7 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/analytics/core.py
View File

@@ -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

18
awx/main/conf.py
View File

@@ -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