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

update rel-eng for fedora20 repos
Merge pull request #10 from gitmopp/patch-2
2026-02-13 02:20:57 +01:00 · 2014-02-18 15:57:42 +00:00 · 2014-02-18 15:57:09 +00:00 · 2014-02-04 05:14:39 -08:00 · 2014-02-04 05:14:24 -08:00 · 2014-01-31 15:06:04 +01:00
4 changed files with 15 additions and 66 deletions
--- a/check_eva/check_eva.py
+++ b/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
-    if output.pop(0).strip() != 'SSSU for HP StorageWorks Command View EVA':
-        error = 1
+        error = 2
+    if output.pop(0).strip().find('SSSU for HP') != 0:
+        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)
--- a/check_msa_hardware-pl/nagios-okplugin-check_msa.spec
+++ b/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)
--- a/rel-eng/packages/nagios-okplugin-check_msa_hardware
+++ b/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/
--- a/rel-eng/releasers.conf
+++ b/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/

-
-[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
+# RHEL 6 Production
 [production-el6-x86_64]
 releaser = tito.release.YumRepoReleaser
 builder = tito.builder.MockBuilder
Author	SHA1	Message	Date
Pall Sigurdsson	22e4293db7	Merge branch 'master' of github.com:opinkerfi/nagios-plugins	2014-02-18 15:57:42 +00:00
Pall Sigurdsson	9b89a3d998	update rel-eng for fedora20 repos	2014-02-18 15:57:09 +00:00
Pall Sigurdsson	553a182dd1	Merge pull request #10 from gitmopp/patch-2 bug in for loop. Looped only once	2014-02-04 05:14:39 -08:00
Pall Sigurdsson	9501bef37b	Merge pull request #9 from gitmopp/patch-1 Fixed output to be more compatible	2014-02-04 05:14:24 -08:00
gitmopp	b672f6f508	bug in for loop. Looped only once	2014-01-31 15:06:04 +01:00
gitmopp	04d25281e3	Fixed output to be more compatible My SSSU 10.1.0 reports "SSSU for HP P6000 Command View" instead of "SSSU for HP StorageWorks Command View EVA". I fixed the output to just check for SSSU for HP	2014-01-30 17:36:33 +01:00
Pall Sigurdsson	9b2474fb49	Automatic commit of package [nagios-okplugin-check_msa_hardware] release [1.0.5-1].	2014-01-30 16:07:10 +00:00