Automatic commit of package [nagios-okplugin-check_rhcs] release [0.0.4-1].

version bump of check_rhcs
check_command is now sudo'ed
2026-02-13 02:20:57 +01:00 · 2012-05-24 07:07:15 +00:00 · 2012-05-24 07:07:04 +00:00 · 2012-05-16 10:37:03 +00:00 · 2012-05-16 10:20:19 +00:00 · 2012-05-16 10:08:37 +00:00
16 changed files with 185 additions and 9 deletions
--- a/check_apcext.pl/nagios-okplugin-apc.spec
+++ b/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
--- a/check_bl/nagios-okplugin-mailblacklist.spec
+++ b/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
--- a/check_cifs/nagios-okplugin-cifs.spec
+++ b/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
--- a/check_cpu.sh/nagios-plugins-check_cpu.spec
+++ b/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 %) 
--- a/check_disks.pl/check_disks.pl
+++ b/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'} ;
 }
--- a/check_disks.pl/nagios-okplugin-check_disks.spec
+++ b/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

--- a/check_drbd/nagios-okplugin-check_drbd.spec
+++ b/check_drbd/nagios-okplugin-check_drbd.spec
@@ -0,0 +1,59 @@
+%define debug_package %{nil}
+
+%define plugin_name	check_drbd
+
+
+Summary:	A Nagios plugin to check Linux Devicemapper Multipathing
+Name:		nagios-okplugin-%{plugin_name}
+Version:	0.0.4
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/System
+URL:		http://opensource.is/trac/wiki/%{plugin_name}
+Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/%{plugin_name}/releases/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	Pall Sigurdsson <palli@opensource.is>
+
+
+%description
+%{summary}
+
+%prep
+%setup -q
+perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/%{plugin_name}.cfg
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 check_drbd %{buildroot}%{_libdir}/nagios/plugins/check_drbd
+install -D -p -m 0755 nrpe.d/%{plugin_name}.cfg %{buildroot}/etc/nrpe.d/%{plugin_name}.cfg
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+#%doc README LICENSE
+%{_libdir}/nagios/plugins/*
+/etc/nrpe.d/%{plugin_name}.cfg
+
+%changelog
+* Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is> 0.0.4-1
+- licence and readme removed from specfile (palli@opensource.is)
+
+* Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is>
+- licence and readme removed from specfile (palli@opensource.is)
+
+* Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is>
+- licence and readme removed from specfile (palli@opensource.is)
+
+* Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is>
+- licence and readme removed from specfile (palli@opensource.is)
+
+* Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is> 0.0.3-1
+- new package built with tito
+
+* Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 0.0.2-1
+- new package built with tito
--- a/check_drbd/nrpe.d/check_drbd.cfg
+++ b/check_drbd/nrpe.d/check_drbd.cfg
--- a/check_hpacucli/nrpe.d/check_hpacucli.cfg
+++ b/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

--- a/check_ibm_bladecenter/check_ibm_bladecenter.py
+++ b/check_ibm_bladecenter/check_ibm_bladecenter.py
@@ -300,7 +300,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)
--- a/check_mssql_health/nagios-okplugin-mssql.spec
+++ b/check_mssql_health/nagios-okplugin-mssql.spec
@@ -2,7 +2,7 @@

 Summary:	Nagios plugins to check the status of MS-SQL Servers
 Name:		nagios-okplugin-mssql
-Version:	0.0.5
+Version:	0.0.7
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -39,6 +39,12 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*

 %changelog
+* Mon Mar 19 2012 Pall Sigurdsson <palli@opensource.is> 0.0.7-1
+- 
+
+* Mon Mar 19 2012 Pall Sigurdsson <palli@opensource.is>
+- 
+
 * Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 0.0.5-1
 - 

--- a/check_nagios/check_nagios_configuration
+++ b/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=$?

--- a/check_rhcs/check_rhcs
+++ b/check_rhcs/check_rhcs
@@ -120,9 +120,12 @@ def main():
            usage()
            sys.exit()

-    clustatOutput = os.popen('/usr/sbin/clustat -fx')
-    dom = xml.dom.minidom.parse(clustatOutput)
-
+    try:
+        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.
--- a/check_rhcs/check_rhcs_fence
+++ b/check_rhcs/check_rhcs_fence
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+
+
+OK=0
+WARNING=1
+CRITICAL=2
+UNKNOWN=3
+
+STATUS=$UNKNOWN
+
+OUTPUT=`fence_tool ls | grep "wait state" | awk '{ print $3}' `
+
+if [ "$OUTPUT" = "none" ]; then
+        STATUS=$OK
+fi
+
+
+echo "Fence wait state (fence_tool ls) is: $OUTPUT"
+exit $STATUS
+
+
--- a/check_rhcs/nagios-okplugin-check_rhcs.spec
+++ b/check_rhcs/nagios-okplugin-check_rhcs.spec
@@ -0,0 +1,69 @@
+%define debug_package %{nil}
+
+%define plugin_name	check_rhcs
+%define version		0.0.4
+
+
+Summary:	A Nagios plugin to check Red Hat Cluster suite (rhel5 and rhel6)
+Name:		nagios-okplugin-%{plugin_name}
+Version:	%{version}
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/System
+URL:		http://opensource.is/trac/wiki/%{plugin_name}
+Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/%{plugin_name}/releases/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	Pall Sigurdsson <palli@opensource.is>
+
+
+%description
+%{summary}
+
+%prep
+%setup -q
+perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/%{plugin_name}.cfg
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 check_rhcs %{buildroot}%{_libdir}/nagios/plugins/check_rhcs
+install -D -p -m 0755 check_rhcs_cman_group.sh %{buildroot}%{_libdir}/nagios/plugins/check_rhcs_cman_group.sh
+install -D -p -m 0755 check_rhcs_manualfencing.sh %{buildroot}%{_libdir}/nagios/plugins/check_rhcs_manualfencing.sh
+install -D -p -m 0755 check_rhcs_fence %{buildroot}%{_libdir}/nagios/plugins/check_rhcs_fence
+
+install -D -p -m 0755 nrpe.d/%{plugin_name}.cfg %{buildroot}/etc/nrpe.d/%{plugin_name}.cfg
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+#%doc README LICENSE
+%{_libdir}/nagios/plugins/*
+/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>
+- 
+
+* Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is> 0.0.3-1
+- new package built with tito
+
+* Wed Mar 14 2012 Pall Sigurdsson <palli@opensource.is> 0.0.3-1
+- new package built with tito
+
+* Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 0.0.2-1
+- new package built with tito
--- a/check_rhcs/nrpe.d/check_rhcs.cfg
+++ b/check_rhcs/nrpe.d/check_rhcs.cfg
@@ -14,3 +14,7 @@ command[check_rhcs_cman_group]=/usr/lib64/nagios/plugins/check_rhcs_cman_group.s
 command[check_rhcs_cman_group_default]=/usr/lib64/nagios/plugins/check_rhcs_cman_group.sh --level 0 --group default
 command[check_rhcs_cman_group_rgmanager]=/usr/lib64/nagios/plugins/check_rhcs_cman_group.sh --level 1 --group rgmanager

+
+# RHEL 6 specific
+command[check_rhcs6_fencing]=/usr/lib64/nagios/plugins/check_rhcs_fence
+
Author	SHA1	Message	Date
Pall Sigurdsson	bf9ecb7777	Automatic commit of package [nagios-okplugin-check_rhcs] release [0.0.4-1].	2012-05-24 07:07:15 +00:00
Pall Sigurdsson	756c0ef1de	version bump of check_rhcs	2012-05-24 07:07:04 +00:00
Pall Sigurdsson	9346c1a60d	check_command is now sudo'ed	2012-05-16 10:37:03 +00:00
Tomas Edwardsson	77b527f44d	Automatic commit of package [nagios-okplugin-check_disks] release [1.0.3-1].	2012-05-16 10:20:19 +00:00
Tomas Edwardsson	5a4d14734e	Updated version of nagios-okplugin-check_disks	2012-05-16 10:08:37 +00:00
Pall Sigurdsson	27f4da23bf	Merge branch 'master' of http://opensource.ok.is/git/misc	2012-05-11 13:33:07 +00:00
Tomas Edwardsson	468f7ef32a	Merge branch 'master' of https://opensource.ok.is/git/misc	2012-05-10 11:20:10 +00:00
Tomas Edwardsson	682ad04b9e	Issue #56 , temporary fix for selinux and disk checks	2012-05-10 11:19:01 +00:00
Tomas Edwardsson	6f5041d8cd	Issue 56, temporary fix for selinux and disk checks	2012-05-10 11:17:49 +00:00
Pall Sigurdsson	2c23f04ffa	Merge branch 'master' of https://opensource.ok.is/git/misc	2012-04-23 12:44:12 +00:00
Pall Sigurdsson	ceda55b389	make sure plugin exits cleanly if unable to run clustat -fx command	2012-04-23 12:43:14 +00:00
Tomas Edwardsson	af98917b05	Merge branch 'master' of https://opensource.ok.is/git/misc	2012-04-20 14:41:24 +00:00
Tomas Edwardsson	ddaad8f39d	Updates buildarch to noarch	2012-04-20 14:41:11 +00:00
Tomas Edwardsson	d6f9b6093f	Updates buildarch to noarch	2012-04-20 14:40:54 +00:00
Tomas Edwardsson	381aef1156	Updated buildarch to noarch	2012-04-20 14:40:13 +00:00
Tomas Edwardsson	ed9d2eb2b9	Added noarch buildarch	2012-04-20 14:39:47 +00:00
Tomas Edwardsson	9248569b6d	Issue 49, fixed typo for blower	2012-04-20 14:37:54 +00:00
Pall Sigurdsson	26e5c218b9	Automatic commit of package [nagios-okplugin-mssql] release [0.0.7-1].	2012-03-19 11:18:42 +00:00
Pall Sigurdsson	aa41f16b6e	check_rhcs_fence added for rhel6 compatibility	2012-03-16 11:17:48 +00:00
Pall Sigurdsson	6230193b05	Automatic commit of package [nagios-okplugin-check_drbd] release [0.0.4-1].	2012-03-14 14:25:32 +00:00
Pall Sigurdsson	bbc5893cfe	copy/paste error removed from spec file	2012-03-14 14:17:18 +00:00
Pall Sigurdsson	599134bc5e	Automatic commit of package [nagios-okplugin-check_rhcs] release [0.0.3-1].	2012-03-14 14:16:31 +00:00
Pall Sigurdsson	f60a518bd3	licence and readme removed from specfile	2012-03-14 14:13:12 +00:00
Pall Sigurdsson	f4615ffed5	Automatic commit of package [nagios-okplugin-check_drbd] release [0.0.3-1].	2012-03-14 14:11:39 +00:00
Pall Sigurdsson	5cdbba7b66	Merge manage.tr.is:/opt/misc	2012-03-04 16:23:00 +00:00
root	15b9e64a88	fixed missing tempfile cleanup	2012-03-04 16:22:37 +00:00