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

Fixed daily.sh overwriting custom alert sql (#9326)

Browse Source
This commit is contained in:
Neil Lathwood
2018-10-15 22:03:56 +01:00
committed by Tony Murray
parent 4fa192681f
commit 3aeab9ed7d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daily.php
View File

@ -256,12 +256,15 @@ if ($options['f'] === 'refresh_alert_rules') {
}
echo 'Refreshing alert rules queries' . PHP_EOL;
$rules = dbFetchRows('SELECT `id`, `rule`, `builder` FROM `alert_rules`');
$rules = dbFetchRows('SELECT `id`, `rule`, `builder`, `extra` FROM `alert_rules`');
foreach ($rules as $rule) {
$data['query'] = GenSQL($rule['rule'], $rule['builder']);
if (!empty($data['query'])) {
dbUpdate($data, 'alert_rules', 'id=?', array($rule['id']));
unset($data);
$rule_options = json_decode($rule['extra'], true);
if ($rule_options['override_query'] !== 'on') {
$data['query'] = GenSQL($rule['rule'], $rule['builder']);
if (!empty($data['query'])) {
dbUpdate($data, 'alert_rules', 'id=?', array($rule['id']));
unset($data);
}
}
}
} catch (LockException $e) {