Changes of Revision 28
| [-] | Changed | check_openmanage.changes |
|
x 1 2 -------------------------------------------------------------------3 +Mon Aug 22 21:20:48 UTC 2011 - cs@linux-administrator.com4 +5 +- Update to version 3.7.1:6 + * Minor feature enhancements, Minor bugfixes7 + * Added new blacklisting keyword 'pdisk_foreign' to suppress warnings about foreign physical disks8 + * SNMP: Get the controller number right when reporting issues with the controller cache battery9 + * Various minor tweaks and bugfixes in the PNP4Nagios template10 + 11 +12 +-------------------------------------------------------------------13 Mon Aug 15 14:52:04 UTC 2011 - cs@linux-administrator.com14 15 - Update to version 3.7.0:16 |
||
| [-] | Changed | check_openmanage.spec ^ |
|
9 1 2 Summary: A Nagios plugin to check hardware health on Dell servers3 Name: check_openmanage4 -Version: 3.7.05 +Version: 3.7.16 Release: 2%{?dist}7 License: GPL8 Group: Applications/System9 |
||
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/CHANGES ^ |
| @@ -1,3 +1,12 @@ +3.7.1 2011-08-22 +------------------ + +* Added new blacklisting keyword 'pdisk_foreign' to suppress warnings + about foreign physical disks +* SNMP: Get the controller number right when reporting issues with the + controller cache battery +* Various minor tweaks and bugfixes in the PNP4Nagios template + 3.7.0 2011-08-15 ------------------ | ||
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/check_openmanage ^ |
| @@ -5,7 +5,7 @@ # Monitor Dell server hardware status using Dell OpenManage Server # Administrator, either locally via NRPE, or remotely via SNMP. # -# $Id: check_openmanage 20643 2011-08-15 11:45:29Z trondham $ +# $Id: check_openmanage 20737 2011-08-22 07:37:33Z trondham $ # # Copyright (C) 2008-2011 Trond H. Amundsen # @@ -51,7 +51,7 @@ # Version and similar info $NAME = 'check_openmanage'; -$VERSION = '3.7.0'; +$VERSION = '3.7.1'; $AUTHOR = 'Trond H. Amundsen'; $CONTACT = 't.h.amundsen@usit.uio.no'; @@ -1969,6 +1969,13 @@ report('storage', $msg, $E_WARNING, $nexus); } } + # Special case: Foreign disk + elsif ($status eq 'Non-Critical' and $state eq 'Foreign' + and blacklisted('pdisk_foreign', $nexus)) { + my $msg = sprintf '%s [%s %s, %s] on ctrl %d is %s', + $name, $vendor, $product, $capacity, $ctrl, $state; + report('storage', $msg, $E_OK, $nexus); + } # Default elsif ($status ne 'Ok') { my $msg = sprintf '%s [%s %s, %s] on ctrl %d needs attention: %s', @@ -2229,7 +2236,7 @@ $state = get_hashval($out->{batteryState}, \%bat_state) || 'Unknown state'; $learn = get_hashval($out->{batteryLearnState}, \%bat_learn_state) || 'Unknown learn state'; $pred = get_hashval($out->{batteryPredictedCapacity}, \%bat_pred_cap) || 'Unknown predicted capacity status'; - $ctrl = ($out->{batteryConnectionControllerNumber} || 10000) - 1; + $ctrl = $snmp_controller{$out->{batteryConnectionControllerNumber}}; $nexus = convert_nexus(($out->{batteryNexusID} || 9999)); $id = $nexus; $id =~ s{\A \d+:(\d+) \z}{$1}xms; | ||
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/check_openmanage.8 ^ |
| @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "CHECK_OPENMANAGE 8" -.TH CHECK_OPENMANAGE 8 "2011-06-27" "check_openmanage 3.7.0" "Nagios plugin" +.TH CHECK_OPENMANAGE 8 "2011-08-16" "check_openmanage 3.7.1" "Nagios plugin" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -522,6 +522,9 @@ .IP "\fBpdisk_cert\fR" 8 .IX Item "pdisk_cert" Suppress warning message about non-certified physical disk. +.IP "\fBpdisk_foreign\fR" 8 +.IX Item "pdisk_foreign" +Suppress warning message about foreign physical disk. .IP "\fBvdisk\fR" 8 .IX Item "vdisk" Logical drive (virtual disk) | ||
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/check_openmanage.conf.5 ^ |
| @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "CHECK_OPENMANAGE.CONF 5" -.TH CHECK_OPENMANAGE.CONF 5 "2011-07-04" "check_openmanage 3.7.0" "Nagios plugin" +.TH CHECK_OPENMANAGE.CONF 5 "2011-07-04" "check_openmanage 3.7.1" "Nagios plugin" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l | ||
| Changed | check_openmanage-3.7.1.tar.bz2/check_openmanage.exe ^ | |
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/check_openmanage.php ^ |
| @@ -6,7 +6,7 @@ # Website: http://folk.uio.no/trondham/software/check_openmanage.html # Date: 2011-08-15 # -# $Id: check_openmanage.php 20655 2011-08-15 13:16:38Z trondham $ +# $Id: check_openmanage.php 20681 2011-08-16 18:43:44Z trondham $ # # Copyright (C) 2008-2011 Trond H. Amundsen # @@ -459,7 +459,7 @@ $def[$id_amp] .= rrd::cdef("sum$KEY", "sum".($KEY-1).",var$KEY,+"); } $def[$id_amp] .= rrd::line1("sum$KEY", "#555555"); - $def[$id_amp] .= rrd::gprint("var$KEY", array("LAST", "MAX", "AVERAGE"),"%6.1lf A last") ; + $def[$id_amp] .= rrd::gprint("var$KEY", array("LAST", "MAX", "AVERAGE"),"%6.1lf A") ; } # VOLTAGE PROBE @@ -514,6 +514,9 @@ # ENCLOSURE TEMPERATURES (Celsius) if (preg_match('/^E(?P<encl>.+?)_t(emp_)?(?P<probe>\d+)/', $label, $matches)) { + # Temperature unit and vertical label + list ($unit, $vlabel) = tempunit($VAL['UNIT']); + $this_id = $matches['encl']; $probe_index = $matches['probe']; @@ -528,7 +531,7 @@ $ds_name[$id_enc] = "Enclosure $enclosure_id Temperatures"; - $opt[$id_enc] = "--slope-mode --vertical-label \"Celsius\" --title \"$def_title: Enclosure $enclosure_id Temperatures\" "; + $opt[$id_enc] = "--slope-mode --vertical-label \"$vlabel\" --title \"$def_title: Enclosure $enclosure_id Temperatures\" "; if(isset($def[$id_enc])){ $def[$id_enc] .= rrd::def("var$KEY", $VAL['RRDFILE'],$VAL['DS'], "AVERAGE") ; @@ -537,7 +540,7 @@ $def[$id_enc] = rrd::def("var$KEY", $VAL['RRDFILE'],$VAL['DS'], "AVERAGE") ; } $def[$id_enc] .= rrd::line1("var$KEY", "#".$colors[$e++], rrd::cut($label, 14) ); - $def[$id_enc] .= rrd::gprint("var$KEY", array("LAST", "MAX", "AVERAGE"),"%6.1lf C"); + $def[$id_enc] .= rrd::gprint("var$KEY", array("LAST", "MAX", "AVERAGE"),"%6.1lf $unit"); } } } | ||
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/check_openmanage.pod ^ |
| @@ -2,7 +2,7 @@ # # pod2man -s 8 -r "`./check_openmanage -V | head -n 1`" -c 'Nagios plugin' check_openmanage.pod check_openmanage.8 # -# $Id: check_openmanage.pod 20420 2011-06-27 08:02:05Z trondham $ +# $Id: check_openmanage.pod 20673 2011-08-16 09:36:43Z trondham $ =head1 NAME @@ -462,6 +462,10 @@ Suppress warning message about non-certified physical disk. +=item B<pdisk_foreign> + +Suppress warning message about foreign physical disk. + =item B<vdisk> Logical drive (virtual disk) | ||
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/debian/changelog ^ |
| @@ -1,3 +1,9 @@ +check-openmanage (3.7.1-1) unstable; urgency=low + + * New upstream release. + + -- Trond Hasle Amundsen <t.h.amundsen@usit.uio.no> Mon, 22 Aug 2011 10:00:00 +0200 + check-openmanage (3.7.0-1) unstable; urgency=low * New upstream release. | ||
| [+] | Changed | check_openmanage-3.7.1.tar.bz2/nagios-plugins-check-openmanage.spec ^ |
| @@ -6,7 +6,7 @@ %global debug_package %{nil} Name: nagios-plugins-check-openmanage -Version: 3.7.0 +Version: 3.7.1 Release: 1%{?dist} Summary: Nagios plugin to monitor hardware health on Dell servers @@ -59,6 +59,9 @@ %changelog +* Mon Aug 22 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.7.1-1 +- Version 3.7.1 + * Mon Aug 15 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.7.0-1 - Version 3.7.0 | ||