Module: check_mk
Branch: master
Commit: 64581ab50227e2f4889cb8d53cc3d92c9bd743cf
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64581ab50227e2…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Sep 3 14:01:15 2015 +0200
Conflicts:
ChangeLog
checks/cmciii_lcp_waterin
checks/cmciii_lcp_waterout
---
.werks/2557 | 10 ++++++++++
ChangeLog | 1 +
checks/cmciii.include | 36 ++++++++++++++++++++++++++++++++++++
checks/cmciii_lcp_airin | 11 +++--------
checks/cmciii_lcp_airout | 11 +++--------
5 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/.werks/2557 b/.werks/2557
new file mode 100644
index 0000000..414b4af
--- /dev/null
+++ b/.werks/2557
@@ -0,0 +1,10 @@
+Title: cmciii_lcp_airin cmciii_lcp_airout cmciii_lcp_waterin cmciii_lcp_waterout: Fixed
exception parsing data from some devices
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i3
+Date: 1441281589
+
+
diff --git a/ChangeLog b/ChangeLog
index 509e1de..73ab280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -161,6 +161,7 @@
* 2577 FIX: printer_input, printer_output: Fix exception on Brother NC-340h
* 2554 FIX: oracle_recovery_status: Fixed exception when files have no checkpoints
* 2568 FIX: apache_status: fixed computation of bytes and requests per second...
+ * 2557 FIX: cmciii_lcp_airin cmciii_lcp_airout cmciii_lcp_waterin
cmciii_lcp_waterout: Fixed exception parsing data from some devices
Multisite:
* 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce
unhandled exceptions...
diff --git a/checks/cmciii.include b/checks/cmciii.include
new file mode 100644
index 0000000..d99d233
--- /dev/null
+++ b/checks/cmciii.include
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at
http://mathias-kettner.de/check_mk.
+#
+# check_mk 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 in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+def cmciii_extract_temps(liste):
+ miste = []
+ for l in liste:
+ try:
+ miste.append(float(l.split(" ")[0]))
+ except ValueError:
+ # Dirty hack fix for a dirty check. Ignore all values that can not be
+ # converted to floats
+ pass
+ return miste
diff --git a/checks/cmciii_lcp_airin b/checks/cmciii_lcp_airin
index 040c980..6e069ea 100644
--- a/checks/cmciii_lcp_airin
+++ b/checks/cmciii_lcp_airin
@@ -28,15 +28,9 @@ def inventory_cmciii_lcp_airin(info):
if info:
return [( None, None )]
-def extract_temps(liste):
- miste = []
- for l in liste:
- miste.append(float(l.split(" ")[0]))
- return miste
-
def check_cmciii_lcp_airin(item, params, info):
unit_desc, unit_status, desc, status = info[0][0:4]
- temps = extract_temps(info[0][4:])
+ temps = cmciii_extract_temps(info[0][4:])
state = 0
sym = ""
@@ -73,7 +67,8 @@ check_info['cmciii_lcp_airin'] = {
oid(".1.3.6.1.4.1.2606.7.4.2.2.1.3.2.6").startswith("Air.Temperature.DescName"),
"snmp_info" : ( '.1.3.6.1.4.1.2606.7.4.2.2.1.10',
[ '2.6', '2.13', '2.15', '2.23', '2.21',
'2.20', '2.19', '2.18', '2.17', '2.7',
'2.8', '2.9' ]
- ),
+ ),
+ "includes" : [ 'cmciii.include' ],
}
#
# .1.3.6.1.4.1.2606.7.4.2.2.1.3.2.6 Air.Temperature.DescName
diff --git a/checks/cmciii_lcp_airout b/checks/cmciii_lcp_airout
index c6ba80a..8e20521 100644
--- a/checks/cmciii_lcp_airout
+++ b/checks/cmciii_lcp_airout
@@ -28,15 +28,9 @@ def inventory_cmciii_lcp_airout(info):
if info:
return [( None, None )]
-def extract_temps(liste):
- miste = []
- for l in liste:
- miste.append(float(l.split(" ")[0]))
- return miste
-
def check_cmciii_lcp_airout(item, params, info):
unit_desc, unit_status, desc, status = info[0][0:4]
- temps = extract_temps(info[0][4:])
+ temps = cmciii_extract_temps(info[0][4:])
state = 0
sym = ""
@@ -73,5 +67,6 @@ check_info['cmciii_lcp_airout'] = {
oid(".1.3.6.1.4.1.2606.7.4.2.2.1.3.2.6").startswith("Air.Temperature.DescName"),
"snmp_info" : ( '.1.3.6.1.4.1.2606.7.4.2.2.1.10',
[ '2.6', '2.13', '2.25', '2.32', '2.30',
'2.29', '2.28', '2.27', '2.26', '2.10',
'2.11', '2.12' ]
- ),
+ ),
+ "includes" : [ 'cmciii.include' ],
}