From c7e6e4ebf31396cbff12a4578a7e4a62e54accd0 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Thu, 28 Jan 2010 19:10:42 +0000 Subject: [PATCH] allow ignoring of removable disks - this includes loopmounts on linux at least, so we get rid of all those pesky 100% storages git-svn-id: http://www.observium.org/svn/observer/trunk@740 61d68cd4-352d-0410-923a-c4978735b2b8 --- config.php.default | 1 + includes/discovery/storage.php | 1 + 2 files changed, 2 insertions(+) diff --git a/config.php.default b/config.php.default index 8dbe127f6..f02197070 100755 --- a/config.php.default +++ b/config.php.default @@ -135,6 +135,7 @@ $config['allow_entity_sensor']['specialEnum'] = 1; $config['ignore_mount'] = array("/kern", "/mnt/cdrom", "/dev", "/dev/pts", "/proc/bus/usb"); $config['ignore_mount_regexp'] = array(); $config['ignore_mount_string'] = array("/.*\/dev\/?$/"); +$config['ignore_mount_removable'] = 0; # Ignore removable disk storage ### Hardcoded ASN descriptions diff --git a/includes/discovery/storage.php b/includes/discovery/storage.php index 8c27ac5c3..0cb643e02 100755 --- a/includes/discovery/storage.php +++ b/includes/discovery/storage.php @@ -19,6 +19,7 @@ foreach($config['ignore_mount'] as $bi) { if($bi == $descr) { $allow = 0; if ($debug) echo("$bi == $descr \n"); } } foreach($config['ignore_mount_string'] as $bi) { if(strpos($descr, $bi) !== FALSE) { $allow = 0; if ($debug) echo("$descr, $bi \n"); } } foreach($config['ignore_mount_regexp'] as $bi) { if(preg_match($bi, $descr)) { $allow = 0; if ($debug) echo("$bi, $descr \n"); } } + if (isset($config['ignore_mount_removable']) && $config['ignore_mount_removable'] && $fstype == "hrStorageRemovableDisk") { $allow = 0; if ($debug) echo("removable, skipping\n"); } $descr = str_replace("mounted on: ", "", $descr); $descr = str_replace(": var file system", "", $descr);