[checkmk-commits] 5433 Bulk notifications can now be made using Event Console comments

Module: check_mk Branch: master Commit: 177cf1a0db05062dd186ade83594f4522ad2bdd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=177cf1a0db0506… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 7 09:32:29 2017 +0100 5433 Bulk notifications can now be made using Event Console comments Change-Id: I43fd3b447317795e3c66b6aa6199db5ce267d043 --- .werks/5433 | 10 ++++++++++ cmk_base/notify.py | 4 ++++ web/htdocs/wato.py | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/5433 b/.werks/5433 new file mode 100644 index 0000000..0e1bf68 --- /dev/null +++ b/.werks/5433 @@ -0,0 +1,10 @@ +Title: Bulk notifications can now be made using Event Console comments +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510043526 +Class: feature + + diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 5e697b0..ff01fc5 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1428,6 +1428,10 @@ def do_bulk_notify(plugin, params, plugin_context, bulk): ec_contact = plugin_context.get("EC_CONTACT", "") bulk_path += ("ec_contact", ec_contact) + if "ec_comment" in bulkby: + ec_comment = plugin_context.get("EC_COMMENT", "") + bulk_path += ("ec_comment", ec_comment) + if "bulk_subject" in bulk: plugin_context["PARAMETER_BULK_SUBJECT"] = bulk["bulk_subject"] diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 584eb8f..acb7a8c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7578,7 +7578,8 @@ def vs_notification_bulkby(): ( "sl", _("Service level") ), ( "check_type", _("Check type") ), ( "state", _("Host/Service state") ), - ( "ec_contact", _("Event console contact") ), + ( "ec_contact", _("Event Console contact") ), + ( "ec_comment", _("Event Console comment") ), ], default_value = [ "host" ], )