* version 3.5.6-beta5

* Include a blacklisting option 'ctrl_pdisk' which takes the
  controller number as argument. This blacklisting option only works
  with omreport and is a workaround for broken disk firmwares that
  contain illegal XML characters. These characters makes openmanage
  barf and exit with an error. Patch from Bas Couwenberg.

git-svn-id: svn+ssh://vcs-usit.uio.no/svnroot/usit-unix-intern/trunk/usit-nagios-plugins/trondham/check_openmanage@16537 e53b7cee-c147-0410-b3a0-ae4c1fa63963

diff --git a/check_openmanage b/check_openmanage
index fd058705d805044835b5b775b3796db88a00f040..544bd275fa63d2fe98cbaec801122976ffa47ed3 100755 (executable)
--- a/check_openmanage
+++ b/check_openmanage
@@ -57,7 +57,7 @@ $SIG{__WARN__} = \&collect_perl_warning;
 
 # Version and similar info
 $NAME    = 'check_openmanage';
-$VERSION = '3.5.6-beta4';
+$VERSION = '3.5.6-beta5';
 $AUTHOR  = 'Trond H. Amundsen';
 $CONTACT = 't.h.amundsen@usit.uio.no';
 
@@ -1308,6 +1308,10 @@ sub check_physical_disks {
     }
     else {
        foreach my $c (@controllers) {
+           # This blacklists disks with broken firmware, which includes
+           # illegal XML characters that makes openmanage choke on itself
+           next if blacklisted('ctrl_pdisk', $c);
+
            push @output, @{ run_omreport("storage pdisk controller=$c") };
            map_item('ctrl', $c, \@output);
        }