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

refactor: Update alert rules to generate sql query and store in db (#4748)

Browse Source
This commit is contained in:
Neil Lathwood
2016-10-15 00:29:55 +01:00
committed by GitHub
parent 74f89978fc
commit e1fac851f9
9 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
html/ajax_form.php
View File

@@ -21,6 +21,7 @@ require_once 'includes/functions.inc.php';
require_once '../includes/functions.php';
require_once 'includes/authenticate.inc.php';
require_once 'includes/vars.inc.php';
require_once '../includes/alerts.inc.php';
set_debug($_REQUEST['debug']);

6
html/includes/forms/create-alert-item.inc.php
View File

@@ -18,6 +18,7 @@ if (is_admin() === false) {
$rule = implode(' ', $_POST['rules']);
$rule = rtrim($rule, '&|');
$query = GenSQL($rule);
$alert_id = $_POST['alert_id'];
$count = mres($_POST['count']);
$delay = mres($_POST['delay']);
@@ -62,7 +63,7 @@ if (empty($rule)) {
);
$extra_json = json_encode($extra);
if (is_numeric($alert_id) && $alert_id > 0) {
if (dbUpdate(array('rule' => $rule, 'severity' => mres($_POST['severity']), 'extra' => $extra_json, 'name' => $name, 'proc' => $proc), 'alert_rules', 'id=?', array($alert_id)) >= 0) {
if (dbUpdate(array('rule' => $rule, 'severity' => mres($_POST['severity']), 'extra' => $extra_json, 'name' => $name, 'proc' => $proc, 'query' => $query), 'alert_rules', 'id=?', array($alert_id)) >= 0) {
$update_message = "Edited Rule: <i>$name: $rule</i>";
} else {
$update_message = 'ERROR: Failed to edit Rule: <i>'.$rule.'</i>';
@@ -71,8 +72,7 @@ if (empty($rule)) {
if (is_array($_POST['maps'])) {
$device_id = ':'.$device_id;
}
if (dbInsert(array('device_id' => $device_id, 'rule' => $rule, 'severity' => mres($_POST['severity']), 'extra' => $extra_json, 'disabled' => 0, 'name' => $name, 'proc' => $proc), 'alert_rules')) {
if (dbInsert(array('device_id' => $device_id, 'rule' => $rule, 'severity' => mres($_POST['severity']), 'extra' => $extra_json, 'disabled' => 0, 'name' => $name, 'proc' => $proc, 'query' => $query), 'alert_rules')) {
$update_message = "Added Rule: <i>$name: $rule</i>";
if (is_array($_POST['maps'])) {
foreach ($_POST['maps'] as $target) {

6
html/includes/output/query.inc.php
View File

@@ -39,7 +39,10 @@ switch ($type) {
$rules = GetRules($device_id);
$output = '';
foreach ($rules as $rule) {
$sql = GenSQL($rule['rule']);
if (empty($rule['query'])) {
$rule['query'] = GenSQL($rule['rule']);
}
$sql = $rule['query'];
$qry = dbFetchRow($sql, array($device_id));
if (is_array($qry)) {
$response = 'matches';
@@ -48,6 +51,7 @@ switch ($type) {
}
$output .= 'Rule name: ' . $rule['name'] . PHP_EOL;
$output .= 'Alert rule: ' . $rule['rule'] . PHP_EOL;
$output .= 'Alert query: ' . $rule['query'] . PHP_EOL;
$output .= 'Rule match: ' . $response . PHP_EOL . PHP_EOL;
}
if ($config['alert']['transports']['mail'] === true) {

2
html/includes/print-alert-rules.php
View File

@@ -83,7 +83,9 @@ if (isset($_POST['create-default'])) {
'disabled' => 0,
'name' => 'Service up/down',
);
require_once '../includes/alerts.inc.php';
foreach ($default_rules as $add_rule) {
$add_rule['query'] = GenSQL($add_rule['rule']);
dbInsert($add_rule, 'alert_rules');
}
}//end if