[checkmk-commits] Check_MK Git: check_mk: FIX Logwatch messages with class unknown ( 'u' ) now displayed as WARN

Module: check_mk Branch: master Commit: f7949d8d696640bf87cb1435b4408bf4f6a325be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7949d8d696640… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Tue Jun 3 14:43:18 2014 +0200 FIX Logwatch messages with class unknown ( 'u' ) now displayed as WARN Certain windows messages don't have a correct error level classification and there get reported as the error type 'u' (unknown).<br> Unknown types were not shown correctly in the multisite logfile viewer. --- .werks/934 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/934 b/.werks/934 new file mode 100644 index 0000000..4f20e7f --- /dev/null +++ b/.werks/934 @@ -0,0 +1,10 @@ +Title: Logwatch messages with class unknown ( 'u' ) now displayed as WARN +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1401799125 +Class: fix + +Certain windows messages don't have a correct error level classification +and there get reported as the error type 'u' (unknown).<br> +Unknown types were not shown correctly in the multisite logfile viewer. diff --git a/ChangeLog b/ChangeLog index c0898b7..5a187f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 0921 FIX: dashboards: fixed bug not updating header timestamp... * 0923 FIX: json export: fixed bug not stripping html tags from output * 0931 FIX: pnp-template ps.perf: fixed display bug of cpu averaging + * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 6b734be..7bc20fe 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -360,6 +360,10 @@ def parse_file(host, file, hidecontext = False): line_level = 1 line_class = 'WARN' + if line[0] == 'u': + line_level = 1 + line_class = 'WARN' + elif line[0] == 'C': line_level = 2 line_class = 'CRIT'