Module: check_mk
Branch: master
Commit: fe0e5bf73615b590aaf27416faea6df75820c8b8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe0e5bf73615b5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Nov 3 09:55:22 2014 +0100
#1483 FIX Savely replace illegal vertical bars in check plugin output
If a check plugin has a vertical bar in its plugin output then the core chopped
off the remaining text and interpreted that is performance values. That was
for example the case when monitoring SAP R/3 jobs. This has now been fixed
by automatically replacing the bar by the Unicode character LIGHT VERTICAL BAR
(U+2758).
---
.werks/1483 | 14 ++++++++++++++
ChangeLog | 3 +++
modules/check_mk_base.py | 6 ++++++
3 files changed, 23 insertions(+)
diff --git a/.werks/1483 b/.werks/1483
new file mode 100644
index 0000000..8bba522
--- /dev/null
+++ b/.werks/1483
@@ -0,0 +1,14 @@
+Title: Savely replace illegal vertical bars in check plugin output
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.5i7
+Date: 1415004782
+
+If a check plugin has a vertical bar in its plugin output then the core chopped
+off the remaining text and interpreted that is performance values. That was
+for example the case when monitoring SAP R/3 jobs. This has now been fixed
+by automatically replacing the bar by the Unicode character LIGHT VERTICAL BAR
+(U+2758).
diff --git a/ChangeLog b/ChangeLog
index 69fd65b..13f68ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
1.2.5i7:
+ Core & Setup:
+ * 1483 FIX: Savely replace illegal vertical bars in check plugin output...
+
Checks & Agents:
* 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices
* 1167 citrix_license/esx_license: Can now be configured to always show OK as state
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 750349f..889c143 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1402,6 +1402,12 @@ def submit_check_result(host, servicedesc, result, sa):
infotext.startswith("UNKNOWN -")):
infotext = nagios_state_names[state] + " - " + infotext
+ # make sure that plugin output does not contain a vertical bar. If that is the
+ # case then replace it with a Uniocode "Light vertical bar"
+ if type(infotext) == unicode:
+ infotext = infotext.encode("utf-8") # should never happen
+ infotext = infotext.replace("|", "\xe2\x9d\x98")
+
global nagios_command_pipe
# [<timestamp>] PROCESS_SERVICE_CHECK_RESULT;<host_name>;<svc_description>;<return_code>;<plugin_output>
Module: check_mk
Branch: master
Commit: 6c84a34d54ab2e9600a6d144306d4ca43a87d911
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c84a34d54ab2e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Oct 31 16:50:09 2014 +0100
#1482 FIX Fix exception when editing a visual of type single host group
Context editor was broken, because there were two filters with the
same HTML variable name <tt>hostgroup</tt>. This has been fixed
by renaming the name of the host group selection filter to <tt>host_group</tt>.
---
.werks/1482 | 12 ++++++++++++
ChangeLog | 1 +
web/htdocs/visuals.py | 10 +++++++---
web/plugins/visuals/filters.py | 4 ++--
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.werks/1482 b/.werks/1482
new file mode 100644
index 0000000..2797d3a
--- /dev/null
+++ b/.werks/1482
@@ -0,0 +1,12 @@
+Title: Fix exception when editing a visual of type single host group
+Level: 1
+Component: multisite
+Compatible: compat
+Version: 1.2.5i7
+Date: 1414770553
+Class: fix
+
+Context editor was broken, because there were two filters with the
+same HTML variable name <tt>hostgroup</tt>. This has been fixed
+by renaming the name of the host group selection filter to <tt>host_group</tt>.
+
diff --git a/ChangeLog b/ChangeLog
index ec8160c..69fd65b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
* 1164 FIX: Fixed links from servicegroup overviews to single servicegroups
* 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files)
* 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters
+ * 1482 FIX: Fix exception when editing a visual of type single host group...
WATO:
* 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks...
diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py
index 4dd059f..ab59a2f 100644
--- a/web/htdocs/visuals.py
+++ b/web/htdocs/visuals.py
@@ -848,9 +848,13 @@ class Filter:
# Is used to populate a value, for example loaded from persistance, into
# the HTML context where it can be used by e.g. the display() method.
def set_value(self, value):
- val = {}
- for varname in self.htmlvars:
- html.set_var(varname, value.get(varname))
+ try:
+ val = {}
+ for varname in self.htmlvars:
+ html.set_var(varname, value.get(varname))
+ except:
+ html.debug("%r, %s" % (self, self.name))
+ raise
def get_filter(name):
return multisite_filters[name]
diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py
index 573fc49..7fe6150 100644
--- a/web/plugins/visuals/filters.py
+++ b/web/plugins/visuals/filters.py
@@ -184,13 +184,13 @@ class FilterGroupCombo(Filter):
def __init__(self, what, title, enforce):
self.enforce = enforce
self.prefix = not self.enforce and "opt" or ""
- htmlvars = [ self.prefix + what + "group" ]
+ htmlvars = [ self.prefix + what + "_group" ]
if not enforce:
htmlvars.append("neg_" + htmlvars[0])
Filter.__init__(self, self.prefix + what + "group", # name, e.g. "hostgroup"
title, # title, e.g. "Hostgroup"
what.split("_")[0], # info, e.g. "host"
- htmlvars, # htmlvars, e.g. "hostgroup"
+ htmlvars, # htmlvars, e.g. "host_group"
[ what + "group_name" ]) # rows needed to fetch for link information
self.what = what
Module: check_mk
Branch: master
Commit: 3525eb2caec37d9a3a4bdb69f04bcf1d3f457441
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3525eb2caec37d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Oct 31 15:21:55 2014 +0100
Updated bug entries #2222
---
.bugs/2222 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.bugs/2222 b/.bugs/2222
new file mode 100644
index 0000000..15605ba
--- /dev/null
+++ b/.bugs/2222
@@ -0,0 +1,9 @@
+Title: Views for services of one host and for all services have icons at different positions
+Component: multisite
+State: open
+Date: 2014-10-31 15:20:29
+Targetversion: future
+Class: nastiness
+
+The position of the column "service icons" is not always the same.
+Sometimes it's at the beginning, sometimes at the end.
Module: check_mk
Branch: master
Commit: 03f5560f2006443edb59e975144efbd0e45073ce
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03f5560f200644…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Oct 31 14:48:51 2014 +0100
#1168 FIX HTML mails can now be configured to display graphs among each other
By default all graphs are displayed besides eachother, trying to fill
horizontally as much space as possible. Now you can configure the mail
notifications to display the graphs among each other by setting the
notification parmeter.
---
.werks/1168 | 12 ++++++++++++
ChangeLog | 3 +++
notifications/mail | 10 +++++++++-
web/plugins/wato/notifications.py | 16 ++++++++++++----
4 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/.werks/1168 b/.werks/1168
new file mode 100644
index 0000000..94d65a9
--- /dev/null
+++ b/.werks/1168
@@ -0,0 +1,12 @@
+Title: HTML mails can now be configured to display graphs among each other
+Level: 1
+Component: notifications
+Compatible: compat
+Version: 1.2.5i7
+Date: 1414763224
+Class: fix
+
+By default all graphs are displayed besides eachother, trying to fill
+horizontally as much space as possible. Now you can configure the mail
+notifications to display the graphs among each other by setting the
+notification parmeter.
diff --git a/ChangeLog b/ChangeLog
index fcbfb17..c7f7171 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
WATO:
* 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks...
+ Notifications:
+ * 1168 FIX: HTML mails can now be configured to display graphs among each other...
+
1.2.5i6:
Core & Setup:
diff --git a/notifications/mail b/notifications/mail
index 57f4b28..e77c21b 100755
--- a/notifications/mail
+++ b/notifications/mail
@@ -171,6 +171,11 @@ img {
margin-right: 10px;
}
+img.nofloat {
+ display: block;
+ margin-bottom: 10px;
+}
+
table.context {
border-collapse: collapse;
}
@@ -555,7 +560,10 @@ def construct_content(context):
name = '%s-%s-%d.png' % (context['HOSTNAME'], svc_desc, source)
attachments.append(('img', name, content, 'inline'))
- graph_code += '<img src="cid:%s" />' % name
+ cls = ''
+ if context.get('PARAMETER_NO_FLOATING_GRAPHS'):
+ cls = ' class="nofloat"'
+ graph_code += '<img src="cid:%s"%s />' % (name, cls)
if graph_code:
content_html += (
diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py
index 12d4733..0814e4b 100644
--- a/web/plugins/wato/notifications.py
+++ b/web/plugins/wato/notifications.py
@@ -78,11 +78,11 @@ register_notification_parameters("mail",
),
( "url_prefix",
TextAscii(
- title = _("URL prefix for links to Multisite"),
+ title = _("URL prefix for links to Check_MK"),
help = _("If you specify an URL prefix here, then several parts of the "
- "email body are armed with hyperlinks to your Multisite GUI, so "
+ "email body are armed with hyperlinks to your Check_MK GUI, so "
"that the recipient of the email can directly visit the host or "
- "service in question in Multisite. Specify an absolute URL including "
+ "service in question in Check_MK. Specify an absolute URL including "
"the <tt>.../check_mk/</tt>"),
regex = "^(http|https)://.*/check_mk/$",
regex_error = _("The URL must begin with <tt>http</tt> or "
@@ -91,7 +91,15 @@ register_notification_parameters("mail",
default_value = "http://" + socket.gethostname() + "/" + (
defaults.omd_site and defaults.omd_site + "/" or "") + "check_mk/",
)
- )
+ ),
+ ( "no_floating_graphs", FixedValue(
+ True,
+ title = _("Display graphs among each other"),
+ totext = _("Graphs are shown among each other"),
+ help = _("By default all multiple graphs in emails are displayed floating "
+ "nearby. You can enable this option to show the graphs among each "
+ "other."),
+ )),
]
)
)