Merge branch 'main' into dismissed-fix-bug

Author: lucaspgz

keep-ui/app/(keep)/maintenance/maintenance-rules-table.tsx

@@ -83,7 +83,7 @@ export default function MaintenanceRulesTable({
       id: "start_time",
       header: "Start Time",
       cell: (context) =>
-        new Date(context.row.original.start_time).toLocaleString(),
+        new Date(context.row.original.start_time + "Z").toLocaleString(),
     }),
     columnHelper.display({
       id: "CEL",
@@ -95,7 +95,7 @@ export default function MaintenanceRulesTable({
       header: "End Time",
       cell: (context) =>
         context.row.original.end_time
-          ? new Date(context.row.original.end_time).toLocaleString()
+          ? new Date(context.row.original.end_time + "Z").toLocaleString()
           : "N/A",
     }),
     columnHelper.display({

keep/api/bl/maintenance_windows_bl.py

@@ -24,6 +24,7 @@ def __init__(self, tenant_id: str, session: Session | None) -> None:
             .filter(MaintenanceWindowRule.tenant_id == tenant_id)
             .filter(MaintenanceWindowRule.enabled == True)
             .filter(MaintenanceWindowRule.end_time >= datetime.datetime.now())
+            .filter(MaintenanceWindowRule.start_time <= datetime.datetime.now())
             .all()
         )
 

tests/test_maintenance_windows_bl.py

@@ -84,7 +84,7 @@ def test_alert_in_active_maintenance_window(
     mock_session, active_maintenance_window_rule, alert_dto
 ):
     # Simulate the query to return the active maintenance_window
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         active_maintenance_window_rule
     ]
 
@@ -100,7 +100,7 @@ def test_alert_in_active_maintenance_window_with_suppress(
     mock_session, active_maintenance_window_rule_with_suppression_on, alert_dto
 ):
     # Simulate the query to return the active maintenance_window
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         active_maintenance_window_rule_with_suppression_on
     ]
 
@@ -117,7 +117,7 @@ def test_alert_not_in_expired_maintenance_window(
     mock_session, expired_maintenance_window_rule, alert_dto
 ):
     # Simulate the query to return the expired maintenance_window
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         expired_maintenance_window_rule
     ]
 
@@ -132,7 +132,7 @@ def test_alert_not_in_expired_maintenance_window(
 
 def test_alert_in_no_maintenance_window(mock_session, alert_dto):
     # Simulate the query to return no maintenance_windows
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = (
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = (
         []
     )
 
@@ -149,7 +149,7 @@ def test_alert_in_maintenance_window_with_non_matching_cel(
 ):
     # Modify the cel_query so that the alert won't match
     active_maintenance_window_rule.cel_query = 'source == "other-source"'
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         active_maintenance_window_rule
     ]
 
@@ -167,7 +167,7 @@ def test_alert_ignored_due_to_resolved_status(
     # Set the alert status to RESOLVED
     alert_dto.status = "resolved"
 
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         active_maintenance_window_rule
     ]
 
@@ -186,7 +186,7 @@ def test_alert_ignored_due_to_acknowledged_status(
     # Set the alert status to ACKNOWLEDGED
     alert_dto.status = "acknowledged"
 
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         active_maintenance_window_rule
     ]
 
@@ -202,7 +202,7 @@ def test_alert_ignored_due_to_acknowledged_status(
 def test_alert_with_missing_cel_field(mock_session, active_maintenance_window_rule, alert_dto):
     # Modify the cel_query to reference a non-existent field
     active_maintenance_window_rule.cel_query = 'alertname == "test-alert"'
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         active_maintenance_window_rule
     ]
 
@@ -220,7 +220,7 @@ def test_alert_not_ignored_due_to_custom_status(
 ):
     # Set the alert status to RESOLVED
 
-    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
+    mock_session.query.return_value.filter.return_value.filter.return_value.filter.return_value.filter.return_value.all.return_value = [
         active_maintenance_window_rule_custom_ignore
     ]