|
[-]
[+]
|
Changed |
check_openmanage.spec
|
|
|
|
[-]
[+]
|
Changed |
check_openmanage-3.6.8.tar.bz2/CHANGES
^
|
| @@ -1,3 +1,10 @@
+3.6.8 2011-06-07
+------------------
+
+* Added workaround for a rare condition in which blade detection fails
+ because the chassis IDs for the blade and interconnect board have
+ switched places in the BaseBoardType SNMP table.
+
3.6.7 2011-05-12
------------------
|
|
[-]
[+]
|
Changed |
check_openmanage-3.6.8.tar.bz2/check_openmanage
^
|
| @@ -51,7 +51,7 @@
# Version and similar info
$NAME = 'check_openmanage';
-$VERSION = '3.6.7';
+$VERSION = '3.6.8';
$AUTHOR = 'Trond H. Amundsen';
$CONTACT = 't.h.amundsen@usit.uio.no';
@@ -608,14 +608,23 @@
# Detecting blade via SNMP
#
sub snmp_detect_blade {
- my $DellBaseBoardType = '1.3.6.1.4.1.674.10892.1.300.80.1.7.1.1';
- my $result = $snmp_session->get_request(-varbindlist => [$DellBaseBoardType]);
+ # In some setups, the IDs for the blade and interconnect
+ # board are mixed up, so we need to check both.
+ my $DellBaseBoardType1 = '1.3.6.1.4.1.674.10892.1.300.80.1.7.1.1';
+ my $DellBaseBoardType2 = '1.3.6.1.4.1.674.10892.1.300.80.1.7.1.2';
+ my $result1 = $snmp_session->get_request(-varbindlist => [$DellBaseBoardType1]);
+ my $result2 = $snmp_session->get_request(-varbindlist => [$DellBaseBoardType2]);
# Identify blade. Older models (4th and 5th gen models) and/or old
# OMSA (4.x) don't have this OID. If we get "noSuchInstance" or
# similar, we assume that this isn't a blade
- if (exists $result->{$DellBaseBoardType} && $result->{$DellBaseBoardType} eq '3') {
+ if (exists $result1->{$DellBaseBoardType1} && $result1->{$DellBaseBoardType1} eq '3') {
$blade = 1;
+ return;
+ }
+ if (exists $result2->{$DellBaseBoardType2} && $result2->{$DellBaseBoardType2} eq '3') {
+ $blade = 1;
+ return;
}
return;
}
|
|
|
Changed |
check_openmanage-3.6.8.tar.bz2/check_openmanage.exe
^
|
|
[-]
[+]
|
Changed |
check_openmanage-3.6.8.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,9 @@
+check-openmanage (3.6.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Trond Hasle Amundsen <t.h.amundsen@usit.uio.no> Tue, 06 Jun 2011 12:56:07 +0200
+
check-openmanage (3.6.7-1) unstable; urgency=low
* New upstream release.
|
|
[-]
[+]
|
Changed |
check_openmanage-3.6.8.tar.bz2/nagios-plugins-check-openmanage.spec
^
|
| @@ -6,7 +6,7 @@
%global debug_package %{nil}
Name: nagios-plugins-check-openmanage
-Version: 3.6.7
+Version: 3.6.8
Release: 1%{?dist}
Summary: Nagios plugin to monitor hardware health on Dell servers
@@ -55,6 +55,9 @@
%changelog
+* Tue Jun 06 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.8-1
+- Version 3.6.8
+
* Thu May 12 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.7-1
- Version 3.6.7
|
