per-device disabling of poller/discovery modules

git-svn-id: http://www.observium.org/svn/observer/trunk@2255 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-05 16:51:36 +00:00
parent d1360e0a24
commit 167d4268f2
3 changed files with 95 additions and 4 deletions
+7 -1
View File
@@ -108,6 +108,8 @@ function poll_device($device, $options) {
global $config;
$attribs = get_dev_attribs($device['device_id']);
$status = 0; unset($array);
$device_start = utime(); // Start counting device poll time
@@ -164,9 +166,13 @@ function poll_device($device, $options) {
} else {
foreach($config['poller_modules'] as $module => $module_status)
{
if($module_status || $device_attribs['poller_module'][$module])
if ($attribs['poll_'.$module] || ( $module_status && !isset($attribs['poll_'.$module])))
{
include('includes/polling/'.$module.'.inc.php');
} elseif (isset($attribs['poll_'.$module]) && $attribs['poll_'.$module] == "0") {
echo("Module [ $module ] disabled on host.\n");
} else {
echo("Module [ $module ] disabled globally.\n");
}
}
}