From 0333434e9562c5eb5a4d01c0e784a229f54e6bfa Mon Sep 17 00:00:00 2001 From: themylogin Date: Tue, 30 Apr 2019 00:45:01 +0200 Subject: [PATCH] Respect alert service enabled field (cherry picked from commit c04330c5fa2c88411a409e94dd39ce9e6308807c) --- src/middlewared/middlewared/plugins/alert.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/middlewared/middlewared/plugins/alert.py b/src/middlewared/middlewared/plugins/alert.py index f0c9e0dd5329..0f45e379e332 100644 --- a/src/middlewared/middlewared/plugins/alert.py +++ b/src/middlewared/middlewared/plugins/alert.py @@ -294,7 +294,8 @@ async def send_alerts(self, job): for policy_name, policy in self.policies.items(): gone_alerts, new_alerts = policy.receive_alerts(now, self.alerts) - for alert_service_desc in await self.middleware.call("datastore.query", "system.alertservice"): + for alert_service_desc in await self.middleware.call("datastore.query", "system.alertservice", + [["enabled", "=", True]]): service_gone_alerts = [ alert for alert in gone_alerts if (