Module: check_mk
Branch: master
Commit: 6caee5e3fdcb117fd89d2ec27cc9cb2bc2120119
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6caee5e3fdcb11…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 26 11:05:25 2016 +0200
3985 FIX mrpe: fixed broken long output when using the CMC
The long output of the mrpe check was appended to the plugin output.
This has been fixed.
---
.werks/3985 | 10 ++++++++++
ChangeLog | 1 +
checks/mrpe | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/3985 b/.werks/3985
new file mode 100644
index 0000000..b09e927
--- /dev/null
+++ b/.werks/3985
@@ -0,0 +1,10 @@
+Title: mrpe: fixed broken long output when using the CMC
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.4.0i2
+Date: 1477472567
+Class: fix
+
+The long output of the mrpe check was appended to the plugin output.
+This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index 99234fd..15e5f0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
* 3829 FIX: Skype for Business checks: refactored most of the checks...
* 3961 FIX: fixed error sections handling if parse function is available
* 3831 FIX: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated...
+ * 3985 FIX: mrpe: fixed broken long output when using the CMC...
Multisite:
* 3959 Two new filters for the comment view: author and comment text field
diff --git a/checks/mrpe b/checks/mrpe
index 118fbeb..f4db5ab 100644
--- a/checks/mrpe
+++ b/checks/mrpe
@@ -106,7 +106,7 @@ def check_mrpe(item, params, info):
# name of check command needed for PNP to choose the correct template
if check_name:
perf_parsed.append(check_name)
- best_result = state, "\\n".join(output), perf_parsed
+ best_result = state, "\n".join(output), perf_parsed
best_state = state
Module: check_mk
Branch: master
Commit: d39e5853c3192da85db784938adfeabe6f81c4da
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39e5853c3192d…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Oct 25 17:06:19 2016 +0200
3831 FIX ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated
The check now raises an MKCounterWrapped instead.
This means that the check might go stale, when the data no longer updates.
---
.werks/3831 | 11 +++++++++++
ChangeLog | 1 +
checks/ucd_cpu_util | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/3831 b/.werks/3831
new file mode 100644
index 0000000..732a8fc
--- /dev/null
+++ b/.werks/3831
@@ -0,0 +1,11 @@
+Title: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.4.0i2
+Date: 1477407867
+Class: fix
+
+The check now raises an MKCounterWrapped instead.
+This means that the check might go stale, when the data no longer updates.
+
diff --git a/ChangeLog b/ChangeLog
index 2e265af..99234fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@
* 3966 FIX: apc_symmetra raritan_emx: Fixed wrong include "temperature.includes"...
* 3829 FIX: Skype for Business checks: refactored most of the checks...
* 3961 FIX: fixed error sections handling if parse function is available
+ * 3831 FIX: ucd_cpu_util: no longer reports an UNKNOWN error when the counter data wasn't updated...
Multisite:
* 3959 Two new filters for the comment view: author and comment text field
diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util
index bd17d85..591c553 100644
--- a/checks/ucd_cpu_util
+++ b/checks/ucd_cpu_util
@@ -53,7 +53,7 @@ def check_ucd_cpu_util(item, params, info):
total = sum(rates)
if total == 0:
- return (3, "counters have not moved since last check, looks like state fake data")
+ raise MKCounterWrapped("Rates have not changed since last interval")
parts = [ r/total for r in rates ]
user = 100 * (parts[0] + parts[1])
Module: check_mk
Branch: master
Commit: 89c36dcf1849afcda92eeb8951aa40871aa9bc7c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89c36dcf1849af…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 26 08:46:50 2016 +0200
More clear help text. Avoid jargon like "glob".
---
web/plugins/wato/check_parameters.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 929d1ac..3182585 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -4388,8 +4388,9 @@ register_rule(group + '/' + subgroup_storage,
'file but also on the count. You can define one or several '
'patterns for a group containing <tt>*</tt> and <tt>?</tt>, for example '
'<tt>/var/log/apache/*.log</tt>. If the pattern begins with a tilde then '
- 'this pattern is interpreted as a regular expression otherwise it is a '
- 'glob. For files contained in a group '
+ 'this pattern is interpreted as a regular expression instead of as a filename '
+ 'globbing pattern and <tt>*</tt> and <tt>?</tt> are treated differently. '
+ 'For files contained in a group '
'the discovery will automatically create a group service instead '
'of single services for each file. This rule also applies when '
'you use manually configured checks instead of inventorized ones. '
Module: check_mk
Branch: master
Commit: ba9755d899ea4f0087196e4076c68cd599aa7e6d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba9755d899ea4f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Oct 25 15:23:32 2016 +0200
Fixed using in_binary_hostlist cache
---
modules/check_mk.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 259f31d..564ada8 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -821,10 +821,14 @@ def host_extra_conf_merged(hostname, conf):
def in_binary_hostlist(hostname, conf):
- # TODO: This cache is never used. And now?
cache = cmk_base.config_cache.get_dict("in_binary_hostlist")
cache_id = id(conf), hostname
+ try:
+ return cache[cache_id]
+ except KeyError:
+ pass
+
# if we have just a list of strings just take it as list of hostnames
if conf and type(conf[0]) == str:
result = hostname in conf