Ele 1068 supperssion in cli (#1013)

* add global alert suppression interval param to cli

* fix bug when meta value is 0

* fix test and add another

* fix bug in param name

* add missing line :)

* rename param + add default

* fix default value of suppression alert to 0

* remove const

* remove test case that never happens

* fix typing

* fix mock

elementary/monitor/api/alerts/alerts.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from datetime import datetime
-from typing import DefaultDict, Dict, List, Optional, Sequence, Union
+from typing import DefaultDict, Dict, List, Sequence, Union
 
 from elementary.clients.api.api_client import APIClient
 from elementary.clients.dbt.dbt_runner import DbtRunner
@@ -18,16 +18,14 @@
 
 logger = get_logger(__name__)
 
-DEFAULT_ALERT_SUPPRESSION_INTERVAL_HOURS = 24
-
 
 class AlertsAPI(APIClient):
     def __init__(
         self,
         dbt_runner: DbtRunner,
         config: Config,
         elementary_database_and_schema: str,
-        global_suppression_interval: Optional[int] = None,
+        global_suppression_interval: int,
     ):
         super().__init__(dbt_runner)
         self.config = config
@@ -156,7 +154,7 @@ def _get_suppressed_alerts(
         cls,
         alerts: AlertsQueryResult[AlertType],
         last_alert_sent_times: Dict[str, str],
-        global_suppression_interval: Optional[int] = None,
+        global_suppression_interval: int,
     ) -> List[str]:
         suppressed_alerts = []
         current_time_utc = datetime.utcnow()
@@ -219,6 +217,4 @@ def _get_latest_alerts(
     def _get_suppression_interval(interval_from_alert, interval_from_cli):
         if interval_from_alert is not None:
             return interval_from_alert
-        if interval_from_cli is not None:
-            return interval_from_cli
-        return DEFAULT_ALERT_SUPPRESSION_INTERVAL_HOURS
+        return interval_from_cli

elementary/monitor/cli.py

@@ -217,7 +217,7 @@ def get_cli_properties() -> dict:
 @click.option(
     "--suppression-interval",
     type=int,
-    default=24,
+    default=0,
     help="The number of hours to suppress alerts after an alert was sent (this is a global default setting).",
 )
 @click.option(

elementary/monitor/data_monitoring/data_monitoring_alerts.py

@@ -40,7 +40,7 @@ def __init__(
         force_update_dbt_package: bool = False,
         disable_samples: bool = False,
         send_test_message_on_success: bool = False,
-        global_suppression_interval: Optional[int] = None,
+        global_suppression_interval: int = 0,
     ):
         super().__init__(
             config, tracking, force_update_dbt_package, disable_samples, filter

tests/mocks/api/alerts_api_mock.py

@@ -9,6 +9,9 @@ def __init__(self, *args, **kwargs):
         mock_dbt_runner = MockDbtRunner()
         config = Config()
         super().__init__(
-            mock_dbt_runner, config, elementary_database_and_schema="test.test"
+            mock_dbt_runner,
+            config,
+            global_suppression_interval=0,
+            elementary_database_and_schema="test.test",
         )
         self.alerts_fetcher = MockAlertsFetcher()

tests/unit/monitor/api/alerts/test_alerts_api.py

@@ -4,9 +4,6 @@
 import pytest
 from parametrization import Parametrization
 
-from elementary.monitor.api.alerts.alerts import (
-    DEFAULT_ALERT_SUPPRESSION_INTERVAL_HOURS,
-)
 from tests.mocks.api.alerts_api_mock import MockAlertsAPI
 
 
@@ -22,10 +19,14 @@ def test_get_suppressed_alerts(alerts_api_mock: MockAlertsAPI):
     model_alerts = alerts_api_mock.alerts_fetcher.query_pending_model_alerts()
 
     suppressed_test_alerts = alerts_api_mock._get_suppressed_alerts(
-        test_alerts, last_test_alert_sent_times
+        test_alerts,
+        last_test_alert_sent_times,
+        alerts_api_mock.global_suppression_interval,
     )
     suppressed_model_alerts = alerts_api_mock._get_suppressed_alerts(
-        model_alerts, last_model_alert_sent_times
+        model_alerts,
+        last_model_alert_sent_times,
+        alerts_api_mock.global_suppression_interval,
     )
 
     assert json.dumps(suppressed_test_alerts, sort_keys=True) == json.dumps(
@@ -49,15 +50,9 @@ def test_get_suppressed_alerts(alerts_api_mock: MockAlertsAPI):
     alert_interval=10,
     expected_interval=10,
 )
-@Parametrization.case(
-    name="both are none- default wins",
-    cli_interval=None,
-    alert_interval=None,
-    expected_interval=DEFAULT_ALERT_SUPPRESSION_INTERVAL_HOURS,
-)
 def test_get_suppression_interval(
     alerts_api_mock: MockAlertsAPI,
-    cli_interval: Optional[int],
+    cli_interval: int,
     alert_interval: Optional[int],
     expected_interval: Optional[int],
 ):