[checkmk-commits] Revert " 4796 FIX Fixed standard setting for rule based notification in new sites"

Module: check_mk Branch: master Commit: f61b279e204802778654fea1d1557388cc2e5b7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f61b279e204802… Author: Sven Rueß &lt;sr(a)mathias-kettner.de&gt; Date: Wed Jun 7 19:42:09 2017 +0200 Revert "4796 FIX Fixed standard setting for rule based notification in new sites" This reverts commit cd9b0fd06c357be03cf505e231f8de48548ed258. Change-Id: I0580fd8f6c285c5ec8def41e23eee2cfacd37012 --- .werks/4796 | 11 ----------- modules/notify.py | 2 +- web/htdocs/wato.py | 1 + web/plugins/wato/globals_notification.py | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.werks/4796 b/.werks/4796 deleted file mode 100644 index e2bcebf..0000000 --- a/.werks/4796 +++ /dev/null @@ -1,11 +0,0 @@ -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 37cfa40..2b8d67d 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 = True +enable_rulebased_notifications = False 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 3ea48d4..e3857c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14386,6 +14386,7 @@ def create_sample_config(): "barracuda_mailqueues", "qmail_stats", ], + "enable_rulebased_notifications": True, } ) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 900dcf3..aab54b4 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 " "&quot;flexible notifications&quot; will become inactive. Instead notificatios will " "be configured with the WATO module <i>Notifications</i> on a global base."), - default_value = True, + default_value = False, ), domain = "check_mk", need_restart = True)