mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refector: centralised check for ignore storage devices #5075 (#5076)

Browse Source 
refector: Centralised check for ignore storage devices #5075
This commit is contained in:
Neil Lathwood
2016-11-30 20:50:29 +00:00
committed by Søren Rosiak
parent 66585b6a88
commit 87de5607df
3 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
includes/discovery/functions.inc.php
View File

@@ -917,3 +917,35 @@ function get_toner_capacity($raw_capacity)
}
return $raw_capacity;
}
/**
* @param $descr
* @return int
*/
function ignore_storage($descr)
{
global $config;
$deny = 0;
foreach ($config['ignore_mount'] as $bi) {
if ($bi == $descr) {
$deny = 1;
d_echo("$bi == $descr \n");
}
}
foreach ($config['ignore_mount_string'] as $bi) {
if (strpos($descr, $bi) !== false) {
$deny = 1;
d_echo("strpos: $descr, $bi \n");
}
}
foreach ($config['ignore_mount_regexp'] as $bi) {
if (preg_match($bi, $descr) > '0') {
$deny = 1;
d_echo("preg_match $bi, $descr \n");
}
}
return $deny;
}

21
includes/discovery/storage/hrstorage.inc.php
View File

@@ -38,25 +38,8 @@ if (is_array($hrstorage_array)) {
$deny = 1;
}
foreach ($config['ignore_mount'] as $bi) {
if ($bi == $descr) {
$deny = 1;
d_echo("$bi == $descr \n");
}
}
foreach ($config['ignore_mount_string'] as $bi) {
if (strpos($descr, $bi) !== false) {
$deny = 1;
d_echo("strpos: $descr, $bi \n");
}
}
foreach ($config['ignore_mount_regexp'] as $bi) {
if (preg_match($bi, $descr) > '0') {
$deny = 1;
d_echo("preg_match $bi, $descr \n");
}
if ($deny != 1) {
$deny = ignore_storage($descr);
}
if (isset($config['ignore_mount_removable']) && $config['ignore_mount_removable'] && $fstype == 'hrStorageRemovableDisk') {

7
includes/discovery/storage/ucd-dsktable.inc.php
View File

@@ -12,7 +12,12 @@ if (is_array($dsktable_array)) {
$dsk['dskTotal'] = $dsk['dskTotal'] * 1024;
$dsk['dskAvail'] = ($entry['dskAvail'] * 1024);
$dsk['dskUsed'] = $dsk['dskTotal'] - $dsk['dskAvail'];
discover_storage($valid_storage, $device, $dsk['dskIndex'], 'dsk', 'ucd-dsktable', $dsk['dskPath'], $dsk['dskTotal'], 1024, $dsk['dskUsed']);
$deny = ignore_storage($dsk['dskPath']);
if ($deny != 1) {
discover_storage($valid_storage, $device, $dsk['dskIndex'], 'dsk', 'ucd-dsktable', $dsk['dskPath'], $dsk['dskTotal'], 1024, $dsk['dskUsed']);
}
}
}
}