Module: check_mk
Branch: master
Commit: 48f30672bade9d385f3bbd91547839fd00e6ab16
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48f30672bade9d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 16 17:29:40 2013 +0200
FIX: local: tolerate invalid output lines
---
ChangeLog | 5 +++--
checks/local | 12 ++++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6525e3e..8d9c1f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,11 +29,12 @@
* hpux_cpu, blade_bx_load: support predictive levels, add perf-o-meter,
make WATO-configable
* check_sql: Database port can now be explicitly set
- * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch
- * FIX: esx_vsphere_hostsystem: fixed bug in handling of params
* steelhead_perrs: New check for Rivergate Gateways
* alcatel_power: Check for power supplies on Alcatel switches
* qnap_disks: New check for Hardisks in Qnap devices
+ * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch
+ * FIX: esx_vsphere_hostsystem: fixed bug in handling of params
+ * FIX: local: tolerate invalid output lines
WATO:
* You can now have site-specific global settings when using
diff --git a/checks/local b/checks/local
index 9862a53..056d6b0 100644
--- a/checks/local
+++ b/checks/local
@@ -26,11 +26,19 @@
def inventory_local(info):
- return [ (line[1], '', '""') for line in info ]
+ inventory = []
+ # Ignore invalid lines, tolerate bugs in local checks
+ # of unexperianced users
+ for line in info:
+ if len(line) >= 4:
+ inventory.append( (line[1], None) )
+ return inventory
def check_local(item, params, info):
for line in info:
- if line[1] == item:
+ # Ignore invalid lines, tolerate bugs in local checks
+ # of unexperianced users
+ if len(line) >= 2 and line[1] == item:
state = int(line[0])
perftxt = line[2]
output = " ".join(line[3:])