Module: check_mk Branch: master Commit: fdb9a797ae171d756d5df455c3b0015e33f50155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdb9a797ae171d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 11 10:47:54 2014 +0100 #1740 FIX Changed default service discovery check intervall to 12 hours --- .werks/1740 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.werks/1740 b/.werks/1740 new file mode 100644 index 0000000..e3ee853 --- /dev/null +++ b/.werks/1740 @@ -0,0 +1,9 @@ +Title: Changed default service discovery check intervall to 12 hours +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1418291243 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8298226..ae3ff56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 1649 FIX: Check_MK inventory service has been renamed to Check_MK Discovery... * 1706 FIX: Fix file permissions when installing MKPs to 0644 or 0755... * 1750 FIX: Handle rare cases where SNMP response string begins with a line feed... + * 1740 FIX: Changed default service discovery check intervall to 12 hours Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8e55d5e..b2147f2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1271,21 +1271,21 @@ group = _("Service discovery") register_configvar(group, "inventory_check_interval", Optional( - Integer(title = _("Do inventory check every"), + Integer(title = _("Perform service discovery check every"), unit = _("minutes"), min_value = 1, - default_value = 120), - title = _("Enable regular inventory checks"), + default_value = 720), + title = _("Enable regular service discovery checks"), help = _("If enabled, Check_MK will create one additional check per host " - "that does a regular check, if the inventory would find new services " + "that does a regular check, if the service discovery would find new services " "currently un-monitored.")), need_restart = True) register_configvar(group, "inventory_check_severity", DropdownChoice( - title = _("Severity of failed inventory check"), - help = _("Please select which alarm state the inventory check services " + title = _("Severity of failed service discovery check"), + help = _("Please select which alarm state the service discovery check services " "shall assume in case that un-monitored services are found."), choices = [ (0, _("OK - do not alert, just display")), @@ -1298,7 +1298,7 @@ register_configvar(group, register_configvar(group, "inventory_check_do_scan", DropdownChoice( - title = _("Inventory check for SNMP devices"), + title = _("Service discovery check for SNMP devices"), choices = [ ( True, _("Perform full SNMP scan always, detect new check types") ), ( False, _("Just rely on existing check files, detect new items only") ) @@ -1308,11 +1308,11 @@ register_configvar(group, register_configvar(group, "inventory_check_autotrigger", Checkbox( - title = _("Inventory triggers inventory check"), - label = _("Automatically schedule inventory check after service configuration changes"), + title = _("Service Discovery triggers service discovery check"), + label = _("Automatically schedule service discovery check after service configuration changes"), help = _("When this option is enabled then after each change of the service " "configuration of a host via WATO - may it be via manual changes or a bulk " - "inventory - the inventory check is automatically rescheduled in order " + "discovry - the service discovery check is automatically rescheduled in order " "to reflect the new service state correctly immediately."), default_value = True, ))