clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 18:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed ping + performance graphs and tab if skip ping check

Browse Source
This commit is contained in:
laf 2015-10-17 18:49:01 +00:00
parent c653e3c0ee
commit bbae6e9c48
5 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
html/pages/device.inc.php
View File

@ -353,11 +353,13 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) {
</li>';
}
echo '<li class="'.$select['performance'].'">
<a href="'.generate_device_url($device, array('tab' => 'performance')).'">
<img src="images/16/chart_line.png" align="absmiddle" border="0" /> Performance
</a>
</li>';
if (can_ping_device($attribs) === true) {
echo '<li class="'.$select['performance'].'">
<a href="'.generate_device_url($device, array('tab' => 'performance')).'">
<img src="images/16/chart_line.png" align="absmiddle" border="0" /> Performance
</a>
</li>';
}
echo '<li class="'.$select['notes'].'">
<a href="'.generate_device_url($device, array('tab' => 'notes')).'">

4
html/pages/device/graphs.inc.php
View File

@ -24,7 +24,9 @@ foreach (dbFetchRows('SELECT * FROM device_graphs WHERE device_id = ? ORDER BY g
// 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';
}
$sep = '';
foreach ($graph_enable as $section => $nothing) {

16
includes/common.php
View File

@ -758,3 +758,19 @@ function round_Nth($val = 0, $round_to) {
}
} // end round_Nth
/**
* Checks if config allows us to ping this device
* $attribs contains an array of all of this devices
* attributes
* @param array $attribs Device attributes
* @return bool
**/
function can_ping_device($attribs) {
global $config;
if ($config['icmp_check'] === true && $attribs['override_icmp_disable'] != "true") {
return true;
}
else {
return false;
}
} // end can_ping_device

6
includes/functions.php
View File

@ -487,13 +487,11 @@ function isSNMPable($device) {
*
* @return bool TRUE if the host responded to at least one ping request, FALSE otherwise.
*/
function isPingable($hostname, $address_family = AF_INET, $device_id = FALSE) {
function isPingable($hostname, $address_family = AF_INET, $device_id = FALSE, $attribs = false) {
global $config;
$tmp_device = array('device_id'=>$device_id);
$response = array();
if ($config['icmp_check'] === true && get_dev_attrib($tmp_device,'override_icmp_disable') != "true") {
if (can_ping_device($attribs) === true) {
$fping_params = '';
if(is_numeric($config['fping_options']['retries']) || $config['fping_options']['retries'] > 1) {
$fping_params .= ' -r ' . $config['fping_options']['retries'];

28
includes/polling/functions.inc.php
View File

@ -155,7 +155,7 @@ function poll_device($device, $options) {
$address_family = snmpTransportToAddressFamily($device['transport']);
$ping_response = isPingable($device['hostname'], $address_family, $device['device_id']);
$ping_response = isPingable($device['hostname'], $address_family, $device['device_id'], $attribs);
$device_perf = $ping_response['db'];
$device_perf['device_id'] = $device['device_id'];
@ -265,23 +265,27 @@ function poll_device($device, $options) {
}
// Ping response rrd
$ping_rrd = $config['rrd_dir'].'/'.$device['hostname'].'/ping-perf.rrd';
if (!is_file($ping_rrd)) {
rrdtool_create($ping_rrd, 'DS:ping:GAUGE:600:0:65535 '.$config['rrd_rra']);
}
if (can_ping_device($attribs) === true) {
$ping_rrd = $config['rrd_dir'].'/'.$device['hostname'].'/ping-perf.rrd';
if (!is_file($ping_rrd)) {
rrdtool_create($ping_rrd, 'DS:ping:GAUGE:600:0:65535 '.$config['rrd_rra']);
}
if (!empty($ping_time)) {
$fields = array(
'ping' => $ping_time,
);
if (!empty($ping_time)) {
$fields = array(
'ping' => $ping_time,
);
rrdtool_update($ping_rrd, $fields);
}
$update_array['last_ping'] = array('NOW()');
$update_array['last_ping_timetaken'] = $ping_time;
rrdtool_update($ping_rrd, $fields);
}
$update_array['last_polled'] = array('NOW()');
$update_array['last_polled_timetaken'] = $device_time;
$update_array['last_ping'] = array('NOW()');
$update_array['last_ping_timetaken'] = $ping_time;
// echo("$device_end - $device_start; $device_time $device_run");
echo "Polled in $device_time seconds\n";