howler-api 4.0.0.dev1258__tar.gz → 4.0.0.dev1279__tar.gz

{howler_api-4.0.0.dev1258 → howler_api-4.0.0.dev1279}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 4.0.0.dev1258
+Version: 4.0.0.dev1279
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs
@@ -28,7 +28,7 @@ Requires-Dist: chevron (==0.14.0)
 Requires-Dist: elasticsearch (==8.19.3)
 Requires-Dist: flasgger (>=0.9.7.1,<0.10.0.0)
 Requires-Dist: flask (==3.1.3)
-Requires-Dist: flask-caching (==2.4.0)
+Requires-Dist: flask-caching (==2.4.1)
 Requires-Dist: gevent (>=25.9.1,<26.0.0)
 Requires-Dist: gunicorn (==23.0.0)
 Requires-Dist: luqum (>=1.0.0,<2.0.0)

{howler_api-4.0.0.dev1258 → howler_api-4.0.0.dev1279}/howler/datastore/howler_store.py

@@ -8,6 +8,7 @@ from howler.odm.models.action import Action
 from howler.odm.models.analytic import Analytic
 from howler.odm.models.case import Case
 from howler.odm.models.clue import Clue
+from howler.odm.models.config import ILMIndexConfig
 from howler.odm.models.dossier import Dossier
 from howler.odm.models.event import Event
 from howler.odm.models.hit import Hit
@@ -34,6 +35,8 @@ INDEXES = {
     "user_avatar": None,
 }
 
+ILM_ENABLED_INDEXES = {"hit", "event", "case"}
+
 
 class HowlerDatastore(object):
     def __init__(self, datastore_object: "ESStore"):
@@ -55,7 +58,12 @@ class HowlerDatastore(object):
             )
 
         for _index, _odm in INDEXES.items():
-            ilm_index_config = config.datastore.ilm.indices.get(_index) if config.datastore.ilm.enabled else None
+            ilm_index_config = config.datastore.ilm.indices.get(_index)
+            if ilm_index_config is None:
+                ilm_index_config = ILMIndexConfig(enabled=_index in ILM_ENABLED_INDEXES)
+            if not (config.datastore.ilm.enabled and ilm_index_config.enabled):
+                ilm_index_config = None
+
             self.ds.register(_index, _odm, ilm_config=ilm_index_config)
 
     def __enter__(self):

{howler_api-4.0.0.dev1258 → howler_api-4.0.0.dev1279}/howler/odm/models/config.py

@@ -97,10 +97,11 @@ class Host(BaseModel):
 class ILMIndexConfig(BaseModel):
     """Per-index ILM phase configuration.
 
-    Controls when an index transitions to warm and cold phases.
+    Controls whether an index uses ILM and when it transitions to warm and cold phases.
     Values are Elasticsearch age strings (e.g. "30d", "90d").
     """
 
+    enabled: bool = Field(default=True, description="Enable ILM for this index")
     warm: Optional[str] = Field(
         default=None,
         description="Min age before the index enters the warm phase (e.g. '30d'). None to skip.",
@@ -135,7 +136,7 @@ class ILMConfig(BaseModel):
         description="Maximum primary shard size before rollover (e.g. '50gb')",
     )
     indices: dict[str, ILMIndexConfig] = Field(
-        default={},
+        default_factory=dict,
         description="Per-index ILM configuration, keyed by collection name (e.g. 'hit')",
     )
 

{howler_api-4.0.0.dev1258 → howler_api-4.0.0.dev1279}/howler/odm/models/ecs/related.py

@@ -33,7 +33,13 @@ class Related(odm.Model):
     )
 
     # Extra fields not defined in ECS but added for outline purposes
-    id = odm.Optional(odm.Keyword(description="The id related to the event."))
+    id = odm.Optional(
+        odm.Keyword(
+            description="The id related to the event.",
+            deprecated=True,
+            deprecated_description="related.ids should be used instead of related.id.",
+        )
+    )
 
     uri = odm.Optional(odm.List(odm.URI(), description="All of the URIs related to the event."))
 
@@ -43,3 +49,23 @@ class Related(odm.Model):
             description="All the signatures/rules that were triggered by the event.",
         )
     )
+
+    def __init__(self, data: dict = None, *args, **kwargs):
+        if data is not None and data.get("id") is not None:
+            # Avoid mutating the caller-provided dict
+            data = dict(data)
+
+            existing_ids = data.get("ids")
+            if isinstance(existing_ids, (list, tuple)):
+                merged_ids = list(existing_ids)
+            elif existing_ids is None:
+                merged_ids = []
+            else:
+                merged_ids = [existing_ids]
+
+            if data["id"] not in merged_ids:
+                merged_ids.append(data["id"])
+
+            data["ids"] = merged_ids
+
+        super().__init__(data, *args, **kwargs)

{howler_api-4.0.0.dev1258 → howler_api-4.0.0.dev1279}/pyproject.toml

@@ -152,7 +152,7 @@ suppress-none-returning = true
 [tool.poetry]
 package-mode = true
 name = "howler-api"
-version = "4.0.0.dev1258"
+version = "4.0.0.dev1279"
 description = "Howler - API server"
 authors = [
     "Canadian Centre for Cyber Security <howler@cyber.gc.ca>",
@@ -203,7 +203,7 @@ chardet = "5.2.0"
 elasticsearch = "8.19.3"
 flask = "3.1.3"
 gevent = "^25.9.1"
-flask-caching = "2.4.0"
+flask-caching = "2.4.1"
 packaging = "<25.0"
 passlib = "1.7.4"
 prometheus-client = "0.25.0"
@@ -256,7 +256,7 @@ types-PyYAML = "6.0.12.20260518"
 types-paramiko = "3.5.0.20250801"
 types-pyOpenSSL = "23.3.0.20240106"
 types-six = "1.17.0.20260518"
-types-requests = "<2.33.0.20260519"
+types-requests = "<2.33.0.20260713"
 websocket-client = "1.9.0"
 types-pytz = "^2024.1.0.20240417"
 types-mock = "^5.2.0.20250306"