External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

collect jt table for analytics

Browse Source
This commit is contained in:
Christian Adams
2019-03-27 20:46:27 -04:00
parent c481919a49
commit 9a4439e731
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
awx/main/analytics/collectors.py
View File

@@ -67,16 +67,17 @@ def counts(since):
inv_counts = dict(models.Inventory.objects.order_by().values_list('kind').annotate(Count('kind'))) inv_counts = dict(models.Inventory.objects.order_by().values_list('kind').annotate(Count('kind')))
inv_counts['normal'] = inv_counts.get('', 0) inv_counts['normal'] = inv_counts.get('', 0)
inv_counts.pop('', None)
inv_counts['smart'] = inv_counts.get('smart', 0) inv_counts['smart'] = inv_counts.get('smart', 0)
counts['inventories'] = inv_counts counts['inventories'] = inv_counts
counts['active_host_count'] = models.Host.objects.active_count() counts['active_host_count'] = models.Host.objects.active_count()
active_sessions = Session.objects.filter(expire_date__gte=now()).count() active_sessions = Session.objects.filter(expire_date__gte=now()).count()
api_sessions = models.UserSessionMembership.objects.select_related('session').filter(session__expire_date__gte=now()).count() api_sessions = models.UserSessionMembership.objects.select_related('session').filter(session__expire_date__gte=now()).count()
channels_sessions = active_sessions - api_sessions anonymous_sessions = active_sessions - api_sessions
counts['active_sessions'] = active_sessions counts['active_sessions'] = active_sessions
counts['active_api_sessions'] = api_sessions counts['active_api_sessions'] = api_sessions
counts['active_channels_sessions'] = channels_sessions counts['active_anonymous_sessions'] = anonymous_sessions
counts['running_jobs'] = models.UnifiedJob.objects.filter(status__in=('running', 'waiting',)).count() counts['running_jobs'] = models.UnifiedJob.objects.filter(status__in=('running', 'waiting',)).count()
return counts return counts
@@ -184,12 +185,12 @@ def job_instance_counts(since):
# Copies Job Events from db to a .csv to be shipped # Copies Job Events from db to a .csv to be shipped
def copy_tables(since, full_path): def copy_tables(since, full_path):
def _copy_table(table, query, path): def _copy_table(table, query, path):
events_file = os.path.join(path, table + '_table.csv') file_path = os.path.join(path, table + '_table.csv')
write_data = open(events_file, 'w', encoding='utf-8') file = open(file_path, 'w', encoding='utf-8')
with connection.cursor() as cursor: with connection.cursor() as cursor:
cursor.copy_expert(query, write_data) cursor.copy_expert(query, file)
write_data.close() file.close()
return events_file return file_path
events_query = '''COPY (SELECT main_jobevent.id, events_query = '''COPY (SELECT main_jobevent.id,
main_jobevent.created, main_jobevent.created,
@@ -233,5 +234,25 @@ def copy_tables(since, full_path):
WHERE main_unifiedjob.created > {} and main_unifiedjob.polymorphic_ctype_id = django_content_type.id WHERE main_unifiedjob.created > {} and main_unifiedjob.polymorphic_ctype_id = django_content_type.id
ORDER BY main_unifiedjob.id ASC) to stdout'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'")) ORDER BY main_unifiedjob.id ASC) to stdout'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'"))
_copy_table(table='unified_jobs', query=unified_job_query, path=full_path) _copy_table(table='unified_jobs', query=unified_job_query, path=full_path)
unified_job_template_query = '''COPY (SELECT main_unifiedjobtemplate.id,
main_unifiedjobtemplate.polymorphic_ctype_id,
django_content_type.model,
main_unifiedjobtemplate.created,
main_unifiedjobtemplate.modified,
main_unifiedjobtemplate.created_by_id,
main_unifiedjobtemplate.modified_by_id,
main_unifiedjobtemplate.name,
main_unifiedjobtemplate.current_job_id,
main_unifiedjobtemplate.last_job_id,
main_unifiedjobtemplate.last_job_failed,
main_unifiedjobtemplate.last_job_run,
main_unifiedjobtemplate.next_job_run,
main_unifiedjobtemplate.next_schedule_id,
main_unifiedjobtemplate.status
FROM main_unifiedjobtemplate, django_content_type
WHERE main_unifiedjobtemplate.polymorphic_ctype_id = django_content_type.id
ORDER BY main_unifiedjobtemplate.id ASC) to stdout'''.format(since.strftime("'%Y-%m-%d %H:%M:%S'"))
_copy_table(table='unified_job_template', query=unified_job_template_query, path=full_path)
return return

5
awx/main/tests/functional/analytics/test_counts.py
View File

@@ -6,16 +6,17 @@ from awx.main.analytics import collectors
@pytest.mark.django_db @pytest.mark.django_db
def test_empty(): def test_empty():
print(collectors.counts(None))
assert collectors.counts(None) == { assert collectors.counts(None) == {
"active_api_sessions": 0, "active_api_sessions": 0,
"active_channels_sessions": 0, "active_anonymous_sessions": 0,
"active_host_count": 0, "active_host_count": 0,
"active_sessions": 0, "active_sessions": 0,
"credential": 0, "credential": 0,
"custom_inventory_script": 0, "custom_inventory_script": 0,
"custom_virtualenvs": 0, # dev env ansible3 "custom_virtualenvs": 0, # dev env ansible3
"host": 0, "host": 0,
'inventory': 0, "inventory": 0,
"inventories": {'normal': 0, 'smart': 0}, "inventories": {'normal': 0, 'smart': 0},
"job_template": 0, "job_template": 0,
"notification_template": 0, "notification_template": 0,

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

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