mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fixed alerting with dynamic contacts for rules made with the new builder (#8677)

Browse Source 
Update test-alert.php too

Thanks to @dsgagi on Discord for identifying the issue
This commit is contained in:
Tony Murray
2018-05-08 15:35:21 -05:00
committed by Neil Lathwood
parent 89092cd363
commit 350b3a1ef8
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/test-alert.php
View File

@@ -14,14 +14,16 @@ if ($options['r'] && $options['h']) {
ini_set('log_errors', 1);
ini_set('error_reporting', 1);
}
$rule_id = $options['r'];
$rule_id = (int)$options['r'];
$device_id = ctype_digit($options['h']) ? $options['h'] : getidbyname($options['h']);
$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 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($device_id, $rule_id));
if (empty($alert)) {
$where = "alerts.device_id = $device_id && alerts.rule_id = $rule_id";
$alerts = loadAlerts($where);
if (empty($alerts)) {
echo "No active alert found, please check that you have the correct ids";
exit(2);
}
$alert['details'] = json_decode(gzuncompress($alert['details']), true);
$alert = $alerts[0];
$alert['details']['delay'] = 0;
IssueAlert($alert);
} else {