[checkmk-commits] Revert "Revert " 4797 FIX Removed deprecated global service discovery setting and added new standard rule ""

Module: check_mk Branch: master Commit: 28ba25c1a73e7275b241604ef182ed2e6bcf6a24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28ba25c1a73e72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 13 09:10:28 2017 +0200 Revert "Revert "4797 FIX Removed deprecated global service discovery setting and added new standard rule"" This reverts commit 174146cd2011fbc22c460c13b8514517fcf00a67. --- .werks/4797 | 13 +++++++++++++ web/htdocs/wato.py | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/4797 b/.werks/4797 new file mode 100644 index 0000000..addba29 --- /dev/null +++ b/.werks/4797 @@ -0,0 +1,13 @@ +Title: Removed deprecated global service discovery setting and added new standard rule +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496774354 + +Removed deprecated global service discovery setting for new created sites +and added a new standard rule which will execute every two hours a service +discovery. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1cb3acc..e3857c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14387,7 +14387,6 @@ def create_sample_config(): "qmail_stats", ], "enable_rulebased_notifications": True, - "inventory_check_interval": 120, } ) @@ -14454,6 +14453,14 @@ def create_sample_config(): 'extra_service_conf:check_interval': [ ( 1440, [], ALL_HOSTS, [ "Check_MK HW/SW Inventory$" ], {'description': u'Restrict HW/SW-Inventory to once a day'} ), ], + + # Periodic service discovery + 'periodic_discovery': [ + ({'severity_unmonitored': 1, + 'severity_vanished': 0, + 'inventory_check_do_scan': True, + 'check_interval': 120.0}, [], ALL_HOSTS, {'description': u'Perform every two hours a service discovery'} ), + ], } rulesets = FolderRulesets(Folder.root_folder())