From d40737d23e70e5c989816b9cdba5a07562116be5 Mon Sep 17 00:00:00 2001
From: Daniele Venzano <venza@brownhat.org>
Date: Mon, 5 Nov 2018 13:20:27 +0100
Subject: [PATCH] Expose more aggregated statistics about the whole platform

---
 zoe_api/web/templates/status.jinja2 |  4 ++--
 zoe_master/stats.py                 | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/zoe_api/web/templates/status.jinja2 b/zoe_api/web/templates/status.jinja2
index 9eb87da..cc658d5 100644
--- a/zoe_api/web/templates/status.jinja2
+++ b/zoe_api/web/templates/status.jinja2
@@ -147,8 +147,8 @@
     <h3 class="section"><a name="platform">Platform</a></h3>
     <ul>
         <li>Total containers: {{ stats.platform_stats.container_count }}</li>
-        <li>Total memory: <script>format_bytes({{ stats.platform_stats.memory_total }}, 2) </script></li>
-        <li>Total cores: {{ stats.platform_stats.cores_total }}</li>
+        <li>Memory: <script>format_bytes({{ stats.platform_stats.memory_total }}, 2)</script> total, <script>format_bytes({{ stats.platform_stats.memory_reserved }}, 2)</script> reserved, <script>format_bytes({{ stats.platform_stats.memory_in_use }}, 2)</script> in use</li>
+        <li>Cores: {{ stats.platform_stats.cores_total }} total, {{ stats.platform_stats.cores_reserved }} reserved, {{ stats.platform_stats.cores_in_use }} in use</li>
     </ul>
 
     <div class="platform_node_detail">
diff --git a/zoe_master/stats.py b/zoe_master/stats.py
index 8c5ac96..2ee6a12 100644
--- a/zoe_master/stats.py
+++ b/zoe_master/stats.py
@@ -80,6 +80,10 @@ class ClusterStats(Stats):
             'container_count': self.container_count,
             'memory_total': self.memory_total,
             'cores_total': self.cores_total,
+            'memory_reserved': sum([n.memory_reserved for n in self.nodes]),
+            'cores_reserved': sum([n.cores_reserved for n in self.nodes]),
+            'memory_in_use': sum([n.memory_in_use for n in self.nodes]),
+            'cores_in_use': sum([n.cores_in_use for n in self.nodes]),
             'nodes': [x.serialize() for x in self.nodes]
         }
 
@@ -93,6 +97,26 @@ class ClusterStats(Stats):
         """Total number of cores installed."""
         return sum([node.cores_total for node in self.nodes])
 
+    @property
+    def memory_reserved(self) -> int:
+        """Total memory reserved in the whole platform."""
+        return sum([node.memory_reserved for node in self.nodes])
+
+    @property
+    def cores_reserved(self) -> int:
+        """Total number of cores reserved."""
+        return sum([node.cores_reserved for node in self.nodes])
+
+    @property
+    def memory_in_use(self) -> int:
+        """Total memory in use in the whole platform."""
+        return sum([node.memory_in_use for node in self.nodes])
+
+    @property
+    def cores_in_use(self) -> int:
+        """Total number of cores in use."""
+        return sum([node.cores_in_use for node in self.nodes])
+
     @property
     def container_count(self) -> int:
         """Total number of containers."""
-- 
GitLab