Module: check_mk
Branch: master
Commit: d16f5e9273145570e2f23747f4bb2d0effcd97b3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d16f5e92731455…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 12 12:28:21 2013 +0100
FIX: Fix hiliting of errors in Nagios output
---
ChangeLog | 5 ++++-
web/htdocs/wato.css | 10 +++++++---
web/htdocs/wato.py | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 15dc4a0..00cb2d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,9 +72,12 @@
* Checks can now omit the typical "OK - " or "WARN -". This text
will be added automatically if missing.
- livestatus:
+ Livestatus:
* FIX: possible crash with VERY long downtime comments
+ WATO:
+ * FIX: Fix hiliting of errors in Nagios output
+
1.2.2b4:
Core:
* FIX: Fix output of cmk -D: datasource programs were missing
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 4b34f30..5580120 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -1003,14 +1003,18 @@ div.varname {
vertical-align: bottom;
}
-.wato div.error pre div.err {
+.wato div.error div.err {
background-color: yellow;
color: #000;
font-weight: bold;
width: 100%;
- margin: 0;
- padding: 0;
+ margin: 2px;
+ padding: 2px 5px;
float: left;
+ border-radius: 3px;
+ position: relative;
+ left: -8px;
+ opacity: 0.90;
}
/* Logwatch pattern editor */
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index c678911..6b95626 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -4116,7 +4116,7 @@ def check_mk_local_automation(command, args=[],
indata=""):
def hilite_errors(outdata):
- return re.sub("\nError: *([^\n]*)", "\n<div class=err>Error:
\\1</div>", outdata)
+ return re.sub("\nError: *([^\n]*)", "\n<div
class=err><b>Error:</b> \\1</div>", outdata)
#.