nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 16:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2131 from laf/issue-1936

Browse Source 
Added ability to turn off icmp checks globally or per device
This commit is contained in:
Mike Rostermund
2015-10-17 18:48:37 +02:00
parent bff3b611eb 0af676ecb9
commit c653e3c0ee
4 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/defaults.inc.php
+2
View File
@@ -195,6 +195,8 @@ $config['snmp']['v3'][0]['cryptopass'] = '';
$config['snmp']['v3'][0]['cryptoalgo'] = 'AES';
// AES | DES
// Devices must respond to icmp by default
$config['icmp_check'] = true;
// Autodiscovery Settings
$config['autodiscovery']['xdp'] = true;
includes/functions.php
+29 -21
View File
@@ -490,31 +490,39 @@ function isSNMPable($device) {
function isPingable($hostname, $address_family = AF_INET, $device_id = FALSE) {
global $config;
$fping_params = '';
if(is_numeric($config['fping_options']['retries']) || $config['fping_options']['retries'] > 1) {
$fping_params .= ' -r ' . $config['fping_options']['retries'];
}
if(is_numeric($config['fping_options']['timeout']) || $config['fping_options']['timeout'] > 1) {
$fping_params .= ' -t ' . $config['fping_options']['timeout'];
}
if(is_numeric($config['fping_options']['count']) || $config['fping_options']['count'] > 0) {
$fping_params .= ' -c ' . $config['fping_options']['count'];
}
if(is_numeric($config['fping_options']['millisec']) || $config['fping_options']['millisec'] > 0) {
$fping_params .= ' -p ' . $config['fping_options']['millisec'];
}
$tmp_device = array('device_id'=>$device_id);
$response = array();
$status = fping($hostname,$fping_params,$address_family);
if ($status['loss'] == 100) {
$response['result'] = FALSE;
if ($config['icmp_check'] === true && get_dev_attrib($tmp_device,'override_icmp_disable') != "true") {
$fping_params = '';
if(is_numeric($config['fping_options']['retries']) || $config['fping_options']['retries'] > 1) {
$fping_params .= ' -r ' . $config['fping_options']['retries'];
}
if(is_numeric($config['fping_options']['timeout']) || $config['fping_options']['timeout'] > 1) {
$fping_params .= ' -t ' . $config['fping_options']['timeout'];
}
if(is_numeric($config['fping_options']['count']) || $config['fping_options']['count'] > 0) {
$fping_params .= ' -c ' . $config['fping_options']['count'];
}
if(is_numeric($config['fping_options']['millisec']) || $config['fping_options']['millisec'] > 0) {
$fping_params .= ' -p ' . $config['fping_options']['millisec'];
}
$status = fping($hostname,$fping_params,$address_family);
if ($status['loss'] == 100) {
$response['result'] = FALSE;
}
else {
$response['result'] = TRUE;
}
if (is_numeric($status['avg'])) {
$response['last_ping_timetaken'] = $status['avg'];
}
$response['db'] = $status;
}
else {
$response['result'] = TRUE;
$response['result'] = true;
$response['last_ping_timetaken'] = 0;
}
if (is_numeric($status['avg'])) {
$response['last_ping_timetaken'] = $status['avg'];
}
$response['db'] = $status;
return($response);
}