Fixing url

check_bl/nagios-okplugin-mailblacklist.spec

@@ -3,7 +3,7 @@
 Summary:	A Nagios plugin to check SMTP blacklists
 Name:		nagios-okplugin-mailblacklist
 Version:	1.1
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-MailBlacklist
@@ -11,7 +11,7 @@ Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_bl/releases/%
 Requires:	nagios-plugins
 Requires:	nagios-plugins-perl
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Gardar Thorsteinsson <gardar@ok.is>
+Packager:	Tomas Edwardsson <tommi@ok.is>
 BuildArch:	noarch
 
 
@@ -22,8 +22,6 @@ Checks DNS Blacklists for existance of hosts
 %setup -q
 perl -pi -e "s|/usr/lib|%{_libdir}|g" check_bl
 
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
-
 %build
 
 
@@ -40,9 +38,6 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
-* Fri May 04 2018 Richard Allen <ra@ok.is> 1.1-2
-- Filter out perl-utils dependancy
-
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1
 - 
 

check_brocade/nagios-okplugin-brocade.spec

@@ -3,14 +3,14 @@
 Summary:	A Nagios plugin to check Brocade devices
 Name:		nagios-okplugin-brocade
 Version:	0.0.5
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade
 Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_brocade/releases/nagios-okplugin-brocade-%{version}.tar.gz
 Requires:	perl-Nagios-Plugin
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Gardar Thorsteinsson <gardar@ok.is>
+Packager:	Tomas Edwardsson <tommi@ok.is>
 
 
 %description
@@ -20,8 +20,6 @@ Checks Brocade devices
 %setup -q
 perl -pi -e "s|/usr/lib|%{_libdir}|g" check_brocade_env
 
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
-
 %build
 
 
@@ -38,9 +36,6 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
-* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 0.0.5-2
-- filter out perl-utils dep
-
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 0.0.5-1
 - 
 

check_cifs/nagios-okplugin-cifs.spec

@@ -3,7 +3,7 @@
 Summary:	A Nagios plugin to check CIFS shares
 Name:		nagios-okplugin-cifs
 Version:	1.1
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade
@@ -11,7 +11,7 @@ Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_cifs/releases
 Requires:	perl-Nagios-Plugin
 Requires:	samba-client, krb5-workstation
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager: Gardar Thorsteinsson <gardar@ok.is>	
+Packager:	Tomas Edwardsson <tommi@ok.is>
 BuildArch:	noarch
 
 
@@ -23,8 +23,6 @@ NTML authentication
 %setup -q
 perl -pi -e "s|/usr/lib|%{_libdir}|g" check_cifs
 
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
-
 %build
 
 
@@ -41,9 +39,6 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
-* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 1.1-2
-- Filter out perl-utils dep
-
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1
 - Merge github.com:opinkerfi/misc (palli@opensource.is)
 

check_firewall_active/nagios-okplugin-check_firewall_active.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check if iptables are actually enforcing rules
 Name:		nagios-okplugin-check_firewall_active
-Version:	1.0.2
+Version:	1.0.0
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -46,7 +46,5 @@ rm -rf %{buildroot}
 restorecon -v %{_libdir}/nagios/plugins/check_firewall_active.sh /etc/nrpe.d/check_firewall_active.cfg /etc/sudoers.d/check_firewall_active
 
 %changelog
-* Thu Dec 21 2016  Gardar Thorsteinsson <gardart@gmail.com> 1.0.1-1
-* Thu Dec 21 2016  Gardar Thorsteinsson <gardart@gmail.com> 1.0.0-3
 * Thu Dec 20 2016  Richard Allen <ra@ok.is> 0.1-1
 - Initial packaging

check_hpssacli/LICENSE

@@ -1,341 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-               51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

check_hpssacli/README

@@ -1,53 +0,0 @@
-= check_hpssacli =
-Checks the raid status on a HP Array using hpssacli. to check the following:
-
- * Controller Status
- * Controller Cache Status
- * Logical disk health (raid status)
- * Physical disk health
-
-== Download ==
-check_hpssacli.py depends on the hpssacli binary which comes with the HP Proliant Support Pack (PSP). The PSP can be downloaded [http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack here].
-
-You can get check_hpacucly.py directly from our subversion repo [http://opensource.is/trac/browser/nagios-plugins/check_hpssacli/trunk here]
-
-== help page ==
-{{{
-# python check_hpssacli.py  --help
-check_hpssacli version 1.0
-This plugin checks HP Array with the hpssacli command
-
-Usage: check_hpssacli.py 
-Usage: check_hpssacli.py [--help]
-Usage: check_hpssacli.py [--version]
-Usage: check_hpssacli.py [--path </path/to/hpssacli>]
-Usage: check_hpssacli.py [--no-perfdata]
-Usage: check_hpssacli.py [--no-longoutput]
-
-
-}}}
-
-== Example output ==
-{{{
-# ./check_hparray --all
-OK - Found 1 controllers, 2 logicaldisks. 8 physicaldisks.  | 
-
-Smart Array P400 in Slot 1
-- Controller Status: OK (sn: P61620F9VV6FX2)
-- Cache Status: OK (sn: PA82C0H9VV4695)
-
-Checking logical Disks:
-- Logical Drive: 1 (/boot 101 MB) = OK
-- Logical Drive: 2 (None) = OK
-
-Checking Physical Disks:
-- physicaldrive 2I:1:1, SAS, 146 GB = OK
-- physicaldrive 2I:1:2, SAS, 146 GB = OK
-- physicaldrive 1I:1:5, SAS, 146 GB = OK
-- physicaldrive 1I:1:6, SAS, 146 GB = OK
-- physicaldrive 1I:1:7, SAS, 146 GB = OK
-- physicaldrive 1I:1:8, SAS, 146 GB = OK
-- physicaldrive 2I:1:3, SAS, 146 GB = OK
-- physicaldrive 2I:1:4, SAS, 146 GB = OK
-}}}
-

check_hpssacli/check_hpssacli.py

@@ -1,362 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2019, Gardar Thorsteinsson <gardar@ok.is>
-#
-# check_hpssacli.py is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# check_hpssacli.py is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# About this script
-#
-# This script will check the status of Smart Array Raid Controller
-# You need the hpssacli binary in path (/usr/sbin/hpssacli is a good place)
-# hpssacli comes with the Proliant Support Pack (PSP) from HP
-
-debugging = False
-
-# No real need to change anything below here
-version = "1.1"
-ok = 0
-warning = 1
-critical = 2
-unknown = 3
-not_present = -1
-nagios_status = -1
-
-state = {}
-state[not_present] = "Not Present"
-state[ok] = "OK"
-state[warning] = "Warning"
-state[critical] = "Critical"
-state[unknown] = "Unknown"
-
-
-longserviceoutput = "\n"
-perfdata = ""
-summary = ""
-sudo = False
-
-
-from sys import exit
-from sys import argv
-from os import getenv, putenv, environ
-import subprocess
-
-
-def print_help():
-    print "check_hpssacli version %s" % version
-    print "This plugin checks HP Array with the hpssacli command"
-    print ""
-    print "Usage: %s " % argv[0]
-    print "Usage: %s [--help]" % argv[0]
-    print "Usage: %s [--version]" % argv[0]
-    print "Usage: %s [--path </path/to/hpssacli>]" % argv[0]
-    print "Usage: %s [--no-perfdata]" % argv[0]
-    print "Usage: %s [--no-longoutput]" % argv[0]
-    print  ""
-
-
-def error(errortext):
-    print "* Error: %s" % errortext
-    print_help()
-    print "* Error: %s" % errortext
-    exit(unknown)
-
-
-def debug(debugtext):
-    global debugging
-    if debugging:
-        print  debugtext
-
-
-def runCommand(command):
-    """ Run command from the shell prompt. Exit Nagios style if unsuccessful"""
-    proc = subprocess.Popen(command,
-                            shell=True,
-                            stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE,
-                            )
-    stdout, stderr = proc.communicate('through stdin to stdout')
-    if proc.returncode > 0:
-        print "Error %s: %s\n command was: '%s'"\
-              % (proc.returncode, stderr.strip(), command)
-    debug("results: %s" % (stdout.strip()))
-    if proc.returncode == 127:  # File not found, lets print path
-        path = getenv("PATH")
-        print "Check if your path is correct %s" % (path)
-    if stderr.find('Password:') == 0 and command.find('sudo') == 0:
-        print "Check if user is in the sudoers file"
-    if stderr.find('sorry, you must have a tty to run sudo') == 0 and command.find('sudo') == 0:
-        print "Please remove 'requiretty' from /etc/sudoers"
-        exit(unknown)
-    else:
-        return stdout
-
-
-def end():
-    global summary
-    global longserviceoutput
-    global perfdata
-    global nagios_status
-    print "%s - %s | %s" % (state[nagios_status], summary, perfdata)
-    print longserviceoutput
-    if nagios_status < 0:
-        nagios_status = unknown
-    exit(nagios_status)
-
-
-def add_perfdata(text):
-    global perfdata
-    text = text.strip()
-    perfdata = perfdata + " %s " % (text)
-
-
-def add_long(text):
-    global longserviceoutput
-    longserviceoutput = longserviceoutput + text + '\n'
-
-
-def add_summary(text):
-    global summary
-    summary = summary + text
-
-
-def set_path(path):
-    current_path = getenv('PATH')
-    if current_path.find('C:\\') > -1:  # We are on this platform
-        if path == '':
-            path = ";C:\Program Files\hp\hpssacli\Bin"
-            path = path + ";C:\Program Files (x86)\hp\hpssacli\Bin"
-            path = path + ";C:\Program Files\Smart Storage Administrator\ssacli\bin"
-        else:
-            path = ';' + path
-    else:  # Unix/Linux, etc
-        if path == '':
-            path = ":/usr/sbin"
-        else:
-            path = ':' + path
-    current_path = "%s%s" % (current_path, path)
-    environ['PATH'] = current_path
-
-
-def run_hpssacli(run_type='controllers', controller=None):
-    if run_type == 'controllers':
-        command = "hpssacli  controller all show detail"
-    elif run_type in ('logicaldisks', 'physicaldisks'):
-        if 'Slot' not in controller:
-            add_summary("Controller not found")
-            end()
-        identifier = 'slot=%s' % (controller['Slot'])
-        command = "hpssacli  controller %s %s all show detail"
-        if run_type == 'logicaldisks':
-            subcommand = 'ld'
-        elif run_type == 'physicaldisks':
-            subcommand = 'pd'
-        else:
-            end()
-            return
-        command = command % (identifier, subcommand)
-    debug(command)
-    if sudo:
-        command = "sudo " + command
-    output = runCommand(command)
-    # Some basic error checking
-    error_strings = ['Permission denied']
-    error_strings.append('Error: You need to have administrator rights to continue.')
-    for error in error_strings:
-        if output.find(error) > -1 and output.find("sudo") != 0:
-            command = "sudo " + command
-            print command
-            output = runCommand(command)
-    output = output.split('\n')
-    objects = []
-    my_object = None
-    for i in output:
-        if len(i) == 0:
-            continue
-        if i.strip() == '':
-            continue
-        if i.startswith('Note:'):
-            continue
-        if run_type == 'controllers' and i[0] != ' ':   # space on first line
-            if my_object and not my_object in objects:
-                objects.append(my_object)
-            my_object = {}
-            my_object['name'] = i
-        elif run_type == 'logicaldisks' and i.find('Logical Drive:') > 0:
-            if my_object and not my_object in objects:
-                objects.append(my_object)
-            my_object = {}
-            my_object['name'] = i.strip()
-        elif run_type == 'physicaldisks' and i.find('physicaldrive') > 0:
-            if my_object and not my_object in objects:
-                objects.append(my_object)
-            my_object = {}
-            my_object['name'] = i.strip()
-        else:
-            i = i.strip()
-            if i.find(':') < 1:
-                continue
-            i = i.split(':')
-            if i[0] == '':
-                continue  # skip empty lines
-            if len(i) == 1:
-                continue
-            key = i[0].strip()
-            value = ' '.join(i[1:]).strip()
-            my_object[key] = value
-    if my_object and not my_object in objects:
-        objects.append(my_object)
-    return objects
-
-
-controllers = []
-
-
-def check_controllers():
-    global controllers
-    status = -1
-    controllers = run_hpssacli()
-    if len(controllers) == 0:
-        add_summary("No Disk Controllers Found. Exiting...")
-        global nagios_state
-        nagios_state = unknown
-        end()
-    add_summary("Found %s controllers" % (len(controllers)))
-    for i in controllers:
-        controller_status = check(i, 'Controller Status', 'OK')
-        status = max(status, controller_status)
-
-        cache_status = check(i, 'Cache Status')
-        status = max(status, cache_status)
-
-        controller_serial = 'n/a'
-        cache_serial = 'n/a'
-        if 'Serial Number' in i:
-            controller_serial = i['Serial Number']
-        if 'Cache Serial Number' in i:
-            cache_serial = i['Cache Serial Number']
-        add_long("%s" % (i['name']))
-        add_long("- Controller Status: %s (sn: %s)"
-                 % (state[controller_status], controller_serial))
-        add_long("- Cache Status: %s (sn: %s)"
-                  % (state[cache_status], cache_serial))
-
-        if controller_status > ok or cache_status > ok:
-            add_summary(";%s on %s;" % (state[controller_status], i['name']))
-
-    add_summary(', ')
-    return status
-
-
-def check_logicaldisks():
-    global controllers
-    if len(controllers) < 1:
-        controllers = run_hpssacli()
-    logicaldisks = []
-    for controller in controllers:
-        for ld in run_hpssacli(run_type='logicaldisks',
-                                controller=controller):
-            logicaldisks.append(ld)
-    status = -1
-    add_long("\nChecking logical Disks:")
-    add_summary("%s logicaldisks" % (len(logicaldisks)))
-    for i in logicaldisks:
-        ld_status = check(i, 'Status')
-        status = max(status, ld_status)
-
-        if i.get('Status') == 'Failed':
-            status = max(status, critical)
-
-        mount_point = i['Mount Points']
-        add_long("- %s (%s) = %s" % (i['name'], mount_point, state[ld_status]))
-    add_summary(". ")
-
-
-def check_physicaldisks():
-    global controllers
-    disktype = 'physicaldisks'
-    if len(controllers) < 1:
-        controllers = run_hpssacli()
-    disks = []
-    for controller in controllers:
-        for disk in run_hpssacli(run_type=disktype, controller=controller):
-            disks.append(disk)
-    status = -1
-    add_long("\nChecking Physical Disks:")
-    add_summary("%s %s" % (len(disks), disktype))
-    for i in disks:
-        disk_status = check(i, 'Status')
-        status = max(status, disk_status)
-
-        size = i['Size']
-        firmware = i['Firmware Revision']
-        interface = i['Interface Type']
-        serial = i['Serial Number']
-        model = i['Model']
-        add_long("- %s, %s, %s = %s" %
-                 (i['name'], interface, size, state[disk_status])
-        )
-        if disk_status > ok:
-            error_str = "-- Replace drive, firmware=%s, model=%s, serial=%s"
-            add_long(error_str % (firmware, model, serial))
-    if status > ok:
-        add_summary("(errors)")
-        add_summary(". ")
-
-
-def check(my_object, field, valid_states=None):
-    if valid_states is None:
-        valid_states = ['OK']
-    state = -1
-    global nagios_status
-    if field in my_object:
-        if my_object[field] in valid_states:
-            state = ok
-        else:
-            state = warning
-    nagios_status = max(nagios_status, state)
-    return state
-
-
-def parse_arguments():
-    arguments = argv[1:]
-    while len(arguments) > 0:
-        arg = arguments.pop(0)
-        if arg == '--help':
-            print_help()
-            exit(ok)
-        elif arg == '--path':
-            path = arguments.pop(0)
-            set_path(path)
-        elif arg == '--debug':
-            global debugging
-            debugging = True
-        elif arg == '--sudo':
-            global sudo
-            sudo = True
-        else:
-            print_help()
-            exit(unknown)
-
-
-def main():
-    parse_arguments()
-    set_path('')
-    check_controllers()
-    check_logicaldisks()
-    check_physicaldisks()
-    end()
-
-
-if __name__ == '__main__':
-    main()

check_hpssacli/nagios-okplugin-check_hpssacli.spec

@@ -1,45 +0,0 @@
-%define debug_package %{nil}
-
-Summary:	A Nagios plugin to check HP Array with hpssacli
-Name:		nagios-okplugin-check_hpssacli
-Version:	1
-Release:	1%{?dist}
-License:	GPLv2+
-Group:		Applications/System
-URL:		http://opensource.is/trac/wiki/check_hpssacli
-Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_hpssacli/releases/nagios-okplugin-check_hpssacli-%{version}.tar.gz
-Requires:	hpssacli
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Gardar Thorsteinsson <gardar@ok.is>
-
-
-%description
-Checks HP Array with hpssacli
-
-%prep
-%setup -q
-perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/check_hpssacli.cfg
-perl -pi -e "s|/usr/lib64|%{_libdir}|g" sudoers.d/*
-
-%build
-
-
-%install
-rm -rf %{buildroot}
-install -D -p -m 0755 check_hpssacli.py %{buildroot}%{_libdir}/nagios/plugins/check_hpssacli.py
-install -D -p -m 0755 nrpe.d/check_hpssacli.cfg %{buildroot}/etc/nrpe.d/check_hpssacli.cfg
-install -D -p -m 0440 sudoers.d/check_hpssacli %{buildroot}/etc/sudoers.d/check_hpssacli
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc README LICENSE
-%{_libdir}/nagios/plugins/*
-/etc/nrpe.d/check_hpssacli.cfg
-/etc/sudoers.d/check_hpssacli
-
-%changelog
-* Fri Jun 14 2019 Gardar Thorsteinsson <gardar@ok.is> 1.1
-- Initial packaging

check_hpssacli/nrpe.d/check_hpssacli.cfg

@@ -1,2 +0,0 @@
-command[check_hpssacli]=sudo /usr/lib/nagios/plugins/check_hpssacli.py
-

check_hpssacli/sudoers.d/check_hpssacli

@@ -1,2 +0,0 @@
-Defaults:nrpe	!requiretty
-nrpe        ALL=(ALL)       NOPASSWD: /usr/lib64/nagios/plugins/check_hpssacli.py

check_ipa/check_ipa_replication

@@ -46,9 +46,9 @@ except Exception, e:
 # Loop through replication agreements
 for rhost in replication:
     plugin.add_summary("Replica %s Status: %s" % (rhost[1]['nsDS5ReplicaHost'][0], rhost[1]['nsds5replicaLastUpdateStatus'][0]))
-    if rhost[1]['nsds5replicaLastUpdateStatus'][0][7:8] == "0":
+    if rhost[1]['nsds5replicaLastUpdateStatus'][0][:2] == "0 ":
         plugin.status(ok)
-    elif rhost[1]['nsds5replicaLastUpdateStatus'][0][7:8] == "1":
+    elif rhost[1]['nsds5replicaLastUpdateStatus'][0][:2] == "1 ":
         # Busy Replica is not an error, its "unknown" (but its "ok" for now)
         plugin.status(ok)
     else:

check_msa_hardware-pl/nagios-okplugin-check_msa.spec

@@ -1,11 +1,11 @@
 %define debug_package %{nil}
 %define plugin check_msa_hardware
-%define packager Gardar Thorsteinsson <gardar@ok.is>
+%define packager Pall Sigurdsson <palli@opensource.is>
 
 Summary:	A Nagios plugin to check status of an MSA (HP P2000) disk array
 Name:		nagios-okplugin-%{plugin}
 Version:	1.0.5
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/System
 URL:		https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin}
@@ -21,8 +21,6 @@ Checks status of a remote MSA disk array, also known as HP P2000
 %prep
 %setup -q
 
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
-
 %build
 
 
@@ -48,9 +46,6 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg
 
 %changelog
-* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 1.0.5-2
-- Filter out perl-utils dep
-
 * Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 1.0.5-1
 - 
 

check_multipath/check_multipath

@@ -48,9 +48,9 @@ print_help() {
 
 	echo "Add this to your sudoers file by running visudo to add access:"
 	if [ -r /proc/modules ]; then
-		echo "Cmnd_Alias MULTIPATH=$MULTIPATH -ll"
+		echo "Cmnd_Alias MULTIPATH=$MULTIPATH -l"
 	else
-		echo "Cmnd_Alias MULTIPATH=$MULTIPATH -ll, $SUDO"
+		echo "Cmnd_Alias MULTIPATH=$MULTIPATH -l, $SUDO"
 	fi
 	echo "nagios  ALL= NOPASSWD: MULTIPATH"
 	echo "The user nagios may very well be nobody or someone else depending on your configuration"
@@ -98,7 +98,7 @@ if [ $(id -un) != "root" ]; then
 	fi
 fi
 
-OUTPUT=$($MULTIPATH -ll 2>/dev/null)
+OUTPUT=$($MULTIPATH -l 2>/dev/null)
 if [ $? != 0 ]; then
 	# Failed. grab more info why
 	if [ $(id -un) != "root" ] && [ `$SUDO -l | grep -c multipath` -eq 0 ]; then
@@ -112,7 +112,7 @@ if [ $? != 0 ]; then
 		exit $STATE_UNKNOWN
 	fi
 
-	echo "MULTIPATH: $($MULTIPATH -ll 2>&1)"
+	echo "MULTIPATH: $(MULTIPATH -l 2>&1)"
 	exit $STATE_UNKNOWN
 fi
 
@@ -137,7 +137,6 @@ if [ "$NUMPATHS" ]; then
    	/^ \\/ {targets++; next} # count targets (lenny)
    	/[0-9]+:[0-9]+:[0-9]+:[0-9]+/ { 
    		if (/active undef running/) { targets++ }	# count targets (squeeze)
-   		if (/active ready running/) { targets++ }	# count targets (RHEL6)
    		next
    	} 
 	{

check_snmp/nagios-okplugin-check_snmp.spec

@@ -3,14 +3,14 @@
 Summary:	Various nagios plugins to check cpu,memory,interfaces via SNMP
 Name:		nagios-okplugin-check_snmp
 Version:	2
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.is/trac/wiki/check_snmp
 Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_snmp/releases/nagios-okplugin-check_snmp-%{version}.tar.gz
 Requires:	perl-Net-SNMP
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Packager:	Gardar Thorsteinsson <gardar@ok.is>
+Packager:	Pall Sigurdsson <palli@opensource.is>
 
 
 %description
@@ -20,8 +20,6 @@ Various nagios plugins to check cpu,memory,interfaces via SNMP
 %setup -q
 #perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/check_hpacucli.cfg
 
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
-
 %build
 
 
@@ -47,9 +45,6 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
-* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 2-2
-- Filter out perl-utils dep
-
 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
 - make sure nagios does not run us in embedded perl (palli@opensource.is)