[checkmk-commits] Check_MK Git: check_mk: Some improvments for innovaphone checks

Module: check_mk Branch: master Commit: 3712cd8c72ed5372223c27628345d8550c9eab27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3712cd8c72ed53… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Mar 26 14:50:38 2014 +0100 Some improvments for innovaphone checks --- checks/innovaphone_channels | 13 +++++++++---- checks/innovaphone_cpu | 2 +- checks/innovaphone_mem | 2 +- checks/innovaphone_temp | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/checks/innovaphone_channels b/checks/innovaphone_channels index ba9b859..893bcc9 100644 --- a/checks/innovaphone_channels +++ b/checks/innovaphone_channels @@ -24,19 +24,24 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -innovaphone_channels_default_levels = ( 75, 80 ) +innovaphone_channels_default_levels = ( 75.0, 80.0 ) def inventory_innovaphone_channels(info): - return [ (x[0], 'innovaphone_channels_default_levels') for x in info ] + return [ (x[0], 'innovaphone_channels_default_levels') for x in info \ + if x[1] == "Up" and x[2] == "Up" ] def check_innovaphone_channels(item, params, info): for line in info: if line[0] == item: - idle, total = map(float, line[1:]) + link, physical = line[1:3] + if link != 'Up' or physical != 'Up': + return 2, "Link: %s, Physical: %s" % ( link, physical ) + idle, total = map(float, line[3:]) perc_used = (idle/total) * 100 perc_free = 100 - perc_used - message = "(Used: %s, Free: %s, Total: %s)" % ( total - idle, idle, total ) + message = "(Used: %.0f, Free: %.0f, Total: %.0f)" % ( total - idle, idle, total ) return check_innovaphone(params, [[None,perc_free]], '%', message ) + return 3, "No Channel information found" check_info["innovaphone_channels"] = { "check_function" : check_innovaphone_channels, diff --git a/checks/innovaphone_cpu b/checks/innovaphone_cpu index 70a521b..aead84b 100644 --- a/checks/innovaphone_cpu +++ b/checks/innovaphone_cpu @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -innovaphone_cpu_default_levels = (90, 95) +innovaphone_cpu_default_levels = ( 90.0, 95.0 ) def inventory_innovaphone_cpu(info): return [ ( None, "innovaphone_cpu_default_levels" )] diff --git a/checks/innovaphone_mem b/checks/innovaphone_mem index e5d93df..a3a88a6 100644 --- a/checks/innovaphone_mem +++ b/checks/innovaphone_mem @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -innovaphone_mem_default_levels = ( 60, 70 ) +innovaphone_mem_default_levels = ( 60.0, 70.0 ) def inventory_innovaphone_mem(info): return [ (None, "innovaphone_mem_default_levels") ] diff --git a/checks/innovaphone_temp b/checks/innovaphone_temp index 1333493..6087522 100644 --- a/checks/innovaphone_temp +++ b/checks/innovaphone_temp @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -innovaphone_temp_default_levels = ( 60, 70 ) +innovaphone_temp_default_levels = ( 45, 50 ) def inventory_innovaphone_temp(info): return [ (None, "innovaphone_temp_default_levels") ]