[checkmk-commits] Check_MK Git: check_mk: Added check_interval and retry_interval rules for host checks

Module: check_mk Branch: master Commit: 25c2e1620004a25cf97a46f5a78e5951f2450632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25c2e1620004a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 10:14:06 2012 +0200 Added check_interval and retry_interval rules for host checks --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 64 ++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index f061fdc..6a31b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * Added new active check configuration for check_smtp * Improved visualization of ruleset lists/dictionaries * Encoding special chars in RegExp valuespec (e.g. logwatch patterns) + * Added check_interval and retry_interval rules for host checks * FIX: Removed double collect_hosts() call in activate changes hook * FIX: Fixed double hook execution when using localized multisite * FIX: User list shows names of contactgroups when no alias given diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 46ec1b7..848e25f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -591,14 +591,7 @@ register_rule(group, register_rulegroup("monconf", _("Monitoring Configuration"), _("Intervals for checking, retries, clustering, configuration for inventory and similar")) -group = "monconf/Checking" - -register_rule(group, - "extra_host_conf:max_check_attempts", - Integer(title = _("Maximum number of check attempts for host"), - help = _("The maximum number of failed host checks until the host will be considered " - "in a hard down state"), - minvalue = 1)) +group = "monconf/Service Checks" register_rule(group, "extra_service_conf:max_check_attempts", @@ -635,15 +628,6 @@ register_rule(group, itemtype = "service") register_rule(group, - "extra_host_conf:check_period", - TimeperiodSelection( - title = _("Check period for hosts"), - help = _("If you specify a check period for a host then active checks of that " - "host will only take place within that period. In the rest of the time " - "the state of the host will stay at its last status.")), - ) - -register_rule(group, "extra_service_conf:check_period", TimeperiodSelection( title = _("Check period for services"), @@ -667,7 +651,7 @@ register_rule(group, register_rule(group, "extra_service_conf:passive_checks_enabled", DropdownChoice( - title = _("Enable/disable proccessing of passiv check results for services"), + title = _("Enable/disable passive checks for services"), help = _("This setting allows you to disable the processing of passiv check results for a " "service."), choices = [ ("1", _("Enable processing of passiv check results")), @@ -686,6 +670,50 @@ register_rule(group, ), itemtype = "service") +group = "monconf/Host Checks" + +register_rule(group, + "extra_host_conf:max_check_attempts", + Integer(title = _("Maximum number of check attempts for host"), + help = _("The maximum number of failed host checks until the host will be considered " + "in a hard down state"), + minvalue = 1)) + +register_rule(group, + "extra_host_conf:check_interval", + Integer( + title = _("Normal check interval for host checks"), + help = _("The default interval is set to one minute. Here you can specify a larger " + "interval. The host is contacted in this interval on a regular base. The host " + "check is also being executed when a problematic service state is detected to check " + "wether or not the service problem is resulting from a host problem."), + minvalue = 1, + label = _("minutes") + ) +) + +register_rule(group, + "extra_host_conf:retry_interval", + Integer(title = _("Retry check interval for host checks"), + help = _("This setting is relevant if you have set the maximum number of check " + "attempts to a number greater than one. In case a host check is not UP " + "and the maximum number of check attempts is not yet reached, it will be " + "rescheduled with this interval. The retry interval is usually set to a smaller " + "value than the normal interval."), + minvalue = 1, + label = _("minutes") + ) +) + +register_rule(group, + "extra_host_conf:check_period", + TimeperiodSelection( + title = _("Check period for hosts"), + help = _("If you specify a check period for a host then active checks of that " + "host will only take place within that period. In the rest of the time " + "the state of the host will stay at its last status.")), + ) + group = "monconf/Notifications" register_rule(group, "extra_host_conf:notifications_enabled",