Module: check_mk
Branch: master
Commit: c6b8d001da6abd56baff8c8c1640791ebfac1b3a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6b8d001da6abd…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jun 29 14:47:34 2015 +0200
#2365 Removed old deprecated notification global options for plain emails
The global settings for old plain email notifications (like configuring the
subject) have been removed. The will not work for the current rule based
notifications anyway. If you really still use plain emails then your old
settings will continue to work for the while, though. We encourage you to
switch over to rule based notifiations.
---
.werks/2365 | 13 ++++
ChangeLog | 1 +
web/plugins/wato/globals_notification.py | 117 ------------------------------
3 files changed, 14 insertions(+), 117 deletions(-)
diff --git a/.werks/2365 b/.werks/2365
new file mode 100644
index 0000000..cc3f720
--- /dev/null
+++ b/.werks/2365
@@ -0,0 +1,13 @@
+Title: Removed old deprecated notification global options for plain emails
+Level: 2
+Component: wato
+Compatible: compat
+Version: 1.2.7i3
+Date: 1435581968
+Class: feature
+
+The global settings for old plain email notifications (like configuring the
+subject) have been removed. The will not work for the current rule based
+notifications anyway. If you really still use plain emails then your old
+settings will continue to work for the while, though. We encourage you to
+switch over to rule based notifiations.
diff --git a/ChangeLog b/ChangeLog
index f361343..c8860ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
* 2379 FIX: Plugin-Output: Fixed handling of URLs within output of check_http...
WATO:
+ * 2365 Removed old deprecated notification global options for plain emails...
* 2344 FIX: Improved validation of selected rules when editing BI aggregations...
* 2346 FIX: Notifications: Fixed garbled page when switching on/off
bulks/backlog/user rules
diff --git a/web/plugins/wato/globals_notification.py
b/web/plugins/wato/globals_notification.py
index e37eb32..81234d3 100644
--- a/web/plugins/wato/globals_notification.py
+++ b/web/plugins/wato/globals_notification.py
@@ -104,123 +104,6 @@ register_configvar(group,
),
domain = "check_mk")
-register_configvar(group,
- "notification_mail_command",
- TextUnicode(
- title = _("Email command line used for notifications"),
- help = _("This command will be executed whenever a notification should be
done. "
- "The command will receive the notification text body on standard
input. "
- "The macro <tt>$SUBJECT$</tt> will be replaced by a
text configured "
- "with "
- "<a
href=\"%s\"><tt>notification_host_subject</tt></a>"
- " and "
- "<a
href=\"%s\"><tt>notification_service_subject</tt></a>.
"
- "You find a list of all remaining available variables in the help
text of "
- "<a
href=\"%s\"><tt>notification_common_body</tt></a>." %
(
-
"wato.py?mode=edit_configvar&varname=notification_host_subject",
-
"wato.py?mode=edit_configvar&varname=notification_service_subject",
-
"wato.py?mode=edit_configvar&varname=notification_common_body",
- )),
- size = 50,
- attrencode = True,
- ),
- domain = "check_mk")
-
-register_configvar(group,
- "notification_host_subject",
- TextUnicode(
- title = _("Email subject to use for host notifications"),
- help = _("This template will be used as <tt>$SUBJECT$</tt> in
email notifications "
- "that deal with host alerts. The variable
<tt>$SUBJECT$</tt> will then "
- "be available in <a
href=\"%s\"><tt>notification_common_body</tt></a>." %
(
-
"wato.py?mode=edit_configvar&varname=notification_common_body",
- )),
- size = 50,
- attrencode = True,
- ),
- domain = "check_mk")
-
-register_configvar(group,
- "notification_service_subject",
- TextUnicode(
- title = _("Email subject to use for service notifications"),
- help = _("This template will be used as <tt>$SUBJECT$</tt> in
email notifications "
- "that deal with service alerts. The variable
<tt>$SUBJECT$</tt> will then "
- "be available in <a
href=\"%s\"><tt>notification_common_body</tt></a>." %
(
-
"wato.py?mode=edit_configvar&varname=notification_common_body",
- )),
- size = 50,
- attrencode = True,
- ),
- domain = "check_mk")
-
-
-register_configvar(group,
- "notification_common_body",
- TextAreaUnicode(
- title = _("Email body to use for both host and service
notifications"),
- help = _("This template will be used as email body when sending
notifications. "
- "Appended to it will be a specific body for either host or service
"
- "notifications configured in two extra parameters. "
- "The following macros are available in all
templates:<br><br>"
- "<tt><b>$CONTACTNAME$</b></tt>: login name
of the contact person, "
- "<tt><b>$CONTACTEMAIL$</b></tt>: email
address of the contact person, "
- "<tt><b>$CONTACTPAGER$</b></tt>: pager
address of the contact person, "
- "<tt><b>$NOTIFICATIONTYPE$</b></tt>: one
of PROBLEM, RECOVERY, ACKNOWLEDGEMENT, FLAPPINGSTART, FLAPPINGSTOP, FLAPPINGDISABLED,
DOWNTIMESTART, DOWNTIMEEND, or DOWNTIMECANCELLED, "
- "<tt><b>$HOSTNAME$</b></tt>: the name of
the host, "
- "<tt><b>$HOSTALIAS$</b></tt>: the alias of
the host, "
- "<tt><b>$HOSTADDRESS$</b></tt>: the IP
address or DNS name of the host, "
- "<tt><b>$LASTHOSTSTATE$</b></tt>: the
previous state of the host, "
- "<tt><b>$HOSTSTATE$</b></tt>: the new
state of the host, "
- "<tt><b>$HOSTCHECKCOMMAND$</b></tt>: the
name of the host check command, "
- "<tt><b>$HOSTOUTPUT$</b></tt>: the output
of the host check command, "
- "<tt><b>$LONGHOSTOUTPUT$</b></tt>: the
long output of the host check, "
- "<tt><b>$HOSTPERFDATA$</b></tt>: the
performance data of the host check, "
- "<tt><b>$SERVICEDESC$</b></tt>: the name
of the service, "
- "<tt><b>$LASTSERVICESTATE$</b></tt>: the
previous state of the service, "
- "<tt><b>$SERVICESTATE$</b></tt>: the new
state of the service, "
- "<tt><b>$SERVICEOUTPUT$</b></tt>: the
output of the check command , "
- "<tt><b>$LONGSERVICEOUTPUT$</b></tt>: the
long output of the check command, "
- "<tt><b>$SERVICEPERFDATA$</b></tt>: the
performance data of the check, "
- "<tt><b>$SERVICECHECKCOMMAND$</b></tt>:
the name of the service check command, "
- "<tt><b>$HOSTPROBLEMID$</b></tt>: a unique
ID of the host problem this notification is about, "
- "<tt><b>$SERVICEPROBLEMID$</b></tt>: the
same for service problems, "
- "<tt><b>$HOSTNOTIFICATIONNUMBER$</b></tt>:
the number of notification of this host problem (begins with 1), "
- "<tt><b>$HOSTURL$</b></tt>: URL pointing
to the host detail view (starting with /check_mk/...), "
- "<tt><b>$SERVICEURL$</b></tt>: URL
pointing to the service detail view (starting with /check_mk/...), "
- "<br><br>"
- "<tt><b>$MONITORING_HOST$</b></tt>: the
host name of the monitoring server "
- "<tt><b>$OMD_ROOT$</b></tt>: the home
directory of the OMD site (only on OMD) "
- "<tt><b>$OMD_SITE$</b></tt>: the name of
the OMD site (only on OMD) "
- ),
- attrencode = True,
- ),
- domain = "check_mk")
-
-
-register_configvar(group,
- "notification_host_body",
- TextAreaUnicode(
- title = _("Email body to use for host notifications"),
- help = _("This template will be appended to the <a
href=\"%s\"><tt>"
- "notification_common_body</tt></a> when host
notifications are sent." %
-
"wato.py?mode=edit_configvar&varname=notification_common_body"
- ),
- attrencode = True,
- ),
- domain = "check_mk")
-
-register_configvar(group,
- "notification_service_body",
- TextAreaUnicode(
- title = _("Email body to use for service notifications"),
- help = _("This template will be appended to the <a
href=\"%s\"><tt>"
- "notification_common_body</tt></a> when service
notifications are sent." %
-
"wato.py?mode=edit_configvar&varname=notification_common_body"
- ),
- attrencode = True,
- ),
- domain = "check_mk")
register_configvar(group,