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

flake8 cleanup

Browse Source
This commit is contained in:
Wayne Witzel III
2019-04-08 09:35:46 -04:00
parent bb5c7a98f3
commit 5c1d2a6f0b
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/views/metrics.py
View File

@@ -5,14 +5,11 @@
import logging import logging
# Django # Django
from django.conf import settings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.timezone import now
# Django REST Framework # Django REST Framework
from rest_framework.exceptions import PermissionDenied
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.renderers import JSONRenderer, StaticHTMLRenderer from rest_framework.renderers import JSONRenderer
# AWX # AWX
# from awx.main.analytics import collectors # from awx.main.analytics import collectors
@@ -23,15 +20,10 @@ from awx.api.generics import (
APIView, APIView,
) )
from awx.api.serializers import (
InventorySerializer,
ActivityStreamSerializer,
)
logger = logging.getLogger('awx.main.analytics') logger = logging.getLogger('awx.main.analytics')
class MetricsView(APIView): class MetricsView(APIView):
view_name = _('Metrics') view_name = _('Metrics')

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

@@ -158,15 +158,16 @@ def instance_info(since):
instances = models.Instance.objects.values_list('hostname').annotate().values( instances = models.Instance.objects.values_list('hostname').annotate().values(
'uuid', 'version', 'capacity', 'cpu', 'memory', 'managed_by_policy', 'hostname', 'last_isolated_check', 'enabled') 'uuid', 'version', 'capacity', 'cpu', 'memory', 'managed_by_policy', 'hostname', 'last_isolated_check', 'enabled')
for instance in instances: for instance in instances:
instance_info = {'uuid': instance['uuid'], instance_info = {
'version': instance['version'], 'uuid': instance['uuid'],
'capacity': instance['capacity'], 'version': instance['version'],
'cpu': instance['cpu'], 'capacity': instance['capacity'],
'memory': instance['memory'], 'cpu': instance['cpu'],
'managed_by_policy': instance['managed_by_policy'], 'memory': instance['memory'],
'last_isolated_check': instance['last_isolated_check'], 'managed_by_policy': instance['managed_by_policy'],
'enabled': instance['enabled'] 'last_isolated_check': instance['last_isolated_check'],
} 'enabled': instance['enabled']
}
info[instance['uuid']] = instance_info info[instance['uuid']] = instance_info
return info return info

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

@@ -27,15 +27,16 @@ EXPECTED_VALUES = {
'awx_instance_memory':0.0, 'awx_instance_memory':0.0,
'awx_instance_info':1.0, 'awx_instance_info':1.0,
} }
@pytest.mark.django_db @pytest.mark.django_db
def test_metrics_counts(organization_factory, job_template_factory, def test_metrics_counts(organization_factory, job_template_factory, workflow_job_template_factory):
workflow_job_template_factory):
objs = organization_factory('org', superusers=['admin']) objs = organization_factory('org', superusers=['admin'])
jt = job_template_factory('test', organization=objs.organization, jt = job_template_factory(
inventory='test_inv', project='test_project', 'test', organization=objs.organization,
credential='test_cred') inventory='test_inv', project='test_project',
credential='test_cred'
)
workflow_job_template_factory('test') workflow_job_template_factory('test')
models.Team(organization=objs.organization).save() models.Team(organization=objs.organization).save()
models.Host(inventory=jt.inventory).save() models.Host(inventory=jt.inventory).save()
@@ -52,4 +53,4 @@ def test_metrics_counts(organization_factory, job_template_factory,
for sample in gauge.samples: for sample in gauge.samples:
# name, label, value, timestamp, exemplar # name, label, value, timestamp, exemplar
name, _, value, _, _ = sample name, _, value, _, _ = sample
assert EXPECTED_VALUES[name] == value assert EXPECTED_VALUES[name] == value