diff --git a/check_eva/check_eva.py b/check_eva/check_eva.py index 333b2de..43b89ea 100644 --- 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) @@ -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): diff --git a/check_msa_hardware-pl/README.md b/check_msa_hardware-pl/README.md new file mode 100644 index 0000000..a1729f5 --- /dev/null +++ b/check_msa_hardware-pl/README.md @@ -0,0 +1 @@ +Checks hardware status of MSA disk arrays also known as HP P2000 diff --git a/check_msa_hardware-pl/check_msa_hardware-pl b/check_msa_hardware-pl/check_msa_hardware similarity index 100% rename from check_msa_hardware-pl/check_msa_hardware-pl rename to check_msa_hardware-pl/check_msa_hardware diff --git a/check_msa_hardware-pl/nagios-okplugin-check_msa.spec b/check_msa_hardware-pl/nagios-okplugin-check_msa.spec index 5e18240..f1e6baf 100644 --- a/check_msa_hardware-pl/nagios-okplugin-check_msa.spec +++ b/check_msa_hardware-pl/nagios-okplugin-check_msa.spec @@ -1,10 +1,10 @@ %define debug_package %{nil} -%define plugin check_storwize +%define plugin check_msa_hardware %define packager Pall Sigurdsson Summary: A Nagios plugin to check status of an MSA (HP P2000) disk array Name: nagios-okplugin-%{plugin} -Version: 1.0.0 +Version: 1.0.5 Release: 1%{?dist} License: GPLv3+ Group: Applications/System @@ -46,5 +46,22 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %changelog +* Thu Jan 30 2014 Pall Sigurdsson 1.0.5-1 +- + +* Thu Jan 30 2014 Pall Sigurdsson 1.0.4-1 +- README.md added (you@example.com) +- nrpe.d added to check_msa (you@example.com) +- rename check_msa_hardware-pl (you@example.com) + +* Thu Jan 30 2014 Pall Sigurdsson 1.0.3-1 +- new package built with tito + +* Thu Jan 30 2014 Pall Sigurdsson 1.0.2-1 +- new package built with tito + +* Thu Jan 30 2014 Unknown name 1.0.1-1 +- new package built with tito + * Fri Jan 27 2014 Pall Sigurdsson 1.0.0-1 - Initial Packaging diff --git a/check_msa_hardware-pl/nrpe.d/check_msa_hardware.cfg b/check_msa_hardware-pl/nrpe.d/check_msa_hardware.cfg new file mode 100644 index 0000000..3f242b5 --- /dev/null +++ b/check_msa_hardware-pl/nrpe.d/check_msa_hardware.cfg @@ -0,0 +1 @@ +command[check_msa_hardware]=/usr/lib64/nagios/plugins/check_msa_hardware diff --git a/rel-eng/packages/nagios-okplugin-check_msa_hardware b/rel-eng/packages/nagios-okplugin-check_msa_hardware new file mode 100644 index 0000000..9d68601 --- /dev/null +++ b/rel-eng/packages/nagios-okplugin-check_msa_hardware @@ -0,0 +1 @@ +1.0.5-1 check_msa_hardware-pl/