[checkmk-commits] Display notification result / progress always as OK/WARN/CRIT

Module: check_mk Branch: master Commit: 71f9e40317f2733eb249114cb45b1b34e48bd4a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71f9e40317f273… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 10:55:14 2016 +0200 Display notification result / progress always as OK/WARN/CRIT --- web/plugins/views/painters.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 7c5bf49..0bd6d82 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2213,8 +2213,8 @@ def paint_log_plugin_output(row): multisite_painters["log_plugin_output"] = { - "title" : _("Log: output of check plugin"), - "short" : _("Check output"), + "title" : _("Log: Output"), + "short" : _("Output"), "columns" : ["log_plugin_output", "log_type", "log_state_type", "log_comment" ], "paint" : paint_log_plugin_output, } @@ -2410,7 +2410,12 @@ multisite_painters["log_date"] = { def paint_log_state(row): state = row["log_state"] - if row["log_service_description"]: + + # Notification result/progress lines don't hold real states. They hold notification plugin + # exit results (0: ok, 1: temp issue, 2: perm issue). We display them as service states. + if row["log_service_description"] \ + or row["log_type"].endswith("NOTIFICATION RESULT") \ + or row["log_type"].endswith("NOTIFICATION PROGRESS"): return paint_service_state_short({"service_has_been_checked":1, "service_state" : state}) else: return paint_host_state_short({"host_has_been_checked":1, "host_state" : state}) @@ -2418,7 +2423,7 @@ def paint_log_state(row): multisite_painters["log_state"] = { "title" : _("Log: state of host/service at log time"), "short" : _("State"), - "columns" : ["log_state", "log_state_type", "log_service_description"], + "columns" : ["log_state", "log_state_type", "log_service_description", "log_type"], "paint" : paint_log_state, }