[checkmk-commits] Check_MK Git: check_mk: #2630 FIX fixed incorrect check interval of Check_MK Discovery

Module: check_mk Branch: master Commit: aab2c8427160186a448d326e2ea30ca8a8179882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aab2c842716018… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 22 14:37:13 2015 +0200 #2630 FIX fixed incorrect check interval of Check_MK Discovery After werk #2595 the periodic discovery time configured through the rule was stored as seconds instead of minutes, causing the check frequency to be 60 times slower than intended. --- .werks/2630 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 15 +++++++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.werks/2630 b/.werks/2630 new file mode 100644 index 0000000..5746037 --- /dev/null +++ b/.werks/2630 @@ -0,0 +1,10 @@ +Title: fixed incorrect check interval of Check_MK Discovery +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i3 +Date: 1442925162 +Class: fix + +After werk #2595 the periodic discovery time configured through the rule was stored as seconds +instead of minutes, causing the check frequency to be 60 times slower than intended. diff --git a/ChangeLog b/ChangeLog index d897bde..d64011b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 2526 FIX: Fixed crash in filesystem checks in case mountpoint contains non-ascii characters * 2540 FIX: Process piggy backed data even if host is set to "No Agent"... * 2543 FIX: Fixed usage of icons/actions configured directly with process rules + * 2630 FIX: fixed incorrect check interval of Check_MK Discovery... Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f072249..78ba37f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1647,7 +1647,7 @@ register_rule(group, title = _("Periodic service discovery"), style = "dropdown", default_value = { - "check_interval" : 2 * 60 * 60, + "check_interval" : 2 * 60, "severity_unmonitored" : 1, "severity_vanished" : 0, "inventory_check_do_scan" : True, @@ -1665,9 +1665,16 @@ register_rule(group, "that are currently not monitored."), elements = [ ( "check_interval", - Age( - title = _("Perform service discovery every"), - )), + Transform( + Age( + minvalue=1, + display = [ "days", "hours", "minutes" ] + ), + forth = lambda v: int(v * 60), + back = lambda v: float(v) / 60.0, + title = _("Perform service discovery every"), + ), + ), ( "severity_unmonitored", DropdownChoice( title = _("Severity of unmonitored services"),