[checkmk-commits] 3939 FIX f5_bigip_conns: readded performance data and graphs

Module: check_mk Branch: master Commit: bbe7da9556157159dc3f8360d727fd025ce5e4ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbe7da95561571… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Nov 7 15:29:53 2016 +0100 3939 FIX f5_bigip_conns: readded performance data and graphs f5_bigip_conns check was missing perfdata and graphs since werk #3692. This has been fixed now. --- .werks/3939 | 11 +++++++++++ ChangeLog | 1 + checks/f5_bigip_conns | 14 ++++++++++---- web/plugins/metrics/check_mk.py | 11 +++++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.werks/3939 b/.werks/3939 new file mode 100644 index 0000000..08aaa5a --- /dev/null +++ b/.werks/3939 @@ -0,0 +1,11 @@ +Title: f5_bigip_conns: readded performance data and graphs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1478528863 + +f5_bigip_conns check was missing perfdata and graphs since werk #3692. This has been fixed now. + diff --git a/ChangeLog b/ChangeLog index 230e838..928b21d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 3986 FIX: esx_vsphere_counters.uptime: fixed incorrect alert when receiving corrupted counter data... * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... + * 3939 FIX: f5_bigip_conns: readded performance data and graphs... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/f5_bigip_conns b/checks/f5_bigip_conns index bec1da4..9dfb8e7 100644 --- a/checks/f5_bigip_conns +++ b/checks/f5_bigip_conns @@ -41,9 +41,9 @@ def inventory_f5_bigip_conns(info): def check_f5_bigip_conns(item, params, info): - for val, what, title in [ - (info[0][0], "conns", "Connections"), - (info[0][1], "ssl_conns", "SSL connections")]: + for val, what, perfkey, title in [ + (info[0][0], "conns", "connections", "Connections"), + (info[0][1], "ssl_conns", "connections_ssl", "SSL connections")]: state = 0 infotext = "%s:" % title @@ -54,9 +54,15 @@ def check_f5_bigip_conns(item, params, info): infotext += " not configured" else: - state, extrainfo, perfdata = check_levels(int(val), what, params.get(what)) + warn, crit = params.get(what) + perfdata.append((perfkey, val, warn, crit)) + + state, extrainfo, extraperf = check_levels(int(val), what, params.get(what)) infotext += " %s%s" % (val, extrainfo) + if len(extraperf) > 0: + perfdata.append(extraperf[0]) + yield state, infotext, perfdata diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index b2623ae..05545bf 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1295,6 +1295,12 @@ metric_info["connections"] = { "color" : "#a080b0", } +metric_info["connections_ssl"] = { + "title" : _("SSL connections"), + "unit" : "count", + "color" : "13/a", +} + metric_info["connections_async_writing"] = { "title" : _("Asynchronous writing connections"), "unit" : "count", @@ -4365,6 +4371,11 @@ check_metrics["check_mk-f5_bigip_interfaces"] = { "bytes_out": { "name" : "if_out_octets" } } +check_metrics["check_mk-f5_bigip_conns"] = { + "conns" : { "name" : "connections" }, + "ssl_conns" : { "name" : "connections_ssl" }, +} + check_metrics["check_mk-mbg_lantime_state"] = { "offset" : { "name" : "time_offset", "scale" : 0.000001 } } # convert us -> sec