Merge branch 'master' of https://opensource.ok.is/git/misc

check_emc_clariion/check_emc_clariion.pl

@@ -288,7 +288,7 @@ sub check_disk {
 	}
 	close (NAVICLIOUT);
 	if ($disk_ok_count eq 0) {
-		print "No disk were founded !\n";
+		print "No disk were found !\n";
 		$state = 'UNKNOWN';
 	} elsif ($crit_count > 0) {
 		$state='CRITICAL';

check_eva/check_eva.py

@@ -207,7 +207,7 @@ def run_sssu(system=None, command="ls system full"):
 	commands.append(command)
 
 	commandstring = "sssu "
-	for i in commands: commandstring = commandstring + "'%s' " % i 
+	for i in commands: commandstring = commandstring + '"%s" ' % i 
 	global server_side_troubleshooting
 	if server_side_troubleshooting == True:	
 		commandstring = 'cat "debug/%s"' % command

check_ironport/nagios-okplugin-check_ironport.spec

@@ -0,0 +1,48 @@
+%define debug_package %{nil}
+
+Summary:	A Nagios plugin to check Cisco Ironport 
+Name:		nagios-okplugin-check_ironport
+Version:	1.1.4
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/System
+URL:		http://opensource.ok.is/trac/wiki/
+Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_ironport/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 a Cisco Ironport
+
+%prep
+%setup -q
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 check_ironport.py %{buildroot}%{_libdir}/nagios/plugins/check_ironport.py
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/*
+#%config(noreplace) %{_sysconfdir}/nrpe.d/check_bond.cfg
+
+%changelog
+* Tue Jul 31 2012 Pall Sigurdsson <palli@opensource.is> 1.1.4-1
+- initial packaging for nagios-okplugin-check_ironport (palli@opensource.is)
+
+* Tue Jul 31 2012 Pall Sigurdsson <palli@opensource.is> 1.1.3-1
+- new package built with tito
+
+
+* Tue Jul 31 2012  Pall Sigurdsson 1.0.0-1
+- Initial packaging