20 May
2013
20 May
'13
9:01 p.m.
Module: check_mk
Branch: master
Commit: f99bf3a65b4bf4de1ee135847705d22d0d2d7755
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f99bf3a65b4bf4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon May 20 23:01:20 2013 +0200
Remove Notification Command user settings, please use flexible notifications instead
---
ChangeLog | 1 +
web/htdocs/wato.py | 11 -----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 28f415f..3b1fd9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -121,6 +121,7 @@
* Configuration of an alternativ host check command
* Inventory: Display link symbol for ps ruleset
* FIX: Rulesets: correct display of rules within subfolders
+ * Remove Notification Command user settings, please use flexible notifications
instead
1.2.2p2:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index eb82b7a..ac41331 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -8084,9 +8084,6 @@ def mode_edit_user(phase):
for what, opts in [ ( "host", "durfs"), ("service",
"wucrfs") ]:
new_user[what + "_notification_options"] = "".join(
[ opt for opt in opts if html.get_checkbox(what + "_" + opt) ])
- # FIXME: Validate notification commands. Do they really exist?
- # FIXME(2): This is deprecated anyway. Remove in future.
- new_user[what + "_notification_commands"] = html.var(what +
"_notification_commands")
value = vs_notification_method.from_html_vars("notification_method")
vs_notification_method.validate_value(value, "notification_method")
@@ -8307,14 +8304,6 @@ def mode_edit_user(phase):
forms.section(_("Notification Method"))
vs_notification_method.render_input("notification_method",
user.get("notification_method"))
- # Notification commands (deprecated)
- forms.section(_("Notification Command for Hosts"))
- html.text_input("host_notification_commands",
user.get("host_notification_commands", "check-mk-notify"))
- html.help(_("Use this Nagios command for sending host notifications."))
- forms.section(_("Notification Command for Services"))
- html.text_input("service_notification_commands",
user.get("service_notification_commands", "check-mk-notify"))
- html.help(_("Use this Nagios command for sending service notifications."))
-
forms.header(_("Personal Settings"), isopen = False)
select_language(user.get('language', ''))
for name, attr in userdb.get_user_attributes():