From eb7ffda978f7b10159e704a9691da7fe32e42556 Mon Sep 17 00:00:00 2001 From: Geert Hauwaerts Date: Wed, 24 Feb 2010 18:24:28 +0000 Subject: [PATCH] - JunOS support for the storage rewrite. git-svn-id: http://www.observium.org/svn/observer/trunk@945 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/device/overview/storage.inc.php | 1 + html/pages/storage.php | 1 + includes/defaults.inc.php | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/html/pages/device/overview/storage.inc.php b/html/pages/device/overview/storage.inc.php index 8b8b0a545..542d128fa 100644 --- a/html/pages/device/overview/storage.inc.php +++ b/html/pages/device/overview/storage.inc.php @@ -17,6 +17,7 @@ if(mysql_result(mysql_query("SELECT count(storage_id) from storage WHERE device_ $skipdrive = 1; } } + $drive["storage_descr"] = preg_replace("/.*mounted on: (.*)/", "\\1", $drive["storage_descr"]); } if ($skipdrive) { continue; } diff --git a/html/pages/storage.php b/html/pages/storage.php index 5cab85dd9..e0aa8b0e7 100644 --- a/html/pages/storage.php +++ b/html/pages/storage.php @@ -32,6 +32,7 @@ while($drive = mysql_fetch_array($query)) { $skipdrive = 1; } } + $drive["storage_descr"] = preg_replace("/.*mounted on: (.*)/", "\\1", $drive["storage_descr"]); } if ($skipdrive) { continue; } diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 0b0bbfbd3..e6cfae021 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -94,6 +94,6 @@ $config['ignore_mount_string'] = array("packages", "devfs", "procfs", "UMA", "MA $config['ignore_mount_regexp'] = array(); $config['ignore_mount_removable'] = 1; # Ignore removable disk storage $config['ignore_mount_network'] = 1; # Ignore network mounted storage -$config['ignore_junos_os_drives'] = array("/, \/packages/", "/, \/dev/", "/, \/proc/"); # Ignore JunOS partitions who are always 100% +$config['ignore_junos_os_drives'] = array("/on: \/packages/", "/on: \/dev/", "/on: \/proc/"); # Ignore JunOS partitions who are always 100% ?>