Merge branch 'master' of github.com:opinkerfi/nagios-plugins

bug in for loop. Looped only once

check_eva/check_eva.py

@@ -49,7 +49,7 @@ timeout = 0  # 0 means no timeout
 server_side_troubleshooting = False
 
 # No real need to change anything below here
-version = "1.0"
+version = "1.0.1"
 ok = 0
 warning = 1
 critical = 2
@@ -239,15 +239,15 @@ def run_sssu(system=None, command="ls system full"):
     if output.pop(0).strip() != '':
         error = 1
     if output.pop(0).strip() != '':
-        error = 1
+        error = 2
-    if output.pop(0).strip() != 'SSSU for HP StorageWorks Command View EVA':
+    if output.pop(0).strip().find('SSSU for HP') != 0:
-        error = 1
+        error = 3
     if output.pop(0).strip().find('Version:') != 0:
-        error = 1
+        error = 4
     if output.pop(0).strip().find('Build:') != 0:
-        error = 1
+        error = 5
     if output.pop(0).strip().find('NoSystemSelected> ') != 0:
-        error = 1
+        error = 6
     #if output.pop(0).strip() != '': error = 1
     #if output.pop(0).strip().find('NoSystemSelected> ') != 0: error=1
     #if output.pop(0).strip() != '': error = 1
@@ -260,7 +260,7 @@ def run_sssu(system=None, command="ls system full"):
         if i.find('information:') > 0:
             break
     if error > 0:
-        print "Error running the sssu command"
+        print "Error running the sssu command: " + str(error)
         print commandstring
         print str_buffer
         exit(unknown)
@@ -572,7 +572,7 @@ def check_generic(command="ls disk full", namefield="objectname", perfdata_field
             if i.has_key(x):
                 longoutput("- %s = %s\n" % (x, i[x]))
 
-        end(summary, perfdata, longserviceoutput, nagios_state)
+    end(summary, perfdata, longserviceoutput, nagios_state)
 
 
 def check_multiple_objects(my_object, name):

check_msa_hardware-pl/nagios-okplugin-check_msa.spec

@@ -4,7 +4,7 @@
 
 Summary:	A Nagios plugin to check status of an MSA (HP P2000) disk array
 Name:		nagios-okplugin-%{plugin}
-Version:	1.0.4
+Version:	1.0.5
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/System
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg
 
 %changelog
+* Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 1.0.5-1
+- 
+
 * Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 1.0.4-1
 - README.md added (you@example.com)
 - nrpe.d added to check_msa (you@example.com)

rel-eng/packages/nagios-okplugin-check_msa_hardware

@@ -1 +1 @@
-1.0.4-1 check_msa_hardware-pl/
+1.0.5-1 check_msa_hardware-pl/

rel-eng/releasers.conf

@@ -6,61 +6,7 @@ builder.mock = fedora-20-x86_64
 builder.test = 1
 rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora20/x86_64/
 
-
+# RHEL 6 Production
-[production-fc20-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = fedora-20-x86_64
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/fedora20/x86_64/
-
-# Fedora FC19
-[test-fc19-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = fedora-19-x86_64
-builder.test = 1
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora19/x86_64/
-
-
-[production-fc19-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = fedora-19-x86_64
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/fedora19/x86_64/
-
-# Fedora FC18
-[test-fc18-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = fedora-18-x86_64
-builder.test = 1
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora18/x86_64/
-
-
-[production-fc18-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = fedora-18-x86_64
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/fedora18/x86_64/
-
-# Fedora FC17
-[test-fc17-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = fedora-17-x86_64
-builder.test = 1
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora17/x86_64/
-
-
-[production-fc17-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = fedora-17-x86_64
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/fedora17/x86_64/
-
-
-
-# RHEL 6
 [production-el6-x86_64]
 releaser = tito.release.YumRepoReleaser
 builder = tito.builder.MockBuilder