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

allow disabling of alerting per device, allow override of syscontact, minor cleanups

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1995 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-30 16:28:24 +00:00
parent d302d1a4ce
commit 9fd77cd884
17 changed files with 126 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/functions.php
+20 -13
View File
@@ -222,7 +222,7 @@ function renamehost($id, $new, $source = 'console')
rename($config['rrd_dir']."/$host",$config['rrd_dir']."/$new");
mysql_query("UPDATE devices SET hostname = '$new' WHERE device_id = '$id'");
eventlog("Hostname changed -> $new ($source)", $id);
log_event("Hostname changed -> $new ($source)", $id, 'system');
}
function delete_port($int_id)
@@ -650,7 +650,7 @@ function get_astext($asn)
}
}
# DEPRECATED
# FIXME DEPRECATED -- only used in dead file includes/polling/interfaces.inc.php - if we no longer need that one, this can go too.
function eventlog($eventtext,$device_id = "", $interface_id = "")
{
$event_query = "INSERT INTO eventlog (host, interface, datetime, message) VALUES (" . ($device_id ? $device_id : "NULL");
@@ -677,20 +677,27 @@ function notify($device,$title,$message)
if ($config['alerts']['email']['enable'])
{
if ($config['alerts']['email']['default_only'])
if (!get_dev_attrib($device,'disable_notify'))
{
$email = $config['alerts']['email']['default'];
} else {
if ($device['sysContact'])
if ($config['alerts']['email']['default_only'])
{
$email = $device['sysContact'];
} else {
$email = $config['alerts']['email']['default'];
} else {
if (get_dev_attrib($device,'override_sysContact_bool'))
{
$email = get_dev_attrib($device,'override_sysContact_string');
}
elseif ($device['sysContact'])
{
$email = $device['sysContact'];
} else {
$email = $config['alerts']['email']['default'];
}
}
if ($email)
{
mail($email, $title, $message, $config['email_headers']);
}
}
if ($email)
{
mail($email, $title, $message, $config['email_headers']);
}
}
}
@@ -780,4 +787,4 @@ function include_dir($dir, $regex = "")
}
}
?>
?>