Automatic commit of package [nagios-okplugin-check_ibm_bladecenter] release [1.1.2-1].

check_apcext.pl/nagios-okplugin-apc.spec

@@ -11,6 +11,7 @@ Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_apcext.pl/rel
 Requires:	nagios-plugins
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Packager:	Tomas Edwardsson <tommi@ok.is>
+BuildArch:	noarch
 
 
 %description

check_bl/nagios-okplugin-mailblacklist.spec

@@ -12,6 +12,7 @@ Requires:	nagios-plugins
 Requires:	nagios-plugins-perl
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Packager:	Tomas Edwardsson <tommi@ok.is>
+BuildArch:	noarch
 
 
 %description

check_cifs/nagios-okplugin-cifs.spec

@@ -12,6 +12,7 @@ Requires:	perl-Nagios-Plugin
 Requires:	samba-client, krb5-workstation
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Packager:	Tomas Edwardsson <tommi@ok.is>
+BuildArch:	noarch
 
 
 %description

check_cpu.sh/nagios-plugins-check_cpu.spec

@@ -11,6 +11,7 @@ Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_cpu/releases/
 Requires:	nrpe
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Packager:	Tomas Edwardsson <tommi@ok.is>
+BuildArch:	noarch
 
 %description
 This shell script checks cpu utilization (user,system,iowait,idle in %) 

check_disks.pl/check_disks.pl

@@ -207,16 +207,17 @@ if($opt_H ne "localhost" and $opt_H ne "127.0.0.1") {
 
 # Envoi commande et renseignement Hashage %disks
 my @output = `$cmd`;
+
 my $ret = $?;
+$ret >>= 8;
 
 if ($ret == -1) {
 	print "Could not find " . (split(' ', $cmd))[0] . "\n";
 	exit $EXIT_CODES{'UNKNOWN'};
 }
 
-$ret >>= 8;
 # 2010/02/25 palli@ok.is : Check if $cmd ran successfully
-if ($ret > 0) {
+if ($ret > 1) {
    print "Failed to execute $cmd: " . join("\n", @output) . "\n";
    exit $EXIT_CODES{'UNKNOWN'} ;
 }

check_disks.pl/nagios-okplugin-check_disks.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check disks via NRPE
 Name:		nagios-okplugin-check_disks
-Version:	1.0.1
+Version:	1.0.3
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -40,6 +40,13 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/check_disks.pl
 
 %changelog
+* Wed May 16 2012 Tomas Edwardsson <tommi@tommi.org> 1.0.3-1
+- Updated version of nagios-okplugin-check_disks (tommi@tommi.org)
+- Issue #56, temporary fix for selinux and disk checks (tommi@tommi.org)
+
+* Mon May 16 2012 Tomas Edwardsson <tommi@opensource.is> 1.0.2-1
+- Ignore warning states from nrpe
+
 * Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 1.0.1-1
 - new package built with tito
 

check_hpacucli/nrpe.d/check_hpacucli.cfg

@@ -1,2 +1,2 @@
-command[check_hpacucli]=/usr/lib/nagios/plugins/check_hpacucli.py
+command[check_hpacucli]=sudo /usr/lib/nagios/plugins/check_hpacucli.py
 

check_ibm_bladecenter/check_ibm_bladecenter.py

@@ -22,7 +22,7 @@
 
 
 # No real need to change anything below here
-version="1.0"
+version="1.1.0"
 ok=0
 warning=1
 critical=2
@@ -226,20 +226,24 @@ def check_powermodules():
 	status = 3
 	details = 4
 	num_ok = 0
+	num_no = 0
 	for i in powermodules.values():
 		myIndex = i[index]
 		myStatus = i[status]
 		myDetails = i[details]
 		myExists = i[exists]
 		if myIndex == opts.exclude: continue
-		if myStatus != "1":
+		if myExists == "0":
-			nagios_status(warning)
+			num_no = num_no + 1
-			add_summary( 'Powermodule "%s" status "%s". %s. ' % (myIndex,myStatus,myDetails) )
 		else:
-			num_ok = num_ok + 1
+			if myStatus != "1":
+				nagios_status(warning)
+				add_summary( 'Powermodule "%s" status "%s". %s. ' % (myIndex,myStatus,myDetails) )
+			else:
+				num_ok = num_ok + 1
 		add_long('Powersupply "%s" status "%s". %s. ' % (myIndex,myStatus,myDetails) )
 	add_summary( "%s out of %s powermodules are healthy" % (num_ok, len(powermodules) ) )
-	add_perfdata( "'Number of powermodules'=%s" % (len(powermodules) ) )
+	add_perfdata( "'Number of powermodules'=%s" % (len(powermodules) - num_no ) )
 	
 		
 	nagios_status(ok)
@@ -267,10 +271,12 @@ def check_switchmodules():
 				add_long("Module%s health bad(%s).\n  post=%s" % (myIndex, healthstate,resultvalue) )
 				add_summary("Problem with Module %s. " % (myIndex))
 			if len(extrainfo) > int(myIndex):
-				myExtraInfo = extrainfo[int(myIndex)-1]
+				try:
-				module_type = myExtraInfo[22]
+					myExtraInfo = extrainfo[int(myIndex)-1]
-				module_ip = myExtraInfo[6]
+					module_type = myExtraInfo[22]
-				add_long( "  type=%s ip=%s" % (module_type,module_ip) )
+					module_ip = myExtraInfo[6]
+					add_long( "  type=%s ip=%s" % (module_type,module_ip) )
+				except: pass
 	if exit_status == ok:
 		add_summary("All switchmodules healthy")
 		
@@ -300,7 +306,7 @@ def check_blowers():
 	# Check blower 2
 	if blower2state == "1":
 		nagios_status(ok)
-		add_summary("Blower1 OK. " )
+		add_summary("Blower2 OK. " )
 	else:
 		add_summary("Blower2 NOT OK. ")
 		nagios_status(warning)

check_ibm_bladecenter/nagios-okplugin-check_ibm_bladecenter.spec

@@ -0,0 +1,51 @@
+%define debug_package %{nil}
+
+Summary:	A Nagios plugin to check IBM Bladecenters 
+Name:		nagios-okplugin-check_ibm_bladecenter
+Version:	1.1.2
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/System
+URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-check_ibm_bladecenter
+Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_ibm_bladecenter/releases/%{name}-%{version}.tar.gz
+Requires:	nagios-plugins
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	Pall Sigurdsson <palli@opensource.is>
+BuildArch:	noarch
+Requires:	nrpe
+
+
+%description
+Checks the health status of an IBM Bladecenter via SNMP
+
+%prep
+%setup -q
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 check_ibm_bladecenter.py %{buildroot}%{_libdir}/nagios/plugins/check_ibm_bladecenter.py
+#mkdir -p %{buildroot}%{_sysconfdir}/nrpe.d
+#sed "s^/usr/lib64^%{_libdir}^g" nrpe.d/check_bond.cfg >  %{buildroot}%{_sysconfdir}/nrpe.d/check_bond.cfg
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc README
+%{_libdir}/nagios/plugins/check_ibm_bladecenter.py
+#%config(noreplace) %{_sysconfdir}/nrpe.d/check_bond.cfg
+
+%changelog
+* Tue Jul 17 2012 Pall Sigurdsson <palli@opensource.is> 1.1.2-1
+- rpm spec file added. version number bumped (palli@opensource.is)
+
+* Tue Jul 17 2012 Pall Sigurdsson <palli@opensource.is> 1.1.1-1
+- new package built with tito
+
+
+* Tue Jul 17 2012  Pall Sigurdsson 1.0.0-1
+- Initial packaging

check_nagios/check_nagios_configuration

@@ -6,6 +6,7 @@ MESSAGE="Nagios configuration is valid"
 EXIT_CODE=3
 
 TMPFILE=`mktemp`
+trap "rm -f $TMPFILE" EXIT
 nagios -v /etc/nagios/nagios.cfg > $TMPFILE
 RESULT=$?
 

check_rhcs/check_rhcs

@@ -120,9 +120,12 @@ def main():
             usage()
             sys.exit()
 
-    clustatOutput = os.popen('/usr/sbin/clustat -fx')
+    try:
-    dom = xml.dom.minidom.parse(clustatOutput)
+        clustatOutput = os.popen('/usr/sbin/clustat -fx')
-
+        dom = xml.dom.minidom.parse(clustatOutput)
+    except Exception, e:
+	print "Error: could not parse output of : '/usr/sbin/clustat -fx': ", e
+	sys.exit(3)
     if typeCheck == 'cluster':
 
         # First we query for the state of the cluster itself.

check_rhcs/nagios-okplugin-check_rhcs.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 %define plugin_name	check_rhcs
-%define version		0.0.3
+%define version		0.0.4
 
 
 Summary:	A Nagios plugin to check Red Hat Cluster suite (rhel5 and rhel6)
@@ -45,6 +45,17 @@ rm -rf %{buildroot}
 /etc/nrpe.d/%{plugin_name}.cfg
 
 %changelog
+* Thu May 24 2012 Pall Sigurdsson <palli@opensource.is> 0.0.4-1
+- version bump of check_rhcs (palli@opensource.is)
+- check_rhcs_fence added for rhel6 compatibility (palli@opensource.is)
+- copy/paste error removed from spec file (palli@opensource.is)
+
+* Thu May 24 2012 Pall Sigurdsson <palli@opensource.is>
+- make sure plugin exits cleanly if unable to run clustat -fx command
+  (palli@opensource.is)
+- check_rhcs_fence added for rhel6 compatibility (palli@opensource.is)
+- copy/paste error removed from spec file (palli@opensource.is)
+
 * Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is>
 - 
 

check_yum/check_yum

@@ -1,15 +1,36 @@
-#!/usr/bin/env python
+#!/usr/bin/python
+# coding=utf-8
 
-"""Nagios plugin to test for Yum updates on RedHat/CentOS Linux.
+#Copyright © 2008-2012, Hari Sekhon <harisekhon@gmail.com>.
+#Copyright © 2012, Christoph Anton Mitterer <mail@christoph.anton.mitterer.name>.
+#All rights reserved.
+#
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; version 2
+#of the License.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+"""Nagios plugin to check the YUM package management system for package updates.
    Can optionally alert on any available updates as well as just
    security related updates"""
 
 __author__  = "Hari Sekhon"
-__title__   = "Nagios Plugin for Yum updates on RedHat/CentOS systems"
+__title__   = "Nagios plugin to check the YUM package management system for package updates."
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 
 # Changes:
-# 0.7.2 added support for rhel6-style yum output
+# 0.7.2 Addes support for rhel6-style output (palli@opensource.is)
+# 0.7.3 Maintenance taken over by Christoph Anton Mitterer
 
 
 # Standard Nagios return codes
@@ -163,7 +184,7 @@ class YumTester:
 
     def check_returncode(self, returncode, output):
         """Takes the returncode and output (as an array of lines) 
-        of the yum program execution and tests for failures, exits 
+        of the YUM program execution and tests for failures, exits 
         with an appropriate message if any are found"""
 
         if returncode == 0:
@@ -174,7 +195,7 @@ class YumTester:
         elif returncode == 200:
             if "lock" in output[-2] or "another copy is running" in output[-2]:
                 msg = "Cannot check for updates, " \
-                    + "another instance of yum is running"
+                    + "another instance of YUM is running"
                 if self.no_warn_on_lock:
                     end(OK, msg)
                 else:
@@ -185,7 +206,7 @@ class YumTester:
         else:
             if not 'Loading "security" plugin' in output \
                or "Command line error: no such option: --security" in output:
-                end(UNKNOWN, "Security plugin for yum is required. Try to "    \
+                end(UNKNOWN, "Security plugin for YUM is required. Try to "    \
                            + "'yum install yum-security' and then re-run "     \
                            + "this plugin. Alternatively, to just alert on "   \
                            + "any update which does not require the security " \
@@ -282,7 +303,7 @@ class YumTester:
                 raise ValueError
         except ValueError:
             end(UNKNOWN, "Error parsing package information, invalid package " \
-                       + "number, yum output may have changed. Please make "   \
+                       + "number, YUM output may have changed. Please make "   \
                        + "sure you have upgraded to the latest version of "    \
                        + "this plugin. If the problem persists, then please "  \
                        + "contact the author for a fix")
@@ -293,7 +314,7 @@ class YumTester:
         count = 0
         re_package_format = \
                 re.compile("^.+\.(i[3456]86|x86_64|noarch)\s+.+\s+.+$")
-        # This is to work around a yum truncation issue effectively changing
+        # This is to work around a YUM truncation issue effectively changing
         # the package output format. Currently only very long kmod lines
         # are seen to have caused this so we stick to what we know for safety
         # and raise an unknown error on anything else for maximum security
@@ -349,7 +370,7 @@ class YumTester:
                 break
 
         if not summary_line_found:
-            end(WARNING, "Cannot find summary line in yum output. Please "     \
+            end(WARNING, "Cannot find summary line in YUM output. Please "     \
                        + "make sure you have upgraded to the latest version "  \
                        + "of this plugin. If the problem persists, please "    \
                        + "contact the author for a fix")
@@ -358,7 +379,7 @@ class YumTester:
             number_security_updates = int(number_security_updates)
             number_total_updates = int(number_total_updates)
         except ValueError:
-            end(WARNING, "Error parsing package information, yum output " \
+            end(WARNING, "Error parsing package information, YUM output " \
                        + "may have changed. Please make sure you have "     \
                        + "upgraded to the latest version of this plugin. "  \
                        + "If the problem persists, the please contact the " \
@@ -464,7 +485,7 @@ def main():
                        help="Does not distinguish between security and "      \
                           + "non-security updates, but returns critical for " \
                           + "any available update. This may be used if the "  \
-                          + "yum security plugin is absent or you want to "   \
+                          + "YUM security plugin is absent or you want to "   \
                           + "maintain every single package at the latest "    \
                           + "version. You may want to use "                   \
                           + "--warn-on-any-update instead of this option")
@@ -486,7 +507,7 @@ def main():
                        action="store_true",
                        dest="no_cache_update",
                        help="Run entirely from cache and do not update the " \
-                          + "cache when running yum. Useful if you have "    \
+                          + "cache when running YUM. Useful if you have "    \
                           + "'yum makecache' cronned so that the nagios "    \
                           + "check itself doesn't have to do it, possibly "  \
                           + "speeding up execution (by 1-2 seconds in tests)")
@@ -494,22 +515,22 @@ def main():
     parser.add_option( "--no-warn-on-lock",
                        action="store_true",
                        dest="no_warn_on_lock",
-                       help="Return OK instead of WARNING when yum is locked " \
+                       help="Return OK instead of WARNING when YUM is locked " \
                           + "and fails to check for updates due to another "   \
                           + "instance running. This is not recommended from "  \
                           + "the security standpoint, but may be wanted to "   \
                           + "reduce the number of alerts that may "            \
                           + "intermittently pop up when someone is running "   \
-                          + "yum interactively for package management")
+                          + "YUM interactively for package management")
 
     parser.add_option( "--enablerepo",
                        dest="repository_to_enable",
-                       help="Explicitly enables a reposity when calling yum. "
+                       help="Explicitly enables a reposity when calling YUM. "
                           + "Can take a comma separated list of repositories")
 
     parser.add_option( "--disablerepo",
                        dest="repository_to_disable",
-                       help="Explicitly disables a repository when calling yum "
+                       help="Explicitly disables a repository when calling YUM "
                           + "Can take a comma separated list of repositories")
 
     parser.add_option( "-t",
@@ -564,3 +585,4 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         print "Caught Control-C..."
         sys.exit(CRITICAL)
+