Changes of Revision 29
[-] | Changed | check_openmanage.changes |
x 1
2 ------------------------------------------------------------------- 3 +Wed Oct 5 19:10:49 UTC 2011 - cs@linux-administrator.com 4 + 5 +- Update to version 3.7.3: 6 + * Minor feature enhancements, Minor bugfixes 7 + * If the option -I or --htmlinfo was used, the OK output would be printed two times. This has been fixed so the OK output is now correct for HTML output. 8 + * A bug was fixed for config file parsing, if the plugin was used in local mode (i.e. no hostname specified). Reported by David Jones. 9 + * Distribution now includes an example configuration file, contributed by Xavier Bachelot 10 + * Various fixes to the RPM spec file contributed by Xavier Bachelot 11 + * RPM name was changed 12 + 13 +- Changes in version 3.7.2: 14 + * Minor feature enhancements, Minor bugfixes 15 + * Added a new option '--hide-servicetag' to censor the servicetag in the plugin output. A corresponding config file option 'output_hide_servicetag' was created. Thanks to Sebastian Ahndorf for a patch 16 + * SNMP: Fixed bug in amperage probes perfdata output when one or more PSUs has lost power, which could cause garbled graphs 17 + 18 +------------------------------------------------------------------- 19 Mon Aug 22 21:20:48 UTC 2011 - cs@linux-administrator.com 20 21 - Update to version 3.7.1: 22 |
||
[-] | Changed | check_openmanage.spec ^ |
9 1
2 Summary: A Nagios plugin to check hardware health on Dell servers 3 Name: check_openmanage 4 -Version: 3.7.1 5 +Version: 3.7.3 6 Release: 2%{?dist} 7 License: GPL 8 Group: Applications/System 9 |
||
[+] | Deleted | check_openmanage-3.7.1.tar.bz2/nagios-plugins-check-openmanage.spec ^ |
@@ -1,206 +0,0 @@ -# Definitions used throughout the spec file -%global plugin check_openmanage -%global nagiospluginsdir %{_libdir}/nagios/plugins - -# No binaries here, do not build a debuginfo package -%global debug_package %{nil} - -Name: nagios-plugins-check-openmanage -Version: 3.7.1 -Release: 1%{?dist} -Summary: Nagios plugin to monitor hardware health on Dell servers - -Group: Applications/System -License: GPLv3+ -URL: http://folk.uio.no/trondham/software/%{plugin}.html -Source0: http://folk.uio.no/trondham/software/files/%{plugin}-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: perl - -Obsoletes: check_openmanage <= 3.6.3-1 - -%description -check_openmanage is a plugin for Nagios which checks the hardware -health of Dell servers running OpenManage Server Administrator -(OMSA). The plugin can be used remotely with SNMP or locally with -NRPE, check_by_ssh or similar, whichever suits your needs and -particular taste. The plugin checks the health of the storage -subsystem, power supplies, memory modules, temperature probes etc., -and gives an alert if any of the components are faulty or operate -outside normal parameters. - -%prep -%setup -q -n %{plugin}-%{version} - -%build -pod2man -s 8 -r "%{plugin} %{version}" -c "Nagios plugin" %{plugin}.pod %{plugin}.8 -pod2man -s 5 -r "%{plugin} %{version}" -c "Nagios plugin" %{plugin}.conf.pod %{plugin}.5 - -%install -%{__rm} -rf %{buildroot} -%{__install} -d -m 0755 %{buildroot}%{nagiospluginsdir} -%{__install} -d -m 0755 %{buildroot}%{_mandir}/man8 -%{__install} -d -m 0755 %{buildroot}%{_mandir}/man5 -%{__install} -pD -m 0755 %{plugin} %{buildroot}%{nagiospluginsdir} -%{__install} -pD -m 0644 %{plugin}.8 %{buildroot}%{_mandir}/man8 -%{__install} -pD -m 0644 %{plugin}.conf.5 %{buildroot}%{_mandir}/man5 - -%clean -%{__rm} -rf %{buildroot} - -%files -%defattr(-, root, root, -) -%doc README COPYING CHANGES -%{nagiospluginsdir}/* -%{_mandir}/man8/*.8* -%{_mandir}/man5/*.5* - - -%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 - -* 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 - -* Thu Apr 28 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.6-1 -- Version 3.6.6 - -* Wed Feb 9 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.5-1 -- Version 3.6.5 - -* Tue Jan 4 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.4-2 -- Don't compress the man page, rpmbuild takes care of that. Thanks to - Jose Pedro Oliveira for a patch that fixes this. - -* Tue Jan 4 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.4-1 -- Version 3.6.4 -- Initial build with new spec file -- Spec file adapted to Fedora/EPEL standards - -* Mon Dec 13 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.3-1 -- Version 3.6.3 - -* Thu Nov 25 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.2-1 -- Version 3.6.2 - -* Tue Nov 2 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.1-1 -- Version 3.6.1 - -* Mon Aug 30 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.0-1 -- Version 3.6.0 - -* Wed Jul 14 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.10-1 -- Version 3.5.10 - -* Tue Jun 29 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.9-1 -- Version 3.5.9 - -* Thu Jun 17 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.8-1 -- Version 3.5.8 - -* Wed Mar 19 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.7-1 -- Version 3.5.7 - -* Tue Feb 23 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.6-1 -- Version 3.5.6 - -* Fri Jan 22 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.5-1 -- Version 3.5.5 - -* Wed Jan 13 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.4-1 -- Version 3.5.4 - -* Thu Dec 17 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.3-1 -- Version 3.5.3 - -* Tue Nov 17 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.2-1 -- Version 3.5.2 - -* Thu Oct 22 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.1-1 -- Version 3.5.1 - -* Tue Oct 13 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.0-1 -- Version 3.5.0 -- New location for the manual page (section 3 -> 8) - -* Fri Aug 7 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.9-1 -- Version 3.4.9 - -* Fri Jul 31 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.8-1 -- Version 3.4.8 - -* Fri Jul 24 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.7-1 -- Version 3.4.7 - -* Tue Jul 7 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.6-1 -- Version 3.4.6 - -* Mon Jun 22 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.5-1 -- Version 3.4.5 - -* Mon Jun 22 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.4-1 -- Version 3.4.4 - -* Thu Jun 11 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.3-1 -- Version 3.4.3 - -* Wed Jun 3 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.2-1 -- Version 3.4.2 - -* Mon May 27 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.1-1 -- Version 3.4.1 - -* Mon May 25 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.0-1 -- Version 3.4.0 - -* Tue May 5 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.3.2-1 -- Version 3.3.2 - -* Tue Apr 28 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.3.1-1 -- Version 3.3.1 - -* Tue Apr 7 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.3.0-1 -- Version 3.3.0 - -* Sun Mar 29 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.7-1 -- Version 3.2.7 - -* Thu Mar 5 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.6-1 -- Version 3.2.6 - -* Tue Feb 24 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.5-1 -- Version 3.2.5 -- take 64bit (other libdir) into consideration - -* Tue Feb 17 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.4-1 -- Version 3.2.4 - -* Mon Feb 9 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.3-1 -- Version 3.2.3 - -* Tue Feb 3 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.2-1 -- Version 3.2.2 - -* Tue Feb 3 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.1-1 -- Version 3.2.1 - -* Tue Jan 27 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.0-1 -- Version 3.2.0 - -* Sat Dec 20 2008 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.0.2-1 -- Version 3.0.2 - -* Thu Dec 4 2008 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.0.0-1 -- Version 3.0.0 - -* Wed Nov 19 2008 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 2.1.0-0 -- first RPM release | ||
[+] | Changed | check_openmanage-3.7.3.tar.bz2/CHANGES ^ |
@@ -1,3 +1,24 @@ +3.7.3 2011-10-05 +------------------ + +* If the option -I or --htmlinfo was used, the OK output would be + printed two times. This has been fixed so the OK output is now + correct for HTML output. +* A bug was fixed for config file parsing, if the plugin was used in + local mode (i.e. no hostname specified). Reported by David Jones. +* Distribution now includes an example configuration file, contributed + by Xavier Bachelot + +3.7.2 2011-09-19 +------------------ + +* Added a new option '--hide-servicetag' to censor the servicetag in + the plugin output. A corresponding config file option + 'output_hide_servicetag' was created. Thanks to Sebastian Ahndorf + for a patch. +* SNMP: Fixed bug in amperage probes perfdata output when one or more + PSUs has lost power, which could cause garbled graphs. + 3.7.1 2011-08-22 ------------------ | ||
[+] | Changed | check_openmanage-3.7.3.tar.bz2/README ^ |
@@ -4,19 +4,20 @@ Files included in the tarball and zip archive: - check_openmanage - The plugin - check_openmanage.exe - Win32 standalone executable - check_openmanage.8 - Program man page - check_openmanage.conf.5 - Config file man page - check_openmanage.pod - Program man page source - check_openmanage.conf.pod - Config file man page source - check_openmanage.php - PNP4Nagios template - nagios-plugins-check-openmanage.spec - RPM spec file - COPYING - License information - INSTALL - Install HOWTO - install.bat - Windows install script - install.sh - Linux/UNIX install script - README - This file + check_openmanage - The plugin + check_openmanage.exe - Win32 standalone executable + check_openmanage.8 - Program man page + check_openmanage.conf.5 - Config file man page + check_openmanage.pod - Program man page source + check_openmanage.conf.pod - Config file man page source + check_openmanage.php - PNP4Nagios template + example.conf - An example configuration file + nagios-plugins-openmanage.spec - RPM spec file + COPYING - License information + INSTALL - Install HOWTO + install.bat - Windows install script + install.sh - Linux/UNIX install script + README - This file About this program | ||
[+] | Changed | check_openmanage-3.7.3.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 20737 2011-08-22 07:37:33Z trondham $ +# $Id: check_openmanage 21113 2011-10-05 12:53:25Z trondham $ # # Copyright (C) 2008-2011 Trond H. Amundsen # @@ -51,7 +51,7 @@ # Version and similar info $NAME = 'check_openmanage'; -$VERSION = '3.7.1'; +$VERSION = '3.7.3'; $AUTHOR = 'Trond H. Amundsen'; $CONTACT = 't.h.amundsen@usit.uio.no'; @@ -167,6 +167,7 @@ 'privkey' => undef, # SMNP v3 'privprotocol' => undef, # SMNP v3 'use_get_table' => 0, # hack for SNMPv3 on Windows with net-snmp + 'hide_servicetag' => 0, # hidden servicetag ); # Get options @@ -210,6 +211,7 @@ 'privkey=s' => \$opt{privkey}, 'privprotocol=s' => \$opt{privprotocol}, 'use-get_table' => \$opt{use_get_table}, + 'hide-servicetag' => \$opt{hide_servicetag}, ) or do { print $USAGE; exit $E_UNKNOWN }; # If user requested help @@ -488,6 +490,7 @@ 'state' => 'output_servicestate', 'shortstate' => 'output_servicestate_abbr', 'show_blacklist' => 'output_blacklist', + 'hide_servicetag' => 'output_hide_servicetag', 'htmlinfo' => 'output_html', 'okinfo' => 'output_ok_verbosity', 'protocol' => 'snmp_version', @@ -743,21 +746,24 @@ # First: Populate the sections array with the global section @sections = ('_'); - # Second: Populate the sections array with host glob pattern (but - # not exact match) - PATTERN: - foreach my $glob (sort keys %{ $tiny }) { - next PATTERN if $glob eq '_'; # global section - next PATTERN if $glob eq $opt{hostname}; # exact match - my $regex = glob2regex($glob); # make regexp - if ($opt{hostname} =~ m{$regex}) { - push @sections, $glob; + # Last two steps only if hostname is defined + if (defined $opt{hostname}) { + # Second: Populate the sections array with host glob pattern (but + # not exact match) + PATTERN: + foreach my $glob (sort keys %{ $tiny }) { + next PATTERN if $glob eq '_'; # global section + next PATTERN if $glob eq $opt{hostname}; # exact match + my $regex = glob2regex($glob); # make regexp + if ($opt{hostname} =~ m{$regex}) { + push @sections, $glob; + } } - } - # Third: Populate the sections array with exact hostname - if (defined $tiny->{$opt{hostname}}) { - push @sections, $opt{hostname}; + # Third: Populate the sections array with exact hostname + if (defined $tiny->{$opt{hostname}}) { + push @sections, $opt{hostname}; + } } # Loop through the sections array and get options @@ -776,6 +782,7 @@ configfile_set_boolean($sect, 'ipv6'); configfile_set_boolean($sect, 'tcp'); configfile_set_boolean($sect, 'legacy_perfdata'); + configfile_set_boolean($sect, 'hide_servicetag'); configfile_set_snmp_version($sect); configfile_set_snmp_community($sect); configfile_set_snmp_port($sect); @@ -4214,6 +4221,12 @@ $max_warn /= 10; $unit = 'A'; } + if ($unit eq 'mA' and $type ne 'amperageProbeTypeIsDiscrete') { + $reading /= 1000; + $max_crit /= 1000; + $max_warn /= 1000; + $unit = 'A'; + } } else { $index = get_nonempty_string('Index', $out, 9999); @@ -4675,7 +4688,7 @@ $sysinfo{model} = $val; } if ($key eq 'Chassis Service Tag' or $key eq 'Service Tag') { - $sysinfo{serial} = $val; + $sysinfo{serial} = $opt{hide_servicetag} ? 'XXXXXXX' : $val; } if ($key eq 'System Revision') { $sysinfo{rev} = q{ } . $val; @@ -4765,7 +4778,7 @@ $sysinfo{model} =~ s{\s+\z}{}xms; # remove trailing whitespace } elsif (exists $chassis_oid{$oid} and $chassis_oid{$oid} eq 'chassisServiceTagName') { - $sysinfo{serial} = $result->{$oid}; + $sysinfo{serial} = $opt{hide_servicetag} ? 'XXXXXXX' : $result->{$oid}; } elsif (exists $chassis_oid{$oid} and $chassis_oid{$oid} eq 'chassisSystemRevisionName') { $sysinfo{rev} = q{ } . $result->{$oid}; @@ -5133,7 +5146,7 @@ # Prefix with service tag if specified with option '-i|--info' if ($opt{info}) { - if (defined $opt{htmlinfo}) { + if (defined $opt{htmlinfo} and !$opt{hide_servicetag}) { $msg = '[<a target="_blank" href="' . warranty_url($sysinfo{serial}) . "\">$sysinfo{serial}</a>] " . $msg; } @@ -5201,11 +5214,16 @@ } } elsif ($exit_code == $E_OK && !$opt{debug}) { - if (defined $opt{htmlinfo}) { + if (defined $opt{htmlinfo} and !$opt{hide_servicetag}) { printf q{OK - System: '<a target="_blank" href="%s">%s%s</a>', SN: '<a target="_blank" href="%s">%s</a>'}, documentation_url($sysinfo{model}), $sysinfo{model}, $sysinfo{rev}, warranty_url($sysinfo{serial}), $sysinfo{serial}; } + elsif (defined $opt{htmlinfo} and $opt{hide_servicetag}) { + printf q{OK - System: '<a target="_blank" href="%s">%s%s</a>', SN: '%s'}, + documentation_url($sysinfo{model}), $sysinfo{model}, $sysinfo{rev}, + $sysinfo{serial}; + } else { printf q{OK - System: '%s%s', SN: '%s'}, $sysinfo{model}, $sysinfo{rev}, $sysinfo{serial}; @@ -5287,11 +5305,16 @@ else { if ($opt{extinfo}) { print $linebreak; - if (defined $opt{htmlinfo}) { + if (defined $opt{htmlinfo} && !$opt{hide_servicetag}) { printf '------ SYSTEM: <a target="_blank" href="%s">%s%s</a>, SN: <a target="_blank" href="%s">%s</a>', documentation_url($sysinfo{model}), $sysinfo{model}, $sysinfo{rev}, warranty_url($sysinfo{serial}), $sysinfo{serial}; } + elsif (defined $opt{htmlinfo} && $opt{hide_servicetag}) { + printf '------ SYSTEM: <a target="_blank" href="%s">%s%s</a>, SN: %s', + documentation_url($sysinfo{model}), $sysinfo{model}, $sysinfo{rev}, + $sysinfo{serial}; + } else { printf '------ SYSTEM: %s%s, SN: %s', $sysinfo{model}, $sysinfo{rev}, $sysinfo{serial}; | ||
[+] | Changed | check_openmanage-3.7.3.tar.bz2/check_openmanage.8 ^ |
@@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "CHECK_OPENMANAGE 8" -.TH CHECK_OPENMANAGE 8 "2011-08-16" "check_openmanage 3.7.1" "Nagios plugin" +.TH CHECK_OPENMANAGE 8 "2011-08-26" "check_openmanage 3.7.3" "Nagios plugin" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -337,6 +337,11 @@ .IX Item "-S, --short-state" Same as the \fB\-\-state\fR option above, except that the state is abbreviated to a single letter (W=warning, C=critical etc.). +.IP "\-\-hide\-servicetag" 4 +.IX Item "--hide-servicetag" +This option will replace the servicetag (serial number) in the output +with \f(CW\*(C`XXXXXXX\*(C'\fR. Use this option to suppress or censor the servicetag +in the plugin output. .IP "\-\-linebreak \fI\s-1STRING\s0\fR" 4 .IX Item "--linebreak STRING" check_openmanage will sometimes report more than one line, e.g. if | ||
[+] | Changed | check_openmanage-3.7.3.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.1" "Nagios plugin" +.TH CHECK_OPENMANAGE.CONF 5 "2011-08-26" "check_openmanage 3.7.3" "Nagios plugin" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -486,6 +486,17 @@ .Sp For more information about codes and formatting, see the corresponding command line option \f(CW\*(C`\-\-postmsg\*(C'\fR in \fIcheck_openmanage\fR\|(8). +.IP "Suppress or censor the servicetag" 4 +.IX Item "Suppress or censor the servicetag" +The option \f(CW\*(C`output_hide_servicetag\*(C'\fR will censor the servicetag +(serial number) in any output from the plugin. This option takes a +boolean value. Example: +.Sp +.Vb 1 +\& output_hide_servicetag = true +.Ve +.Sp +Corresponding command line option: \f(CW\*(C`\-\-hide\-servicetag\*(C'\fR .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fIcheck_openmanage\fR\|(8) | ||
[+] | Changed | check_openmanage-3.7.3.tar.bz2/check_openmanage.conf.pod ^ |
@@ -354,6 +354,16 @@ For more information about codes and formatting, see the corresponding command line option C<--postmsg> in L<check_openmanage(8)>. +=item Suppress or censor the servicetag + +The option C<output_hide_servicetag> will censor the servicetag +(serial number) in any output from the plugin. This option takes a +boolean value. Example: + + output_hide_servicetag = true + +Corresponding command line option: C<--hide-servicetag> + =back =head1 SEE ALSO | ||
Changed | check_openmanage-3.7.3.tar.bz2/check_openmanage.exe ^ | |
[+] | Changed | check_openmanage-3.7.3.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 20673 2011-08-16 09:36:43Z trondham $ +# $Id: check_openmanage.pod 20778 2011-08-26 11:14:52Z trondham $ =head1 NAME @@ -238,6 +238,12 @@ Same as the B<--state> option above, except that the state is abbreviated to a single letter (W=warning, C=critical etc.). +=item --hide-servicetag + +This option will replace the servicetag (serial number) in the output +with C<XXXXXXX>. Use this option to suppress or censor the servicetag +in the plugin output. + =item --linebreak I<STRING> check_openmanage will sometimes report more than one line, e.g. if | ||
[+] | Changed | check_openmanage-3.7.3.tar.bz2/debian/changelog ^ |
@@ -1,3 +1,15 @@ +check-openmanage (3.7.3-1) unstable; urgency=low + + * New upstream release. + + -- Trond Hasle Amundsen <t.h.amundsen@usit.uio.no> Wed, 05 Oct 2011 15:00:00 +0200 + +check-openmanage (3.7.2-1) unstable; urgency=low + + * New upstream release. + + -- Trond Hasle Amundsen <t.h.amundsen@usit.uio.no> Mon, 19 Sep 2011 15:00:00 +0200 + check-openmanage (3.7.1-1) unstable; urgency=low * New upstream release. | ||
[+] | Added | check_openmanage-3.7.3.tar.bz2/example.conf ^ |
@@ -0,0 +1,224 @@ +# Nagios Open Manage plugin configuration file +# +# See http://folk.uio.no/trondham/software/check_openmanage.html#id111 for details + +# +# General section +# + +# Check control +# Any keyword to the --check parameter are accepted in the +# configuration file, as "check_KEYWORD". These options take boolean +# values ("true" or "false"). If used together with the --check +# command line option, the command line option will override the +# configuration file, if there is a conflict. The option +# check_everything is special and turns on all checks. Setting this +# option to "true" will effectively negate any other check options. +# This option corresponds to the -a or --all command line option. +# +# For more information about check control, see +# http://folk.uio.no/trondham/software/check_openmanage.html#check-control +# The following keywords are accepted for check control, listed here with their +# default values: +# check_storage = true +# check_memory = true +# check_fans = true +# check_power = true +# check_temp = true +# check_cpu = true +# check_voltage = true +# check_batteries = true +# check_amperage = true +# check_intrusion = true +# check_sdcard = true +# check_esmhealth = true +# check_esmlog = false +# check_alertlog = false +# check_everything = false + +# Blacklisting +# For blacklisting the keyword blacklist is used, and the value is a +# string that uses the same syntax as the -b or --blacklist parameter. +# If used together with the -b or --blacklist command line option, the +# two blacklists from the config file and command line are merged +# together. +# For more information about blacklisting, including syntax, see +# http://folk.uio.no/trondham/software/check_openmanage.html#blacklisting +# Example: +# blacklist = ctrl_fw=all/pdisk=0:0:1 + +# Timeout +# The plugin timeout can be configured with the timeout keyword. The +# argument is number of seconds and should be a positive integer. The +# corresponding command line option is -t or --timeout. +# Example: +# timeout = 60 + +# Performance data +# Performance data can be turned on in the configuration file with +# performance_data. Accepted values are boolean (TRUE/FALSE) or either +# of the keywords "minimal" and "multiline". +# The corresponding command line option is -p or --perfdata. +# Example: +# performance_data = true + +# Legacy Performance data +# With version 3.7.0, performance data output changed. The new format +# is not compatible with the old format. Users who wish to postpone +# switching to the new performance data API may use this option. This +# option takes a boolean value. +# The corresponding command line option is --legacy-perfdata. +# Example: +# legacy_performance_data = true + +# Temperature unit +# The temperature unit used for reporting, performance data etc. can +# be set with the temperature_unit option. Allowed values are F for +# Fahrenheit, C for Celsius, K for Kelvin and R for Rankine. +# The corresponding command line option is --tempunit. Note that the +# command line option -F or --fahrenheit will override both the +# command line option and the configuration file option. +# Example: +# temperature_unit = F + +# Temperature limits +# Custom temperature limits may be configured with the options +# temp_threshold_warning and temp_threshold_critical. These options +# corresponds to the command line options -w or --warning and -c or +# --critical, respectively. They take the same arguments as the +# command line options. +# Examples: +# temp_threshold_warning = 0=30/10 +# temp_threshold_critical = 0=35/8 + +# +# SNMP +# + +# Several SNMP related options may be set in the configuration +# file. The configuration file may contain the following SNMP options: + +# SNMP community string +# The SNMP community string can be set with snmp_community. +# Corresponding command line option: -C or --community +# Example: +# snmp_community = mycommunity + + +# SNMP protocol version +# The SNMP protocol version can be set with snmp_version. +# Corresponding command line option: -P or --protocol +# Example: +# snmp_version = 2 + +# SNMP port number +# The remote port number used with SNMP can be set with snmp_port. +# Corresponding command line option: --port +# Example: +# snmp_port = 161 + +# Use IPv6 instead of IPv4 +# The option snmp_use_ipv6 instructs the plugin to use IPv6 instead of +# IPv4. This option takes a boolean value. +# Corresponding command line option: -6 or --ipv6 +# Example: +# snmp_use_ipv6 = true + +# Use TCP instead of UDP +# The option snmp_use_ipv6 instructs the plugin to use TCP instead of +# UDP. This option takes a boolean value. +# Corresponding command line option: --tcp +# Example: +# snmp_use_tcp = true + +# +# Output control +# +# + +# These options gives some control over the output given by the plugin. + +# Include servicetag in alerts +# The option output_servicetag will make the plugin include the +# servers servicetag (serial number) in every alert. This option takes +# a boolean value. Corresponding command line option: -i or --info +# Example: +# output_servicetag = true + +# Include service state in alerts +# The option output_servicestate will make the plugin include the +# service state in any alerts. This option takes a boolean value. +# Corresponding command line option: -s or --state +# Example: +# output_servicestate = true + +# Include abbreviated service state in alerts +# The option output_servicestate_abbr will make the plugin include the +# abbreviated service state in any alerts. This option takes a boolean +# value. Corresponding command line option: -S or --short-state +# Example: +# output_servicestate_abbr = true + +# Show system info with alerts +# The option output_sysinfo will make the plugin output some system +# information with alerts. This option takes a boolean value. +# Corresponding command line option: -e or --extinfo +# Example: +# output_sysinfo = true + +# Show blacklistings in OK output +# The option output_blacklist will make the plugin show any +# blacklistings in the OK output. This option takes a boolean value. +# Corresponding command line option: -B or --show-blacklist +# Example: +# output_blacklist = true + +# Verbosity of OK output +# The option output_ok_verbosity lets you adjust how much information +# is shown in the OK output. This option takes a positive integer as +# parameter. +# Corresponding command line option: -o or --ok-info +# Example: +# output_ok_verbosity = 3 + +# HTML output +# The output output_html makes the plugin produce HTML output. This +# option takes either a boolean value, or a country or area code. +# Corresponding command line option: -I or --htmlinfo +# Example: +# output_html = de + +# Custom line after alerts +# The option output_post_message lets you specify one line of +# information to be shown after any alerts. This option takes a string +# as parameter. +# For more information about codes and formatting, see +# http://folk.uio.no/trondham/software/check_openmanage.html#custom-line-after-the-alert-s +# Example: +# output_post_message = OS: %o %r +# output_post_message = NOTE: Handled in ticket 123456 + + +# +# Hosts specific settings +# + +# Any setting from the root section can be altered in host specific +# sections. The values set in a bracket section will override those +# set in the root section, in case of conflicts. +# +# A section begins with the name of the section in square brackets and +# continues until the next section begins. An example of section with +# two keywords and parameters: +# +# [section] +# key1 = boolean +# key2 = string +# +# Normal shell globbing may be used for the section names. This is +# limited to *, ? and []. Some examples: +# +# [192.168.*] matches e.g. 192.168.10.20 +# [192.168.10[34].1] matches 192.168.103.1 and 192.168.104.1 +# [login?.example.com] matches e.g. login1.example.com +# | ||
[+] | Added | check_openmanage-3.7.3.tar.bz2/nagios-plugins-openmanage.spec ^ |
@@ -0,0 +1,227 @@ +# Definitions used throughout the spec file +%global plugin check_openmanage +%global nagiospluginsdir %{_libdir}/nagios/plugins + +# No binaries here, do not build a debuginfo package +%global debug_package %{nil} + +Name: nagios-plugins-openmanage +Version: 3.7.3 +Release: 1%{?dist} +Summary: Nagios plugin to monitor hardware health on Dell servers + +Group: Applications/System +License: GPLv3+ +URL: http://folk.uio.no/trondham/software/%{plugin}.html +Source0: http://folk.uio.no/trondham/software/files/%{plugin}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: /usr/bin/pod2man + +Requires: perl(Config::Tiny) +Requires: perl(Net::SNMP) +Requires: perl(Crypt::Rijndael) +Requires: nagios-plugins + +Provides: nagios-plugins-check-openmanage = %{version}-%{release} +Obsoletes: nagios-plugins-check-openmanage < 3.7.2-3 + +%description +check_openmanage is a plugin for Nagios which checks the hardware +health of Dell servers running OpenManage Server Administrator +(OMSA). The plugin can be used remotely with SNMP or locally with +NRPE, check_by_ssh or similar, whichever suits your needs and +particular taste. The plugin checks the health of the storage +subsystem, power supplies, memory modules, temperature probes etc., +and gives an alert if any of the components are faulty or operate +outside normal parameters. + +%prep +%setup -q -n %{plugin}-%{version} + +%build +pod2man -s 8 -r "%{plugin} %{version}" -c "Nagios plugin" %{plugin}.pod %{plugin}.8 +pod2man -s 5 -r "%{plugin} %{version}" -c "Nagios plugin" %{plugin}.conf.pod %{plugin}.5 + +%install +rm -rf %{buildroot} +install -Dp -m 0755 %{plugin} %{buildroot}%{nagiospluginsdir}/%{plugin} +install -Dp -m 0644 %{plugin}.8 %{buildroot}%{_mandir}/man8/%{plugin}.8 +install -Dp -m 0644 %{plugin}.conf.5 %{buildroot}%{_mandir}/man5/%{plugin}.conf.5 +install -Dp -m 0644 example.conf %{buildroot}%{_sysconfdir}/nagios/%{plugin}.conf + +%clean +rm -rf %{buildroot} + +%files +%defattr(-, root, root, -) +%doc README COPYING CHANGES +%{nagiospluginsdir}/* +%{_mandir}/man8/*.8* +%{_mandir}/man5/*.5* +%dir %{_sysconfdir}/nagios +%config(noreplace) %{_sysconfdir}/nagios/* + + +%changelog +* Wed Oct 5 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.7.3-1 +- Version 3.7.3 +- RPM name changed to nagios-plugins-openmanage +- Added obsoletes for old name + +* Tue Sep 27 2011 Xavier Bachelot <xavier@bachelot.org> - 3.7.2-2 +- Add a commented configuration file. +- Add some Requires to have all features out of the box. +- Add Requires on nagios-plugins for %%{_libdir}/nagios/plugins directory. +- Remove some useless command macros. +- Fix Obsoletes/Provides. + +* Mon Sep 19 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.7.2-1 +- Version 3.7.2 + +* 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 + +* 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 + +* Thu Apr 28 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.6-1 +- Version 3.6.6 + +* Wed Feb 9 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.5-1 +- Version 3.6.5 + +* Tue Jan 4 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.4-2 +- Don't compress the man page, rpmbuild takes care of that. Thanks to + Jose Pedro Oliveira for a patch that fixes this. + +* Tue Jan 4 2011 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.4-1 +- Version 3.6.4 +- Initial build with new spec file +- Spec file adapted to Fedora/EPEL standards + +* Mon Dec 13 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.3-1 +- Version 3.6.3 + +* Thu Nov 25 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.2-1 +- Version 3.6.2 + +* Tue Nov 2 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.1-1 +- Version 3.6.1 + +* Mon Aug 30 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.6.0-1 +- Version 3.6.0 + +* Wed Jul 14 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.10-1 +- Version 3.5.10 + +* Tue Jun 29 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.9-1 +- Version 3.5.9 + +* Thu Jun 17 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.8-1 +- Version 3.5.8 + +* Wed Mar 19 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.7-1 +- Version 3.5.7 + +* Tue Feb 23 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.6-1 +- Version 3.5.6 + +* Fri Jan 22 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.5-1 +- Version 3.5.5 + +* Wed Jan 13 2010 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.4-1 +- Version 3.5.4 + +* Thu Dec 17 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.3-1 +- Version 3.5.3 + +* Tue Nov 17 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.2-1 +- Version 3.5.2 + +* Thu Oct 22 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.1-1 +- Version 3.5.1 + +* Tue Oct 13 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.5.0-1 +- Version 3.5.0 +- New location for the manual page (section 3 -> 8) + +* Fri Aug 7 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.9-1 +- Version 3.4.9 + +* Fri Jul 31 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.8-1 +- Version 3.4.8 + +* Fri Jul 24 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.7-1 +- Version 3.4.7 + +* Tue Jul 7 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.6-1 +- Version 3.4.6 + +* Mon Jun 22 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.5-1 +- Version 3.4.5 + +* Mon Jun 22 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.4-1 +- Version 3.4.4 + +* Thu Jun 11 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.3-1 +- Version 3.4.3 + +* Wed Jun 3 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.2-1 +- Version 3.4.2 + +* Mon May 27 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.1-1 +- Version 3.4.1 + +* Mon May 25 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.4.0-1 +- Version 3.4.0 + +* Tue May 5 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.3.2-1 +- Version 3.3.2 + +* Tue Apr 28 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.3.1-1 +- Version 3.3.1 + +* Tue Apr 7 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.3.0-1 +- Version 3.3.0 + +* Sun Mar 29 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.7-1 +- Version 3.2.7 + +* Thu Mar 5 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.6-1 +- Version 3.2.6 + +* Tue Feb 24 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.5-1 +- Version 3.2.5 +- take 64bit (other libdir) into consideration + +* Tue Feb 17 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.4-1 +- Version 3.2.4 + +* Mon Feb 9 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.3-1 +- Version 3.2.3 + +* Tue Feb 3 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.2-1 +- Version 3.2.2 + +* Tue Feb 3 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.1-1 +- Version 3.2.1 + +* Tue Jan 27 2009 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.2.0-1 +- Version 3.2.0 + +* Sat Dec 20 2008 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.0.2-1 +- Version 3.0.2 + +* Thu Dec 4 2008 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 3.0.0-1 +- Version 3.0.0 + +* Wed Nov 19 2008 Trond H. Amundsen <t.h.amundsen@usit.uio.no> - 2.1.0-0 +- first RPM release |