Automatic commit of package [nagios-okplugin-ipa] release [0.0.4-1].

Removed socket.gethostname to discover own hostname instead using the
local flag which is output from /usr/sbin/clustat -fx node definitions.
The gethostname does not always match the cluster node name which would
make the check fail.

check_apcext.pl/nagios-okplugin-apc.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check APC devices
 Name:		nagios-okplugin-apc
-Version:	2.1.0
+Version:	2.1.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -38,6 +38,12 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Thu Mar 20 2014 Tomas Edwardsson <tommi@tommi.org> 2.1.1-1
+- Merge github.com:opinkerfi/misc (palli@opensource.is)
+- Use the right value for the job nbmstemp (tommi@tommi.org)
+- Fixed metric conversion for all mibs (tommi@opensource.is)
+- Added fahrenheit to celsius conversion (tommi@tommi.org)
+
 * Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 2.1.0-1
 - Version number bumped to 2.1.0 (palli@opensource.is)
 - Added noarch buildarch (tommi@tommi.org)

check_bl/nagios-okplugin-mailblacklist.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check SMTP blacklists
 Name:		nagios-okplugin-mailblacklist
-Version:	1.0
+Version:	1.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -38,6 +38,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1
+- 
+
 * Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 1.0-1
 - Updated buildarch to noarch (tommi@tommi.org)
 

check_bond/nagios-okplugin-bond.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check network bond devices
 Name:		nagios-okplugin-bond
-Version:	0.0.3
+Version:	0.0.4
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -40,6 +40,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/nrpe.d/check_bond.cfg
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 0.0.4-1
+- Merge pull request #5 from pallvalmundsson/check_yum_security_patch (palli-
+  github@minor.is)
+
 * Wed Mar 13 2013 Pall Sigurdsson <palli@opensource.is> 0.0.3-1
 - 
 

check_brocade/nagios-okplugin-brocade.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check Brocade devices
 Name:		nagios-okplugin-brocade
-Version:	0.0.4
+Version:	0.0.5
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -36,6 +36,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 0.0.5-1
+- 
+
 * Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 0.0.4-1
 - new package built with tito
 

check_cifs/nagios-okplugin-cifs.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check CIFS shares
 Name:		nagios-okplugin-cifs
-Version:	1.0
+Version:	1.1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -39,6 +39,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1
+- Merge github.com:opinkerfi/misc (palli@opensource.is)
+
 * Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 1.0-1
 - version number of scripts bumped (palli@opensource.is)
 - Updates buildarch to noarch (tommi@tommi.org)

check_cpu.py/nagios-okplugin-check_cpu.spec

@@ -0,0 +1,59 @@
+%define debug_package %{nil}
+
+Summary:	A Nagios plugin to check CPU on Linux servers
+Name:		nagios-okplugin-check_cpu
+Version:	1.1
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/System
+URL:		https://github.com/opinkerfi/nagios-plugins/
+Source0:	https://github.com/opinkerfi/nagios-plugins/archive/%{name}-%{version}-%{release}.tar.gz
+Requires:	nagios-okplugin-common
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	Tomas Edwardsson <tommi@tommi.org>
+BuildArch:	noarch
+
+%description
+Check cpu states on line machines
+
+%prep
+%setup -q
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 okplugin_check_cpu %{buildroot}%{_libdir}/nagios/plugins/okplugin_check_cpu
+install -D -p -m 0755 nrpe.d/okplugin_check_cpu.cfg %{buildroot}/etc/nrpe.d/okplugin_check_cpu.cfg
+
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/service nrpe reload
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/*
+%{_sysconfdir}/nrpe.d/*
+
+
+
+%changelog
+* Mon Jan 20 2014 Tomas Edwardsson <tommi@tommi.org> 1.1-1
+- new package built with tito
+
+* Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 1.0-1
+- Version number bumped
+- Updates buildarch to noarch (tommi@tommi.org)
+
+* Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 0.3-1
+- new package built with tito
+
+* Thu Nov 25 2010  Pall Sigurdsson <palli@opensource.is> 0.1-2
+- Nrpe config now ships with plugin by default
+* Mon Mar  1 2010  Tomas Edwardsson <tommi@ok.is> 0.1-1
+- Initial packaging
+

check_cpu.py/nrpe.d/okplugin_check_cpu.cfg

@@ -0,0 +1 @@
+command[okplugin_check_cpu]=/usr/lib/nagios/plugins/okplugin_check_cpu

check_cpu.py/okplugin_check_cpu

@@ -0,0 +1,131 @@
+#!/usr/bin/python
+#
+# Copyright 2014, Tomas Edwardsson
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+"""
+Gathers information on cpu usage on a linux machine
+
+It returns performance data for both the last 5 seconds and from last run.
+"""
+
+from pynag.Plugins import PluginHelper, ok, unknown
+import os
+import time
+
+
+def main():
+    """The main logic of the program"""
+
+    # See man proc and search for /proc/stat
+    stat_fields = ['cpu', 'user', 'nice', 'system', 'idle', 'iowait', 'irq',
+                   'softirq', 'steal', 'guest', 'guest_nice']
+
+    pyplug = PluginHelper()
+
+    # Get the statistics from last run
+    old_stat = get_saved_stat()
+
+    # Get current state
+    stat = get_stat()
+
+    # Resample
+    time.sleep(5)
+    stat2 = get_stat()
+
+    try:
+        save_stat(stat)
+    except IOError, err:
+        pyplug.exit(unknown, "Unable to save cpu statistics: %s" % err)
+
+
+    # Calculate averages for the last few seconds
+    current_averages = diff_stats(stat2, stat)
+    for pos in range(len(current_averages)):
+        pyplug.add_metric(label=stat_fields[pos+1],
+                          value=current_averages[pos],
+                          uom="%")
+
+    # Calculate averages from last run
+    if old_stat:
+        last_run_avg = diff_stats(old_stat, stat)
+        for pos in range(len(current_averages)):
+            pyplug.add_metric(label=stat_fields[pos+1]+"_avg",
+                              value=last_run_avg[pos],
+                              uom="%")
+
+    pyplug.add_status(ok)
+    pyplug.add_summary("CPU load %.2f%%" % (100.0 - current_averages[3]))
+    pyplug.exit()
+
+def diff_stats(older, newer):
+    """Calculates the percentage between two stat arrays"""
+    if older:
+        diff = []
+        for pos in range(len(newer)):
+            diff.append(newer[pos] - older[pos])
+        averages =  calc_avg(diff)
+    else:
+        averages =  calc_avg(newer)
+
+    return averages
+
+
+def remove_stale_state():
+    """Removes the last state file if we have rebooted"""
+
+    try:
+        state_mtime = os.stat("/var/lib/nagios-okplugin/check_cpu").st_mtime
+        boot_time = os.stat("/proc/1").st_mtime
+        if state_mtime < boot_time:
+            os.unlink("/var/lib/nagios-okplugin/check_cpu")
+    except OSError:
+        return None
+
+    return state_mtime
+
+def calc_avg(stat):
+    """Calculates the average of each int in array"""
+    stat_sum = sum(stat)
+    avg = []
+    for pos in range(len(stat)):
+        avg.append(float(stat[pos]) / stat_sum * 100)
+    return avg
+
+def get_stat():
+    """Fetches the first line from /proc/stat and returns the numbers"""
+    stat_fh = open("/proc/stat")
+    return [int(pos) for pos in stat_fh.readline().split()[1:]]
+
+def get_saved_stat():
+    """Fetches information about the last run to be able to do averages"""
+
+    remove_stale_state()
+    try:
+        stat_fh = open("/var/lib/nagios-okplugin/check_cpu")
+    except IOError:
+        return None
+    return [int(pos) for pos in stat_fh.readline().split()[1:]]
+
+def save_stat(stat):
+    """Save statistics to compare to in next run"""
+    stat_fh = open("/var/lib/nagios-okplugin/check_cpu", "w")
+
+    stat_fh.write("cpu " + " ".join([str(pos) for pos in stat]) + "\n")
+    stat_fh.close()
+
+if __name__ == "__main__":
+    main()
+
+# vim: sts=4 expandtab

check_cpu.sh/nagios-plugins-check_cpu.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check CPU on Linux servers
 Name:		nagios-plugins-check_cpu
-Version:	1.0
+Version:	2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -45,6 +45,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- Added nrpe reload to post section (tommi@tommi.org)
+- Merge github.com:opinkerfi/misc (palli@opensource.is)
+- Added dependency on bc (palli@opensource.is)
+
 * Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 1.0-1
 - Version number bumped
 - Updates buildarch to noarch (tommi@tommi.org)

check_dataprotector/nagios-okplugin-check_dataprotector.spec

@@ -2,7 +2,7 @@
 
 Summary:	Nagios Plugins to monitor HP Dataprotector
 Name:		nagios-okplugin-check_dataprotector
-Version:	1.0.1
+Version:	2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -45,6 +45,10 @@ rm -rf %{buildroot}
 /etc/nrpe.d/check_dataprotector.cfg
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- removed warning threshold of 60 (palli@opensource.is)
+- contrib removed from plugin path (palli@opensource.is)
+
 * Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 1.0.1-1
 - new package built with tito
 

check_disks.pl/nagios-okplugin-check_disks.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check disks via NRPE
 Name:		nagios-okplugin-check_disks
-Version:	1.0.4
+Version:	1.0.6
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -40,6 +40,12 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/check_disks.pl
 
 %changelog
+* Tue Mar 25 2014 Tomas Edwardsson <tommi@tommi.org> 1.0.6-1
+- Bumped version
+
+* Tue Mar 25 2014 Tomas Edwardsson <tommi@tommi.org> 1.0.5-1
+- Added support for inodes (tryggvi@linux.is)
+
 * Sat Mar 02 2013 Tryggvi Farestveit <tryggvi@linux.is> 1.0.4-1
 - Added support for inodes
 

check_eva/check_eva.py

@@ -23,23 +23,18 @@
 # binaries for Windows and Linux
 
 
-
-
-
-
 # Some Defaults
 show_perfdata = True
 show_longserviceoutput = True
 debugging = False
 
 
-
 # check_eva defaults
-hostname="localhost"
+hostname = "localhost"
-username="eva"
+username = "eva"
-password="eva1234"
+password = "eva1234"
-mode="check_systems"
+mode = "check_systems"
-path=''
+path = ''
 nagios_server = "94.142.154.10"
 nagios_port = 80
 nagios_myhostname = None
@@ -47,19 +42,21 @@ do_phone_home = False
 escape_newlines = False
 check_system = None  # By default check all systems
 proxyserver = None
+timeout = 0  # 0 means no timeout
 
-server_side_troubleshooting = False # set to true, if you do not have sssu binary handy
+
+# set to true, if you do not have sssu binary handy
+server_side_troubleshooting = False
 
 # No real need to change anything below here
-version="1.0"
+version = "1.0.1"
-ok=0
+ok = 0
-warning=1
+warning = 1
-critical=2
+critical = 2
-unknown=3
+unknown = 3
 not_present = -1
 
 
-
 state = {}
 state[not_present] = "Not Present"
 state[ok] = "OK"
@@ -67,16 +64,21 @@ state[warning] = "Warning"
 state[critical] = "Critical"
 state[unknown] = "Unknown"
 
-longserviceoutput="\n"
+longserviceoutput = "\n"
-perfdata=""
+perfdata = ""
 
-valid_modes = ( "check_systems", "check_controllers", "check_diskgroups","check_disks", "check_diskshelfs", "check_diskshelves")
+valid_modes = ("check_systems", "check_controllers", "check_diskgroups",
+               "check_disks", "check_diskshelfs", "check_diskshelves")
 
 from sys import exit
 from sys import argv
-from os import getenv,putenv,environ
+from os import getenv, environ
+import signal
 import subprocess
-import xmlrpclib,httplib
+import xmlrpclib
+import httplib
+
+# we need to set socket default timeout in case we are using the phone-home part
 import socket
 socket.setdefaulttimeout(5)
 
@@ -93,6 +95,7 @@ def print_help():
     print " [--path </path/to/sssu>]"
     print " [--mode <mode>] "
     print " [--test]"
+    print " [--timeout <timeout>]"
     print " [--debug]"
     print " [--help]"
     print ""
@@ -107,34 +110,37 @@ def error(errortext):
     print "* Error: %s" % errortext
     exit(unknown)
 
-def debug( debugtext ):
+
+def debug(debugtext):
     global debugging
     if debugging:
         print debugtext
 
 # parse arguments
 
-arguments=argv[1:]
+arguments = argv[1:]
 while len(arguments) > 0:
-	arg=arguments.pop(0)
+    arg = arguments.pop(0)
     if arg == 'invalid':
         pass
     elif arg == '-H' or arg == '--host':
-		hostname=arguments.pop(0)
+        hostname = arguments.pop(0)
     elif arg == '-U' or arg == '--username':
-		username=arguments.pop(0)
+        username = arguments.pop(0)
     elif arg == '-P' or arg == '--password':
         password = arguments.pop(0)
     elif arg == '-T' or arg == '--test':
-		testmode=1
+        testmode = 1
+    elif arg == '--timeout':
+        timeout = int(arguments.pop(0))
     elif arg == '--path':
         path = arguments.pop(0) + '/'
     elif arg == '-M' or arg == '--mode':
-		mode=arguments.pop(0)
+        mode = arguments.pop(0)
         if mode not in valid_modes:
             error("Invalid --mode %s" % arg)
     elif arg == '-d' or arg == '--debug':
-		debugging=True
+        debugging = True
     elif arg == '--longserviceoutput':
         show_longserviceoutput = True
     elif arg == '--no-longserviceoutput':
@@ -161,9 +167,7 @@ while len(arguments) > 0:
         print_help()
         exit(ok)
     else:
-		error( "Invalid argument %s"% arg)
+        error("Invalid argument %s" % arg)
-
-
 
 
 subitems = {}
@@ -177,133 +181,142 @@ subitems['bus'] = 'communicationbuses'
 subitems['port'] = 'fibrechannelports'
 
 
-'''runCommand: Runs command from the shell prompt. Exit Nagios style if unsuccessful'''
 def runCommand(command):
-  proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE,stderr=subprocess.PIPE,)
+    """ runCommand: Runs 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)
+        print "Error %s: %s\n command was: '%s'" % (proc.returncode, stderr.strip(), command)
-    if proc.returncode == 127 or proc.returncode == 1: # File not found, lets print path
+        # File not found, lets print path
-	path=getenv("PATH")
+        if proc.returncode == 127 or proc.returncode == 1:
-	print "Current Path: %s" % (path)
+            path = getenv("PATH")
+            print "Current Path: %s" % path
             exit(unknown)
     else:
         return stdout
 
 
-
-
-'''Runs the sssu command. This one is responsible for error checking from sssu'''
 def run_sssu(system=None, command="ls system full"):
+    """Runs the sssu command. This one is responsible for error checking from sssu"""
     commands = []
 
-	continue_on_error="set option on_error=continue"
+    continue_on_error = "set option on_error=continue"
-	login="select manager %s USERNAME=%s PASSWORD=%s"%(hostname,username,password)
+    login = "select manager %s USERNAME=%s PASSWORD=%s" % (
+        hostname, username, password)
 
     commands.append(continue_on_error)
     commands.append(login)
-	if system != None:
+    if system is not None:
         commands.append('select SYSTEM "%s"' % system)
     commands.append(command)
 
     commandstring = "sssu "
-	for i in commands: commandstring = commandstring + '"%s" ' % i 
+    for i in commands:
+        commandstring += '"%s" ' % i
     global server_side_troubleshooting
     if server_side_troubleshooting == True:
         commandstring = 'cat "debug/%s"' % command
 
-	#print mystring
+    # print mystring
-	#if command == "ls system full":
+    # if command == "ls system full":
     #	output = runCommand("cat sssu.out")
-	#elif command == "ls disk_groups full":
+    # elif command == "ls disk_groups full":
     #	output = runCommand("cat ls_disk*")
-	#elif command == "ls controller full":
+    # elif command == "ls controller full":
     #	output = runCommand("cat ls_controller")
-	#else:
+    # else:
     #	print "What command is this?", command
     #	exit(unknown)
     output = runCommand(commandstring)
-	debug( commandstring )
+    debug(commandstring)
 
     output = output.split('\n')
 
-	# Lets process the top few results from the sssu command. Make sure the results make sense
+    # Lets process the top few results from the sssu command. Make sure the
+    # results make sense
     error = 0
-	if output.pop(0).strip() != '': error = 1
+    if output.pop(0).strip() != '':
-	if output.pop(0).strip() != '': error = 1
+        error = 1
-	if output.pop(0).strip() != 'SSSU for HP StorageWorks Command View EVA': error = 1
+    if output.pop(0).strip() != '':
-	if output.pop(0).strip().find('Version:') != 0: error=1
+        error = 2
-	if output.pop(0).strip().find('Build:') != 0: error=1
+    if output.pop(0).strip().find('SSSU for HP') != 0:
-	if output.pop(0).strip().find('NoSystemSelected> ') != 0: error=1
+        error = 3
+    if output.pop(0).strip().find('Version:') != 0:
+        error = 4
+    if output.pop(0).strip().find('Build:') != 0:
+        error = 5
+    if output.pop(0).strip().find('NoSystemSelected> ') != 0:
+        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
-	buffer = ""
+    str_buffer = ""
     for i in output:
-		buffer = buffer + i + "\n"
+        str_buffer = str_buffer + i + "\n"
         if i.find('Error') > -1:
             print "This is the command i was trying to execute: %s" % i
             error = 1
-		if i.find('information:') > 0: break
+        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 buffer
+        print str_buffer
         exit(unknown)
-	
     objects = []
-	object = None
+    current_object = None
-	parent_object = None
     for line in output:
         if len(line) == 0:
             continue
         line = line.strip()
         tmp = line.split()
         if len(tmp) == 0:
-			if object:
+            if current_object:
-				if not object['master'] in objects: objects.append( object['master'] )
+                if not current_object['master'] in objects:
-				object = None
+                    objects.append(current_object['master'])
+                current_object = None
             continue
         key = tmp[0].strip()
-		if object and not object['master'] in objects: objects.append( object['master'] )
+        if current_object and not current_object['master'] in objects:
+            objects.append(current_object['master'])
         if key == 'object':
-			object = {}
+            current_object = {}
-			object['master'] = object
+            current_object['master'] = current_object
         if key == 'controllertemperaturestatus':
-			object = object['master']
+            current_object = current_object['master']
         if key == 'iomodules':
             key = 'modules'
-		#if key in subitems.values():
+        # if key in subitems.values():
         #	object['master'][key] = []
         if key in subitems.keys():
             mastergroup = subitems[key]
-			master = object['master']
+            master = current_object['master']
-			object = {}
+            current_object = {}
-			object['object_type'] = key
+            current_object['object_type'] = key
-			object['master'] = master
+            current_object['master'] = master
-			if not object['master'].has_key(mastergroup):
+            if not current_object['master'].has_key(mastergroup):
-				object['master'][mastergroup] = []
+                current_object['master'][mastergroup] = []
-			object['master'][mastergroup].append(object)
+            current_object['master'][mastergroup].append(current_object)
-			
-			
 
         if line.find('.:') > 0:
             # We work on first come, first serve basis, so if
             # we accidentally see same key again, we will ignore
-			if not object.has_key(key):
+            if not current_object.has_key(key):
-				value = ' '.join( tmp[2:] ).strip()
+                value = ' '.join(tmp[2:]).strip()
-				object[key] = value
+                current_object[key] = value
     # Check if we were instructed to check only one eva system
     global check_system
-	if command == "ls system full" and check_system !=  None:
+    if command == "ls system full" and check_system is not None:
         tmp_objects = []
         for i in objects:
             if i['objectname'] == check_system:
-				tmp_objects.append( i )
+                tmp_objects.append(i)
         objects = tmp_objects
     return objects
 
-def end(summary,perfdata,longserviceoutput,nagios_state):
+
+def end(summary, perfdata, longserviceoutput, nagios_state):
     global show_longserviceoutput
     global show_perfdata
     global nagios_server
@@ -315,66 +328,81 @@ def end(summary,perfdata,longserviceoutput,nagios_state):
     global escape_newlines
     global check_system
 
-	message = "%s - %s" % ( state[nagios_state], summary)
+    message = "%s - %s" % (state[nagios_state], summary)
     if show_perfdata:
-		message = "%s | %s" % ( message, perfdata)
+        message = "%s | %s" % (message, perfdata)
     if show_longserviceoutput:
-		message = "%s\n%s" % ( message, longserviceoutput.strip())
+        message = "%s\n%s" % (message, longserviceoutput.strip())
     if escape_newlines == True:
         lines = message.split('\n')
         message = '\\n'.join(lines)
-	debug( "do_phone_home = %s" %(do_phone_home) )
+    debug("do_phone_home = %s" % do_phone_home)
     if do_phone_home == True:
         try:
             if nagios_myhostname is None:
-				if environ.has_key( 'HOSTNAME' ):
+                if environ.has_key('HOSTNAME'):
                     nagios_myhostname = environ['HOSTNAME']
-				elif environ.has_key( 'COMPUTERNAME' ):
+                elif environ.has_key('COMPUTERNAME'):
                     nagios_myhostname = environ['COMPUTERNAME']
                 else:
                     nagios_myhostname = hostname
-			try: phone_home(nagios_server,nagios_port, status=nagios_state, message=message, hostname=nagios_myhostname, servicename=mode,system=check_system)
+            try:
-			except:pass
+                phone_home(nagios_server,
+                           nagios_port,
+                           status=nagios_state,
+                           message=message,
+                           hostname=nagios_myhostname,
+                           servicename=mode,
+                           system=check_system
+                           )
+            except Exception:
+                pass
 
         except:
             raise
     print message
     exit(nagios_state)
+
+
 class ProxiedTransport(xmlrpclib.Transport):
+
     def set_proxy(self, proxy):
         self.proxy = proxy
+
     def make_connection(self, host):
         self.realhost = host
         h = httplib.HTTP(self.proxy)
         return h
+
     def send_request(self, connection, handler, request_body):
         connection.putrequest("POST", 'http://%s%s' % (self.realhost, handler))
+
     def send_host(self, connection, host):
         connection.putheader('Host', self.realhost)
 
 
-
+def phone_home(nagios_server, nagios_port, status, message, hostname=None, servicename=None, system=None):
-''' phone_home: Sends results to remote nagios server via python xml-rpc '''
+    """phone_home: Sends results to remote nagios server via python xml-rpc"""
-def phone_home(nagios_server,nagios_port, status, message, hostname=None, servicename=None,system=None):
+    debug("phoning home: %s" % servicename)
-	debug("phoning home: %s" % (servicename) )
     if system is not None:
         servicename = str(servicename) + str(system)
-	uri = "http://%s:%s" % (nagios_server,nagios_port)
+    uri = "http://%s:%s" % (nagios_server, nagios_port)
 
     global proxyserver
-	if proxyserver != None:
+    if proxyserver is not None:
         p = ProxiedTransport()
         p.set_proxy(proxyserver)
-		s = xmlrpclib.Server( uri, transport=p ) 
+        s = xmlrpclib.Server(uri, transport=p)
     else:
-		s = xmlrpclib.ServerProxy( uri )
+        s = xmlrpclib.ServerProxy(uri)
     s.nagiosupdate(hostname, servicename, status, message)
     return 0
 
+
 def check_systems():
-	summary=""
+    summary = ""
-	perfdata=""
+    perfdata = ""
-	#longserviceoutput="\n"
+    # longserviceoutput="\n"
     nagios_state = ok
     objects = run_sssu()
     for i in objects:
@@ -384,174 +412,205 @@ def check_systems():
         if operationalstate != 'good':
             nagios_state = max(nagios_state, warning)
         # Lets add to the summary
-		summary = summary + " %s=%s " %(name, operationalstate)
+        summary += " %s=%s " % (name, operationalstate)
         # Collect the performance data
         interesting_perfdata = 'totalstoragespace|usedstoragespace|availablestoragespace'
-		perfdata = perfdata + get_perfdata(i,interesting_perfdata.split('|'), identifier="%s_"% name)
+        perfdata += get_perfdata(
+            i, interesting_perfdata.split('|'), identifier="%s_" % name)
         # Collect extra info for longserviceoutput
-		long("%s = %s (%s)\n" % ( i['objectname'], i['operationalstate'], i['operationalstatedetail']) )
+        longoutput("%s = %s (%s)\n" %
+                   (i['objectname'], i['operationalstate'], i['operationalstatedetail']))
         interesting_fields = 'licensestate|systemtype|firmwareversion|nscfwversion|totalstoragespace|usedstoragespace|availablestoragespace'
         for x in interesting_fields.split('|'):
-			long( "- %s = %s \n" %(x, i[x]) )
+            longoutput("- %s = %s \n" % (x, i[x]))
-		long("\n")
+        longoutput("\n")
-	end(summary,perfdata,longserviceoutput,nagios_state)
+    end(summary, perfdata, longserviceoutput, nagios_state)
 
 
-
+def get_perfdata(my_object, interesting_fields, identifier=""):
-def get_perfdata(object, interesting_fields, identifier=""):
     perfdata = ""
     for i in interesting_fields:
-		if i == '': continue
+        if i == '':
-		perfdata = perfdata + "'%s%s'=%s " % (identifier, i, object[i])
+            continue
+        perfdata += "'%s%s'=%s " % (identifier, i, my_object[i])
     return perfdata
 
+
 def add_perfdata(text):
     global perfdata
     text = text.strip()
-	perfdata = perfdata + " %s " % (text)
+    perfdata += " %s " % text
 
-def long(text):
+
+def longoutput(text):
     global longserviceoutput
     longserviceoutput = longserviceoutput + text
-def get_longserviceoutput(object, interesting_fields):
+
+
+def get_longserviceoutput(my_object, interesting_fields):
     longserviceoutput = ""
     for i in interesting_fields:
-		longserviceoutput = longserviceoutput + "%s = %s \n" %(i, object[i])
+        longserviceoutput += "%s = %s \n" % (i, my_object[i])
     return longserviceoutput
 
-def check_operationalstate(object, print_failed_objects=False,namefield='objectname',detailfield='operationalstatedetail',statefield='operationalstate',valid_states=['good']):
+
-	if not object.has_key(detailfield): detailfield = statefield
+def check_operationalstate(my_object, print_failed_objects=False, namefield='objectname', detailfield='operationalstatedetail', statefield='operationalstate', valid_states=None):
-	if not object.has_key(statefield):
+    if not valid_states:
+        valid_states = ['good']
+    if not my_object.has_key(detailfield):
+        detailfield = statefield
+    if not my_object.has_key(statefield):
         if print_failed_objects:
-			long("- Warning, %s does not have any '%s'" % ( object[namefield], statefield ) )
+            longoutput("- Warning, %s does not have any '%s'" %
+                       (my_object[namefield], statefield))
         return warning
-	if object[statefield] not in valid_states:
+    if my_object[statefield] not in valid_states:
         if print_failed_objects:
-			long("- Warning, %s=%s (%s)\n" % ( object[namefield], object['operationalstate'], object[detailfield] ))
+            longoutput("- Warning, %s=%s (%s)\n" %
+                       (my_object[namefield], my_object['operationalstate'], my_object[detailfield]))
         return warning
-	debug( "OK, %s=%s (%s)\n" % ( object[namefield], object['operationalstate'], object[detailfield] ) )
+    debug("OK, %s=%s (%s)\n" %
+          (my_object[namefield], my_object['operationalstate'], my_object[detailfield]))
     return ok
 
 
-
+def check_generic(command="ls disk full", namefield="objectname", perfdata_fields=None, longserviceoutputfields=None, detailedsummary=False):
-def check_generic(command="ls disk full",namefield="objectname", perfdata_fields=[], longserviceoutputfields=[], detailedsummary=False):
+    if not perfdata_fields:
-        summary=""
+        perfdata_fields = []
+    if not longserviceoutputfields:
+        longserviceoutputfields = []
     global perfdata
     nagios_state = ok
     systems = run_sssu()
     objects = []
     if command == 'ls system full':
         objects = systems
-		for i in systems: i['systemname'] = '' #i['objectname']
+        for i in systems:
+            i['systemname'] = ''  # i['objectname']
     else:
         for i in systems:
             result = run_sssu(system=i['objectname'], command=command)
             for x in result:
                 x['systemname'] = i['objectname']
-        	                objects.append( x )
+                objects.append(x)
     summary = "%s objects found " % len(objects)
+    usedstoragespacegb = 0
+    occupancyalarmlvel = 0
+    warninggb = 0
     for i in objects:
         systemname = i['systemname']
-		
         # Some versions of commandview use "objectname" instead of namefield
-		if i.has_key( namefield ):
+        if i.has_key(namefield):
             objectname = i[namefield]
         else:
             objectname = i['objectname']
-                # Some versions of CV also return garbage objects, luckily it is easy to find these
+        # Some versions of CV also return garbage objects, luckily it is easy
+        # to find these
         if i.has_key('objecttype') and i['objecttype'] == 'typenotset':
-			long("Object %s was skipped because objecttype == typenotset\n" % objectname )
+            longoutput(
+                "Object %s was skipped because objecttype == typenotset\n" % objectname)
             continue
         # Lets see if this object is working
-                nagios_state = max( check_operationalstate(i), nagios_state )
+        nagios_state = max(check_operationalstate(i), nagios_state)
-
 
         # Lets add to the summary
         if i['operationalstate'] != 'good' or detailedsummary == True:
-                	summary = summary + " %s/%s=%s " %(systemname,objectname, i['operationalstate'])
+            summary += " %s/%s=%s " % (
+                systemname, objectname, i['operationalstate'])
 
         # Lets get some perfdata
-                identifier = "%s/%s_" % (systemname,objectname)
+        identifier = "%s/%s_" % (systemname, objectname)
         i['identifier'] = identifier
 
-
         for field in perfdata_fields:
-			if field == '': continue
+            if field == '':
-			add_perfdata( "'%s%s'=%s " % (identifier, field, i[field]) )
+                continue
+            add_perfdata("'%s%s'=%s " %
+                         (identifier, field, i.get(field, None)))
 
         # Disk group gets a special perfdata treatment
         if command == "ls disk_group full":
-			totalstoragespacegb= float( i['totalstoragespacegb'] )
+            totalstoragespacegb = float(i['totalstoragespacegb'])
-			usedstoragespacegb= float ( i['usedstoragespacegb'] )
+            usedstoragespacegb = float(i['usedstoragespacegb'])
-			occupancyalarmlvel = float( i['occupancyalarmlevel'] ) 
+            occupancyalarmlvel = float(i['occupancyalarmlevel'])
-			warninggb= totalstoragespacegb * occupancyalarmlvel / 100
+            warninggb = totalstoragespacegb * occupancyalarmlvel / 100
-			add_perfdata( " '%sdiskusage'=%s;%s;%s "% (identifier, usedstoragespacegb,warninggb,totalstoragespacegb) )
+            add_perfdata(" '%sdiskusage'=%s;%s;%s " %
+                         (identifier, usedstoragespacegb, warninggb, totalstoragespacegb))
 
         # Long Serviceoutput
 
         # There are usually to many disks for nagios to display. Skip.
         if command != "ls disk full":
-			long( "\n%s/%s = %s (%s)\n"%(systemname,objectname,i['operationalstate'], i['operationalstatedetail']) )
+            longoutput("\n%s/%s = %s (%s)\n" %
+                       (systemname, objectname, i['operationalstate'], i['operationalstatedetail']))
 
-		# If diskgroup has a problem because it is over allocated. Lets inform about that
+        # If diskgroup has a problem because it is over allocated. Lets inform
+        # about that
         if command == "ls disk_group full" and usedstoragespacegb > warninggb:
-				long("- %s - diskgroup usage is over %s%% threshold !\n" % (state[warning], occupancyalarmlvel) )
+                longoutput(
+                    "- %s - diskgroup usage is over %s%% threshold !\n" %
+                    (state[warning], occupancyalarmlvel))
         # If a disk has a problem, lets display some extra info on it
         elif command == "ls disk full" and i['operationalstate'] != 'good':
-			long( "Warning - %s=%s (%s)\n" % (i['diskname'], i['operationalstate'], i['operationalstatedetail'] ))
+            longoutput("Warning - %s=%s (%s)\n" %
-			fields="modelnumber firmwareversion serialnumber failurepredicted  diskdrivetype".split()
+                       (i['diskname'], i['operationalstate'], i['operationalstatedetail']))
+            fields = "modelnumber firmwareversion serialnumber failurepredicted  diskdrivetype".split(
+            )
             for field in fields:
-				long( "- %s = %s\n" % (field, i[field]) )
+                longoutput("- %s = %s\n" % (field, i[field]))
-
 
         nagios_state = max(nagios_state, check_multiple_objects(i, 'sensors'))
         nagios_state = max(nagios_state, check_multiple_objects(i, 'fans'))
-		nagios_state = max(nagios_state, check_multiple_objects(i, 'powersupplies'))
+        nagios_state = max(
-		nagios_state = max(nagios_state, check_multiple_objects(i, 'communicationbuses'))
+            nagios_state, check_multiple_objects(i, 'powersupplies'))
-		nagios_state = max(nagios_state, check_multiple_objects(i, 'fibrechannelports'))
+        nagios_state = max(
+            nagios_state, check_multiple_objects(i, 'communicationbuses'))
+        nagios_state = max(
+            nagios_state, check_multiple_objects(i, 'fibrechannelports'))
         nagios_state = max(nagios_state, check_multiple_objects(i, 'modules'))
         for x in longserviceoutputfields:
-			if i.has_key( x ):
+            if i.has_key(x):
-				long( "- %s = %s\n" % (x, i[x]))
+                longoutput("- %s = %s\n" % (x, i[x]))
 
-        end(summary,perfdata,longserviceoutput,nagios_state)
+    end(summary, perfdata, longserviceoutput, nagios_state)
 
-def check_multiple_objects(object, name):
+
+def check_multiple_objects(my_object, name):
     item_status = not_present
-	if object.has_key(name): 
+    if my_object.has_key(name):
         item_status = not_present
-		valid_states=['good']
+        valid_states = ['good']
-		namefield="name"	
+        namefield = "name"
         detailfield = 'operationalstatedetail'
 
-
-
         if name == 'fans' or name == 'sensors':
-			valid_states = ['good','notavailable','unsupported','notinstalled']
+            valid_states = [
+                'good', 'notavailable', 'unsupported', 'notinstalled']
         elif name == 'fibrechannelports':
-			valid_states.append( 'notinstalled' )
+            valid_states.append('notinstalled')
-		num_items = len(object[name])
+        num_items = len(my_object[name])
-		for item in object[name]:
+        for item in my_object[name]:
-			stat = check_operationalstate( item,print_failed_objects=True, namefield=namefield, valid_states=valid_states,detailfield=detailfield)
+            stat = check_operationalstate(
-			item_status = max( stat, item_status )
+                item, print_failed_objects=True, namefield=namefield, valid_states=valid_states, detailfield=detailfield)
-		long('- %s on %s (%s detected)\n'% (state[item_status], name, num_items) )
+            item_status = max(stat, item_status)
-		add_perfdata( " '%s%s'=%s" % (object['identifier'],name, num_items) )
+        longoutput('- %s on %s (%s detected)\n' %
+                   (state[item_status], name, num_items))
+        add_perfdata(" '%s%s'=%s" %
+                     (my_object['identifier'], name, num_items))
     return item_status
 
 
-
 def check_controllers():
-	summary=""
+    perfdata = ""
-	perfdata=""
+    # longserviceoutput="\n"
-	#longserviceoutput="\n"
     nagios_state = ok
     systems = run_sssu()
-	controllers =[]
+    controllers = []
     for i in systems:
         result = run_sssu(system=i['objectname'], command="ls controller full")
         for controller in result:
             controller['systemname'] = i['objectname']
-			controllers.append( controller )
+            controllers.append(controller)
     summary = "%s objects found " % len(controllers)
     for i in controllers:
         systemname = i['systemname']
@@ -560,32 +619,32 @@ def check_controllers():
         else:
             controllername = i['objectname']
         # Lets see if this controller is working
-		nagios_state = max( check_operationalstate(i), nagios_state )
+        nagios_state = max(check_operationalstate(i), nagios_state)
 
         # Lets add to the summary
         if not i.has_key('operationalstate'):
-			summary = summary + " %s does not have any operationalstate " % controllername
+            summary += " %s does not have any operationalstate " % controllername
-			nagios_state = max( unknown, nagios_state )
+            nagios_state = max(unknown, nagios_state)
             continue
         elif i['operationalstate'] != 'good':
-			summary = summary + " %s/%s=%s " %(systemname,controllername, i['operationalstate'])
+            summary += " %s/%s=%s " % (
+                systemname, controllername, i['operationalstate'])
 
         # Lets get some perfdata
         interesting_fields = "controllermainmemory"
-		identifier = "%s/%s_" % (systemname,controllername)
+        identifier = "%s/%s_" % (systemname, controllername)
-		perfdata = perfdata + get_perfdata(i, interesting_fields.split('|'), identifier=identifier)
+        perfdata += get_perfdata(
+            i, interesting_fields.split('|'), identifier=identifier)
 
         # Long Serviceoutput
-		interesting_fields = "operationalstate|operationalstatedetail|firmwareversion|serialnumber"
         #longserviceoutput = longserviceoutput + get_longserviceoutput(i, interesting_fields.split('|') )
         #longserviceoutput = longserviceoutput + "\n%s/%s\n"%(systemname,controllername)
-		long( "\n%s/%s = %s (%s)\n"%(systemname,controllername,i['operationalstate'], i['operationalstatedetail']) )
+        longoutput("\n%s/%s = %s (%s)\n" %
-		long( "- firmwareversion = %s \n" %(i['firmwareversion']))
+                   (systemname, controllername, i['operationalstate'], i['operationalstatedetail']))
-		long( "- serialnumber = %s \n" %(i['serialnumber']))
+        longoutput("- firmwareversion = %s \n" % (i['firmwareversion']))
-
+        longoutput("- serialnumber = %s \n" % (i['serialnumber']))
 
         controllertemperaturestatus = not_present
-		cache_state = not_present
         fanstate = not_present
         hostportstate = not_present
         sensorstate = ok
@@ -605,52 +664,59 @@ def check_controllers():
             else:
                 controllertemperaturestatus = warning
 
-		
         # Process the subsensors
         for hostport in i['hostports']:
             #long(" %s = %s\n" % (hostport['portname'], hostport['operationalstate']))
-			hostportstate = max(hostportstate,ok)
+            hostportstate = max(hostportstate, ok)
             if hostport['operationalstate'] != 'good':
-				hostportstate = max(warning,hostport_state)
+                hostportstate = max(warning, hostportstate)
-				long("Hostport %s state = %s\n" % hostport['portname'], hostport['operationalstate'])
+                message = "Hostport %s state = %s\n" % (
+                    hostport['portname'], hostport['operationalstate'])
+                longoutput(message)
         if i.has_key('fans'):
             for fan in i['fans']:
-				fanstate = max(fanstate,ok)
+                fanstate = max(fanstate, ok)
                 #long(" %s = %s\n" % (fan['fanname'], fan['status']))
-				if fan.has_key('status'): status = fan['status']
+                if fan.has_key('status'):
-				elif fan.has_key('installstatus'): status = fan['installstatus']
+                    status = fan['status']
+                elif fan.has_key('installstatus'):
+                    status = fan['installstatus']
                 if status != 'normal' and status != 'yes':
-					fanstate = max(warning,fanstate)
+                    fanstate = max(warning, fanstate)
-					long("Fan %s status = %s\n" % (fan['fanname'],status))
+                    longoutput("Fan %s status = %s\n" %
+                               (fan['fanname'], status))
         if i.has_key('powersources'):
             for source in i['powersources']:
-				source_state = max(source_state,ok)
+                source_state = max(source_state, ok)
-				if not source.has_key('status'): continue
+                if not source.has_key('status'):
+                    continue
                 if source['state'] != 'good':
-					source_state = max(warning,source_state)
+                    source_state = max(warning, source_state)
-					long("Powersource %s status = %s\n" % (source['type'],source['state']))
+                    longoutput("Powersource %s status = %s\n" %
+                               (source['type'], source['state']))
         if i.has_key('modules'):
             for module in i['modules']:
-				module_state = max(module_state,ok)
+                module_state = max(module_state, ok)
-				if module['operationalstate'] not in ('good','not_present'):
+                if module['operationalstate'] not in ('good', 'not_present'):
-					module_state = max(warning,module_state)
+                    module_state = max(warning, module_state)
-					long("Battery Module %s status = %s\n" % (module['name'],module['operationalstate']))
+                    longoutput("Battery Module %s status = %s\n" %
+                               (module['name'], module['operationalstate']))
 
-
+        for i in (fanstate, hostportstate, sensorstate, source_state, module_state, cache_state, controllertemperaturestatus):
-		for i in (fanstate,hostportstate,sensorstate,source_state,module_state,cache_state,controllertemperaturestatus):
             nagios_state = max(nagios_state, i)
 
-		long("- %s on fans\n"%( state[fanstate] ) )
+        longoutput("- %s on fans\n" % (state[fanstate]))
-		long("- %s on cachememory\n"%( state[cache_state] ) )
+        longoutput("- %s on cachememory\n" % (state[cache_state]))
-		long("- %s on temperature\n"%( state[controllertemperaturestatus] ) )
+        longoutput("- %s on temperature\n" %
-		long("- %s on hostports\n"%( state[hostportstate] ) )
+                   (state[controllertemperaturestatus]))
-		long("- %s on sensors\n"%( state[sensorstate] ) )
+        longoutput("- %s on hostports\n" % (state[hostportstate]))
-		long("- %s on powersupplies\n"%( state[source_state] ) )
+        longoutput("- %s on sensors\n" % (state[sensorstate]))
-		long("- %s on batterymodules\n"%( state[module_state] ) )
+        longoutput("- %s on powersupplies\n" % (state[source_state]))
+        longoutput("- %s on batterymodules\n" % (state[module_state]))
 
+        longoutput('\n')
+    end(summary, perfdata, longserviceoutput, nagios_state)
 
-		long('\n')
-	end(summary,perfdata,longserviceoutput,nagios_state)
 
 def set_path():
     global path
@@ -660,34 +726,42 @@ def set_path():
             path = ";C:\\Program Files\\Hewlett-Packard\\Sanworks\\Element Manager for StorageWorks HSV"
         else:
             path = ":/usr/local/bin"
-	current_path = "%s%s" % (current_path,path)
+    current_path = "%s%s" % (current_path, path)
     environ['PATH'] = current_path
 set_path()
 
 
+# Create an alarm so that plugin can exit properly if timeout occurs
+exit_with_timeout = lambda x, y: error("Timeout of %s seconds exceeded" % timeout)
+signal.signal(signal.SIGALRM, exit_with_timeout)
+signal.alarm(timeout)
 
 if mode == 'check_systems':
-                perfdata_fields = 'totalstoragespace usedstoragespace availablestoragespace'.split()
+    perfdata_fields = 'totalstoragespace usedstoragespace availablestoragespace'.split(
-                longserviceoutputfields = 'licensestate systemtype firmwareversion nscfwversion totalstoragespace usedstoragespace availablestoragespace'.split()
+    )
+    longserviceoutputfields = 'licensestate systemtype firmwareversion nscfwversion totalstoragespace usedstoragespace availablestoragespace'.split(
+    )
     command = "ls system full"
-		namefield="objectname"
+    namefield = "objectname"
-		check_generic(command=command,namefield=namefield,longserviceoutputfields=longserviceoutputfields, perfdata_fields=perfdata_fields)
+    check_generic(command=command, namefield=namefield,
-		#check_systems
+                  longserviceoutputfields=longserviceoutputfields, perfdata_fields=perfdata_fields)
 elif mode == 'check_controllers':
     check_controllers()
 elif mode == 'check_diskgroups':
     command = "ls disk_group full"
-	namefield='diskgroupname'
+    namefield = 'diskgroupname'
-	longserviceoutputfields = "totaldisks levelingstate levelingprogress totalstoragespacegb usedstoragespacegb  occupancyalarmlevel".split()
+    longserviceoutputfields = "totaldisks levelingstate levelingprogress totalstoragespacegb usedstoragespacegb  occupancyalarmlevel".split(
-	perfdata_fields="totaldisks".split()	
+    )
-	check_generic(command=command,namefield=namefield,longserviceoutputfields=longserviceoutputfields, perfdata_fields=perfdata_fields)
+    perfdata_fields = "totaldisks".split()
+    check_generic(command=command, namefield=namefield,
+                  longserviceoutputfields=longserviceoutputfields, perfdata_fields=perfdata_fields)
 elif mode == 'check_disks':
-	check_generic(command="ls disk full",namefield="objectname")
+    check_generic(command="ls disk full", namefield="objectname")
 elif mode == 'check_diskshelfs' or mode == 'check_diskshelves':
-        check_generic(command="ls diskshelf full",namefield="diskshelfname",longserviceoutputfields=[], perfdata_fields=[])
+    check_generic(command="ls diskshelf full", namefield="diskshelfname",
+                  longserviceoutputfields=[], perfdata_fields=[])
 else:
     print "* Error: Mode %s not found" % mode
     print_help()
     print "* Error: Mode %s not found" % mode
     exit(unknown)
-

check_eva/nagios-okplugin-check_eva.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check HP EVA Disk Systems
 Name:		nagios-okplugin-check_eva
-Version:	1.0.2
+Version:	2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -40,6 +40,22 @@ rm -rf %{buildroot}
 /etc/nrpe.d/check_eva.cfg
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- Merge pull request #10 from gitmopp/patch-2 (palli-github@minor.is)
+- bug in for loop. Looped only once (mopp@gmx.net)
+- Fixed output to be more compatible (mopp@gmx.net)
+- check_eva new Make sure --timeout is an integer (palli@opensource.is)
+- check_eva new command line option --timeout (palli@opensource.is)
+- check_eva Fix undefined fix typos (palli@opensource.is)
+- PEP8 cleanup (palli@opensource.is)
+- merged (palli@opensource.is)
+- check_eva - minor bugfixes (palli@opensource.is)
+- check_eva.py more code cleanup with pycharm inspections (palli@opensource.is)
+- check_eva.py - Make code more readable (palli@opensource.is)
+- convert from tabs to spaces (palli@opensource.is)
+- check_eva - fix mixed tab/spaces (palli@opensource.is)
+- Update check_eva.py (sander.grendelman@gmail.com)
+
 * Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 1.0.2-1
 - changed sssu subcommands from being singlequoted to doublequoted for windows
   compatibility (palli@opensource.is)

check_hpacucli/nagios-okplugin-check_hpacucli.spec

@@ -2,8 +2,8 @@
 
 Summary:	A Nagios plugin to check HP Array with hpacucli
 Name:		nagios-okplugin-check_hpacucli
-Version:	1.2
+Version:	2
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.is/trac/wiki/check_hpacucli
@@ -41,6 +41,17 @@ rm -rf %{buildroot}
 /etc/sudoers.d/check_hpacucli
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- check_hpacucli.py - fix typo in hpacucli command (palli@opensource.is)
+- check_hpacucli.py: pep8 cleanup (palli@opensource.is)
+- check_hpacucli - fix tab indentation (palli@opensource.is)
+- check_hpacucli: ignore hpacucli output that starts with "Note:"
+  (palli@opensource.is)
+- sudoers.d added to install (you@example.com)
+- dummy commit (you@example.com)
+- dummy commit (you@example.com)
+- Add sudoers support to check_hpacucli (palli@opensource.is)
+
 * Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 1.2-2
 - version number of scripts bumped (palli@opensource.is)
 

check_ibm_bladecenter/check_ibm_bladecenter.py

@@ -20,18 +20,16 @@
 # This script will check the status of a remote IBM Bladecenter via SNMP.
 
 
-
 # No real need to change anything below here
-version="1.1.2"
+version = "1.1.2"
-ok=0
+ok = 0
-warning=1
+warning = 1
-critical=2
+critical = 2
-unknown=3 
+unknown = 3
 not_present = -1
 exit_status = -1
 
 
-
 state = {}
 state[not_present] = "Not Present"
 state[ok] = "OK"
@@ -40,59 +38,57 @@ state[critical] = "Critical"
 state[unknown] = "Unknown"
 
 
-longserviceoutput="\n"
+longserviceoutput = "\n"
-perfdata=""
+perfdata = ""
-summary=""
+summary = ""
-sudo=False
+sudo = False
 
 
 from sys import exit
 from sys import argv
-from os import getenv,putenv,environ
+from os import getenv, putenv, environ
 import subprocess
 
 
-
-
-
-
 # Parse some Arguments
 from optparse import OptionParser
 parser = OptionParser()
-parser.add_option("-m","--mode", dest="mode",
+parser.add_option("-m", "--mode", dest="mode",
                   help="Which check mode is in use (powermodules,system-health,temperature,chassis-status,bladehealth,blowers,switchmodules)")
-parser.add_option("-H","--host", dest="host",
+parser.add_option("-H", "--host", dest="host",
                   help="Hostname or IP address of the host to check")
-parser.add_option("-w","--warning", dest="warning_threshold",
+parser.add_option("-w", "--warning", dest="warning_threshold",
                   help="Warning threshold", type="int", default=None)
-parser.add_option("-c","--critical", type="int", dest="critical_threshold",
+parser.add_option("-c", "--critical", type="int", dest="critical_threshold",
                   help="Critical threshold", default=None)
-parser.add_option("-e","--exclude", dest="exclude",
+parser.add_option("-e", "--exclude", dest="exclude",
                   help="Exclude specific object", default=None)
-parser.add_option("-v","--snmp_version", dest="snmp_version",
+parser.add_option("-v", "--snmp_version", dest="snmp_version",
                   help="SNMP Version to use (1, 2c or 3)", default="1")
-parser.add_option("-u","--snmp_username", dest="snmp_username",
+parser.add_option("-u", "--snmp_username", dest="snmp_username",
                   help="SNMP username (only with SNMP v3)", default=None)
-parser.add_option("-C","--snmp_community", dest="snmp_community",
+parser.add_option("-C", "--snmp_community", dest="snmp_community",
                   help="SNMP Community (only with SNMP v1|v2c)", default=None)
-parser.add_option("-p","--snmp_password", dest="snmp_password",
+parser.add_option("-p", "--snmp_password", dest="snmp_password",
                   help="SNMP password (only with SNMP v3)", default=None)
-parser.add_option("-l","--snmp_security_level", dest="snmp_seclevel",
+parser.add_option("-l", "--snmp_security_level", dest="snmp_seclevel",
                   help="SNMP security level (only with SNMP v3) (noAuthNoPriv|authNoPriv|authPriv)", default=None)
-parser.add_option("-t","--snmp_timeout", dest="snmp_timeout",
+parser.add_option("-t", "--snmp_timeout", dest="snmp_timeout",
                   help="Timeout in seconds for SNMP", default=10)
-parser.add_option("-d","--debug", dest="debug",
+parser.add_option("-d", "--debug", dest="debug",
                   help="Enable debugging (for troubleshooting", action="store_true", default=False)
 
-(opts,args) = parser.parse_args()
+(opts, args) = parser.parse_args()
 
 
-if opts.host == None:
+if opts.host is None:
     parser.error("Hostname (-H) is required.")
-if opts.mode == None:
+if opts.mode is None:
     parser.error("Mode (--mode) is required.")
 
 snmp_options = ""
+
+
 def set_snmp_options():
     global snmp_options
     if opts.snmp_version is not None:
@@ -101,39 +97,47 @@ def set_snmp_options():
         if opts.snmp_username is None:
             parser.error("--snmp_username required with --snmp_version=3")
         if opts.snmp_seclevel is None:
-			parser.error("--snmp_security_level required with --snmp_version=3")
+            parser.error(
+                "--snmp_security_level required with --snmp_version=3")
         if opts.snmp_password is None:
             parser.error("--snmp_password required with --snmp_version=3")
-		snmp_options = snmp_options + " -u %s -l %s -A %s " % (opts.snmp_username, opts.snmp_seclevel,opts.snmp_password)
+        snmp_options = snmp_options + " -u %s -l %s -A %s " % (
+            opts.snmp_username, opts.snmp_seclevel, opts.snmp_password)
     else:
         if opts.snmp_community is None:
-			parser.error("--snmp_community is required with --snmp_version=1|2c")
+            parser.error(
+                "--snmp_community is required with --snmp_version=1|2c")
         snmp_options = snmp_options + " -c %s " % opts.snmp_community
     snmp_options += " -t %s " % (opts.snmp_timeout)
 
+
 def error(errortext):
     print "* Error: %s" % errortext
     exit(unknown)
 
-def debug( debugtext ):
+
+def debug(debugtext):
     if opts.debug:
         print debugtext
 
-def nagios_status( newStatus ):
+
+def nagios_status(newStatus):
     global exit_status
     exit_status = max(exit_status, newStatus)
     return exit_status
 
-'''runCommand: Runs command from the shell prompt. Exit Nagios style if unsuccessful'''
+
 def runCommand(command):
-  debug( "Executing: %s" % command )
+    '''runCommand: Runs command from the shell prompt. Exit Nagios style if unsuccessful'''
-  proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE,stderr=subprocess.PIPE,)
+    debug("Executing: %s" % command)
+    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)
+        print "Error %s: %s\n command was: '%s'" % (proc.returncode, stderr.strip(), command)
-    debug("results: %s" % (stdout.strip() ) )
+        debug("results: %s" % (stdout.strip()))
         if proc.returncode == 127:  # File not found, lets print path
-        path=getenv("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"
@@ -143,70 +147,82 @@ def runCommand(command):
     else:
         return stdout
 
+
 def end():
     global summary
     global longserviceoutput
     global perfdata
     global exit_status
-        print "%s - %s | %s" % (state[exit_status], summary,perfdata)
+    print "%s - %s | %s" % (state[exit_status], summary, perfdata)
     print longserviceoutput
-	if exit_status < 0: exit_status = unknown
+    if exit_status < 0:
+        exit_status = unknown
     exit(exit_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 == '':
             pass
-		else: path = ';' + path
+        else:
+            path = ';' + path
     else:  # Unix/Linux, etc
-		if path == '': path = ":/usr/sbin"
+        if path == '':
-		else: path = ':' + path
+            path = ":/usr/sbin"
-	current_path = "%s%s" % (current_path,path)
+        else:
+            path = ':' + path
+    current_path = "%s%s" % (current_path, path)
     environ['PATH'] = current_path
 
 
-
 def snmpget(oid):
-	snmpgetcommand = "snmpget %s %s %s" % (snmp_options,opts.host,oid)
+    snmpgetcommand = "snmpget %s %s %s" % (snmp_options, opts.host, oid)
     output = runCommand(snmpgetcommand)
-	oid,result = output.strip().split(' = ', 1)
+    oid, result = output.strip().split(' = ', 1)
-	resultType,resultValue = result.split(': ',1)
+    resultType, resultValue = result.split(': ', 1)
     if resultType == 'STRING':  # strip quotes of the string
         resultValue = resultValue[1:-1]
     return resultValue
 
-# snmpwalk -v3 -u v3get mgmt-rek-proxy-p02 -A proxy2011 -l authNoPriv 1.3.6.1.4.1.15497
+# snmpwalk -v3 -u v3get mgmt-rek-proxy-p02 -A proxy2011 -l authNoPriv
+# 1.3.6.1.4.1.15497
+
+
 def snmpwalk(base_oid):
     snmpwalkcommand = "snmpwalk %s %s %s" % (snmp_options, opts.host, base_oid)
     output = runCommand(snmpwalkcommand + " " + base_oid)
     return output
 
+
 def getTable(base_oid):
     myTable = {}
     output = snmpwalk(base_oid)
     for line in output.split('\n'):
         tmp = line.strip().split(' = ', 1)
         if len(tmp) == 2:
-			oid,result = tmp
+            oid, result = tmp
         else:
             continue
-		tmp = result.split(': ',1)
+        tmp = result.split(': ', 1)
         if len(tmp) > 1:
-			resultType,resultValue = tmp[0],tmp[1]
+            resultType, resultValue = tmp[0], tmp[1]
         else:
             resultType = None
             resultValue = tmp[0]
@@ -215,10 +231,12 @@ def getTable(base_oid):
         index = oid.strip().split('.')
         column = int(index.pop())
         row = int(index.pop())
-		if not myTable.has_key(column): myTable[column] = {}
+        if not myTable.has_key(column):
+            myTable[column] = {}
         myTable[column][row] = resultValue
     return myTable
 
+
 def check_powermodules():
     powermodules = getTable('1.3.6.1.4.1.2.3.51.2.2.4')
     index = 1
@@ -232,22 +250,27 @@ def check_powermodules():
         myStatus = i[status]
         myDetails = i[details]
         myExists = i[exists]
-		if myIndex == opts.exclude: continue
+        if myIndex == opts.exclude:
+            continue
         if myExists == "0":
             num_no = num_no + 1
         else:
             if myStatus != "1":
                 nagios_status(warning)
-				add_summary( 'Powermodule "%s" status "%s". %s. ' % (myIndex,myStatus,myDetails) )
+                add_summary('Powermodule "%s" status "%s". %s. ' %
+                            (myIndex, myStatus, myDetails))
             else:
                 num_ok = num_ok + 1
-		add_long('Powersupply "%s" status "%s". %s. ' % (myIndex,myStatus,myDetails) )
+        add_long('Powersupply "%s" status "%s". %s. ' %
-	add_summary( "%s out of %s powermodules are healthy" % (num_ok, len(powermodules) ) )
+                 (myIndex, myStatus, myDetails))
-	add_perfdata( "'Number of powermodules'=%s" % (len(powermodules) - num_no ) )
+    add_summary("%s out of %s powermodules are healthy" %
-	
+                (num_ok, len(powermodules)))
+    add_perfdata("'Number of powermodules'=%s" %
+                 (len(powermodules) - num_no))
 
     nagios_status(ok)
 
+
 def check_switchmodules():
     switchmodules = getTable("1.3.6.1.4.1.2.3.51.2.22.3.1.1")
     # The following oid is undocumented, but contains some useful extra info
@@ -265,18 +288,21 @@ def check_switchmodules():
             'this module is installed'
             if healthstate == "1":
                 nagios_status(ok)
-				add_long("Module%s health good.\n  post=%s" % (myIndex,resultvalue))
+                add_long("Module%s health good.\n  post=%s" %
+                         (myIndex, resultvalue))
             else:
                 nagios_status(warning)
-				add_long("Module%s health bad(%s).\n  post=%s" % (myIndex, healthstate,resultvalue) )
+                add_long("Module%s health bad(%s).\n  post=%s" %
+                         (myIndex, healthstate, resultvalue))
                 add_summary("Problem with Module %s. " % (myIndex))
             if len(extrainfo) > int(myIndex):
                 try:
-					myExtraInfo = extrainfo[int(myIndex)-1]
+                    myExtraInfo = extrainfo[int(myIndex) - 1]
                     module_type = myExtraInfo[22]
                     module_ip = myExtraInfo[6]
-					add_long( "  type=%s ip=%s" % (module_type,module_ip) )
+                    add_long("  type=%s ip=%s" % (module_type, module_ip))
-				except: pass
+                except:
+                    pass
     if exit_status == ok:
         add_summary("All switchmodules healthy")
 
@@ -291,14 +317,14 @@ def check_blowers():
     blower2speed = snmpget("1.3.6.1.4.1.2.3.51.2.2.3.2.0")
     blower2state = snmpget("1.3.6.1.4.1.2.3.51.2.2.3.11.0")
 
-	add_long( "Blower 1 state=%s speed=%s" % (blower1state,blower1speed) )
+    add_long("Blower 1 state=%s speed=%s" % (blower1state, blower1speed))
-	add_long( "Blower 2 state=%s speed=%s" % (blower2state,blower2speed) )
+    add_long("Blower 2 state=%s speed=%s" % (blower2state, blower2speed))
-	add_perfdata("blower1=%s" %(blower1speed.split(None,1)[0] ))
+    add_perfdata("blower1=%s" % (blower1speed.split(None, 1)[0]))
-	add_perfdata("blower2=%s" %(blower2speed.split(None,1)[0] ))
+    add_perfdata("blower2=%s" % (blower2speed.split(None, 1)[0]))
     # Check blower 1
     if blower1state == "1":
         nagios_status(ok)
-		add_summary("Blower1 OK. " )
+        add_summary("Blower1 OK. ")
     else:
         add_summary("Blower1 NOT OK. ")
         nagios_status(warning)
@@ -306,7 +332,7 @@ def check_blowers():
     # Check blower 2
     if blower2state == "1":
         nagios_status(ok)
-		add_summary("Blower2 OK. " )
+        add_summary("Blower2 OK. ")
     else:
         add_summary("Blower2 NOT OK. ")
         nagios_status(warning)
@@ -319,33 +345,33 @@ def check_chassis_status():
     chassis = getTable('1.3.6.1.4.1.2.3.51.2.2.5.2')
     oids = chassis.values()[0]
     chassis_oid = {
-		1  :"bistSdram",
+        1: "bistSdram",
-		10 :"bistBootRomFlashImage",
+        10: "bistBootRomFlashImage",
-		11 :"bistEthernetPort1",
+            11: "bistEthernetPort1",
-		113 :"bistSwitchModulesCommunicating",
+            113: "bistSwitchModulesCommunicating",
-		12 :"bistEthernetPort2",
+            12: "bistEthernetPort2",
-		13 :"bistInternalPCIBus",
+            13: "bistInternalPCIBus",
-		14 :"bistExternalI2CDevices",
+            14: "bistExternalI2CDevices",
-		15 :"bistUSBController",
+            15: "bistUSBController",
-		16 :"bistVideoCompressorBoard",
+            16: "bistVideoCompressorBoard",
-		17 :"bistPrimaryBus",
+            17: "bistPrimaryBus",
-		18 :"bistInternalEthernetSwitch",
+            18: "bistInternalEthernetSwitch",
-		2  :"bistRs485Port1",
+            2: "bistRs485Port1",
-		3  :"bistRs485Port2",
+            3: "bistRs485Port2",
-		33 :"bistBladesInstalled",
+            33: "bistBladesInstalled",
-		4  :"bistNvram",
+            4: "bistNvram",
-		49 :"bistBladesCommunicating",
+            49: "bistBladesCommunicating",
-		6  :"bistRtc",
+            6: "bistRtc",
-		65 :"bistBlowersInstalled",
+            65: "bistBlowersInstalled",
-		7  :"bistLocalI2CBus",
+            7: "bistLocalI2CBus",
-		73 :"bistBlowersFunctional",
+            73: "bistBlowersFunctional",
-		74 :"bistMediaTrayInstalled",
+            74: "bistMediaTrayInstalled",
-		75 :"bistMediaTrayCommunicating",
+            75: "bistMediaTrayCommunicating",
-		8  :"bistPrimaryMainAppFlashImage",
+            8: "bistPrimaryMainAppFlashImage",
-		81 :"bistPowerModulesInstalled",
+            81: "bistPowerModulesInstalled",
-		89 :"bistPowerModulesFunctional",
+            89: "bistPowerModulesFunctional",
-		9  :"bistSecondaryMainAppFlashImage",
+            9: "bistSecondaryMainAppFlashImage",
-		97 :"bistSwitchModulesInstalled",
+            97: "bistSwitchModulesInstalled",
     }
 
     # Check if all blades are working
@@ -363,59 +389,60 @@ def check_chassis_status():
 
     # Check Blade Communications
     if not oids.has_key(bistBladesInstalled) or not oids.has_key(bistBladesCommunicating):
-		add_summary( "Blades N/A. ")
+        add_summary("Blades N/A. ")
     elif oids[bistBladesInstalled] == oids[bistBladesCommunicating]:
         nagios_status(ok)
-		add_summary( "Blades OK. " )
+        add_summary("Blades OK. ")
     else:
         nagios_status(warning)
-		add_summary( "Blades NOT OK. " )
+        add_summary("Blades NOT OK. ")
     # Check PowerModule Status
     if not oids.has_key(bistPowerModulesFunctional) or not oids.has_key(bistPowerModulesInstalled):
-		add_summary( "Powermodules N/A. ")
+        add_summary("Powermodules N/A. ")
     elif oids[bistPowerModulesFunctional] == oids[bistPowerModulesInstalled]:
         nagios_status(ok)
-		add_summary( "PowerModules OK. " )
+        add_summary("PowerModules OK. ")
     else:
         nagios_status(warning)
-		add_summary( "PowerModules NOT OK. " )
+        add_summary("PowerModules NOT OK. ")
 
     # Check SwitcModule Communications
     if not oids.has_key(bistSwitchModulesCommunicating) or not oids.has_key(bistSwitchModulesInstalled):
-		add_summary( "SwitchModules N/A. ")
+        add_summary("SwitchModules N/A. ")
     if oids[bistSwitchModulesCommunicating] == oids[bistSwitchModulesInstalled]:
         nagios_status(ok)
         add_summary("Switchmodules OK. ")
     else:
         nagios_status(warning)
-		add_summary( "Switchmodules NOT OK. ")
+        add_summary("Switchmodules NOT OK. ")
     # Check blower status
     if not oids.has_key(bistBlowersInstalled) or not oids.has_key(bistBlowersFunctional):
-		add_summary( "Blowers N/A. ")
+        add_summary("Blowers N/A. ")
     elif oids[bistBlowersInstalled] == oids[bistBlowersFunctional]:
         nagios_status(ok)
-		add_summary( "Blowers OK. " )
+        add_summary("Blowers OK. ")
     else:
         nagios_status(warning)
-		add_summary( "Blowers NOT OK. " )
+        add_summary("Blowers NOT OK. ")
     # Check Media Tray Status
     if not oids.has_key(bistMediaTrayCommunicating) or not oids.has_key(bistMediaTrayInstalled):
         nagios_status(ok)
-		add_summary( "Media Trays N/A. ")
+        add_summary("Media Trays N/A. ")
     elif oids[bistMediaTrayCommunicating] == oids[bistMediaTrayInstalled]:
-		add_summary( "Media Trays OK. " )
+        add_summary("Media Trays OK. ")
     else:
         nagios_status(warning)
-		add_summary( "Media Trays NOT OK. " )
+        add_summary("Media Trays NOT OK. ")
-	
 
     # status_oids, oids that where 0 == ok
-	status_oids = ( 2,3,5,7,8,9,10,11,14,18,19,20,21,22,23,24,25,26,27,28,29,30, )
+    status_oids = (2, 3, 5, 7, 8, 9, 10, 11, 14, 18,
+                   19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, )
 
     add_long("Other Sensors: ")
     sensor_status = ok
     for oid in status_oids:
-		if not chassis_oid.has_key(oid): continue
+        if not chassis_oid.has_key(oid):
+            continue
         oidValue = oids[oid]
         oidName = chassis_oid[oid]
         if oidValue == "0":
@@ -424,28 +451,32 @@ def check_chassis_status():
             friendly_status = "%s (not ok)" % oidValue
             nagios_status(warning)
             sensor_status = warning
-			add_summary( "%s is %s" % oidName, friendly_status)
+            add_summary("%s is %s" % oidName, friendly_status)
-		add_long( " %s status: %s" % (oidName,friendly_status) )
+        add_long(" %s status: %s" % (oidName, friendly_status))
     if sensor_status == ok:
-		add_summary( "Other Sensors: OK. ")
+        add_summary("Other Sensors: OK. ")
 
 
 def check_bladehealth():
     blades = getTable('1.3.6.1.4.1.2.3.51.2.22.1.5.2.1')
     bladestate = getTable('1.3.6.1.4.1.2.3.51.2.22.1.5.1.1').values()
 
-	index,bladeid,severity,description = (1,2,3,4)
+    index, bladeid, severity, description = (1, 2, 3, 4)
     good_blades = 0
     total_blades = 0
-	for i,row in enumerate(blades.values()):
+    for i, row in enumerate(blades.values()):
         myIndex = row[index]
         myBladeid = row[bladeid]
         mySeverity = row[severity]
         myDescription = row[description]
-		try: myName = bladestate[i][6]
+        try:
-		except: myName = ""
+            myName = bladestate[i][6]
-		if mySeverity == "(No severity)": continue
+        except:
-		add_long( "blade%s (%s): %s %s" % (myBladeid,myName,mySeverity, myDescription) )
+            myName = ""
+        if mySeverity == "(No severity)":
+            continue
+        add_long("blade%s (%s): %s %s" %
+                 (myBladeid, myName, mySeverity, myDescription))
         if opts.exclude:
             if myDescription.find(opts.exclude) > -1:
                 continue
@@ -455,27 +486,33 @@ def check_bladehealth():
             good_blades += 1
         else:
             nagios_status(warning)
-			add_summary( "blade%s (%s): %s %s. " % (myBladeid,myName,mySeverity, myDescription) )
+            add_summary("blade%s (%s): %s %s. " %
+                        (myBladeid, myName, mySeverity, myDescription))
     if good_blades == total_blades:
-		add_summary( "%s out of %s blades in Good health. " % (good_blades, total_blades))
+        add_summary("%s out of %s blades in Good health. " %
+                    (good_blades, total_blades))
         nagios_status(ok)
     else:
         nagios_status(warning)
+
+
 def check_systemhealth():
     systemhealthstat = snmpget('1.3.6.1.4.1.2.3.51.2.2.7.1.0')
     summary = getTable('1.3.6.1.4.1.2.3.51.2.2.7.2.1')
-	index,severity,description,date = (1,2,3,4)
+    index, severity, description, date = (1, 2, 3, 4)
-	# Sometimes chassis delivers warning when absolutely nothing is going on. Lets work around that
+    # Sometimes chassis delivers warning when absolutely nothing is going on.
+    # Lets work around that
     workaround = [{1: '1', 2: 'Good', 3: 'No critical or warning events', 4: 'No timestamp'}]
     # Check overall health
     if systemhealthstat == '255':
         nagios_status(ok)
         add_summary("Bladecenter health: OK. ")
-	elif systemhealthstat == "2":
+    elif summary.values() == workaround:
-		if summary.values() == workaround:
+        add_summary("Non-Critical Error (bug in firmware): '%s' " %
-			add_summary("Non-Critical Error: %s " % workaround[0][description] )
+                    workaround[0][description])
         nagios_status(ok)
         return
+    elif systemhealthstat == "2":
         nagios_status(warning)
         add_summary("Non-Critical Error. ")
     elif systemhealthstat == "4":
@@ -486,7 +523,9 @@ def check_systemhealth():
         add_summary("Critical. ")
     else:
         nagios_status(unknown)
-		add_summary("Bladecenter health unkown (oid 1.3.6.1.4.1.2.3.51.2.2.7.1.0 returns %s). " % systemhealthstat)
+        add_summary(
+            "Bladecenter health unkown (oid 1.3.6.1.4.1.2.3.51.2.2.7.1.0 returns %s). " %
+            systemhealthstat)
     for row in summary.values():
         if row[severity] == 'Good':
             nagios_status(ok)
@@ -496,30 +535,37 @@ def check_systemhealth():
             nagios_status(warning)
         else:
             nagios_status(critical)
-		add_summary( "%s. " % (row[description]) )
+        add_summary("%s. " % (row[description]))
-		add_long( "* %s. " % (row[description]) )
+        add_long("* %s. " % (row[description]))
+
 
 def check_temperature():
     # set some sensible defaults
-	if opts.warning_threshold is None: opts.warning_threshold = 28
+    if opts.warning_threshold is None:
-	if opts.critical_threshold is None: opts.critical_threshold = 35
+        opts.warning_threshold = 28
+    if opts.critical_threshold is None:
+        opts.critical_threshold = 35
     str_temp = snmpget('1.3.6.1.4.1.2.3.51.2.2.1.5.1.0')
-	float_temp,measurement = str_temp.split(None, 1)
+    float_temp, measurement = str_temp.split(None, 1)
-	float_temp = float( float_temp )
+    float_temp = float(float_temp)
     if opts.critical_threshold is not None and float_temp > opts.critical_threshold:
         nagios_status(critical)
-		add_summary( "ambient temperature (%s) is over critical thresholds (%s). " % (str_temp, opts.critical_threshold) )
+        add_summary(
+            "ambient temperature (%s) is over critical thresholds (%s). " %
+            (str_temp, opts.critical_threshold))
     elif opts.warning_threshold is not None and float_temp > opts.warning_threshold:
         nagios_status(warning)
-		add_summary( "ambient temperature (%s) is over warning thresholds (%s). " % (str_temp, opts.warning_threshold) )
+        add_summary(
+            "ambient temperature (%s) is over warning thresholds (%s). " %
+            (str_temp, opts.warning_threshold))
     else:
-		add_summary( "Ambient temperature = %s. " % (str_temp) )
+        add_summary("Ambient temperature = %s. " % (str_temp))
-	add_perfdata( "'ambient_temp'=%s;%s;%s " % (float_temp,opts.warning_threshold,opts.critical_threshold) )
+    add_perfdata("'ambient_temp'=%s;%s;%s " %
+                 (float_temp, opts.warning_threshold, opts.critical_threshold))
     #add_long( "Ambient Temperature = %s" % (str_temp) )
     nagios_status(ok)
 
 
-
 if __name__ == '__main__':
     try:
         set_snmp_options()

check_ibm_bladecenter/nagios-okplugin-check_ibm_bladecenter.spec

@@ -2,8 +2,8 @@
 
 Summary:	A Nagios plugin to check IBM Bladecenters 
 Name:		nagios-okplugin-check_ibm_bladecenter
-Version:	1.1.2
+Version:	4
-Release:	3%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-check_ibm_bladecenter
@@ -40,6 +40,21 @@ rm -rf %{buildroot}
 #%config(noreplace) %{_sysconfdir}/nrpe.d/check_bond.cfg
 
 %changelog
+* Fri Feb 21 2014 Pall Sigurdsson <palli@opensource.is> 4-1
+- 
+
+* Fri Feb 21 2014 Unknown name 3-1
+- Merge branch 'master' of github.com:opinkerfi/nagios-plugins
+  (palli@opensource.is)
+- ibm_bladecenter - another firmware bug workaround (palli@opensource.is)
+- pep8 fixes (palli@opensource.is)
+- Fix workaround for firmware bug (palli@opensource.is)
+
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- Merge branch 'master' of github.com:opinkerfi/misc (palli@opensource.is)
+- --exclude option added. Added workaround around false positives
+  (palli@opensource.is)
+
 * Thu Aug 23 2012 Pall Sigurdsson <palli@opensource.is> 1.1.2-3
 - version number of scripts bumped (palli@opensource.is)
 

check_ipa/README

@@ -1,3 +0,0 @@
-check_ipa
-
-Various checks for IPA http://freeipa.org/ server

check_ipa/README.md

@@ -0,0 +1,19 @@
+check_ipa_replication
+=====================
+You need some configuration for this plugin to have access to replication
+information.
+
+Allow anonymous read to replication information
+-----------------------------------------------
+You will need to do this for every IPA server, masters and replicas
+
+```
+ldapmodify -x -D "cn=directory manager" -W -f grant_anonymous_replication_view.ldif -h ipa-host.example.com
+```
+
+Configure the directory manager credentials
+-------------------------------------------
+NOT RECOMENDED, you can use -D and -w with the directory manager credentials
+and the plugin will work as expected.
+
+

check_ipa/grant_anonymous_replication_view.ldif

@@ -0,0 +1,4 @@
+dn: cn="dc=mr,dc=lan",cn=mapping tree,cn=config
+changetype: modify
+add: aci
+aci: (targetattr=*)(targetfilter="(|(objectclass=nsds5replicationagreement)(objectclass=nsDSWindowsReplicationAgreement))")(version 3.0; aci "permission:Read Replication Agreements"; allow (read, search, compare) groupdn = "ldap:///anyone";)

check_ipa/nagios-okplugin-ipa.spec

@@ -3,7 +3,7 @@
 
 Summary:	A Nagios plugin to check IPA server status
 Name:		nagios-okplugin-%{plugin}
-Version:	0.0.3
+Version:	0.0.4
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -37,10 +37,17 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc README
+%doc grant_anonymous_replication_view.ldif
 %{_libdir}/nagios/plugins/*
 %config(noreplace) %{_sysconfdir}/nrpe.d/check_ipa.cfg
 
 %changelog
+* Fri Apr 04 2014 Tomas Edwardsson <tommi@tommi.org> 0.0.4-1
+- Renamed to markdown (tommi@tommi.org)
+- Added examples and documentation (tommi@tommi.org)
+- Missing colon (tommi@tommi.org)
+- Added missing OK when things worked out (tommi@tommi.org)
+
 * Thu Apr 25 2013 Tomas Edwardsson <tommi@tommi.org> 0.0.3-1
 - Preliminary testing done, released
 - Various errors in syntax fixed (tommi@tommi.org)

check_ironport/nagios-okplugin-check_ironport.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check Cisco Ironport 
 Name:		nagios-okplugin-check_ironport
-Version:	1.1.4
+Version:	2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -37,6 +37,10 @@ rm -rf %{buildroot}
 #%config(noreplace) %{_sysconfdir}/nrpe.d/check_bond.cfg
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- Merge branch 'master' of https://opensource.ok.is/git/misc
+  (palli@opensource.is)
+
 * Tue Jul 31 2012 Pall Sigurdsson <palli@opensource.is> 1.1.4-1
 - initial packaging for nagios-okplugin-check_ironport (palli@opensource.is)
 

check_msa_hardware-pl/README.md

@@ -0,0 +1 @@
+Checks hardware status of MSA disk arrays also known as HP P2000

check_msa_hardware-pl/nagios-okplugin-check_msa.spec

@@ -0,0 +1,67 @@
+%define debug_package %{nil}
+%define plugin check_msa_hardware
+%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:	1%{?dist}
+License:	GPLv3+
+Group:		Applications/System
+URL:		https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin}
+Source0:	https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin}/releases/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	%{packager}
+BuildArch:	noarch
+Requires:	pynag
+
+
+%description
+Checks status of a remote MSA disk array, also known as HP P2000 
+%prep
+%setup -q
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin}
+mkdir -p %{buildroot}%{_sysconfdir}/nrpe.d
+sed "s^/usr/lib64^%{_libdir}^g" nrpe.d/%{plugin}.cfg >  %{buildroot}%{_sysconfdir}/nrpe.d/%{plugin}.cfg
+
+# Temporary fix for selinux
+chcon system_u:object_r:nagios_unconfined_plugin_exec_t:s0 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin}
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/service nrpe status &> /dev/null && /sbin/service nrpe reload || :
+
+%files
+%defattr(-,root,root,-)
+%doc README.md
+%{_libdir}/nagios/plugins/*
+%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)
+- rename check_msa_hardware-pl (you@example.com)
+
+* Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 1.0.3-1
+- new package built with tito
+
+* Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 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

check_msa_hardware-pl/nrpe.d/check_msa_hardware.cfg

@@ -0,0 +1 @@
+command[check_msa_hardware]=/usr/lib64/nagios/plugins/check_msa_hardware

check_other/README

@@ -0,0 +1,14 @@
+check_other
+===========
+
+This plugin is designed to execute another plugin that is given as an argument.
+
+Usually you want this to use the perfdata parsing of pynag and you want to alert on specific thresholds in the other plugin.
+
+Usage:
+```
+check_other -- check_nrpe -H localhost -c check_load
+
+# Same as above, but alert on performance metric load1
+check_other --threshold metric=load1,warn=2..inf -- check_nrpe -H localhost -c check_load
+```

check_other/check_other

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# This script runs whatever command is printed on the command line
+# Usage:
+#   ./check_other -- someotherplugin --arguments-for-the-other-plugin
+#
+# Example:
+#   ./check_other -- check_nrpe -H localhost
+#
+# If you want to provide options to check_other (for example to enforce a threshold:
+# ./check_other --threshold=load1,warn=5..inf -- check_nrpe -H localhost check_load
+
+
+import subprocess
+import sys
+
+from pynag.Plugins import PluginHelper
+from pynag.Utils import runCommand, PluginOutput, PerfData
+
+p = PluginHelper()
+
+p.parser.add_option('--string', dest='string', help='run this command (will be shell expanded, use quotes)')
+p.parse_arguments()
+
+
+# --string was provided
+if p.options.string:
+    return_code, stdout, stderr = runCommand(p.options.string)
+# No --string, and no arguments on the command line
+elif not p.arguments:
+    p.parser.error("You need to provide an external command as an argument. Try:  %s ls" % sys.argv[0])
+# some arguments were provided
+else:
+    try:
+        proc = subprocess.Popen(p.arguments, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE,)
+        stdout, stderr = proc.communicate('through stdin to stdout')
+        return_code = proc.returncode
+    except Exception, e:
+        p.set_summary("Failed to execute '%s': %s " % (p.arguments[0], e))
+        p.status(3)
+        p.exit()
+
+p.status(return_code)
+other = PluginOutput(stdout)
+
+p.set_summary(other.summary)
+p.set_long_output(other.long_output)
+p._perfdata = PerfData(other.perfdata)
+
+p.check_all_metrics()
+p.exit()

check_package_updates/README.md

@@ -4,10 +4,6 @@ About
 This Nagios plugin checks for available updates using PackageKit
 http://packagekit.org/ on Linux systems
 
-Draft
-=====
-The implementation isn't finished yet.
-
 Why a new plugin?
 =================
 

check_package_updates/check_package_updates

@@ -17,7 +17,7 @@
 
 from subprocess import Popen, PIPE
 from pynag.Plugins import PluginHelper, unknown, ok
-
+from collections import defaultdict
 known_types = ['Enhancement', 'Normal', 'Bug fix', 'Security']
 
 
@@ -57,7 +57,9 @@ def pkcon_get_updates():
 
     :return: { "Bug fix": [ "pkg-1.0.1", "anthr-pkg-3.1.4" ], "Security": [ "pkg2-2.1.1" ],
     """
-    update_types = {}
+    update_types = defaultdict(list)
+    for t in known_types:
+        update_types[t] = []
 
     stdout = ""
     stderr = ""
@@ -72,7 +74,7 @@ def pkcon_get_updates():
 
     total_updates = 0
     results_section = False
-    for line in stdout.split("\n"):
+    for line in stdout.splitlines():
         if not line:
             continue
         if line.startswith("There are no updates"):
@@ -83,8 +85,6 @@ def pkcon_get_updates():
             update_type = line[:13].strip()
             update_package = line[13:].strip()
 
-            if update_type not in update_types:
-                update_types[update_type] = []
             update_types[update_type].append(update_package)
             total_updates += 1
 
@@ -94,9 +94,6 @@ def pkcon_get_updates():
     if results_section is False:
         raise Exception("pkcon returned no 'Results:' section. Output of pkcon command:\n" + stdout)
 
-    for t in known_types:
-        if t not in update_types:
-            update_types[t] = []
     return total_updates, update_types
 
 

check_package_updates/nagios-okplugin-check_package_updates.spec

@@ -3,7 +3,7 @@
 
 Summary:	A Nagios plugin to check operating system updates
 Name:		nagios-okplugin-%{plugin}
-Version:	0.0.6
+Version:	0.0.7
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/System
@@ -15,7 +15,6 @@ BuildArch:	noarch
 Requires:	nrpe
 Requires:	pynag
 Requires:	PackageKit
-Obsoletes:	nagios-okplugin-check_yum
 
 
 %description
@@ -32,10 +31,15 @@ rm -rf %{buildroot}
 install -D -p -m 0755 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin}
 mkdir -p %{buildroot}%{_sysconfdir}/nrpe.d
 sed "s^/usr/lib64^%{_libdir}^g" nrpe.d/%{plugin}.cfg >  %{buildroot}%{_sysconfdir}/nrpe.d/%{plugin}.cfg
+# Temporary fix for selinux
+chcon system_u:object_r:nagios_unconfined_plugin_exec_t:s0 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin}
 
 %clean
 rm -rf %{buildroot}
 
+%post
+/sbin/service nrpe status &> /dev/null && /sbin/service nrpe reload || :
+
 %files
 %defattr(-,root,root,-)
 %doc README.md
@@ -43,6 +47,15 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg
 
 %changelog
+* Fri Sep 13 2013 Tomas Edwardsson <tommi@tommi.org> 0.0.7-1
+- check_package_updates - minor refactor (palli@opensource.is)
+- check_package_updates - fix inconsistent tab/space (palli@opensource.is)
+- Removed obsoletes and thresholds (tommi@tommi.org)
+- Removed Draft, should be working pretty good (tommi@tommi.org)
+- Added --legacy to default since that is the default format (tommi@tommi.org)
+- Added nrpe reload since moving from check_yum needs it (tommi@tommi.org)
+- Added obsolete for okplugin check_updates (tommi@tommi.org)
+
 * Tue Jul 16 2013 Tomas Edwardsson <tommi@tommi.org> 0.0.6-1
 - Fix failure on a fully patched system (tommi@tommi.org)
 

check_package_updates/nrpe.d/check_package_updates.cfg

@@ -1,2 +1,5 @@
 # Critical on security updates, warning if 40 or more total updates
-command[check_updates]=/usr/lib64/nagios/plugins/check_package_updates --th "metric=security,critical=1..inf" --th "metric=total,warning=40..inf"
+command[check_package_updates]=/usr/lib64/nagios/plugins/check_package_updates --legacy
+
+# Critical on security updates
+command[check_package_updates_security]=/usr/lib64/nagios/plugins/check_package_updates --th "metric=security,critical=1..inf" --legacy

check_rhcs/check_rhcs

@@ -72,12 +72,11 @@ def getLocalNodeState(dom):
     """
     Get the state of the local node
     """
-    hostname = socket.gethostname()
     nodesList = dom.getElementsByTagName('node')
     nodeState = {}
     
     for node in nodesList:
-        if node.attributes['name'].value == hostname:
+        if node.attributes['local'].value == "1":
             nodeState['name'] = node.attributes['name'].value
             nodeState['state'] = node.attributes['state'].value 
             nodeState['rgmanager'] = node.attributes['rgmanager'].value 
@@ -95,7 +94,6 @@ def getServiceState(dom, service):
     Get the state of the named service
     """
     groupList = dom.getElementsByTagName('group')
-    hostname = socket.gethostname()
     serviceState = {}
     for group in groupList:
         if group.attributes['name'].value in (service,"service:"+service,"vm:"+service):

check_rhcs/nagios-okplugin-check_rhcs.spec

@@ -6,7 +6,7 @@
 
 Summary:	A Nagios plugin to check Red Hat Cluster suite (rhel5 and rhel6)
 Name:		nagios-okplugin-%{plugin_name}
-Version:	%{version}
+Version:	1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -45,6 +45,11 @@ rm -rf %{buildroot}
 /etc/nrpe.d/%{plugin_name}.cfg
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1-1
+- Updated rhcs nrpe config as well (tommi@tommi.org)
+- Added check for suspended services -Z (tommi@tommi.org)
+- Fix broken libdir on 64-bit platforms (palli@opensource.is)
+
 * Thu May 24 2012 Pall Sigurdsson <palli@opensource.is> 0.0.4-1
 - version bump of check_rhcs (palli@opensource.is)
 - check_rhcs_fence added for rhel6 compatibility (palli@opensource.is)

check_selinux/nagios-plugins-check_selinux.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check SELinux status on Linux servers
 Name:		nagios-plugins-check_selinux
-Version:	1.1
+Version:	1.3
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/System
@@ -35,6 +35,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.3-1
+- 
+
+* Thu Feb 20 2014 Pall Sigurdsson
+- 
+
 * Wed May 22 2013 Tomas Edwardsson <tommi@tommi.org> 1.1-1
 - new package built with tito
 

check_snmp/nagios-okplugin-check_snmp.spec

@@ -2,7 +2,7 @@
 
 Summary:	Various nagios plugins to check cpu,memory,interfaces via SNMP
 Name:		nagios-okplugin-check_snmp
-Version:	1.0.1
+Version:	2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -45,6 +45,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- make sure nagios does not run us in embedded perl (palli@opensource.is)
+
 * Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 1.0.1-1
 - new package built with tito
 

check_storwize/README.md

@@ -0,0 +1,77 @@
+check_storwize.py
+=================
+
+Nagios plugin to check the status of a remote Storwize disk array.
+
+This plugin is designed to be syntactically compatible with check_storwize.sh from nagios exchange
+with the following differences:
+
+  - Outputs performance data
+  - GPL License
+  - Written in python
+  - More stable plugin results when disk array is broken
+
+
+USAGE
+=============
+```
+ python check_storwize.py --help
+Usage: check_storwize.py [options]
+
+Options:
+  -h, --help            show this help message and exit
+  -H HOSTNAME, -M HOSTNAME, --hostname=HOSTNAME
+                        Hostname or ip address
+  -U USER, --user=USER  Log in as this user to storwize
+  -Q QUERY, --query=QUERY
+                        Query to send to storwize (see also -L)
+  -L, --list-queries    List of valid queries
+  --test                Run this plugin in test mode
+
+  Generic Options:
+    --timeout=50        Exit plugin with unknown status after x seconds
+    --threshold=range   Thresholds in standard nagios threshold format
+    --th=range          Same as --threshold
+    --extra-opts=@file  Read options from an ini file. See
+                        http://nagiosplugins.org/extra-opts
+    -d, --debug         Print debug info
+
+  Display Options:
+    -v, --verbose       Print more verbose info
+    --no-perfdata       Dont show any performance data
+    --no-longoutput     Hide longoutput from the plugin output (i.e. only
+                        display first line of the output)
+    --no-summary        Hide summary from plugin output
+    --get-metrics       Print all available metrics and exit (can be combined
+                        with --verbose)
+    --legacy            Deprecated, do not use
+```
+
+EXAMPLES
+========
+```
+# List array status
+python check_storwize -H remote_host -U username -Q lsarray
+
+# List vdisk status
+python check_storwize -H remote_host -U username -Q lsarray
+
+```
+
+
+Valid modes
+===========
+The following is a list of valid modes (at the time of this writing). For an up-to-date list consult check_storwize -L
+
+  * lsarray
+  * lsdrive
+  * lsenclosurebattery
+  * lsenclosurecanister
+  * lsenclosurepsu
+  * lsenclosureslot
+  * lsenclosure
+  * lsmdiskgrp
+  * lsmdskgrp
+  * lsmgrp
+  * lsrcrelationship
+  * lsvdisk

check_storwize/check_storwize.py

@@ -0,0 +1,205 @@
+#!/usr/bin/env python
+
+from pynag.Plugins import PluginHelper, ok, warning, critical, unknown
+from pynag.Utils import runCommand
+from collections import namedtuple
+
+valid_queries = "lsarray lsdrive lsenclosurebattery lsenclosurecanister lsenclosurepsu lsenclosureslot lsenclosure lsmdiskgrp lsmdskgrp lsmgrp lsrcrelationship lsvdisk"
+
+p = PluginHelper()
+p.add_option("-H", "--hostname", '-M', help="Hostname or ip address", dest="hostname")
+p.add_option("-U", "--user", help="Log in as this user to storwize", dest="user", default="nagios")
+p.add_option("-Q", "--query", help="Query to send to storwize (see also -L)", dest="query", default="lsarray")
+p.add_option("-L", "--list-queries", help="List of valid queries", dest="list_queries", action="store_true")
+p.add_option("--test", help="Run this plugin in test mode", dest="test", action="store_true")
+
+p.parse_arguments()
+
+if p.options.list_queries is True:
+    p.parser.error("Valid Queries: %s" % valid_queries)
+if not p.options.hostname:
+    p.parser.error("Required options -H is missing")
+if p.options.query not in valid_queries.split():
+    p.parser.error("%s does not look like a valid query. Use -L for a list of valid queries" % p.options.query)
+
+query = p.options.query
+
+
+# Connect to remote storwize and run a connect
+def run_query():
+    """ Connect to a remote storwize box and run query  """
+    command = "ssh %s@%s %s -delim ':'" % (p.options.user, p.options.hostname, p.options.query)
+    if p.options.test:
+        command = "cat %s.txt" % (p.options.query)
+    return_code, stdout, stderr = runCommand(command)
+
+    if return_code != 0:
+        p.status(unknown)
+        p.add_summary("Got error %s when trying to log into remote storwize box" % return_code)
+        p.add_long_output("\ncommand:\n===============\n%s" % command)
+        p.add_long_output("\nStandard output:\n==============\n%s" % (stdout))
+        p.add_long_output("\nStandard stderr:\n==============\n%s" % (stderr))
+        p.exit()
+    if stderr:
+        p.status(unknown)
+        p.add_summary("Error when connecting to storwize: %s" % stderr)
+        p.exit()
+
+    # Parse the output of run query and return a list of "rows"
+    lines = stdout.splitlines()
+    top_line = lines.pop(0)
+    headers = top_line.split(':')
+    Row = namedtuple('Row', ' '.join(headers))
+    rows = []
+    for i in lines:
+        i = i.strip()
+        columns = i.split(':')
+        row = Row(*columns)
+        rows.append(row)
+    return rows
+
+
+def check_lsmdiskgrp():
+    p.add_summary("%s diskgroups found" % (len(rows)))
+    p.add_metric("number of groups", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("group %s is %s." % (row.name, row.status))
+        p.add_long_output("%s: used: %s out of %s" % (row.name, row.used_capacity, row.capacity))
+        # Add a performance metric
+        metric_name = "%s_capacity" % row.name
+        p.add_metric(metric_name, value=row.used_capacity, max=row.capacity)
+
+
+def check_lsdrive():
+    p.add_summary("%s drives found" % (len(rows)))
+    p.add_metric("number of drives", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("drive %s is %s" % (row.id, row.status))
+
+
+def check_lsmgrp():
+    p.add_summary("%s groups found" % (len(rows)))
+    p.add_metric("number of groups", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("group %s is %s" % (row.name, row.status))
+
+
+def check_lsenclosurebattery():
+    p.add_summary("%s batteries found" % (len(rows)))
+    p.add_metric("number of batteries", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("battery %s:%s is %s" % (row.enclosure_id, row.battery_id, row.status))
+
+
+def check_lsenclosurecanister():
+    p.add_summary("%s canisters found" % (len(rows)))
+    p.add_metric("number of canisters", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("canister %s:%s is %s" % (row.enclosure_id, row.canister_id, row.status))
+
+
+def check_lsenclosurepsu():
+    p.add_summary("%s psu found" % (len(rows)))
+    p.add_metric("number of psu", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("psu %s:%s is %s" % (row.enclosure_id, row.PSU_id, row.status))
+
+
+def check_lsenclosure():
+    p.add_summary("%s enclosures found" % (len(rows)))
+    p.add_metric("number of enclosures", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("enclosure %s is %s" % (row.id, row.status))
+
+
+def check_lsenclosureslot():
+    p.add_summary("%s slots found" % (len(rows)))
+    p.add_metric("number of slots", len(rows))
+    for row in rows:
+        if row.port_1_status != 'online':
+            p.status(critical)
+            p.add_summary("port1 on slot %s:%s is %s" % (row.enclosure_id, row.slot_id, row.port_1_status))
+        if row.port_2_status != 'online':
+            p.status(critical)
+            p.add_summary("port2 on slot %s:%s is %s" % (row.enclosure_id, row.slot_id, row.port_2_status))
+
+
+def check_lsrcrelationship():
+    p.add_summary("%s cluster relationships found" % (len(rows)))
+    p.add_metric("number of relationships", len(rows))
+    for row in rows:
+        if row.state != 'consistent_synchronized':
+            p.status(critical)
+            p.add_summary("%s is %s" % (row.consistency_group_name, row.state))
+
+
+def check_lsvdisk():
+    p.add_summary("%s disks found" % (len(rows)))
+    p.add_metric("number of disks", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.status(critical)
+            p.add_summary("disk %s is %s" % (row.name, row.status))
+
+
+def check_lsarray():
+    p.add_summary("%s arrays found" % (len(rows)))
+    p.add_metric("number of arrays", len(rows))
+    for row in rows:
+        if row.status != 'online':
+            p.add_summary("array %s is %s." % (row.mdisk_name, row.status))
+            p.status(critical)
+        if row.raid_status != 'online':
+            p.add_summary("array %s has raid status %s." % (row.mdisk_name, row.raid_status))
+            p.status(critical)
+        # Add some performance metrics
+        metric_name = row.mdisk_name + "_capacity"
+        p.add_metric(metric_name, value=row.capacity)
+
+# Run our given query, and parse the output
+rows = run_query()
+
+if query == 'lsmdiskgrp':
+    check_lsmdiskgrp()
+elif query == 'lsarray':
+    check_lsarray()
+elif query == 'lsdrive':
+    check_lsdrive()
+elif query == 'lsvdisk':
+    check_lsvdisk()
+elif query == 'lsmgrp':
+    check_lsmgrp()
+elif query == 'lsenclosure':
+    check_lsenclosure()
+elif query == 'lsenclosurebattery':
+    check_lsenclosurebattery()
+elif query == 'lsenclosurecanister':
+    check_lsenclosurecanister()
+elif query == 'lsenclosurepsu':
+    check_lsenclosurepsu()
+elif query == 'lsrcrelationship':
+    check_lsrcrelationship()
+elif query == 'lsenclosureslot':
+    check_lsenclosureslot()
+else:
+    p.status(unknown)
+    p.add_summary("unsupported query: %s. See -L for list of valid queries" % query)
+    p.exit()
+
+# Check metrics and exit
+p.check_all_metrics()
+p.exit()

check_storwize/nagios-okplugin-check_storwize.spec

@@ -0,0 +1,50 @@
+%define debug_package %{nil}
+%define plugin check_storwize
+%define packager Pall Sigurdsson <palli@opensource.is>
+
+Summary:	A Nagios plugin to check status of a storwize disk array
+Name:		nagios-okplugin-%{plugin}
+Version:	1.0.0
+Release:	1%{?dist}
+License:	GPLv3+
+Group:		Applications/System
+URL:		https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin}
+Source0:	https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin}/releases/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	%{packager}
+BuildArch:	noarch
+Requires:	pynag
+
+
+%description
+Checks updates via PackageKit and can notify on various different situations
+
+%prep
+%setup -q
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin}
+mkdir -p %{buildroot}%{_sysconfdir}/nrpe.d
+sed "s^/usr/lib64^%{_libdir}^g" nrpe.d/%{plugin}.cfg >  %{buildroot}%{_sysconfdir}/nrpe.d/%{plugin}.cfg
+# Temporary fix for selinux
+chcon system_u:object_r:nagios_unconfined_plugin_exec_t:s0 %{plugin} %{buildroot}%{_libdir}/nagios/plugins/%{plugin}
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/service nrpe status &> /dev/null && /sbin/service nrpe reload || :
+
+%files
+%defattr(-,root,root,-)
+%doc README.md
+%{_libdir}/nagios/plugins/*
+%config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg
+
+%changelog
+* Fri Dec 6 2013 Pall Sigurdsson 1.0.0-1
+- Initial Packaging

check_storwize/test.sh

@@ -0,0 +1,33 @@
+CURRENT_PATH=`pwd`
+cd $CURRENT_PATH/tests/ok
+tests=`echo * | sed 's/.txt//g'`
+for i in $tests ; do
+	command="python $CURRENT_PATH/check_storwize.py --test -H testhost -U nagios -Q $i"
+	$command > /dev/null 2>&1
+	RESULT=$?
+	if [ $RESULT -ne 0 ]; then
+		echo "FAIL"
+		echo "cd `pwd`"
+		echo "Command: $command"
+	else
+		echo "$i working as expected"
+	fi 
+done
+
+
+cd $CURRENT_PATH/tests/critical
+tests=`echo * | sed 's/.txt//g'`
+for i in $tests ; do
+	command="python $CURRENT_PATH/check_storwize.py --test -H testhost -U nagios -Q $i"
+	$command > /dev/null 2>&1
+	RESULT=$?
+	if [ $RESULT -ne 2 ]; then
+		echo "FAIL"
+		echo "cd `pwd`"
+		echo "Command: $command"
+	else
+		echo "$i working as expected"
+	fi 
+done
+
+

check_time/nagios-okplugin-check_time.spec

@@ -2,13 +2,14 @@
 
 Summary:	A Nagios plugin to compare time on remote host with localhost
 Name:		nagios-okplugin-check_time
-Version:	1.0.1
+Version:	1.0.3
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://opensource.is/trac/wiki/check_time
 Source0:	http://opensource.ok.is/trac/browser/nagios-plugins/check_time/releases/nagios-okplugin-check_time-%{version}.tar.gz
 Requires:	nagios-nrpe
+Requires:	bc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Packager:	Pall Sigurdsson <palli@opensource.is>
 
@@ -40,6 +41,12 @@ rm -rf %{buildroot}
 /etc/nrpe.d/check_time.cfg
 
 %changelog
+* Fri Apr 04 2014 Tomas Edwardsson <tommi@tommi.org> 1.0.3-1
+- check_time - Added requirement for bc (tommi@tommi.org)
+
+* Tue Mar 25 2014 Tomas Edwardsson <tommi@tommi.org> 1.0.2-1
+- Bump version
+
 * Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 1.0.1-1
 - new package built with tito
 

check_uptime/nagios-okplugin-check_uptime.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check uptime of a remote host via NRPE
 Name:		nagios-okplugin-check_uptime
-Version:	1.0.1
+Version:	1.0.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 /etc/nrpe.d/check_uptime.cfg
 
 %changelog
+* Mon Dec 30 2013 Tomas Edwardsson <tommi@tommi.org> 1.0.2-1
+- Updated tag for build with newer tito
+
 * Mon Mar 12 2012 Pall Sigurdsson <palli@opensource.is> 1.0.1-1
 - new package built with tito
 

check_yum/nagios-okplugin-check_yum.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check yum updates via NRPE
 Name:		nagios-okplugin-check_yum
-Version:	0.8.2
+Version:	1
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -45,6 +45,10 @@ rm -rf %{buildroot}
 /etc/nrpe.d/check_yum.cfg
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1-1
+- Merge branch 'master' of github.com:opinkerfi/nagios-plugins
+  (palli@opensource.is)
+
 * Mon May 27 2013 Tomas Edwardsson <tommi@tommi.org> 0.8.2-1
 - Fixed nrpe with invalid libdir (tommi@tommi.org)
 

nagios-okplugin-common/nagios-okplugin-common.spec

@@ -0,0 +1,46 @@
+%define debug_package %{nil}
+
+Summary:	A common package for the okplugin suite
+Name:		nagios-okplugin-common
+Version:	1.2
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/System
+URL:		https://github.com/opinkerfi/nagios-plugins/
+Source0:	https://github.com/opinkerfi/nagios-plugins/archive/%{name}-%{version}-%{release}.tar.gz
+Requires:	nrpe
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	Tomas Edwardsson <tommi@ok.is>
+BuildArch:	noarch
+
+%description
+Common utilities for okplugins
+
+%prep
+%setup -q
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+mkdir -m 0770 -p %{buildroot}%{_sharedstatedir}/nagios-okplugin
+
+%clean
+rm -rf %{buildroot}
+
+%post
+
+%files
+%defattr(-,root,root,-)
+%dir %attr(0770, nrpe, nrpe) %{_sharedstatedir}/nagios-okplugin
+
+%changelog
+* Mon Jan 20 2014 Tomas Edwardsson <tommi@tommi.org> 1.2-1
+- 
+
+* Mon Jan 20 2014 Tomas Edwardsson <tommi@tommi.org> 1.1-1
+- new package built with tito
+
+* Mon Jan 20 2014 Tomas Edwardsson <tommi@tommi.org> 1.0-1
+- Initial build

okc-get_network_stat/nagios-okplugin-get_network_stat.spec

@@ -0,0 +1,46 @@
+%define debug_package %{nil}
+
+Summary:	A Nagios plugin to get network statistics over NRPE
+Name:		nagios-okplugin-get_network_stat
+Version:	1.0.1
+Release:	1%{?dist}
+License:	GPLv2+
+Group:		Applications/System
+URL:		https://github.com/opinkerfi/nagios-plugins/okc-get_network_stat
+Source0:	https://github.com/opinkerfi/nagios-plugins/okc-get_network_stat/%{name}-%{version}.tar.gz
+Requires:	nagios-plugins-nrpe
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Packager:	Tomas Edwardsson <tommi@tommi.org>
+BuildArch:	noarch
+
+
+
+%description
+A Nagios plugin to get network statistics over NRPE
+
+
+%prep
+%setup -q
+
+%build
+
+
+%install
+rm -rf %{buildroot}
+install -D -p -m 0755 okc-get_network_stat %{buildroot}%{_libdir}/nagios/plugins/okc-get_network_stat
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+#%doc README LICENSE
+#%{_libdir}/nagios/plugins/*
+%{_libdir}/nagios/plugins/okc-get_network_stat
+
+%changelog
+* Wed Apr 02 2014 Tomas Edwardsson <tommi@tommi.org> 1.0.1-1
+- new package built with tito
+
+* Wed Apr  2 2014 Tomas Edwardsson <tommi@tommi.org> 1.0.0-1
+- Initial release

okc-get_network_stat/okc-get_network_stat

@@ -0,0 +1,65 @@
+#!/usr/bin/python
+
+from pynag.Plugins import PluginHelper, ok, warning, critical, unknown
+from pynag.Utils import runCommand
+import re
+
+helper = PluginHelper()
+
+helper.parser.add_option("-H", help="Host to connect to", dest="host", default='localhost')
+
+helper.parse_arguments()
+
+if helper.options.host == "localhost":
+    command="cat /proc/net/dev|sed 's/  */ /g'"
+else:
+    command="/usr/lib64/nagios/plugins/check_nrpe -H '%s' -c get_network_interfaces_stat" % helper.options.host
+
+return_code, stdout, stderr = runCommand(command)
+
+try:
+    receive, transmit = stdout.split("\n")[1].split("|")[1:]
+    receive = receive.split()
+    transmit = transmit.split()
+
+    interfaces = []
+
+    for int_line in stdout.split("\n")[2:]:
+        int_line = int_line.strip()
+        if not int_line:
+            continue
+
+        int_arr = re.split("[: ]+", int_line.strip())
+
+        interface = int_arr.pop(0)
+
+        if interface == "lo" or interface.startswith('sit'):
+            continue
+
+        interfaces.append(interface)
+        for i in range(0, len(receive)):
+            helper.add_metric(
+                label="%s_rx_%s" % (interface, receive[i]),
+                value=int_arr.pop(0),
+                uom="c")
+        for i in range(0, len(transmit)):
+            helper.add_metric(
+                label="%s_tx_%s" % (interface, transmit[i]),
+                value=int_arr.pop(0),
+                uom="c")
+
+    helper.add_summary("Network interfaces %s" % ", ".join(interfaces))
+
+    # Here all metrics will be checked against thresholds that are either
+    # built-in or added via --threshold from the command-line
+    helper.check_all_metrics()
+
+    # Print out plugin information and exit nagios-style
+    helper.exit(ok)
+except Exception, error:
+    helper.status(unknown)
+    helper.add_summary(stdout + stderr)
+    helper.exit(unknown)
+
+# vim: sts=4 expandtab autoindent
+

rel-eng/packages/nagios-okplugin-apc

@@ -1 +1 @@
-2.1.0-1 check_apcext.pl/
+2.1.1-1 check_apcext.pl/

rel-eng/packages/nagios-okplugin-bond

@@ -1 +1 @@
-0.0.3-1 check_bond/
+0.0.4-1 check_bond/

rel-eng/packages/nagios-okplugin-brocade

@@ -1 +1 @@
-0.0.4-1 check_brocade/
+0.0.5-1 check_brocade/

rel-eng/packages/nagios-okplugin-check_dataprotector

@@ -1 +1 @@
-1.0.1-1 check_dataprotector/
+2-1 check_dataprotector/

rel-eng/packages/nagios-okplugin-check_disks

@@ -1 +1 @@
-1.0.3-1 check_disks.pl/
+1.0.6-1 check_disks.pl/

rel-eng/packages/nagios-okplugin-check_eva

@@ -1 +1 @@
-1.0.2-1 check_eva/
+2-1 check_eva/

rel-eng/packages/nagios-okplugin-check_hpacucli

@@ -1 +1 @@
-1.2-2 check_hpacucli/
+2-1 check_hpacucli/

rel-eng/packages/nagios-okplugin-check_ibm_bladecenter

@@ -1 +1 @@
-1.1.2-3 check_ibm_bladecenter/
+4-1 check_ibm_bladecenter/

rel-eng/packages/nagios-okplugin-check_ironport

@@ -1 +1 @@
-1.1.4-1 check_ironport/
+2-1 check_ironport/

rel-eng/packages/nagios-okplugin-check_msa_hardware

@@ -0,0 +1 @@
+1.0.5-1 check_msa_hardware-pl/

rel-eng/packages/nagios-okplugin-check_package_updates

@@ -1 +1 @@
-0.0.6-1 check_package_updates/
+0.0.7-1 check_package_updates/

rel-eng/packages/nagios-okplugin-check_rhcs

@@ -1 +1 @@
-0.0.4-1 check_rhcs/
+1-1 check_rhcs/

rel-eng/packages/nagios-okplugin-check_snmp

@@ -1 +1 @@
-1.0.1-1 check_snmp/
+2-1 check_snmp/

rel-eng/packages/nagios-okplugin-check_time

@@ -1 +1 @@
-1.0.1-1 check_time/
+1.0.3-1 check_time/

rel-eng/packages/nagios-okplugin-check_uptime

@@ -1 +1 @@
-1.0.1-1 check_uptime/
+1.0.2-1 check_uptime/

rel-eng/packages/nagios-okplugin-check_yum

@@ -1 +1 @@
-0.8.2-1 check_yum/
+1-1 check_yum/

rel-eng/packages/nagios-okplugin-cifs

@@ -1 +1 @@
-1.0-1 check_cifs/
+1.1-1 check_cifs/

rel-eng/packages/nagios-okplugin-get_network_stat

@@ -0,0 +1 @@
+1.0.1-1 okc-get_network_stat/

rel-eng/packages/nagios-okplugin-ipa

@@ -1 +1 @@
-0.0.3-1 check_ipa/
+0.0.4-1 check_ipa/

rel-eng/packages/nagios-okplugin-mailblacklist

@@ -1 +1 @@
-1.0-1 check_bl/
+1.1-1 check_bl/

rel-eng/packages/nagios-plugins-check_cpu

@@ -1 +1 @@
-1.0-1 check_cpu.sh/
+2-1 check_cpu.sh/

rel-eng/packages/nagios-plugins-check_selinux

@@ -1 +1 @@
-1.1-1 check_selinux/
+1.3-1 check_selinux/

rel-eng/releasers.conf

@@ -1,36 +1,12 @@
-# Fedora FC18
+# Fedora FC20
-[test-fc18-x86_64]
+[test-fc20-x86_64]
 releaser = tito.release.YumRepoReleaser
 builder = tito.builder.MockBuilder
-builder.mock = fedora-18-x86_64
+builder.mock = fedora-20-x86_64
 builder.test = 1
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora18/x86_64/
+rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora20/x86_64/
 
-
+# RHEL 6 Production
-[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