Automatic commit of package [nagios-okplugin-check_time] release [1.0.3-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_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_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_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_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
 

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-check_disks

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

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-get_network_stat

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