Module: check_mk
Branch: master
Commit: 80f3ff5bcd01d75aa9b10d45478659b515409a18
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80f3ff5bcd01d7…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Wed Jun 7 09:50:58 2017 +0200
4788 FIX openhardwaremonitor: New support of current hardware
Due the update from 0.7.1 to 0.8.0 a new set of hardware is supported. For
more information please see the official website of the developer:
http://openhardwaremonitor.org/
Change-Id: I9eb3b865969c7c47e3cade39f1558d3c033413b4
---
.werks/4788 | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/.werks/4788 b/.werks/4788
new file mode 100644
index 0000000..a5627a4
--- /dev/null
+++ b/.werks/4788
@@ -0,0 +1,12 @@
+Title: openhardwaremonitor: New support of current hardware
+Level: 2
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1496821715
+Class: fix
+
+Due the update from 0.7.1 to 0.8.0 a new set of hardware is supported. For
+more information please see the official website of the developer:
+http://openhardwaremonitor.org/
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())
Module: check_mk
Branch: master
Commit: cd9b0fd06c357be03cf505e231f8de48548ed258
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd9b0fd06c357b…
Author: Sven Rueß <sr(a)mathias-kettner.de>
Date: Tue Jun 6 20:32:27 2017 +0200
4796 FIX Fixed standard setting for rule based notification in new sites
Rule based notifications is new standard setting for new created sites.
Change-Id: If0a2eedd2e021403e7b9a365ce7987a41634841e
---
.werks/4796 | 11 +++++++++++
modules/notify.py | 2 +-
web/htdocs/wato.py | 1 -
web/plugins/wato/globals_notification.py | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.werks/4796 b/.werks/4796
new file mode 100644
index 0000000..e2bcebf
--- /dev/null
+++ b/.werks/4796
@@ -0,0 +1,11 @@
+Title: Fixed standard setting for rule based notification in new sites
+Level: 1
+Component: notifications
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1496773819
+
+Rule based notifications is new standard setting for new created sites.
diff --git a/modules/notify.py b/modules/notify.py
index 2b8d67d..37cfa40 100644
--- a/modules/notify.py
+++ b/modules/notify.py
@@ -61,7 +61,7 @@ notification_logging = 1
notification_backlog = 10 # keep the last 10 notification contexts for reference
# Settings for new rule based notifications
-enable_rulebased_notifications = False
+enable_rulebased_notifications = True
notification_fallback_email = ""
notification_rules = []
notification_bulk_interval = 10 # Check every 10 seconds for ripe bulks
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index af70a51..ba358d6 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -14387,7 +14387,6 @@ def create_sample_config():
"qmail_stats",
],
"inventory_check_interval": 120,
- "enable_rulebased_notifications": True,
}
)
diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py
index aab54b4..900dcf3 100644
--- a/web/plugins/wato/globals_notification.py
+++ b/web/plugins/wato/globals_notification.py
@@ -42,7 +42,7 @@ register_configvar(group,
help = _("If you enable the new rule based notifications then the current plain text email and "
""flexible notifications" will become inactive. Instead notificatios will "
"be configured with the WATO module <i>Notifications</i> on a global base."),
- default_value = False,
+ default_value = True,
),
domain = "check_mk",
need_restart = True)