External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 02:19:58 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3729 from rooftopcellist/rename_analytics_setting

Browse Source 
rename analytics setting

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-04-17 22:55:43 +00:00 committed by GitHub
commit e14f19468b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ def gather(dest=None, module=None):
logger.exception("Invalid License provided, or No License Provided")
return "Error: Invalid License provided, or No License Provided"
if not settings.INSIGHTS_DATA_ENABLED:
if not settings.INSIGHTS_TRACKING_STATE:
logger.error("Insights analytics not enabled")
return "Error: Insights analytics not enabled"

2
awx/main/analytics/metrics.py
View File

@ -49,7 +49,7 @@ def metrics():
license_info = get_license(show_key=False)
SYSTEM_INFO.info({
'install_uuid': settings.INSTALL_UUID,
'insights_analytics': str(settings.INSIGHTS_DATA_ENABLED),
'insights_analytics': str(settings.INSIGHTS_TRACKING_STATE),
'tower_url_base': settings.TOWER_URL_BASE,
'tower_version': get_awx_version(),
'ansible_version': get_ansible_version(),

2
awx/main/conf.py
View File

@ -309,7 +309,7 @@ register(
)
register(
'INSIGHTS_DATA_ENABLED',
'INSIGHTS_TRACKING_STATE',
field_class=fields.BooleanField,
default=False,
label=_('Gather data for Automation Insights'),

2
awx/main/tests/functional/analytics/test_core.py
View File

@ -37,7 +37,7 @@ def mock_valid_license():
@pytest.mark.django_db
def test_gather(mock_valid_license):
settings.INSIGHTS_DATA_ENABLED = True
settings.INSIGHTS_TRACKING_STATE = True
tgz = gather(module=importlib.import_module(__name__))
files = {}

2
awx/settings/defaults.py
View File

@ -670,7 +670,7 @@ PENDO_TRACKING_STATE = "off"
# Enables Insights data collection for Ansible Tower.
# Note: This setting may be overridden by database settings.
INSIGHTS_DATA_ENABLED = False
INSIGHTS_TRACKING_STATE = False
# Default list of modules allowed for ad hoc commands.

2
awx/settings/development.py
View File

@ -88,7 +88,7 @@ AWX_ISOLATED_LAUNCH_TIMEOUT = 30
# Disable Pendo on the UI for development/test.
# Note: This setting may be overridden by database settings.
PENDO_TRACKING_STATE = "off"
INSIGHTS_DATA_ENABLED = False
INSIGHTS_TRACKING_STATE = False
# Use Django-Jenkins if installed. Only run tests for awx.main app.
try:

2
awx/ui/client/src/configuration/forms/system-form/sub-forms/system-misc.form.js
View File

@ -59,7 +59,7 @@ export default ['i18n', function(i18n) {
type: 'textarea',
reset: 'CUSTOM_VENV_PATHS'
},
INSIGHTS_DATA_ENABLED: {
INSIGHTS_TRACKING_STATE: {
type: 'toggleSwitch'
}
},

4
awx/ui/client/src/login/authenticationServices/insightsEnablement.service.js
View File

@ -11,11 +11,11 @@ export default ['$rootScope', 'Rest', 'GetBasePath', 'ProcessErrors',
updateInsightsTrackingState: function(tracking_type) {
if (tracking_type === true || tracking_type === false) {
Rest.setUrl(`${GetBasePath('settings')}system`);
Rest.patch({ INSIGHTS_DATA_ENABLED: tracking_type })
Rest.patch({ INSIGHTS_TRACKING_STATE: tracking_type })
.catch(function ({data, status}) {
ProcessErrors($rootScope, data, status, null, {
hdr: 'Error!',
msg: 'Failed to patch INSIGHTS_DATA_ENABLED in settings: ' +
msg: 'Failed to patch INSIGHTS_TRACKING_STATE in settings: ' +
status });
});
} else {