assemblyline-core 4.7.5.dev73__tar.gz → 4.7.5.dev76__tar.gz

{assemblyline_core-4.7.5.dev73 → assemblyline_core-4.7.5.dev76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev73
+Version: 4.7.5.dev76
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.5.dev76/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.5.dev76

{assemblyline_core-4.7.5.dev73 → assemblyline_core-4.7.5.dev76}/assemblyline_core/scaler/base.py

@@ -243,44 +243,6 @@ class ScalerBase(ThreadedCoreBase):
             return 1
         return self.config.core.scaler.memory_overallocation
 
-    def get_cpu_info(self, overallocation: bool) -> tuple[float, float]:
-        # Get the raw used resource numbers
-        free_cpu, total_cpu = self.controller.cpu_info()
-
-        # Recalculate the amount of free resources expanding the total quantity by the overallocation
-        if overallocation:
-            used_cpu = total_cpu - free_cpu
-            free_cpu = total_cpu * self.get_cpu_overallocation() - used_cpu
-
-        # Include the service containers not counted in the raw numbers because they are pending
-        for name, pending in self.controller.get_unavailable().items():
-            profile = self.profiles.get(name)
-            if not profile or not pending:
-                continue
-
-            free_cpu = free_cpu - profile.container_config.cpu_cores * pending
-
-        return (free_cpu, total_cpu)
-
-    def get_memory_info(self, overallocation: bool) -> tuple[float, float]:
-        # Get the raw used resource numbers
-        free_memory, total_memory = self.controller.memory_info()
-
-        # Recalculate the amount of free resources expanding the total quantity by the overallocation
-        if overallocation:
-            used_memory = total_memory - free_memory
-            free_memory = total_memory * self.get_memory_overallocation() - used_memory
-
-        # Include the service containers not counted in the raw numbers because they are pending
-        for name, pending in self.controller.get_unavailable().items():
-            profile = self.profiles.get(name)
-            if not profile or not pending:
-                continue
-
-            free_memory = free_memory - profile.container_config.ram_mb * pending
-
-        return (free_memory, total_memory)
-
     def log_container_events(self):
         """The service status table may have references to containers that have crashed. Try to remove them all."""
         while self.sleep(CONTAINER_EVENTS_LOG_INTERVAL):
@@ -315,7 +277,8 @@ class ScalerBase(ThreadedCoreBase):
                     'memory_total': memory_total,
                     'cpu_total': cpu_total,
                     'memory_free': memory,
-                    'cpu_free': cpu
+                    'cpu_free': cpu,
+                    'pending_containers': sum(self.controller.get_unavailable().values())
                 }
                 export_metrics_once('scaler', Metrics, metrics, host=HOSTNAME,
                                     counter_type='scaler', config=self.config, redis=self.redis)
@@ -325,3 +288,9 @@ class ScalerBase(ThreadedCoreBase):
 
     def sync_metrics(self):
         raise NotImplementedError()
+
+    def get_cpu_info(self, overallocation: bool) -> tuple[float, float]:
+        raise NotImplementedError()
+
+    def get_memory_info(self, overallocation: bool) -> tuple[float, float]:
+        raise NotImplementedError()

{assemblyline_core-4.7.5.dev73 → assemblyline_core-4.7.5.dev76}/assemblyline_core/scaler/controllers/interface.py

@@ -44,6 +44,10 @@ class ControllerInterface:
         """Set the target for running instances of a service."""
         raise NotImplementedError()
 
+    def get_unavailable(self) -> dict[str, int]:
+        """Report the number of pending containers from deployments monitored by the system."""
+        raise NotImplementedError()
+
     def restart(self, service: ServiceProfile):
         raise NotImplementedError()
 

{assemblyline_core-4.7.5.dev73 → assemblyline_core-4.7.5.dev76}/assemblyline_core/scaler/scaler_server.py

@@ -729,3 +729,40 @@ class ScalerServer(ScalerBase):
                                 duty_cycle=profile.high_duty_cycle
                             )
 
+    def get_cpu_info(self, overallocation: bool) -> tuple[float, float]:
+        # Get the raw used resource numbers
+        free_cpu, total_cpu = self.controller.cpu_info()
+
+        # Recalculate the amount of free resources expanding the total quantity by the overallocation
+        if overallocation:
+            used_cpu = total_cpu - free_cpu
+            free_cpu = total_cpu * self.get_cpu_overallocation() - used_cpu
+
+        # Include the service containers not counted in the raw numbers because they are pending
+        for name, pending in self.controller.get_unavailable().items():
+            profile = self.profiles.get(name)
+            if not profile or not pending:
+                continue
+
+            free_cpu = free_cpu - profile.container_config.cpu_cores * pending
+
+        return (free_cpu, total_cpu)
+
+    def get_memory_info(self, overallocation: bool) -> tuple[float, float]:
+        # Get the raw used resource numbers
+        free_memory, total_memory = self.controller.memory_info()
+
+        # Recalculate the amount of free resources expanding the total quantity by the overallocation
+        if overallocation:
+            used_memory = total_memory - free_memory
+            free_memory = total_memory * self.get_memory_overallocation() - used_memory
+
+        # Include the service containers not counted in the raw numbers because they are pending
+        for name, pending in self.controller.get_unavailable().items():
+            profile = self.profiles.get(name)
+            if not profile or not pending:
+                continue
+
+            free_memory = free_memory - profile.container_config.ram_mb * pending
+
+        return (free_memory, total_memory)

{assemblyline_core-4.7.5.dev73 → assemblyline_core-4.7.5.dev76}/assemblyline_core/scaler_hpa/scaler_server.py

@@ -524,3 +524,10 @@ class ScalerServer(ScalerBase):
                             profile.running_instances = 0
                             profile.duty_cycle = 0.7
 
+    def get_cpu_info(self, overallocation: bool) -> tuple[float, float]:
+        # Get the raw used resource numbers
+        return self.controller.cpu_info()
+
+    def get_memory_info(self, overallocation: bool) -> tuple[float, float]:
+        # Get the raw used resource numbers
+        return self.controller.memory_info()

{assemblyline_core-4.7.5.dev73 → assemblyline_core-4.7.5.dev76}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev73
+Version: 4.7.5.dev76
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.5.dev73/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.5.dev73