shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 06:51:10 +03:00
Code Releases Activity

Merge pull request #3502 from ryanpetrello/metrics-license-counts

Browse Source 
fix a few issues with license counts in /api/v2/metrics/
This commit is contained in:
Ryan Petrello 2019-04-24 12:37:03 -04:00 committed by GitHub
commit d7cdec37f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,9 @@ INSTANCE_INFO = Info('awx_instance', 'Info about each node in a Tower system', [
INSTANCE_LAUNCH_TYPE = Gauge('awx_instance_launch_type_total', 'Type of Job launched', ['node', 'launch_type',]) INSTANCE_LAUNCH_TYPE = Gauge('awx_instance_launch_type_total', 'Type of Job launched', ['node', 'launch_type',])
INSTANCE_STATUS = Gauge('awx_instance_status_total', 'Status of Job launched', ['node', 'status',]) INSTANCE_STATUS = Gauge('awx_instance_status_total', 'Status of Job launched', ['node', 'status',])
LICENSE_INSTANCE_TOTAL = Gauge('awx_license_instance_total', 'Total number of managed hosts provided by your license')
LICENSE_INSTANCE_FREE = Gauge('awx_license_instance_free', 'Number of remaining managed hosts provided by your license')
def metrics(): def metrics():
license_info = get_license(show_key=False) license_info = get_license(show_key=False)
@ -54,13 +57,15 @@ def metrics():
'tower_version': get_awx_version(), 'tower_version': get_awx_version(),
'ansible_version': get_ansible_version(), 'ansible_version': get_ansible_version(),
'license_type': license_info.get('license_type', 'UNLICENSED'), 'license_type': license_info.get('license_type', 'UNLICENSED'),
'free_instances': str(license_info.get('free instances', 0)),
'license_expiry': str(license_info.get('time_remaining', 0)), 'license_expiry': str(license_info.get('time_remaining', 0)),
'pendo_tracking': settings.PENDO_TRACKING_STATE, 'pendo_tracking': settings.PENDO_TRACKING_STATE,
'external_logger_enabled': str(settings.LOG_AGGREGATOR_ENABLED), 'external_logger_enabled': str(settings.LOG_AGGREGATOR_ENABLED),
'external_logger_type': getattr(settings, 'LOG_AGGREGATOR_TYPE', 'None') 'external_logger_type': getattr(settings, 'LOG_AGGREGATOR_TYPE', 'None')
}) })
LICENSE_INSTANCE_TOTAL.set(str(license_info.get('available_instances', 0)))
LICENSE_INSTANCE_FREE.set(str(license_info.get('free_instances', 0)))
current_counts = counts(None) current_counts = counts(None)
ORG_COUNT.set(current_counts['organization']) ORG_COUNT.set(current_counts['organization'])

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

@ -28,6 +28,8 @@ EXPECTED_VALUES = {
'awx_instance_cpu':0.0, 'awx_instance_cpu':0.0,
'awx_instance_memory':0.0, 'awx_instance_memory':0.0,
'awx_instance_info':1.0, 'awx_instance_info':1.0,
'awx_license_instance_total':0,
'awx_license_instance_free':0,
} }