removed unused analytics metrics

awx/main/analytics/collectors.py

@@ -65,7 +65,6 @@ def config(since, **kwargs):
     }
 
 
-@register('counts', '1.0', description=_('Counts of objects such as organizations, inventories, and projects'))
 def counts(since, **kwargs):
     counts = {}
     for cls in (models.Organization, models.Team, models.User,
@@ -99,68 +98,6 @@ def counts(since, **kwargs):
     counts['pending_jobs'] = models.UnifiedJob.objects.exclude(launch_type='sync').filter(status__in=('pending',)).count()
     return counts
 
-    
-@register('org_counts', '1.0', description=_('Counts of users and teams by organization'))
-def org_counts(since, **kwargs):
-    counts = {}
-    for org in models.Organization.objects.annotate(num_users=Count('member_role__members', distinct=True), 
-                                                    num_teams=Count('teams', distinct=True)).values('name', 'id', 'num_users', 'num_teams'):
-        counts[org['id']] = {'name': org['name'],
-                             'users': org['num_users'],
-                             'teams': org['num_teams']
-                             }
-    return counts
-    
-    
-@register('cred_type_counts', '1.0', description=_('Counts of credentials by credential type'))
-def cred_type_counts(since, **kwargs):
-    counts = {}
-    for cred_type in models.CredentialType.objects.annotate(num_credentials=Count(
-                                                            'credentials', distinct=True)).values('name', 'id', 'managed_by_tower', 'num_credentials'):  
-        counts[cred_type['id']] = {'name': cred_type['name'],
-                                   'credential_count': cred_type['num_credentials'],
-                                   'managed_by_tower': cred_type['managed_by_tower']
-                                   }
-    return counts
-    
-    
-@register('inventory_counts', '1.2', description=_('Inventories, their inventory sources, and host counts'))
-def inventory_counts(since, **kwargs):
-    counts = {}
-    for inv in models.Inventory.objects.filter(kind='').annotate(num_sources=Count('inventory_sources', distinct=True), 
-                                                                 num_hosts=Count('hosts', distinct=True)).only('id', 'name', 'kind'):
-        source_list = []
-        for source in inv.inventory_sources.filter().annotate(num_hosts=Count('hosts', distinct=True)).values('name','source', 'num_hosts'):
-            source_list.append(source)
-        counts[inv.id] = {'name': inv.name,
-                          'kind': inv.kind,
-                          'hosts': inv.num_hosts,
-                          'sources': inv.num_sources,
-                          'source_list': source_list
-                          }
-
-    for smart_inv in models.Inventory.objects.filter(kind='smart'):
-        counts[smart_inv.id] = {'name': smart_inv.name,
-                                'kind': smart_inv.kind,
-                                'hosts': smart_inv.hosts.count(),
-                                'sources': 0,
-                                'source_list': []
-                                }
-    return counts
-
-
-@register('projects_by_scm_type', '1.0', description=_('Counts of projects by source control type'))
-def projects_by_scm_type(since, **kwargs):
-    counts = dict(
-        (t[0] or 'manual', 0)
-        for t in models.Project.SCM_TYPE_CHOICES
-    )
-    for result in models.Project.objects.values('scm_type').annotate(
-        count=Count('scm_type')
-    ).order_by('scm_type'):
-        counts[result['scm_type'] or 'manual'] = result['count']
-    return counts
-
 
 def _get_isolated_datetime(last_check):
     if last_check:
@@ -194,7 +131,6 @@ def instance_info(since, include_hostnames=False, **kwargs):
     return info
 
 
-@register('job_counts', '1.0', description=_('Counts of jobs by status'))
 def job_counts(since, **kwargs):
     counts = {}
     counts['total_jobs'] = models.UnifiedJob.objects.exclude(launch_type='sync').count()
@@ -204,7 +140,6 @@ def job_counts(since, **kwargs):
     return counts
     
     
-@register('job_instance_counts', '1.0', description=_('Counts of jobs by execution node'))
 def job_instance_counts(since, **kwargs):
     counts = {}
     job_types = models.UnifiedJob.objects.exclude(launch_type='sync').values_list(

awx/main/analytics/metrics.py

@@ -12,7 +12,7 @@ from prometheus_client import (
 from awx.conf.license import get_license
 from awx.main.utils import (get_awx_version, get_ansible_version)
 from awx.main.analytics.collectors import (
-    counts, 
+    counts,
     instance_info,
     job_instance_counts,
     job_counts,

awx/main/tests/functional/analytics/test_counts.py

@@ -67,57 +67,3 @@ def test_database_counts(
         "custom_inventory_script",
     ):
         assert counts[key] == 1
-
-
-@pytest.mark.django_db
-def test_inventory_counts(organization_factory, inventory_factory):
-    (inv1, inv2, inv3) = [inventory_factory(f"inv-{i}") for i in range(3)]
-
-    s1 = inv1.inventory_sources.create(name="src1", source="ec2")
-    s2 = inv1.inventory_sources.create(name="src2", source="file")
-    s3 = inv1.inventory_sources.create(name="src3", source="gce")
-
-    s1.hosts.create(name="host1", inventory=inv1)
-    s1.hosts.create(name="host2", inventory=inv1)
-    s1.hosts.create(name="host3", inventory=inv1)
-
-    s2.hosts.create(name="host4", inventory=inv1)
-    s2.hosts.create(name="host5", inventory=inv1)
-
-    s3.hosts.create(name="host6", inventory=inv1)
-
-    s1 = inv2.inventory_sources.create(name="src1", source="ec2")
-
-    s1.hosts.create(name="host1", inventory=inv2)
-    s1.hosts.create(name="host2", inventory=inv2)
-    s1.hosts.create(name="host3", inventory=inv2)
-
-    inv_counts = collectors.inventory_counts(None)
-
-    assert {
-        inv1.id: {
-            "name": "inv-0",
-            "kind": "",
-            "hosts": 6,
-            "sources": 3,
-            "source_list": [
-                {"name": "src1", "source": "ec2", "num_hosts": 3},
-                {"name": "src2", "source": "file", "num_hosts": 2},
-                {"name": "src3", "source": "gce", "num_hosts": 1},
-            ],
-        },
-        inv2.id: {
-            "name": "inv-1",
-            "kind": "",
-            "hosts": 3,
-            "sources": 1,
-            "source_list": [{"name": "src1", "source": "ec2", "num_hosts": 3}],
-        },
-        inv3.id: {
-            "name": "inv-2",
-            "kind": "",
-            "hosts": 0,
-            "sources": 0,
-            "source_list": [],
-        },
-    } == inv_counts

awx/main/tests/functional/analytics/test_projects_by_scm_type.py

@@ -1,34 +0,0 @@
-import pytest
-import random
-
-from awx.main.models import Project
-from awx.main.analytics import collectors
-
-
-@pytest.mark.django_db
-def test_empty():
-    assert collectors.projects_by_scm_type(None) == {
-        'manual': 0,
-        'git': 0,
-        'svn': 0,
-        'hg': 0,
-        'insights': 0,
-        'archive': 0,
-    }
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize('scm_type', [t[0] for t in Project.SCM_TYPE_CHOICES])
-def test_multiple(scm_type):
-    expected = {
-        'manual': 0,
-        'git': 0,
-        'svn': 0,
-        'hg': 0,
-        'insights': 0,
-        'archive': 0,
-    }
-    for i in range(random.randint(0, 10)):
-        Project(scm_type=scm_type).save()
-        expected[scm_type or 'manual'] += 1
-    assert collectors.projects_by_scm_type(None) == expected