Merge ~andreserl/maas:prometheus_extra_stats into maas:master

[Andres Rodriguez]

Add extra stats for architectures and pods.

This gather stats for machines by architectures and information about pods as preparation with integration to prometheus.

8879991... by Andres Rodriguez on 2018-10-16

Fix typo

[MAAS Lander (maas-lander)]

UNIT TESTS
-b prometheus_extra_stats lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4214/console
COMMIT: 8879991e0c7a733c354e14d428bafcf1f4b04661

review: Needs Fixing

edd3687... by Andres Rodriguez on 2018-10-16

Fix lint

[Mike Pontillo (mpontillo)]

Looks like a good start; I found a couple of issues and have a couple of suggestions.

review: Needs Fixing

f61694e... by Andres Rodriguez on 2018-10-16

Fix typos

146bf07... by Andres Rodriguez on 2018-10-16

Address review comment

58768be... by Andres Rodriguez on 2018-10-17

Add tests

[MAAS Lander (maas-lander)]

UNIT TESTS
-b prometheus_extra_stats lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 146bf074273a094f40bda1a79757b0a0bcf68ec5

review: Approve

[Mike Pontillo (mpontillo)]

Looks better; thanks for the fixes.

I would consider making the power_type a parameter so that you can get stats on other pod types as well.

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b prometheus_extra_stats lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 58768beccfa202880f729e5145e7b14584a851ff

review: Approve

diff --git a/src/maasserver/stats.py b/src/maasserver/stats.py
index 5f43bdc..d0d7f1c 100644
--- a/src/maasserver/stats.py
+++ b/src/maasserver/stats.py
@@ -21,12 +21,16 @@ from twisted.application.internet import TimerService
 log = LegacyLogger()
 
 import base64
-from collections import Counter
+from collections import (
+    Counter,
+    defaultdict,
+)
 import json
 
 from maasserver.enum import (
     NODE_TYPE,
     NODE_STATUS,
+    BMC_TYPE,
 )
 from maasserver.models import (
     Node,
@@ -34,6 +38,8 @@ from maasserver.models import (
     VLAN,
     Space,
     Subnet,
+    BMC,
+    Pod,
 )
 from maasserver.utils import get_maas_user_agent
 import requests
@@ -73,6 +79,58 @@ def get_machine_state_stats():
         }
 
 
+def get_machines_by_architecture():
+    node_arches = Node.objects.filter(
+        node_type=NODE_TYPE.MACHINE).extra(
+            dict(
+                short_arch="SUBSTRING(architecture FROM '(.*)/')")
+            ).values_list('short_arch', flat=True)
+
+    count_by_arch = defaultdict(int)
+    for arch in node_arches:
+        count_by_arch[arch] += 1
+
+    return count_by_arch
+
+
+def get_kvm_pods_stats():
+    pods = BMC.objects.filter(bmc_type=BMC_TYPE.POD, power_type='virsh')
+    # Calculate available physical resources
+    # total_mem is in MB
+    # local_storage is in bytes
+    available_resources = pods.aggregate(
+        cores=Sum('cores'), memory=Sum('memory'),
+        storage=Sum('local_storage'))
+
+    # available resources with overcommit
+    over_cores = over_memory = 0
+    for pod in pods:
+        over_cores += pod.cores * pod.cpu_over_commit_ratio
+        over_memory += pod.memory * pod.memory_over_commit_ratio
+    available_resources['over_cores'] = over_cores
+    available_resources['over_memory'] = over_memory
+
+    # Calculate utilization
+    pod_machines = Pod.objects.all()
+    machines = cores = memory = storage = 0
+    for pod in pod_machines:
+        machines += Node.objects.filter(bmc__id=pod.id).count()
+        cores += pod.get_used_cores()
+        memory += pod.get_used_memory()
+        storage += pod.get_used_local_storage()
+
+    return {
+        "kvm_pods": len(pods),
+        "kvm_machines": machines,
+        "kvm_available_resources": available_resources,
+        "kvm_utilized_resources": {
+            'cores': cores,
+            'memory': memory,
+            'storage': storage,
+        }
+    }
+
+
 def get_subnets_stats():
     subnets = Subnet.objects.all()
     v4 = [net for net in subnets if net.get_ip_version() == 4]
diff --git a/src/maasserver/tests/test_stats.py b/src/maasserver/tests/test_stats.py
index 7f27ba0..65d9ea9 100644
--- a/src/maasserver/tests/test_stats.py
+++ b/src/maasserver/tests/test_stats.py
@@ -21,8 +21,10 @@ from maasserver.models import (
     VLAN,
 )
 from maasserver.stats import (
+    get_kvm_pods_stats,
     get_maas_stats,
     get_machine_stats,
+    get_machines_by_architecture,
     get_request_params,
     make_maas_user_agent_request,
 )
@@ -45,6 +47,72 @@ from twisted.internet.defer import fail
 
 class TestMAASStats(MAASServerTestCase):
 
+    def make_pod(self, cpu=0, mem=0, cpu_over_commit=1, mem_over_commit=1):
+        # Make one pod
+        zone = factory.make_Zone()
+        pool = factory.make_ResourcePool()
+        ip = factory.make_ipv4_address()
+        power_parameters = {
+            'power_address': 'qemu+ssh://%s/system' % ip,
+            'power_pass': 'pass',
+        }
+        return factory.make_Pod(
+            pod_type='virsh', zone=zone, pool=pool,
+            cores=cpu, memory=mem,
+            cpu_over_commit_ratio=cpu_over_commit,
+            memory_over_commit_ratio=mem_over_commit,
+            parameters=power_parameters)
+
+    def test_get_machines_by_architecture(self):
+        arches = [
+            'amd64/generic', 's390x/generic', 'ppc64el/generic',
+            'arm64/generic', 'i386/generic']
+        for arch in arches:
+            factory.make_Machine(architecture=arch)
+        stats = get_machines_by_architecture()
+        compare = {
+            "amd64": 1,
+            "i386": 1,
+            "arm64": 1,
+            "ppc64el": 1,
+            "s390x": 1,
+        }
+        self.assertEquals(stats, compare)
+
+    def test_get_kvm_pods_stats(self):
+        pod1 = self.make_pod(
+            cpu=10, mem=100, cpu_over_commit=2, mem_over_commit=3)
+        pod2 = self.make_pod(
+            cpu=20, mem=200, cpu_over_commit=3, mem_over_commit=2)
+
+        total_cores = pod1.cores + pod2.cores
+        total_memory = pod1.memory + pod2.memory
+        over_cores = (
+            pod1.cores * pod1.cpu_over_commit_ratio +
+            pod2.cores * pod2.cpu_over_commit_ratio)
+        over_memory = (
+            pod1.memory * pod1.memory_over_commit_ratio +
+            pod2.memory * pod2.memory_over_commit_ratio)
+
+        stats = get_kvm_pods_stats()
+        compare = {
+            "kvm_pods": 2,
+            "kvm_machines": 0,
+            "kvm_available_resources": {
+                "cores": total_cores,
+                "memory": total_memory,
+                "over_cores": over_cores,
+                "over_memory": over_memory,
+                "storage": 0,
+            },
+            "kvm_utilized_resources": {
+                'cores': 0,
+                'memory': 0,
+                'storage': 0
+            },
+        }
+        self.assertEquals(compare, stats)
+
     def test_get_maas_stats(self):
         # Make one component of everything
         factory.make_RegionRackController()