Skip to content

Commit 7756b4f

Browse files
committed
Improve the alert filtering based on Alex's PR suggestion.
1 parent 430733c commit 7756b4f

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

stackhpc_cloud_tests/monitoring/test_prometheus.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,8 @@ def test_prometheus_alerts_inactive(prom):
7676
]
7777

7878
def alert_is_ignored(alert, alerts_to_ignore):
79-
alert_items = alert.items()
80-
for alert_to_ignore in alerts_to_ignore:
81-
alert_to_ignore_items = alert_to_ignore.items()
82-
# alert has more items than alerts_to_ignore
83-
# so here we can return True if alert_to_ignore is a subset of alerts
84-
if alert_to_ignore_items <= alert_items:
85-
return True
86-
return False
79+
# Check if any of the "ignore cases" match the alert
80+
return any(alert_to_ignore.items() <= alert.items() for alert_to_ignore in alerts_to_ignore)
8781

8882
alerts = [ alert for alert in alerts if not alert_is_ignored(alert["labels"], aio_alerts_to_ignore) ]
8983
assert len(alerts) == 0

0 commit comments

Comments
 (0)