nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add RegEx support to alert rules and device groups

Browse Source
This commit is contained in:
f0o
2015-09-26 17:30:19 +00:00
parent c0f384a2d8
commit 407afd022a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/alerts.inc.php
+1 -1
View File
@@ -91,7 +91,7 @@ function GenSQL($rule) {
} }
$i++; $i++;
} }
$sql = "SELECT * FROM ".implode(",",$tables)." WHERE (".$join."".str_replace("(","",$tables[0]).".device_id = ?) && (".str_replace(array("%","@","!~","~"),array("","%","NOT LIKE","LIKE"),$rule).")"; $sql = "SELECT * FROM ".implode(",",$tables)." WHERE (".$join."".str_replace("(","",$tables[0]).".device_id = ?) && (".str_replace(array("%","@","!~","~"),array("",".*","NOT REGEXP","REGEXP"),$rule).")";
return $sql; return $sql;
} }
includes/device-groups.inc.php
+1 -1
View File
@@ -63,7 +63,7 @@ function GenGroupSQL($pattern, $search='') {
$search .= ' &&'; $search .= ' &&';
} }
$sql = 'SELECT DISTINCT('.str_replace('(', '', $tables[0]).'.device_id) FROM '.implode(',', $tables).' WHERE '.$search.' ('.str_replace(array('%', '@', '!~', '~'), array('', '%', 'NOT LIKE', 'LIKE'), $pattern).')'; $sql = 'SELECT DISTINCT('.str_replace('(', '', $tables[0]).'.device_id) FROM '.implode(',', $tables).' WHERE '.$search.' ('.str_replace(array('%', '@', '!~', '~'), array('', '.*', 'NOT REGEXP', 'REGEXP'), $pattern).')';
return $sql; return $sql;
}//end GenGroupSQL() }//end GenGroupSQL()