[checkmk-commits] [tribe29/checkmk] 4f92fd: Remove unallowed cmk_base import from cmk/notifica...

Tom Bärwinkel noreply at github.com
Wed Jun 26 09:01:28 CEST 2019


  Branch: refs/heads/1.6.0
  Home:   https://github.com/tribe29/checkmk
  Commit: 4f92fdf1ac48bafe840c6e66d6bf256e5f59ba71
      https://github.com/tribe29/checkmk/commit/4f92fdf1ac48bafe840c6e66d6bf256e5f59ba71
  Author: Tom Baerwinkel <tom.baerwinkel at tribe29.com>
  Date:   2019-06-26 (Wed, 26 Jun 2019)

  Changed paths:
    M cmk/notification_plugins/utils.py
    M cmk/utils/notify.py
    M cmk_base/notify.py

  Log Message:
  -----------
  Remove unallowed cmk_base import from cmk/notification_plugins/utils.py

Change-Id: Ib8a0703856244855e186aab21276b9fa9be26591


  Commit: 8b0102655a4c0f4fe92ab3eb550e6b9114fb5315
      https://github.com/tribe29/checkmk/commit/8b0102655a4c0f4fe92ab3eb550e6b9114fb5315
  Author: Tom Baerwinkel <tom.baerwinkel at tribe29.com>
  Date:   2019-06-26 (Wed, 26 Jun 2019)

  Changed paths:
    A .werks/7427
    M cmk/gui/view_utils.py
    M cmk/notification_plugins/mail.py
    M cmk/notification_plugins/utils.py
    M cmk_base/events.py
    M tests/unit/cmk/notifications/test_mail.py

  Log Message:
  -----------
  7427 FIX mail: don't escape state markers in emails

Since version 1.5.0p14 state markers in HTML emails were escaped
and not interpreted as HTML but shown as text. The state marker
for CRIT was e.g. shown as:

<b class="stmarkCRITICAL">CRIT</b>

This werk restores the old behaviour and state markers are shown
in HTML emails as usual.

If you use the macros HOSTOUTPUT_HTML, SERVICEOUTPUT_HTML, or
LONGSERVICEOUTPUT_HTML in custom notification scripts please
switch to the macros HOSTOUTPUT, SERVICEOUTPUT, and
LONGSERVICEOUTPUT which contain the textual state markers
'(!)' and '(!!)' for WARN and CRIT, respectively. The *_HTML
variables will be deprecated in 1.6 and removed in 1.7.
If you want to replace the textual state markers by HTML code
you can use the utility function
cmk.notification_plugins.utils.format_plugin_output.

CMK-2142

Change-Id: Idc2eb2df8c7d4dabecc06799e3947391ae75d8d3


Compare: https://github.com/tribe29/checkmk/compare/d2bf19a3352b...8b0102655a4c


More information about the checkmk-commits mailing list