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 alert notes (#9093)

Browse Source 
Fix test-template.php to work like the actual alert code.

DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
This commit is contained in:
Tony Murray
2018-08-27 15:02:36 -05:00
committed by Neil Lathwood
parent 6d62026751
commit 0a210208e0
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
includes/alerts.inc.php
View File

@@ -688,6 +688,7 @@ function loadAlerts($where)
} else { } else {
$alert['alert_id'] = $alert_status['id']; $alert['alert_id'] = $alert_status['id'];
$alert['state'] = $alert_status['state']; $alert['state'] = $alert_status['state'];
$alert['note'] = $alert_status['note'];
$alert['details'] = json_decode(gzuncompress($alert['details']), true); $alert['details'] = json_decode(gzuncompress($alert['details']), true);
$alerts[] = $alert; $alerts[] = $alert;
} }

17
scripts/test-template.php
View File

@@ -14,15 +14,20 @@ if (isset($options['t']) && isset($options['h']) && isset($options['r'])) {
$template_id = $options['t']; $template_id = $options['t'];
$device_id = ctype_digit($options['h']) ? $options['h'] : getidbyname($options['h']); $device_id = ctype_digit($options['h']) ? $options['h'] : getidbyname($options['h']);
$rule_id = $options['r']; $rule_id = (int)$options['r'];
$where = 'alerts.device_id=' . $device_id . ' && alerts.rule_id=' . $rule_id;
if (isset($options['s'])) { if (isset($options['s'])) {
$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 && alert_log.state=? ORDER BY alert_log.id DESC LIMIT 1', array($device_id, $rule_id, intval($options['s']))); $where .= ' alerts.state=' . (int)$options['s'];
} }
if (!isset($alert)) {
$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)); $alerts = loadAlerts($where);
if (empty($alerts)) {
echo "No alert found, make sure to select an active alert.\n";
exit(2);
} }
$alert['details'] = json_decode(gzuncompress($alert['details']), true);
$obj = DescribeAlert($alert); $obj = DescribeAlert($alerts[0]);
if (isset($options['p'])) { if (isset($options['p'])) {
$obj['transport'] = $options['p']; $obj['transport'] = $options['p'];
} }