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

Assign invalid device_id if a rule is created with a mapping.

Browse Source 
Update rule to invalidate `device_id` if a map has been assigned afterwards.
Update rule to restore `device_id` if no more maps are assigned to it.
Remove all maps (if any) if a rule is deleted.
Fixed SQL-schema
This commit is contained in:
f0o
2015-04-04 11:37:07 +00:00
parent 00954ff4d6
commit 441c27a7d4
5 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ $name = mres($_POST['name']);
if(empty($rule)) { if(empty($rule)) {
$update_message = "ERROR: No rule was generated"; $update_message = "ERROR: No rule was generated";
} elseif(validate_device_id($_POST['device_id']) || $_POST['device_id'] == '-1') { } elseif(validate_device_id($_POST['device_id']) || $_POST['device_id'] == '-1' || $_POST['device_id'][0] == ':') {
$device_id = $_POST['device_id']; $device_id = $_POST['device_id'];
if(!is_numeric($count)) { if(!is_numeric($count)) {
$count='-1'; $count='-1';
@@ -53,7 +53,10 @@ if(empty($rule)) {
$update_message = "ERROR: Failed to edit Rule: <i>".$rule."</i>"; $update_message = "ERROR: Failed to edit Rule: <i>".$rule."</i>";
} }
} else { } else {
if( dbInsert(array('device_id'=>0,'rule'=>$rule,'severity'=>mres($_POST['severity']),'extra'=>$extra_json,'name'=>$name),'alert_rules') ) { 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,'name'=>$name),'alert_rules') ) {
$update_message = "Added Rule: <i>$name: $rule</i>"; $update_message = "Added Rule: <i>$name: $rule</i>";
if( is_array($_POST['maps']) ) { if( is_array($_POST['maps']) ) {
foreach( $_POST['maps'] as $target ) { foreach( $_POST['maps'] as $target ) {

11
html/forms/create-map-item.inc.php
View File

@@ -26,7 +26,7 @@ if( empty($rule) || empty($target) ) {
} else { } else {
$raw = $rule; $raw = $rule;
$rule = dbFetchCell('SELECT id FROM alert_rules WHERE name = ?',array($rule)); $rule = dbFetchCell('SELECT id FROM alert_rules WHERE name = ?',array($rule));
if( !is_numeric($target) && $target[0] != "g" ) { if( !is_numeric($rule) ) {
array_unshift($ret, "ERROR: Could not find rule for '".$raw."'"); array_unshift($ret, "ERROR: Could not find rule for '".$raw."'");
} else { } else {
$raw = $target; $raw = $target;
@@ -35,7 +35,7 @@ if( empty($rule) || empty($target) ) {
} else { } else {
$target = dbFetchCell('SELECT device_id FROM devices WHERE hostname = ?',array($target)); $target = dbFetchCell('SELECT device_id FROM devices WHERE hostname = ?',array($target));
} }
if( !is_numeric($target) && $target[0] != "g" ) { if( !is_numeric(str_replace('g','',$target)) ) {
array_unshift($ret, "ERROR: Could not find entry for '".$raw."'"); array_unshift($ret, "ERROR: Could not find entry for '".$raw."'");
} else { } else {
if(is_numeric($map_id) && $map_id > 0) { if(is_numeric($map_id) && $map_id > 0) {
@@ -51,6 +51,13 @@ if( empty($rule) || empty($target) ) {
array_unshift($ret,"ERROR: Failed to add Map: <i>".$rule." = ".$target."</i>"); array_unshift($ret,"ERROR: Failed to add Map: <i>".$rule." = ".$target."</i>");
} }
} }
if( ($tmp=dbFetchCell('SELECT device_id FROM alert_rules WHERE id = ?',array($rule))) && $tmp[0] != ":" ) {
if(dbUpdate(array('device_id' => ':'.$tmp), 'alert_rules', 'id=?',array($rule)) >= 0) {
$ret[] = "Edited Rule: <i>".$rule." device_id = ':".$tmp."'</i>";
} else {
array_unshift($ret,"ERROR: Failed to edit Rule: <i>".$rule.": device_id = ':".$tmp."'</i>");
}
}
} }
} }
} }

34
html/forms/delete-alert-map.inc.php
View File

@@ -15,17 +15,27 @@
if(is_admin() === false) { if(is_admin() === false) {
die('ERROR: You need to be admin'); die('ERROR: You need to be admin');
} }
$ret = array();
if(!is_numeric($_POST['map_id'])) { $brk = false;
echo('ERROR: No map selected'); if( !is_numeric($_POST['map_id']) ) {
exit; array_unshift($ret,'ERROR: No map selected');
} else { } else {
if(dbDelete('alert_map', "`id` = ?", array($_POST['map_id']))) { if( dbFetchCell('SELECT COUNT(B.id) FROM alert_map,alert_map AS B WHERE alert_map.rule=B.rule && alert_map.id = ?',array($_POST['map_id'])) <= 1 ) {
echo('Map has been deleted.'); $rule = dbFetchRow('SELECT alert_rules.id,alert_rules.device_id FROM alert_map,alert_rules WHERE alert_map.rule=alert_rules.id && alert_map.id = ?',array($_POST['map_id']));
exit; $rule['device_id'] = str_replace(":",'',$rule['device_id']);
} else { if( dbUpdate(array('device_id'=>$rule['device_id']),'alert_rules','id = ?',array($rule['id'])) >= 0 ) {
echo('ERROR: Map has not been deleted.'); $ret[] = "Restored Rule: <i>".$rule['id'].": device_id = '".$rule['device_id']."'</i>";
exit; } else {
} array_unshift($ret, 'ERROR: Rule '.$rule['id'].' has not been restored.');
$brk = true;
}
}
if( $brk === false && dbDelete('alert_map', "`id` = ?", array($_POST['map_id'])) ) {
$ret[] = 'Map has been deleted.';
} else {
array_unshift($ret, 'ERROR: Map has not been deleted.');
}
}
foreach( $ret as $msg ) {
echo $msg."<br/>";
} }

5
html/forms/delete-alert-rule.inc.php
View File

@@ -21,6 +21,11 @@ if(!is_numeric($_POST['alert_id'])) {
exit; exit;
} else { } else {
if(dbDelete('alert_rules', "`id` = ?", array($_POST['alert_id']))) { if(dbDelete('alert_rules', "`id` = ?", array($_POST['alert_id']))) {
if(dbDelete('alert_map', "rule = ?", array($_POST['alert_id'])) || dbFetchCell('COUNT(id) FROM alert_map WHERE rule = ?',array($_POST['alert_id'])) == 0) {
echo('Maps has been deleted.');
} else {
echo('WARNING: Maps could not be deleted.');
}
echo('Alert rule has been deleted.'); echo('Alert rule has been deleted.');
exit; exit;
} else { } else {

6
sql-schema/045.sql
View File

@@ -1,3 +1,5 @@
CREATE TABLE IF NOT EXISTS `device_groups` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL DEFAULT '', `desc` varchar(255) NOT NULL DEFAULT '', `pattern` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`)) ENGINE=InnoDB DEFAULT; CREATE TABLE IF NOT EXISTS `device_groups` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL DEFAULT '', `desc` varchar(255) NOT NULL DEFAULT '', `pattern` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`)) ENGINE=InnoDB;
CREATE TABLE IF NOT EXISTS `alert_map` ( `id` int(11) NOT NULL AUTO_INCREMENT, `rule` int(11) NOT NULL DEFAULT '0', `target` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '', PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT; CREATE TABLE IF NOT EXISTS `alert_map` ( `id` int(11) NOT NULL AUTO_INCREMENT, `rule` int(11) NOT NULL DEFAULT '0', `target` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '', PRIMARY KEY (`id`)) ENGINE=InnoDB;
ALTER TABLE `alert_rules` ADD UNIQUE (`name`); ALTER TABLE `alert_rules` ADD UNIQUE (`name`);
ALTER TABLE `alert_rules` CHANGE `device_id` `device_id` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';