Automatic commit of package [nagios-okplugin-apc] release [2.1.1-1].

Rework hostname detection to use local
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.
2026-02-13 02:20:57 +01:00 · 2014-03-20 08:10:31 +00:00 · 2014-03-07 11:25:24 +00:00 · 2014-03-07 11:23:28 +00:00 · 2014-02-21 11:10:55 +00:00 · 2014-02-21 11:07:39 +00:00
11 changed files with 539 additions and 473 deletions
--- a/check_apcext.pl/nagios-okplugin-apc.spec
+++ b/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)
--- a/check_cifs/nagios-okplugin-cifs.spec
+++ b/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)
--- a/check_cpu.py/okplugin_check_cpu
+++ b/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
--- a/check_ibm_bladecenter/check_ibm_bladecenter.py
+++ b/check_ibm_bladecenter/check_ibm_bladecenter.py
--- a/check_ibm_bladecenter/nagios-okplugin-check_ibm_bladecenter.spec
+++ b/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
--- a/check_rhcs/check_rhcs
+++ b/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):
--- a/check_yum/nagios-okplugin-check_yum.spec
+++ b/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)

--- a/rel-eng/packages/nagios-okplugin-apc
+++ b/rel-eng/packages/nagios-okplugin-apc
@@ -1 +1 @@
-2.1.0-1 check_apcext.pl/
+2.1.1-1 check_apcext.pl/
--- a/rel-eng/packages/nagios-okplugin-check_ibm_bladecenter
+++ b/rel-eng/packages/nagios-okplugin-check_ibm_bladecenter
@@ -1 +1 @@
-2-1 check_ibm_bladecenter/
+4-1 check_ibm_bladecenter/
--- a/rel-eng/packages/nagios-okplugin-check_yum
+++ b/rel-eng/packages/nagios-okplugin-check_yum
@@ -1 +1 @@
-0.8.2-1 check_yum/
+1-1 check_yum/
--- a/rel-eng/packages/nagios-okplugin-cifs
+++ b/rel-eng/packages/nagios-okplugin-cifs
@@ -1 +1 @@
-1.0-1 check_cifs/
+1.1-1 check_cifs/
Author	SHA1	Message	Date
Tomas Edwardsson	95693e3c73	Automatic commit of package [nagios-okplugin-apc] release [2.1.1-1].	2014-03-20 08:10:31 +00:00
Tomas Edwardsson	55daf8f4c9	Rework hostname detection to use local 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.	2014-03-07 11:25:24 +00:00
Tomas Edwardsson	d11d29185a	Remove debug print	2014-03-07 11:23:28 +00:00
Pall Sigurdsson	06194c84cc	Automatic commit of package [nagios-okplugin-check_ibm_bladecenter] release [4-1].	2014-02-21 11:10:55 +00:00
Pall Sigurdsson	184d7d3b4a	Merge branch 'master' of github.com:opinkerfi/nagios-plugins	2014-02-21 11:07:39 +00:00
Pall Sigurdsson	1574cd13d3	ibm_bladecenter - another firmware bug workaround	2014-02-21 11:06:00 +00:00
Pall Sigurdsson	b0b55dcd3e	pep8 fixes	2014-02-21 10:52:39 +00:00
Pall Sigurdsson	b96e973e60	Fix workaround for firmware bug Blade chassis will sometimes report critical error that there are no critical or warning events. Fix plugin so it properly works around the issue.	2014-02-21 10:50:32 +00:00
Pall Sigurdsson	51b75943cf	Automatic commit of package [nagios-okplugin-cifs] release [1.1-1].	2014-02-20 18:11:40 +00:00
Pall Sigurdsson	8ff1cf84d0	Automatic commit of package [nagios-okplugin-check_yum] release [1-1].	2014-02-20 18:09:38 +00:00