From b52f7f5e86d876a47ce300c2d8722b0d6347c6a0 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sat, 24 Oct 2015 14:21:19 +1000 Subject: [PATCH] Fix rebase for can_ping_device --- includes/common.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/includes/common.php b/includes/common.php index 929163c9b..e31d70d2c 100644 --- a/includes/common.php +++ b/includes/common.php @@ -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 /*