6 Jun
2017
6 Jun
'17
6:51 p.m.
Module: check_mk
Branch: master
Commit: 261bb97ae769bf2dcb6d9e4a58ff1d6dfcda2fb5
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=261bb97ae769bf…
Author: Sven Rueß <sr(a)mathias-kettner.de>
Date: Tue Jun 6 20:41:34 2017 +0200
4797 FIX Removed deprecated global service discovery setting and added new standard rule
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.
Change-Id: Ie1a7f628d91d8341dcf22a6df7a6c9e1e0f49784
---
.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 ba358d6..3ea48d4 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -14386,7 +14386,6 @@ def create_sample_config():
"barracuda_mailqueues",
"qmail_stats",
],
- "inventory_check_interval": 120,
}
)
@@ -14453,6 +14452,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())