|
[-]
[+]
|
Changed |
check_openmanage.changes
|
|
|
|
[-]
[+]
|
Changed |
check_openmanage.spec
^
|
|
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/CHANGES
^
|
| @@ -1,3 +1,12 @@
+3.7.8 2012-12-12
+------------------
+
+* Fixed a regression regarding un-certified physical disks in "Ready"
+ state (e.g. hot-spare) when using the blacklisting keyword
+ "pdisk_cert"
+* Added an option "--snmp-timeout" which allows setting the SNMP
+ object timeout for the Net::SNMP perl module
+
3.7.7 2012-12-06
------------------
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/check_openmanage
^
|
| @@ -49,7 +49,7 @@
# Version and similar info
$NAME = 'check_openmanage';
-$VERSION = '3.7.7';
+$VERSION = '3.7.8';
$AUTHOR = 'Trond H. Amundsen';
$CONTACT = 't.h.amundsen@usit.uio.no';
@@ -133,6 +133,7 @@
'fahrenheit' => 0, # Use fahrenheit
'configfile' => undef, # configuration file
'timeout' => 30, # default timeout is 30 seconds
+ 'snmp_timeout' => 5, # SNMP transport layer timeout
'debug' => 0, # debugging / verbose output
'help' => 0, # display help output
'perfdata' => undef, # output performance data
@@ -177,6 +178,7 @@
'F|fahrenheit' => \$opt{fahrenheit},
'f|config=s' => \$opt{configfile},
't|timeout=i' => \$opt{timeout},
+ 'snmp-timeout=i' => \$opt{snmp_timeout},
'd|debug' => \$opt{debug},
'h|help' => \$opt{help},
'V|version' => \$opt{version},
@@ -503,6 +505,7 @@
'perfdata' => 'performance_data',
'tempunit' => 'temperature_unit',
'timeout' => 'timeout',
+ 'snmp_timeout' => 'snmp_timeout',
'blacklist' => 'blacklist',
'legacy_perfdata' => 'legacy_performance_data',
);
@@ -591,6 +594,20 @@
return;
}
+ # Set SNMP timeout according to statements in the configuration file
+ sub configfile_set_snmp_timeout {
+ my $keyword = shift;
+ if (defined $tiny->{$keyword}->{snmp_timeout} and $tiny->{$keyword}->{snmp_timeout} ne q{}) {
+ if ($tiny->{$keyword}->{snmp_timeout} =~ m{\A \d+ \z}xms) { # integer
+ $opt{snmp_timeout} = $tiny->{$keyword}->{snmp_timeout};
+ }
+ else {
+ report('other', "CONFIG ERROR: Rvalue for 'snmp_timeout' must be a positive integer", $E_UNKNOWN);
+ }
+ }
+ return;
+ }
+
# Set a boolean option
sub configfile_set_boolean {
my ($keyword, $bool) = @_;
@@ -770,6 +787,7 @@
configfile_adjust_checks($sect);
configfile_set_blacklist($sect);
configfile_set_timeout($sect);
+ configfile_set_snmp_timeout($sect);
configfile_set_htmlinfo($sect);
configfile_set_ok_verbosity($sect);
configfile_set_boolean($sect, 'all');
@@ -860,6 +878,7 @@
'-port' => $opt{port},
'-hostname' => $opt{hostname},
'-version' => $opt{protocol},
+ '-timeout' => $opt{snmp_timeout},
);
# Setting the domain (IP version and transport protocol)
@@ -1965,7 +1984,8 @@
# Special case: Uncertified disk
if (!$cert) {
# Functional non Dell disks get a Non-Critical status
- if ($state eq 'Online' and $status eq 'Non-Critical' and blacklisted('pdisk_cert', $nexus)) {
+ if (($state eq 'Online' or $state eq 'Ready')
+ and $status eq 'Non-Critical' and blacklisted('pdisk_cert', $nexus)) {
--$stack;
}
else {
|
|
|
Changed |
check_openmanage-3.7.8.tar.bz2/check_openmanage.exe
^
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/check_openmanage.php
^
|
| @@ -5,8 +5,8 @@
# Author: Trond Hasle Amundsen
# Contact: t.h.amundsen@usit.uio.no
# Website: http://folk.uio.no/trondham/software/check_openmanage.html
-# Date: 2012-12-06
-# Version: 3.7.7
+# Date: 2012-12-12
+# Version: 3.7.8
#
# Copyright (C) 2008-2012 Trond Hasle Amundsen
#
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,9 @@
+check-openmanage (3.7.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Trond Hasle Amundsen <t.h.amundsen@usit.uio.no> Wed, 12 Dec 2012 12:00:00 +0100
+
check-openmanage (3.7.7-1) unstable; urgency=low
* New upstream release.
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/example.conf
^
|
| @@ -133,6 +133,14 @@
# Example:
# snmp_use_tcp = true
+# Set a custom SNMP object timeout
+# The option snmp_timeout sets the timeout (in seconds) of the SNMP
+# object in the Net::SNMP perl module. This option takes an integer
+# value between 1 and 60
+# Corresponding command line option: --snmp-timeout
+# Example:
+# snmp_timeout = 5
+
#
# Output control
#
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/man/check_openmanage.8
^
|
| @@ -2,12 +2,12 @@
.\" Title: check_openmanage
.\" Author: Trond Hasle Amundsen <t.h.amundsen@usit.uio.no>
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 12/06/2012
+.\" Date: 12/12/2012
.\" Manual: Nagios plugin
.\" Source: check_openmanage
.\" Language: English
.\"
-.TH "CHECK_OPENMANAGE" "8" "12/06/2012" "check_openmanage" "Nagios plugin"
+.TH "CHECK_OPENMANAGE" "8" "12/12/2012" "check_openmanage" "Nagios plugin"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -445,6 +445,13 @@
This option will cause the plugin to use TCP as transport protocol\&. The default is UDP if the option is not present\&.
.RE
.PP
+\fB\-\-snmp\-timeout\fR \fIseconds\fR
+.RS 4
+This option sets the timeout for the SNMP object of the Net::SNMP perl module\&. Legal values are between 1 and 60 seconds, and the default is 5 seconds if the option is not present\&. Note that there is one retry (with the same timeout) before the SNMP object times out completely\&. For an unresponsive SNMP server, you\'ll see that the plugin times out with an SNMP error after 10 seconds if the 5 second default is used\&.
+.sp
+This option is usually not needed\&. The default timeout of 5 seconds is more than sufficient in most cases\&.
+.RE
+.PP
\fB\-U\fR, \fB\-\-username\fR \fIsecurityname\fR
.RS 4
[SNMPv3] The User\-based Security Model (USM) used by SNMPv3 requires that a securityName be specified\&. This option is required when using SNMP version 3, and expects a string 1 to 32 octets in lenght\&.
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/man/check_openmanage.8.xml
^
|
| @@ -647,6 +647,27 @@
</varlistentry>
<varlistentry>
<term>
+ <option>--snmp-timeout</option> <replaceable>seconds</replaceable>
+ </term>
+ <listitem>
+ <para>
+ This option sets the timeout for the SNMP object of the
+ Net::SNMP perl module. Legal values are between 1 and 60
+ seconds, and the default is 5 seconds if the option is not
+ present. Note that there is one retry (with the same
+ timeout) before the SNMP object times out completely. For
+ an unresponsive SNMP server, you'll see that the plugin
+ times out with an SNMP error after 10 seconds if the 5
+ second default is used.
+ </para>
+ <para>
+ This option is usually not needed. The default timeout of
+ 5 seconds is more than sufficient in most cases.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
<option>-U</option>, <option>--username</option>
<replaceable>securityname</replaceable>
</term>
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/man/check_openmanage.conf.5
^
|
| @@ -2,12 +2,12 @@
.\" Title: check_openmanage.conf
.\" Author: Trond Hasle Amundsen <t.h.amundsen@usit.uio.no>
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 12/06/2012
+.\" Date: 12/12/2012
.\" Manual: Nagios plugin
.\" Source: check_openmanage
.\" Language: English
.\"
-.TH "CHECK_OPENMANAGE\&.C" "5" "12/06/2012" "check_openmanage" "Nagios plugin"
+.TH "CHECK_OPENMANAGE\&.C" "5" "12/12/2012" "check_openmanage" "Nagios plugin"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -346,6 +346,14 @@
Corresponding command line option:
\fB\-\-tcp\fR
.RE
+.PP
+\fIsnmp_timeout\fR (integer)
+.RS 4
+Set timeout in seconds for the SNMP object of Net::SNMP\&.
+.sp
+Corresponding command line option:
+\fB\-\-snmp\-timeout\fR
+.RE
.SS "Output configuration options"
.PP
These options gives some control over the output given by the plugin\&.
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/man/check_openmanage.conf.5.xml
^
|
| @@ -476,6 +476,18 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><emphasis>snmp_timeout</emphasis> (integer)</term>
+ <listitem>
+ <para>
+ Set timeout in seconds for the SNMP object of Net::SNMP.
+ </para>
+ <para>
+ Corresponding command line option:
+ <option>--snmp-timeout</option>
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect2>
|
|
[-]
[+]
|
Changed |
check_openmanage-3.7.8.tar.bz2/nagios-plugins-openmanage.spec
^
|
| @@ -17,7 +17,7 @@
%endif
Name: nagios-plugins-openmanage
-Version: 3.7.7
+Version: 3.7.8
Release: 1%{?dist}
Summary: Nagios plugin to monitor hardware health on Dell servers
@@ -83,6 +83,9 @@
%changelog
+* Wed Dec 12 2012 Trond Hasle Amundsen <t.h.amundsen@usit.uio.no> - 3.7.8-1
+- Version 3.7.8
+
* Thu Dec 6 2012 Trond Hasle Amundsen <t.h.amundsen@usit.uio.no> - 3.7.7-1
- Version 3.7.7
|
