Fix ignoring custom monitoring window in per-bot checks

Author: kamil-certat

intelmq_monitoring_checkmk/checks/bot_status.py

@@ -8,7 +8,7 @@
 """
 
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta
 
 from ..base import BaseServiceCheck
 from ..config import Config
@@ -75,6 +75,14 @@ def bot_config(self):
     def bot_parameters(self):
         return self.bot_config.get("parameters") or {}
 
+    def _get_time_window(self):
+        cfg_value = self.get_custom_bot_monitoring_config(
+            self._bot_id, "activity-window-days"
+        )
+        if not cfg_value:
+            return self.config.TIME_WINDOW
+        return timedelta(days=cfg_value)
+
     def _check_bot_state(self):
         """Verify that enabled bot is running"""
         status_code, status_description = self.intelmq_cli.bot_status(self._bot_id)
@@ -90,7 +98,7 @@ def _check_bot_state(self):
 
     def _update_stat_queues_cache(self):
         logger.debug("Updating stats from statistic database")
-        period_start = datetime.utcnow() - self.config.TIME_WINDOW
+        period_start = datetime.utcnow() - self._get_time_window()
         for cache_key, redis_template in STATS_CACHE_MAPPING.items():
             current_value = 0
             for queue in self.stat_db.keys(redis_template.format(self._bot_id)):
@@ -127,12 +135,12 @@ def _check_collector_processed_data(self):
         if not total_sum:
             self.writer.status = CheckStatus.CRITICAL
             self.writer.add_summary_line(
-                f"FAIL: Collector processed no data in last {self.config.TIME_WINDOW}"
+                f"FAIL: Collector processed no data in last {self._get_time_window()}"
             )
             self.writer.set_short_summary("Collector doesn't produce data")
         else:
             self.writer.add_summary_line(
-                f"OK: Collector processed data in last {self.config.TIME_WINDOW}"
+                f"OK: Collector processed data in last {self._get_time_window()}"
             )
 
     @property

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "intelmq_monitoring_checkmk"
-version = "0.6.1"
+version = "0.6.2"
 description = "Scripts to monitor IntelMQ instances using CheckMK as a report tool"
 readme = "README.md"
 requires-python = ">=3.7"

tests/test_bot_status.py

@@ -68,7 +68,7 @@ def test_check_bot_status_all_failing_checks_reported(
 
 
 @freeze_time("2023-03-08T12:00:01")
-def test_stat_queues_are_cached_and_cleaned(bot_status_check, fake_stats):
+def test_stat_queues_are_cached_and_cleaned(bot_status_check, fake_stats, runtime):
     fake_stats["test-bot.total._default"] = "5"
     fake_stats["test-bot.total.path"] = "2"
     fake_stats["test-bot.stats.success"] = "6"
@@ -87,6 +87,8 @@ def test_stat_queues_are_cached_and_cleaned(bot_status_check, fake_stats):
         {"time": "2023-03-07T12:00:00", "value": 1},
     ]
 
+    runtime["test-bot"] = {"groupname": "collectors", "enabled": True}
+
     bot_status_check._update_stat_queues_cache()
 
     assert bot_status_check.storage["total-processed-timeline"] == [
@@ -191,6 +193,28 @@ def test_check_collector_proceeds_data_fail(bot_status_check, runtime):
     )
 
 
+def test_check_collector_proceeds_data_custom_length(bot_status_check, runtime):
+    runtime["test-bot"] = {
+        "groupname": "collectors",
+        "enabled": True,
+        "parameters": {"monitoring-activity-window-days": 14},
+    }
+    # this check just uses cache updated by separated method
+    bot_status_check.storage["total-processed-timeline"] = [
+        {"time": (datetime.now() - timedelta(days=5)).isoformat(), "value": 2},
+        {"time": (datetime.now() - timedelta(days=3)).isoformat(), "value": 7},
+        {"time": (datetime.now() - timedelta(days=1)).isoformat(), "value": 7},
+    ]
+
+    bot_status_check._check_collector_processed_data()
+
+    assert bot_status_check.writer.status is None
+    assert (
+        "OK: Collector processed data in last 14 days, 0:00:00"
+        in bot_status_check.writer._summary_lines
+    )
+
+
 def test_check_collector_proceeds_data_ignored(bot_status_check, runtime):
     runtime["test-bot"] = {
         "groupname": "collectors",