From f7e365f2961055dbfb35453057366986e1123a0e Mon Sep 17 00:00:00 2001 From: Thom Seddon Date: Thu, 23 May 2019 14:58:34 +0100 Subject: [PATCH] Fix alert follow up for custom queries (#10253) RunFollowUp checks if there is a custom sql query attached to the alert and uses this before invoking GenSQL to build the query. However, the custom query column was not included when selecting alerts so the GenSQL function was always invoked. This patch includes the alert_rules.query in the loadAlerts function used by RunFollowUp. --- includes/alerts.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/alerts.inc.php b/includes/alerts.inc.php index c5effcb63a..1428d57a5b 100644 --- a/includes/alerts.inc.php +++ b/includes/alerts.inc.php @@ -674,7 +674,7 @@ function loadAlerts($where) $alerts = []; foreach (dbFetchRows("SELECT alerts.id, alerts.device_id, alerts.rule_id, alerts.state, alerts.note, alerts.info FROM alerts WHERE $where") as $alert_status) { $alert = dbFetchRow( - 'SELECT alert_log.id,alert_log.rule_id,alert_log.device_id,alert_log.state,alert_log.details,alert_log.time_logged,alert_rules.rule,alert_rules.severity,alert_rules.extra,alert_rules.name,alert_rules.builder FROM alert_log,alert_rules WHERE alert_log.rule_id = alert_rules.id && alert_log.device_id = ? && alert_log.rule_id = ? && alert_rules.disabled = 0 ORDER BY alert_log.id DESC LIMIT 1', + 'SELECT alert_log.id,alert_log.rule_id,alert_log.device_id,alert_log.state,alert_log.details,alert_log.time_logged,alert_rules.rule,alert_rules.severity,alert_rules.extra,alert_rules.name,alert_rules.query,alert_rules.builder FROM alert_log,alert_rules WHERE alert_log.rule_id = alert_rules.id && alert_log.device_id = ? && alert_log.rule_id = ? && alert_rules.disabled = 0 ORDER BY alert_log.id DESC LIMIT 1', array($alert_status['device_id'], $alert_status['rule_id']) );