Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3464 FIX netstat.linux: fix monitoring of UDP listeners

by Mathias Kettner

Module: check_mk Branch: master Commit: fa513c2530c6bf6190f740e1bdadb7e9ef48746c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa513c2530c6bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 15:13:32 2016 +0200 3464 FIX netstat.linux: fix monitoring of UDP listeners Thanks to Davice Delgrande. --- .werks/3464 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/netstat.linux | 2 +- checks/netstat | 16 ++++++++++++++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.werks/3464 b/.werks/3464 new file mode 100644 index 0000000..f96f8ec --- /dev/null +++ b/.werks/3464 @@ -0,0 +1,10 @@ +Title: netstat.linux: fix monitoring of UDP listeners +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461330784 + +Thanks to Davice Delgrande. diff --git a/ChangeLog b/ChangeLog index 73e0baf..eb8226c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,7 @@ * 3421 FIX: cisco_asa_failover: Do not discover interfaces where failover is not enabled... * 3422 FIX: printer_pages, canon_pages: Detect pages on Canon 8350 with generic check... * 3463 FIX: ups_modulys_alarms: avoid crash on some SOCOMEC UPS where some alarm OIDs are empty + * 3464 FIX: netstat.linux: fix monitoring of UDP listeners... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/netstat.linux b/agents/plugins/netstat.linux index f467d04..55a27ae 100755 --- a/agents/plugins/netstat.linux +++ b/agents/plugins/netstat.linux @@ -28,4 +28,4 @@ # have an execution time complexity of at least O(n^2) on Linux. echo '<<<netstat>>>' -netstat -ntu | egrep '^(tcp|udp)' +netstat -ntua | egrep '^(tcp|udp)' | sed -e 's/LISTEN/LISTENING/g' diff --git a/checks/netstat b/checks/netstat index 48112b3..846bcf0 100644 --- a/checks/netstat +++ b/checks/netstat @@ -24,8 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example output from agent (Linux) +# Example output from agent (Linux) - note missing LISTENING column for UDP # <<netstat>>> +# tcp 0 0 0.0.0.0:6556 0.0.0.0:* LISTENING +# tcp 0 0 127.0.0.1:445 0.0.0.0:* LISTENING +# tcp 0 0 10.1.1.50:445 0.0.0.0:* LISTENING # tcp 0 0 127.0.0.1:57573 127.0.0.1:80 ESTABLISHED # tcp 0 0 10.1.1.50:38692 178.248.246.154:993 ESTABLISHED # tcp 0 0 127.0.0.1:34929 127.0.0.1:5000 TIME_WAIT @@ -44,6 +47,9 @@ # tcp 0 0 127.0.0.1:34984 127.0.0.1:5000 TIME_WAIT # tcp 0 0 127.0.0.1:80 127.0.0.1:57488 TIME_WAIT # tcp 0 0 127.0.0.1:34967 127.0.0.1:5000 TIME_WAIT +# udp 0 0 10.1.2.255:137 0.0.0.0:* +# udp 0 0 10.1.2.160:137 0.0.0.0:* +# udp 0 0 0.0.0.0:137 0.0.0.0:* def parse_netstat(info): connections = [] @@ -55,7 +61,13 @@ def parse_netstat(info): elif proto.startswith("udp"): proto = "UDP" - connections.append( (proto, local.rsplit(":", 1), remote.rsplit(":", 1), + if len(line) == 5: # handles UDP listeners + proto, recv_q, send_q, local, remote = line + if proto.startswith("udp"): + proto = "UDP" + connstate = "LISTENING" + + connections.append( (proto, local.rsplit(":", 1), remote.rsplit(":", 1), connstate) ) return connections

8 years, 2 months

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 4d6d47cc65df5e7ee39a9fa4f772edd633f80b47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d6d47cc65df5e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 22 15:07:01 2016 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ccd40ea..c880438 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3473 +3523

8 years, 2 months

3463 FIX ups_modulys_alarms: avoid crash on some SOCOMEC UPS where some alarm OIDs are empty

by Mathias Kettner

Module: check_mk Branch: master Commit: ba0ac4048d4803ee36f81d8285fc0b07707f16f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba0ac4048d4803… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 15:05:07 2016 +0200 3463 FIX ups_modulys_alarms: avoid crash on some SOCOMEC UPS where some alarm OIDs are empty --- .werks/3463 | 10 ++++++++++ ChangeLog | 1 + checks/ups_modulys_alarms | 3 +-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3463 b/.werks/3463 new file mode 100644 index 0000000..f73594d --- /dev/null +++ b/.werks/3463 @@ -0,0 +1,10 @@ +Title: ups_modulys_alarms: avoid crash on some SOCOMEC UPS where some alarm OIDs are empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461330267 + + diff --git a/ChangeLog b/ChangeLog index c904cc7..73e0baf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -179,6 +179,7 @@ * 3420 FIX: check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time... * 3421 FIX: cisco_asa_failover: Do not discover interfaces where failover is not enabled... * 3422 FIX: printer_pages, canon_pages: Detect pages on Canon 8350 with generic check... + * 3463 FIX: ups_modulys_alarms: avoid crash on some SOCOMEC UPS where some alarm OIDs are empty Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ups_modulys_alarms b/checks/ups_modulys_alarms index f49b6d2..0481fbf 100644 --- a/checks/ups_modulys_alarms +++ b/checks/ups_modulys_alarms @@ -32,7 +32,6 @@ def inventory_ups_modulys_alarms(info): def check_ups_modulys_alarms(_no_item, _no_params, info): - oiddef = { '1' : (2, 'Disconnect'), '2' : (2, 'Input power failure'), @@ -67,7 +66,7 @@ def check_ups_modulys_alarms(_no_item, _no_params, info): for oidend, flag in info: result = False - if int(flag): + if flag and int(flag): result = True yield oiddef[oidend]

8 years, 2 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a845bdadc5b54647e8f3e60c57550eb7df4c5d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a845bdadc5b54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 15:04:16 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b18589c..ccd40ea 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3463 +3473

8 years, 2 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: e359fc5299552814c7fec0ed177b0cd5d739ac65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e359fc52995528… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 22 14:31:04 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/LogCache.h | 2 +- livestatus/src/Table.cc | 67 ++++++++++++---------------- livestatus/src/Table.h | 27 ++++++++--- livestatus/src/TableColumns.cc | 4 ++ livestatus/src/TableColumns.h | 10 +++-- livestatus/src/TableCommands.cc | 6 ++- livestatus/src/TableCommands.h | 6 ++- livestatus/src/TableContactgroups.cc | 4 ++ livestatus/src/TableContactgroups.h | 6 ++- livestatus/src/TableContacts.cc | 4 ++ livestatus/src/TableContacts.h | 7 ++- livestatus/src/TableDownComm.cc | 8 ++++ livestatus/src/TableDownComm.h | 6 +-- livestatus/src/TableHostgroups.cc | 4 ++ livestatus/src/TableHostgroups.h | 7 ++- livestatus/src/TableHosts.cc | 4 ++ livestatus/src/TableHosts.h | 6 ++- livestatus/src/TableHostsByGroup.cc | 4 ++ livestatus/src/TableHostsByGroup.h | 7 +-- livestatus/src/TableLog.cc | 4 ++ livestatus/src/TableLog.h | 6 +-- livestatus/src/TableServicegroups.cc | 4 ++ livestatus/src/TableServicegroups.h | 7 ++- livestatus/src/TableServices.cc | 4 ++ livestatus/src/TableServices.h | 6 ++- livestatus/src/TableServicesByGroup.cc | 4 ++ livestatus/src/TableServicesByGroup.h | 7 +-- livestatus/src/TableServicesByHostGroup.cc | 5 +++ livestatus/src/TableServicesByHostGroup.h | 7 +-- livestatus/src/TableStateHistory.cc | 4 ++ livestatus/src/TableStateHistory.h | 7 +-- livestatus/src/TableStatus.cc | 4 ++ livestatus/src/TableStatus.h | 4 +- livestatus/src/TableTimeperiods.cc | 4 ++ livestatus/src/TableTimeperiods.h | 4 +- 35 files changed, 184 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e359fc5299…

8 years, 2 months

db2_mem: Internal code cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 262b537d989527601b91db57cd72b29eb32c83aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=262b537d989527… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 14:29:29 2016 +0200 db2_mem: Internal code cleanup --- checks/db2_mem | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/checks/db2_mem b/checks/db2_mem index b29858d..ad1845f 100644 --- a/checks/db2_mem +++ b/checks/db2_mem @@ -34,41 +34,46 @@ def check_db2_mem(item, params, info): raise MKCounterWrapped("Login into database failed") warn, crit = params - hit = 0 - values = [] - perf = [] - state = 3 - message = "Instance not found" + + in_block = False + limit, usage = None, None for line in info: - if hit > 0 and hit <= 2: - hit += 1 + if line[1] == item: + in_block = True + elif in_block == True: if line[-1].lower() == "kb": value = int(line[-2]) * 1024 elif line[-1].lower() == "mb": value = int(line[-2]) * 1024 * 1024 else: value = int(line[-2]) - values.append(value) - if len(values) == 2: - limit, usage = values - left = limit - usage - perc_level = ( 100.0 / limit ) * left - label = ", Warn/Crit %d%%/%d%%" % (warn, crit) - if perc_level <= crit: - state = 2 - elif perc_level <= warn: - state = 1 - else: - label = "" - state = 0 - message = "Max: %s, Used: %s (%.2d%% Free%s) " % \ - (get_bytes_human_readable(limit), get_bytes_human_readable(usage), perc_level, label) - perf = [("mem", usage, 0, 0, 0, limit )] + if limit == None: + limit = value + else: + usage = value + break + + if limit == None or usage == None: + return - if line[1] == item: - hit = 1 + left = limit - usage + perc_level = ( 100.0 / limit ) * left + label = " (Warn/Crit %d%%/%d%%)" % (warn, crit) + + if perc_level <= crit: + state = 2 + elif perc_level <= warn: + state = 1 + else: + label = "" + state = 0 + message = "Max: %s, Used: %s (%.2d%% Free%s) " % \ + (get_bytes_human_readable(limit), + get_bytes_human_readable(usage), + perc_level, label) + perf = [("mem", usage, 0, 0, 0, limit )] return state, message, perf

8 years, 2 months

3422 FIX printer_pages, canon_pages: Detect pages on Canon 8350 with generic check

by Mathias Kettner

Module: check_mk Branch: master Commit: 973de7598ba67bf98f4c6452793c365a00907ef1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=973de7598ba67b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 14:24:20 2016 +0200 3422 FIX printer_pages, canon_pages: Detect pages on Canon 8350 with generic check This printer (and maybe others) do not implement the Canon-specific OIDs so we now fall back to the generic MIB. --- .werks/3422 | 11 +++++++++++ ChangeLog | 1 + checks/printer_pages.include | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3422 b/.werks/3422 new file mode 100644 index 0000000..1d6d432 --- /dev/null +++ b/.werks/3422 @@ -0,0 +1,11 @@ +Title: printer_pages, canon_pages: Detect pages on Canon 8350 with generic check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461327795 + +This printer (and maybe others) do not implement the Canon-specific OIDs so we +now fall back to the generic MIB. diff --git a/ChangeLog b/ChangeLog index 1cf78a1..c904cc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,7 @@ * 3419 FIX: solaris_mem: avoid crash in case of empty agent section, treat section as missing... * 3420 FIX: check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time... * 3421 FIX: cisco_asa_failover: Do not discover interfaces where failover is not enabled... + * 3422 FIX: printer_pages, canon_pages: Detect pages on Canon 8350 with generic check... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/printer_pages.include b/checks/printer_pages.include index d8b9ed6..b5b2446 100644 --- a/checks/printer_pages.include +++ b/checks/printer_pages.include @@ -36,7 +36,8 @@ def scan_ricoh_printer(oid): def scan_canon_printer(oid): return "canon" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None + and oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None \ + and oid(".1.3.6.1.4.1.1602.1.11.1.3.1.4") != None def scan_generic_printer(oid): return oid(".1.3.6.1.2.1.43.10.2.1.4.1.1") != None \

8 years, 2 months

3421 FIX cisco_asa_failover: Do not discover interfaces where failover is not enabled

by Mathias Kettner

Module: check_mk Branch: master Commit: c40203df3d55a4b9e57307b4c33ea12f77b84a3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c40203df3d55a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 14:11:48 2016 +0200 3421 FIX cisco_asa_failover: Do not discover interfaces where failover is not enabled Thanks to Udo Wöhler. --- .werks/3421 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_asa_failover | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3421 b/.werks/3421 new file mode 100644 index 0000000..2d32dae --- /dev/null +++ b/.werks/3421 @@ -0,0 +1,10 @@ +Title: cisco_asa_failover: Do not discover interfaces where failover is not enabled +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461327076 + +Thanks to Udo Wöhler. diff --git a/ChangeLog b/ChangeLog index 997bf1a..1cf78a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -177,6 +177,7 @@ * 3435 FIX: check_varnish_uptime: Fixed broken check * 3419 FIX: solaris_mem: avoid crash in case of empty agent section, treat section as missing... * 3420 FIX: check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time... + * 3421 FIX: cisco_asa_failover: Do not discover interfaces where failover is not enabled... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cisco_asa_failover b/checks/cisco_asa_failover index 3918bdc..1c316b7 100644 --- a/checks/cisco_asa_failover +++ b/checks/cisco_asa_failover @@ -43,7 +43,7 @@ def inventory_cisco_asa_failover(info): return None for deviceentry in info[-2:]: - if "this device" in deviceentry[0]: + if "this device" in deviceentry[0] and not "Failover Off" in deviceentry[2]: return [ (None, None) ]

8 years, 2 months

win_dhcp_pools: Cleaned up check a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 858fedc6487521f472bf5d9bf7d78c9d728608f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=858fedc6487521… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 13:58:18 2016 +0200 win_dhcp_pools: Cleaned up check a bit --- checks/win_dhcp_pools | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 73f5d24..939ebb1 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -105,6 +105,7 @@ def inventory_win_dhcp_pools(info): continue if in_block: pool_stats.append(saveint(line[1])) + if len(pool_stats) == 3: in_block = False used, free, pending = pool_stats @@ -115,17 +116,19 @@ def inventory_win_dhcp_pools(info): def check_win_dhcp_pools(item, params, info): in_block = False - pool_stats = [] + pool_stats = [None, None, None] for line in parse_win_dhcp_pools(info): if win_dhcp_pools_stats_translate.get(line[0], line[0]) == 'Subnet' and line[1] == item: in_block = True + pool_stats = [] continue + if in_block: pool_stats.append(saveint(line[1])) - if len(pool_stats) == 3: - break + if len(pool_stats) == 3: + break - if len(pool_stats) == 3: + if all(v is not None for v in pool_stats): used, free, pending = pool_stats size = used + free + pending

8 years, 2 months

3420 FIX check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time

by Mathias Kettner

Module: check_mk Branch: master Commit: fa27b44fab56bd2c6e50b058f7108769b6964d27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa27b44fab56bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 13:44:33 2016 +0200 3420 FIX check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time Thanks to Gregor Hoffleit. --- .werks/3420 | 10 ++++++ ChangeLog | 1 + checks/check_ftp | 7 +++- checks/check_smtp | 9 +++-- checks/check_tcp | 7 +++- web/plugins/wato/active_checks.py | 67 ++++++++++++++++++++++++------------- 6 files changed, 73 insertions(+), 28 deletions(-) diff --git a/.werks/3420 b/.werks/3420 new file mode 100644 index 0000000..7f8662a --- /dev/null +++ b/.werks/3420 @@ -0,0 +1,10 @@ +Title: check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461325421 + +Thanks to Gregor Hoffleit. diff --git a/ChangeLog b/ChangeLog index 874aa8b..997bf1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -176,6 +176,7 @@ * 3434 FIX: cmctc_lcp: Fixed broken check in case parameter are specified * 3435 FIX: check_varnish_uptime: Fixed broken check * 3419 FIX: solaris_mem: avoid crash in case of empty agent section, treat section as missing... + * 3420 FIX: check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/check_ftp b/checks/check_ftp index 596e470..b3c0e34 100644 --- a/checks/check_ftp +++ b/checks/check_ftp @@ -61,7 +61,12 @@ def check_ftp_arguments(params): args += ' --ssl' if "cert_days" in settings: - args += ' -D %d' % settings["cert_days"] + # legacy behavior + if type(settings["cert_days"]) == int: + args += ' -D %d' % settings["cert_days"] + else: + warn, crit = settings["cert_days"] + args += ' -D %d,%d' % (warn, crit) return args diff --git a/checks/check_smtp b/checks/check_smtp index c5db085..2aabd5e 100644 --- a/checks/check_smtp +++ b/checks/check_smtp @@ -78,8 +78,13 @@ def check_smtp_arguments(params): if 'fqdn' in settings: args += ' -F %s' % quote_shell_string(settings['fqdn']) - if 'cert_days' in settings: - args += ' -D %d' % settings['cert_days'] + if "cert_days" in settings: + # legacy behavior + if type(settings["cert_days"]) == int: + args += ' -D %d' % settings["cert_days"] + else: + warn, crit = settings["cert_days"] + args += ' -D %d,%d' % (warn, crit) if 'hostname' in settings: args += ' -H %s' % settings['hostname'] diff --git a/checks/check_tcp b/checks/check_tcp index ce46f85..ded7076 100644 --- a/checks/check_tcp +++ b/checks/check_tcp @@ -68,7 +68,12 @@ def check_tcp_arguments(params): args += ' --ssl' if "cert_days" in settings: - args += ' -D %d' % settings["cert_days"] + # legacy behavior + if type(settings["cert_days"]) == int: + args += ' -D %d' % settings["cert_days"] + else: + warn, crit = settings["cert_days"] + args += ' -D %d,%d' % (warn, crit) if "quit_string" in settings: args += ' -q %s' % quote_shell_string(settings["quit_string"]) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9e4f373..1a86264 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -250,6 +250,14 @@ register_rule(group, match = "all", ) +# Several active checks just had crit levels as one integer +def transform_cert_days(cert_days): + if type(cert_days) != tuple: + return (cert_days, 0) + else: + return cert_days + + register_rule(group, "active_checks:ftp", Transform( @@ -312,11 +320,17 @@ register_rule(group, ), ( "cert_days", - Integer( - title = _("SSL certificate validation"), - help = _("Minimum number of days a certificate has to be valid"), - unit = _("days"), - default_value = 30) + Transform( + Tuple( + title = _("SSL certificate validation"), + help = _("Minimum number of days a certificate has to be valid"), + elements = [ + Integer(title = _("Warning at or below"), minvalue = 0, unit = _("days")), + Integer(title = _("Critical at or below"), minvalue = 0, unit = _("days")), + ], + ), + forth = transform_cert_days, + ), ), ]), forth = lambda x: type(x) == tuple and x[1] or x, @@ -631,11 +645,17 @@ register_rule(group, ), ( "cert_days", - Integer( - title = _("SSL certificate validation"), - help = _("Minimum number of days a certificate has to be valid"), - unit = _("days"), - default_value = 30) + Transform( + Tuple( + title = _("SSL certificate validation"), + help = _("Minimum number of days a certificate has to be valid"), + elements = [ + Integer(title = _("Warning at or below"), minvalue = 0, unit = _("days")), + Integer(title = _("Critical at or below"), minvalue = 0, unit = _("days")), + ], + ), + forth = transform_cert_days, + ), ), ( "quit_string", @@ -691,12 +711,6 @@ register_rule(group, ])) -# cert_days was only an integer for warning level until version 1.2.7 -def transform_check_http_cert_days(cert_days): - if type(cert_days) != tuple: - cert_days = (cert_days, 0) - return cert_days - ip_address_family_element = ("address_family", DropdownChoice( title = _("IP Address Family"), @@ -1008,7 +1022,7 @@ register_rule(group, Integer(title = _("Critical at or below"), minvalue = 0, unit = _("days")), ], ), - forth = transform_check_http_cert_days, + forth = transform_cert_days, ), ), ( "cert_host", @@ -1241,13 +1255,18 @@ register_rule(group, default_value = "", ) ), - ("cert_days", - Integer( - title = _("Minimum Certificate Age"), - help = _("Minimum number of days a certificate has to be valid."), - unit = _("days"), - ) - ), + ( "cert_days", + Transform( + Tuple( + title = _("Minimum Certificate Age"), + help = _("Minimum number of days a certificate has to be valid"), + elements = [ + Integer(title = _("Warning at or below"), minvalue = 0, unit = _("days")), + Integer(title = _("Critical at or below"), minvalue = 0, unit = _("days")), + ], + ), + forth = transform_cert_days, + )), ("starttls", FixedValue( True,

8 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016