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

Add pending jobs and system level job status to metrics

Browse Source
This commit is contained in:
Christian Adams
2019-07-25 13:29:01 -04:00
parent 128fa8947a
commit 11a6e98230
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ def counts(since):
counts['active_user_sessions'] = active_user_sessions counts['active_user_sessions'] = active_user_sessions
counts['active_anonymous_sessions'] = active_anonymous_sessions counts['active_anonymous_sessions'] = active_anonymous_sessions
counts['running_jobs'] = models.UnifiedJob.objects.exclude(launch_type='sync').filter(status__in=('running', 'waiting',)).count() counts['running_jobs'] = models.UnifiedJob.objects.exclude(launch_type='sync').filter(status__in=('running', 'waiting',)).count()
counts['pending_jobs'] = models.UnifiedJob.objects.exclude(launch_type='sync').filter(status__in=('pending',)).count()
return counts return counts

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

@@ -15,6 +15,7 @@ from awx.main.analytics.collectors import (
counts, counts,
instance_info, instance_info,
job_instance_counts, job_instance_counts,
job_counts,
) )
@@ -36,6 +37,8 @@ INV_SCRIPT_COUNT = Gauge('awx_inventory_scripts_total', 'Number of invetory scri
USER_SESSIONS = Gauge('awx_sessions_total', 'Number of sessions', ['type',]) USER_SESSIONS = Gauge('awx_sessions_total', 'Number of sessions', ['type',])
CUSTOM_VENVS = Gauge('awx_custom_virtualenvs_total', 'Number of virtualenvs') CUSTOM_VENVS = Gauge('awx_custom_virtualenvs_total', 'Number of virtualenvs')
RUNNING_JOBS = Gauge('awx_running_jobs_total', 'Number of running jobs on the Tower system') RUNNING_JOBS = Gauge('awx_running_jobs_total', 'Number of running jobs on the Tower system')
PENDING_JOBS = Gauge('awx_pending_jobs_total', 'Number of pending jobs on the Tower system')
STATUS = Gauge('awx_status_total', 'Status of Job launched', ['status',])
INSTANCE_CAPACITY = Gauge('awx_instance_capacity', 'Capacity of each node in a Tower system', ['hostname', 'instance_uuid',]) INSTANCE_CAPACITY = Gauge('awx_instance_capacity', 'Capacity of each node in a Tower system', ['hostname', 'instance_uuid',])
INSTANCE_CPU = Gauge('awx_instance_cpu', 'CPU cores on each node in a Tower system', ['hostname', 'instance_uuid',]) INSTANCE_CPU = Gauge('awx_instance_cpu', 'CPU cores on each node in a Tower system', ['hostname', 'instance_uuid',])
@@ -87,7 +90,13 @@ def metrics():
USER_SESSIONS.labels(type='user').set(current_counts['active_user_sessions']) USER_SESSIONS.labels(type='user').set(current_counts['active_user_sessions'])
USER_SESSIONS.labels(type='anonymous').set(current_counts['active_anonymous_sessions']) USER_SESSIONS.labels(type='anonymous').set(current_counts['active_anonymous_sessions'])
all_job_data = job_counts(None)
statuses = all_job_data.get('status', {})
for status, value in statuses.items():
STATUS.labels(status=status).set(value)
RUNNING_JOBS.set(current_counts['running_jobs']) RUNNING_JOBS.set(current_counts['running_jobs'])
PENDING_JOBS.set(current_counts['pending_jobs'])
instance_data = instance_info(None, include_hostnames=True) instance_data = instance_info(None, include_hostnames=True)
for uuid, info in instance_data.items(): for uuid, info in instance_data.items():

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

@@ -26,7 +26,8 @@ def test_empty():
"team": 0, "team": 0,
"user": 0, "user": 0,
"workflow_job_template": 0, "workflow_job_template": 0,
"unified_job": 0 "unified_job": 0,
"pending_jobs": 0
} }

1
awx/main/tests/functional/analytics/test_metrics.py
View File

@@ -30,6 +30,7 @@ EXPECTED_VALUES = {
'awx_instance_info':1.0, 'awx_instance_info':1.0,
'awx_license_instance_total':0, 'awx_license_instance_total':0,
'awx_license_instance_free':0, 'awx_license_instance_free':0,
'awx_pending_jobs_total':0,
} }