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

Module: check_mk Branch: master Commit: 174146cd2011fbc22c460c13b8514517fcf00a67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=174146cd2011fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 12 09:47:06 2017 +0200 Revert "4797 FIX Removed deprecated global service discovery setting and added new standard rule" This reverts commit 261bb97ae769bf2dcb6d9e4a58ff1d6dfcda2fb5. Change-Id: I1ed7382f7e857f058f73fb72c9d2868da86e1589 --- .werks/4797 | 13 ------------- web/htdocs/wato.py | 9 +-------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.werks/4797 b/.werks/4797 deleted file mode 100644 index addba29..0000000 --- a/.werks/4797 +++ /dev/null @@ -1,13 +0,0 @@ -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 e3857c7..1cb3acc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14387,6 +14387,7 @@ def create_sample_config(): "qmail_stats", ], "enable_rulebased_notifications": True, + "inventory_check_interval": 120, } ) @@ -14453,14 +14454,6 @@ 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())