Fix rebase for can_ping_device

This commit is contained in:
Paul Gear
2015-10-24 14:21:19 +10:00
parent 953ea3fa15
commit b52f7f5e86

View File

@@ -803,7 +803,9 @@ function enable_graphs($device, &$graph_enable)
{
// These are standard graphs we should have for all systems
$graph_enable['poller']['poller_perf'] = 'device_poller_perf';
$graph_enable['poller']['ping_perf'] = 'device_ping_perf';
if (can_ping_device($attribs) === true) {
$graph_enable['poller']['ping_perf'] = 'device_ping_perf';
}
enable_os_graphs($device['os'], $graph_enable);
}
@@ -842,6 +844,9 @@ function can_ping_device($attribs) {
if ($config['icmp_check'] === true && $attribs['override_icmp_disable'] != "true") {
return true;
}
else {
return false;
}
} // end can_ping_device
/*