assemblyline-core 4.5.1.dev409__tar.gz → 4.5.1.dev413__tar.gz

{assemblyline_core-4.5.1.dev409 → assemblyline_core-4.5.1.dev413}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: assemblyline-core
-Version: 4.5.1.dev409
+Version: 4.5.1.dev413
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.5.1.dev413/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.1.dev413

{assemblyline_core-4.5.1.dev409 → assemblyline_core-4.5.1.dev413}/assemblyline_core/dispatching/dispatcher.py

@@ -182,7 +182,7 @@ class TemporaryFileData:
             self.shared_values[key] = []
 
         # make sure the input is the right type
-        if not isinstance(values, list | tuple):
+        if not isinstance(values, (list, tuple)):
             return False
 
         # Add each value one at a time testing for new values

{assemblyline_core-4.5.1.dev409 → assemblyline_core-4.5.1.dev413}/assemblyline_core/metrics/helper.py

@@ -1,7 +1,8 @@
 import time
-
 import elasticsearch
 
+from os import environ
+
 from assemblyline.datastore.exceptions import ILMException
 
 MAX_RETRY_BACKOFF = 10
@@ -64,6 +65,11 @@ def create_ilm_policy(es, name, archive_config):
 def ensure_indexes(log, es, config, indexes, datastream_enabled=False):
     for index_type in indexes:
         try:
+            # Get the shard/replica configuration for metric-based indices from the environment
+            # Otherwise default to values for a single-node Elastic cluster
+            replicas = environ.get(f"ELASTIC_{index_type.upper()}_METRICS_REPLICAS", environ.get('ELASTIC_DEFAULT_METRICS_REPLICAS', 0))
+            shards = environ.get(f"ELASTIC_{index_type.upper()}_METRICS_SHARDS", environ.get('ELASTIC_DEFAULT_METRICS_SHARDS', 1))
+
             index = f"al_metrics_{index_type}_ds" if datastream_enabled else f"al_metrics_{index_type}"
             policy = f"{index}_policy"
             while True:
@@ -83,7 +89,9 @@ def ensure_indexes(log, es, config, indexes, datastream_enabled=False):
                 template_body = {
                     "settings": {
                         "index.lifecycle.name": policy,
-                        "index.codec": "best_compression"
+                        "index.codec": "best_compression",
+                        "index.number_of_replicas": replicas,
+                        "index.number_of_shards": shards
                     }
                 }
                 put_template_func = None

{assemblyline_core-4.5.1.dev409 → assemblyline_core-4.5.1.dev413}/assemblyline_core/scaler/controllers/kubernetes_ctl.py

@@ -1194,7 +1194,7 @@ class KubernetesController(ControllerInterface):
             service = self.api.read_namespaced_service(deployment_name, self.namespace)
             service.metadata.labels = labels
             service.spec.selector = labels
-            service.spec.ports = [V1ServicePort(port=int(_p)) for _p in spec.container.ports]
+            service.spec.ports = [V1ServicePort(port=int(_p), name=f"port-{_p}") for _p in spec.container.ports]
             self.api.patch_namespaced_service(deployment_name, self.namespace, service)
         except ApiException as error:
             if error.status != 404:
@@ -1204,7 +1204,7 @@ class KubernetesController(ControllerInterface):
                 spec=V1ServiceSpec(
                     cluster_ip='None',
                     selector=labels,
-                    ports=[V1ServicePort(port=int(_p)) for _p in spec.container.ports]
+                    ports=[V1ServicePort(port=int(_p), name=f"port-{_p}") for _p in spec.container.ports]
                 )
             )
             self.api.create_namespaced_service(self.namespace, service)

{assemblyline_core-4.5.1.dev409 → assemblyline_core-4.5.1.dev413}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: assemblyline-core
-Version: 4.5.1.dev409
+Version: 4.5.1.dev413
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.5.1.dev409/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.1.dev409