Automatic commit of package [nagios-okplugin-check_hpasm] release [4.1.4-1].

Closes #13

check_apcext.pl/check_apcext.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# nagios: -epn
 #
 # check_apcext.pl - APC Extra gear monitoring plugin for Nagios
 # 05.02.07 Paul Venezia

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.2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -38,6 +38,15 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/*
 
 %changelog
+* Mon Jun 09 2014 Tomas Edwardsson <tommi@tommi.org> 2.1.2-1
+- Disable embedded perl (tommi@tommi.org)
+
+* 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_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/okplugin_check_cpu

@@ -89,7 +89,6 @@ def remove_stale_state():
         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:
-            print "unlinking"
             os.unlink("/var/lib/nagios-okplugin/check_cpu")
     except OSError:
         return None

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/check_disks.pl

@@ -251,10 +251,10 @@ if ($ret > 1) {
 #
 
 foreach my $l (@output) {
-    if($l =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+([\/\w\d\.-]+)$/) {
     next if ($l =~ m/$opt_R/);
     next if ($l !~ m/$opt_r/);
     next if ($l =~ m/$exclude_re/);
+    if($l =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+([\/\w\d\.-]+)$/) {
         my ($s,$u,$f,$pu,$d) = ($1,$2,$3,$4,$5);
         $alldisks{$d}->{pused} = $pu;
         $alldisks{$d}->{pfree} = 100-$pu;
@@ -268,10 +268,10 @@ foreach my $l (@output) {
 # This is the output of df.exe on Windows
 #C:\    9097126      6094081      3003045    67% argon-c (ntfs)
     else {
-	if ($l =~ /(\w)\:\\\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(.*)$/) {
         next if ($l =~ m/$opt_R/);
         next if ($l !~ m/$opt_r/);
         next if ($l =~ m/$exclude_re/);
+	if ($l =~ /(\w)\:\\\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(.*)$/) {
         my ($d,$s,$u,$f,$pu) = ("/$1",$2,$3,$4,$5);
         $alldisks{$d}->{pused} = $pu;
         $alldisks{$d}->{pfree} = 100-$pu;

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/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
@@ -28,7 +28,7 @@ perl -pi -e "s|/usr/lib64|%{_libdir}|g" sudoers.d/*
 rm -rf %{buildroot}
 install -D -p -m 0755 check_hpacucli.py %{buildroot}%{_libdir}/nagios/plugins/check_hpacucli.py
 install -D -p -m 0755 nrpe.d/check_hpacucli.cfg %{buildroot}/etc/nrpe.d/check_hpacucli.cfg
-install -D -p -m 0755 sudoers.d/check_hpacucli %{buildroot}/etc/sudoers.d/check_hpacucli
+install -D -p -m 0440 sudoers.d/check_hpacucli %{buildroot}/etc/sudoers.d/check_hpacucli
 
 %clean
 rm -rf %{buildroot}
@@ -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_hpacucli/sudoers.d/check_hpacucli

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

check_hpasm/nagios-okplugin-check_hpasm.spec

@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check HP Hardware Status 
 Name:		nagios-okplugin-check_hpasm
-Version:	4.1.2
+Version:	4.1.4
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -45,5 +45,11 @@ rm -rf %{buildroot}
 /etc/nrpe.d/check_hpasm.cfg
 
 %changelog
+* Fri Oct 03 2014 Tomas Edwardsson <tommi@tommi.org> 4.1.4-1
+- hpasm invalid nrpe check command name (tommi@tommi.org)
+
+* Thu May 15 2014 Tomas Edwardsson <tommi@tommi.org> 4.1.3-1
+- new package built with tito
+
 * Tue Jun 4 2013 Pall Sigurdsson <palli@opensource.is> 4.1.2-1
 - Initial packaging

check_hpasm/nrpe.d/check_hpasm.cfg

@@ -1,3 +1,3 @@
 
 
-command[check_updates]=sudo /usr/lib/nagios/plugins/check_hpasm
+command[check_hpasm]=sudo /usr/lib/nagios/plugins/check_hpasm

check_ibm_bladecenter/check_ibm_bladecenter.py

@@ -20,7 +20,6 @@
 # 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
@@ -31,7 +30,6 @@ not_present = -1
 exit_status = -1
 
 
-
 state = {}
 state[not_present] = "Not Present"
 state[ok] = "OK"
@@ -52,10 +50,6 @@ from os import getenv,putenv,environ
 import subprocess
 
 
-
-
-
-
 # Parse some Arguments
 from optparse import OptionParser
 parser = OptionParser()
@@ -87,12 +81,14 @@ parser.add_option("-d","--debug", dest="debug",
 (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,33 +97,41 @@ 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):
     if opts.debug:
         print debugtext
 
+
 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):
+    '''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,)
+    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)
@@ -143,6 +147,7 @@ def runCommand(command):
     else:
         return stdout
 
+
 def end():
     global summary
     global longserviceoutput
@@ -150,36 +155,43 @@ def end():
     global exit_status
     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"
+        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)
     output = runCommand(snmpgetcommand)
@@ -189,12 +201,16 @@ def snmpget(oid):
         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)
@@ -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,10 +288,12 @@ 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:
@@ -276,7 +301,8 @@ def check_switchmodules():
                     module_type = myExtraInfo[22]
                     module_ip = myExtraInfo[6]
                     add_long("  type=%s ip=%s" % (module_type, module_ip))
-				except: pass
+                except:
+                    pass
     if exit_status == ok:
         add_summary("All switchmodules healthy")
 
@@ -408,14 +434,15 @@ def check_chassis_status():
         nagios_status(warning)
         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":
@@ -442,10 +469,14 @@ def check_bladehealth():
         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)
-	# 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)
@@ -499,27 +538,34 @@ def check_systemhealth():
         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.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 = 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_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/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
@@ -42,6 +42,12 @@ rm -rf %{buildroot}
 %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_lvm_mirror/check_lvm_mirror.py

@@ -0,0 +1,117 @@
+#!/usr/bin/python
+
+from pynag.Plugins import simple as Plugin, WARNING, CRITICAL, UNKNOWN, OK
+from subprocess import Popen, PIPE
+import os
+
+
+def main():
+    global plugin
+
+    plugin = Plugin(must_threshold=False)
+    plugin.add_arg("l", "logical-volume",
+                   "Comma seperated list of VG/LV, eg vg00/data,vg00/snap",
+                   required=False)
+    plugin.add_arg("V", "volume-group",
+                   "Comma seperated list of VG, eg vg00,vg01",
+                   required=False)
+    plugin.add_arg("a", "check-all", "Check all LVs", required=False,
+                   action="store_true")
+    plugin.activate()
+
+    lvs = plugin["logical-volume"] and plugin["logical-volume"].split(
+        ",") or []
+    vgs = plugin["volume-group"] and plugin["volume-group"].split(",") or []
+
+    if not lvs and not vgs and not plugin['check-all']:
+        plugin.parser.error(
+            "Either logical-volume or volume-group must be specified")
+    elif plugin['check-all'] and ( lvs or vgs ):
+        plugin.parser.error(
+            "Mixing check-all and logical-volume or volume-group does not make sense")
+
+    check_mirror(lvs, vgs, plugin['check-all'], plugin['host'])
+
+    (code, message) = (plugin.check_messages(joinallstr="\n"))
+    plugin.nagios_exit(code, message)
+
+
+def check_mirror(lv_list, vg_list, check_all, hostname):
+    # Ensure the right locale for text parsing
+    """
+
+        :rtype : None
+        """
+    # Change lang setting for string consitency
+    env = os.environ.copy()
+    env['LC_ALL'] = 'C'
+
+    # Remote execution
+    if hostname:
+        cmd = ['check_nrpe', '-H', hostname, '-c', 'get_lvm_mirrors']
+        # Local
+    else:
+        cmd = ["lvs", "--separator", ";", "-o",
+               "vg_name,lv_name,lv_attr,copy_percent"]
+    # Execute lvs
+    ret = None
+    lvs_output = None
+    try:
+        lvs = Popen(cmd, stdout=PIPE, shell=False, env=env)
+        ret = lvs.wait()
+        lvs_output = lvs.stdout.readlines()
+    except Exception, e:
+        plugin.nagios_exit(UNKNOWN, "Unable to execute lvs: %s" % (e))
+
+    if ret != 0:
+        plugin.nagios_exit(CRITICAL,
+                       "lvs execution failed, return code %i" % (ret))
+    all_lvs = []
+    all_vgs = []
+
+    # Loop through lvs output
+    linenumber = 0
+    for l in lvs_output:
+        linenumber += 1
+        try:
+            vg_name, lv_name, lv_attr, copy_percent = l.strip().split(";")
+        except ValueError as error:
+            plugin.add_message(UNKNOWN,
+                               "Unable to parse lvs line %i: %s\n%s" % (
+                                   linenumber, error, l))
+            continue
+        all_lvs.append("%s/%s" % (vg_name, lv_name))
+        if vg_name not in all_vgs:
+            all_vgs.append(vg_name)
+
+        if check_all or "%s/%s" % (
+                vg_name, lv_name) in lv_list or vg_name in vg_list:
+            if lv_attr[0] != "m" and lv_attr[0] != "M":
+                plugin.add_message(CRITICAL,
+                                   "LV %s/%s not mirrored" % (vg_name, lv_name))
+            elif lv_attr[2] != "a":
+                plugin.add_message(CRITICAL,
+                                   "LV %s/%s not active" % (vg_name, lv_name))
+            elif lv_attr[5] != "o":
+                plugin.add_message(CRITICAL,
+                                   "LV %s/%s not open" % (vg_name, lv_name))
+            elif float(copy_percent or 0) < 100:
+                plugin.add_message(WARNING, "LV %s/%s Copy Percent %s" % (
+                    vg_name, lv_name, copy_percent))
+            else:
+                plugin.add_message(OK, "LV %s/%s functioning" % (vg_name, lv_name))
+
+    # Find lvs that were specified in cmd line but were not found via lvs
+    for v in vg_list:
+        if v not in all_vgs:
+            plugin.add_message(CRITICAL, "VG %s not found" % (v))
+
+    # Find lvs that were specified in cmd line but were not found via lvs
+    for l in lv_list:
+        if l not in all_lvs:
+            plugin.add_message(CRITICAL, "LV %s not found" % (l))
+
+if __name__ == "__main__":
+    main()
+
+

check_package_updates/check_package_updates

@@ -45,6 +45,11 @@ def main():
             for pkg in pkg_updates[update_type]:
                 p.add_long_output("  %s" % pkg)
 
+    for m in known_types:
+        m = m.lower()
+        if not p.get_metric(m):
+            p.add_metric(m, 0)
+
     p.check_all_metrics()
     p.exit()
 

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_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_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.2
+Version:	1.0.3
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -41,6 +41,9 @@ rm -rf %{buildroot}
 /etc/nrpe.d/check_uptime.cfg
 
 %changelog
+* Sun Apr 13 2014 Tomas Edwardsson <tommi@tommi.org> 1.0.3-1
+- Update tag
+
 * Mon Dec 30 2013 Tomas Edwardsson <tommi@tommi.org> 1.0.2-1
 - Updated tag for build with newer 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)
 

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.2-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_hpasm

@@ -0,0 +1 @@
+4.1.4-1 check_hpasm/

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_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.2-1 check_uptime/
+1.0.3-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-plugins-check_cpu

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

rel-eng/releasers.conf

@@ -1,10 +1,18 @@
-# Fedora FC20
+# RHEL 7 Production
-[test-fc20-x86_64]
+[production-el7-x86_64]
 releaser = tito.release.YumRepoReleaser
 builder = tito.builder.MockBuilder
-builder.mock = fedora-20-x86_64
+builder.mock = epel-7-x86_64
+rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/rhel7/x86_64/
+
+# RHEL 7 Test
+[test-el7-x86_64]
+releaser = tito.release.YumRepoReleaser
+builder = tito.builder.MockBuilder
+builder.mock = epel-7-x86_64
 builder.test = 1
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora20/x86_64/
+rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/rhel7/x86_64/
+
 
 # RHEL 6 Production
 [production-el6-x86_64]
@@ -37,6 +45,21 @@ builder.mock = epel-5-i386
 createrepo_command = createrepo -s sha1 .
 rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/rhel5/i386/
 
+# RHEL 6 Test
+[test-el6-x86_64]
+releaser = tito.release.YumRepoReleaser
+builder = tito.builder.MockBuilder
+builder.mock = epel-6-x86_64
+builder.test = 1
+rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/rhel6/x86_64/
+
+[test-el6-i386]
+releaser = tito.release.YumRepoReleaser
+builder = tito.builder.MockBuilder
+builder.mock = epel-6-i386
+builder.test = 1
+rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/rhel6/i386/
+
 
 # RHEL 5 Testing
 [test-el5-x86_64]
@@ -57,20 +80,22 @@ createrepo_command = createrepo -s sha1 .
 rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/rhel5/i386/
 
 
-# RHEL 6 Test
-[test-el6-x86_64]
-releaser = tito.release.YumRepoReleaser
-builder = tito.builder.MockBuilder
-builder.mock = epel-6-x86_64
-builder.test = 1
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/rhel6/x86_64/
 
-[test-el6-i386]
+# Fedora FC20
+[production-fc20-x86_64]
 releaser = tito.release.YumRepoReleaser
 builder = tito.builder.MockBuilder
-builder.mock = epel-6-i386
+builder.mock = fedora-20-x86_64
+rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/fedora20/x86_64/
+
+# Fedora FC20
+[test-fc20-x86_64]
+releaser = tito.release.YumRepoReleaser
+builder = tito.builder.MockBuilder
+builder.mock = fedora-20-x86_64
 builder.test = 1
-rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/rhel6/i386/
+rsync = tito@opensource.is:/var/www/sites/opensource.ok.is/repo/testing/fedora20/x86_64/
+