Automatic commit of package [nagios-okplugin-check_ibm_bladecenter] release [4-1].

Blade chassis will sometimes report critical error that
there are no critical or warning events.

Fix plugin so it properly works around the issue.

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.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_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_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"
-ok=0
-warning=1
-critical=2
-unknown=3 
+version = "1.1.2"
+ok = 0
+warning = 1
+critical = 2
+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"
-perfdata=""
-summary=""
-sudo=False
+longserviceoutput = "\n"
+perfdata = ""
+summary = ""
+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 )
-  proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE,stderr=subprocess.PIPE,)
+    '''runCommand: Runs command from the shell prompt. Exit Nagios style if unsuccessful'''
+    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)
-    debug("results: %s" % (stdout.strip() ) )
+        print "Error %s: %s\n command was: '%s'" % (proc.returncode, stderr.strip(), command)
+        debug("results: %s" % (stdout.strip()))
         if proc.returncode == 127:  # File not found, lets print path
-        path=getenv("PATH")
+            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"
-		else: path = ':' + path
-	current_path = "%s%s" % (current_path,path)
+        if path == '':
+            path = ":/usr/sbin"
+        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)
-	resultType,resultValue = result.split(': ',1)
+    oid, result = output.strip().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_summary( "%s out of %s powermodules are healthy" % (num_ok, len(powermodules) ) )
-	add_perfdata( "'Number of powermodules'=%s" % (len(powermodules) - num_no ) )
-	
+        add_long('Powersupply "%s" status "%s". %s. ' %
+                 (myIndex, myStatus, myDetails))
+    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) )
-				except: pass
+                    add_long("  type=%s ip=%s" % (module_type, module_ip))
+                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 2 state=%s speed=%s" % (blower2state,blower2speed) )
-	add_perfdata("blower1=%s" %(blower1speed.split(None,1)[0] ))
-	add_perfdata("blower2=%s" %(blower2speed.split(None,1)[0] ))
+    add_long("Blower 1 state=%s speed=%s" % (blower1state, blower1speed))
+    add_long("Blower 2 state=%s speed=%s" % (blower2state, blower2speed))
+    add_perfdata("blower1=%s" % (blower1speed.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",
-		10 :"bistBootRomFlashImage",
-		11 :"bistEthernetPort1",
-		113 :"bistSwitchModulesCommunicating",
-		12 :"bistEthernetPort2",
-		13 :"bistInternalPCIBus",
-		14 :"bistExternalI2CDevices",
-		15 :"bistUSBController",
-		16 :"bistVideoCompressorBoard",
-		17 :"bistPrimaryBus",
-		18 :"bistInternalEthernetSwitch",
-		2  :"bistRs485Port1",
-		3  :"bistRs485Port2",
-		33 :"bistBladesInstalled",
-		4  :"bistNvram",
-		49 :"bistBladesCommunicating",
-		6  :"bistRtc",
-		65 :"bistBlowersInstalled",
-		7  :"bistLocalI2CBus",
-		73 :"bistBlowersFunctional",
-		74 :"bistMediaTrayInstalled",
-		75 :"bistMediaTrayCommunicating",
-		8  :"bistPrimaryMainAppFlashImage",
-		81 :"bistPowerModulesInstalled",
-		89 :"bistPowerModulesFunctional",
-		9  :"bistSecondaryMainAppFlashImage",
-		97 :"bistSwitchModulesInstalled",
+        1: "bistSdram",
+        10: "bistBootRomFlashImage",
+            11: "bistEthernetPort1",
+            113: "bistSwitchModulesCommunicating",
+            12: "bistEthernetPort2",
+            13: "bistInternalPCIBus",
+            14: "bistExternalI2CDevices",
+            15: "bistUSBController",
+            16: "bistVideoCompressorBoard",
+            17: "bistPrimaryBus",
+            18: "bistInternalEthernetSwitch",
+            2: "bistRs485Port1",
+            3: "bistRs485Port2",
+            33: "bistBladesInstalled",
+            4: "bistNvram",
+            49: "bistBladesCommunicating",
+            6: "bistRtc",
+            65: "bistBlowersInstalled",
+            7: "bistLocalI2CBus",
+            73: "bistBlowersFunctional",
+            74: "bistMediaTrayInstalled",
+            75: "bistMediaTrayCommunicating",
+            8: "bistPrimaryMainAppFlashImage",
+            81: "bistPowerModulesInstalled",
+            89: "bistPowerModulesFunctional",
+            9: "bistSecondaryMainAppFlashImage",
+            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_long( " %s status: %s" % (oidName,friendly_status) )
+            add_summary("%s is %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]
-		except: myName = ""
-		if mySeverity == "(No severity)": continue
-		add_long( "blade%s (%s): %s %s" % (myBladeid,myName,mySeverity, myDescription) )
+        try:
+            myName = bladestate[i][6]
+        except:
+            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)
-	# Sometimes chassis delivers warning when absolutely nothing is going on. Lets work around that
+    index, severity, description, date = (1, 2, 3, 4)
+    # 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":
-		if summary.values() == workaround:
-			add_summary("Non-Critical Error: %s " % workaround[0][description] )
+    elif summary.values() == workaround:
+        add_summary("Non-Critical Error (bug in firmware): '%s' " %
+                    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_long( "* %s. " % (row[description]) )
+        add_summary("%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.critical_threshold is None: opts.critical_threshold = 35
+    if opts.warning_threshold is None:
+        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 = float( float_temp )
+    float_temp, measurement = str_temp.split(None, 1)
+    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_perfdata( "'ambient_temp'=%s;%s;%s " % (float_temp,opts.warning_threshold,opts.critical_threshold) )
+        add_summary("Ambient temperature = %s. " % (str_temp))
+    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,7 +2,7 @@
 
 Summary:	A Nagios plugin to check IBM Bladecenters 
 Name:		nagios-okplugin-check_ibm_bladecenter
-Version:	2
+Version:	4
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -40,6 +40,16 @@ 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

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_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_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)
 

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_ibm_bladecenter

@@ -1 +1 @@
-2-1 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_snmp

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

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-plugins-check_cpu

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