[checkmk-commits] 5838 FIX Citrix Netscaler Certificates: check is cluster aware now

Module: check_mk Branch: master Commit: e61e756678a5eaa72542a17fddb8e3a99e810cf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e61e756678a5ea… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Mar 19 08:35:59 2018 +0100 5838 FIX Citrix Netscaler Certificates: check is cluster aware now Change-Id: Id870396837f5604dee87093578bc6317cd20adef --- .werks/5838 | 10 ++++++++++ checks/netscaler_sslcertificates | 12 ++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/5838 b/.werks/5838 new file mode 100644 index 0000000..748d39a --- /dev/null +++ b/.werks/5838 @@ -0,0 +1,10 @@ +Title: Citrix Netscaler Certificates: check is cluster aware now +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521444854 +Class: fix + + diff --git a/checks/netscaler_sslcertificates b/checks/netscaler_sslcertificates index afe0196..6d236e2 100644 --- a/checks/netscaler_sslcertificates +++ b/checks/netscaler_sslcertificates @@ -41,13 +41,13 @@ factory_settings["netscaler_sslcerts_default_levels"] = { def inventory_netscaler_sslcerts(info): - for line in info: - if line[0]: - yield line[0], {} + for node, certname, daysleft in info: + if certname: + yield certname, {} def check_netscaler_sslcerts(item, params, info): - for certname, daysleft in info: + for node, certname, daysleft in info: if certname == item: state, daysleft = 0, int(daysleft) warn, crit = params["age_levels"] @@ -59,6 +59,9 @@ def check_netscaler_sslcerts(item, params, info): infotext = "Certificate valid for %d days" % daysleft + if node: + infotext = ": ".join([node, infotext]) + if state > 0: infotext += " (warn/crit below %s/%s)" % (warn, crit) @@ -69,6 +72,7 @@ check_info["netscaler_sslcertificates"] = { "check_function" : check_netscaler_sslcerts, "inventory_function" : inventory_netscaler_sslcerts, "service_description" : "SSL Certificate %s", + "node_info" : True, "snmp_info" : (".1.3.6.1.4.1.5951.4.1.1.56.1.1", [ 1, # sslCertKeyName 5, # sslDaysToExpire