Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: b5a56a58ae5d24ecbc7eb08abe8f0acbd0a61d41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5a56a58ae5d24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 7 21:11:32 2016 +0100 Updated bug entries #2378 --- .bugs/2378 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/2378 b/.bugs/2378 index dd73e68..100cc46 100644 --- a/.bugs/2378 +++ b/.bugs/2378 @@ -1,11 +1,15 @@ Title: check_bi_aggr: $HOSTNAME$ in aggregation name does not work correctly with CMC Component: checks -State: open +Class: bug +State: works4me Date: 2015-09-21 15:43:27 Targetversion: 1.2.8 -Class: bug If you use $HOSTNAME$ as part of the aggregation name (just as the online help suggests), then the correct aggregation is being queried, but the service description contains <tt>HOSTNAME</tt> instead of the actual host name. So the expansion of <tt>$HOSTNAME</tt> in the service description does not work. + +2016-02-07 21:11:29: changed state open -> works4me +Seems to be an old bug entry. I've double checked this. The expansion +is done correctly.

8 years, 7 months

check_bi_aggr: Add quote to host name, better error message

by Mathias Kettner

Module: check_mk Branch: master Commit: 187f536cf292a5c29c47dc1d5f834d27f8feada9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=187f536cf292a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 7 21:04:29 2016 +0100 check_bi_aggr: Add quote to host name, better error message --- checks/check_bi_aggr | 2 +- doc/treasures/active_checks/check_bi_aggr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/check_bi_aggr b/checks/check_bi_aggr index 88ba907..4db4681 100644 --- a/checks/check_bi_aggr +++ b/checks/check_bi_aggr @@ -46,7 +46,7 @@ def check_bi_aggr_arguments(params): args += ' --acknowledged %s' % opt_params['acknowledged'] if opt_params.get("track_downtimes"): - args += ' -r -n $HOSTNAME$' + args += " -r -n '$HOSTNAME$'" return args diff --git a/doc/treasures/active_checks/check_bi_aggr b/doc/treasures/active_checks/check_bi_aggr index 0d38bd4..aae84a8 100755 --- a/doc/treasures/active_checks/check_bi_aggr +++ b/doc/treasures/active_checks/check_bi_aggr @@ -178,7 +178,7 @@ except Exception, e: sys.exit(3) if len(obj) == 1: - sys.stdout.write('ERROR: Aggregation does not exist or user is not permitted\n') + sys.stdout.write('ERROR: Aggregation "%s" does not exist or user is not permitted\n' % aggr_name) sys.exit(3) if type(obj) != list or len(obj) != 2:

8 years, 7 months

Fix replacing placeholders in generated PNP templates

by Mathias Kettner

Module: check_mk Branch: master Commit: b39dea4bd0a210055f6c6f49eb324773b445f2ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b39dea4bd0a210… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 22:45:48 2016 +0100 Fix replacing placeholders in generated PNP templates --- .bugs/2365 | 7 +++++-- pnp-templates/default.php | 16 +++++++++++++++- web/htdocs/metrics.py | 14 ++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.bugs/2365 b/.bugs/2365 index d3e26a8..7bfdaf6 100644 --- a/.bugs/2365 +++ b/.bugs/2365 @@ -1,10 +1,13 @@ Title: generated pnp templates don't support placeholders Component: multisite -State: open +Class: bug +State: done Date: 2015-10-29 09:05:03 Targetversion: 1.2.8 -Class: bug If a template for the new graphing system contains a placeholder (i.e. %(util:max@count)), that placeholder is resolved fine in new graphs but not in the generated PNP templates. + +2016-02-06 22:45:21: changed state open -> done +Not the full syntax is supported but at least those cases that are in use. diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 6c2eb32..af16c6e 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -79,13 +79,27 @@ if ($cache_state != "uptodate") } } +function replace_cmk_expression($NAME, $MIN, $MAX, $WARN, $CRIT, $text) +{ + # Replace expressions in the title. This not a full implementation of + # the complete RPN expression syntax of Check_MK - but sufficient for + # all used cases. + foreach ($NAME as $i => $n) { + $text = str_replace("%($n:min@count)", "$MIN[$i]", $text); + $text = str_replace("%($n:max@count)", "$MAX[$i]", $text); + $text = str_replace("%($n:warn@count)", "$WARN[$i]", $text); + $text = str_replace("%($n:crit@count)", "$CRIT[$i]", $text); + } + return $text; +} + # Now read template information from cache file, if present if (($cache_state == "uptodate" || $cache_state == "stale") && filesize($template_cache_path) > 0) { $rrdbase = substr($NAGIOS_XMLFILE, 0, strlen($NAGIOS_XMLFILE) - 4); $fd = fopen($template_cache_path, "r"); while (!feof($fd)) { $dsname_line = trim(fgets($fd)); - $option_line = trim(fgets($fd)); + $option_line = replace_cmk_expression($NAME, $MIN, $MAX, $WARN, $CRIT, trim(fgets($fd))); $graph_line = str_replace('$RRDBASE$', $rrdbase, fgets($fd)); if ($dsname_line && $option_line && $graph_line) { $ds_name[] = $dsname_line; diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index d755f45..0633def 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1021,6 +1021,19 @@ def get_graph_range(graph_template, translated_metrics): return min_value, max_value +#. +# .--PNP Templates-------------------------------------------------------. +# | ____ _ _ ____ _____ _ _ | +# | | _ \| \ | | _ \ |_ _|__ _ __ ___ _ __ | | __ _| |_ ___ ___ | +# | | |_) | \| | |_) | | |/ _ \ '_ ` _ \| '_ \| |/ _` | __/ _ \/ __| | +# | | __/| |\ | __/ | | __/ | | | | | |_) | | (_| | || __/\__ \ | +# | |_| |_| \_|_| |_|\___|_| |_| |_| .__/|_|\__,_|\__\___||___/ | +# | |_| | +# +----------------------------------------------------------------------+ +# | Core for creating templates for PNP4Nagios from CMK graph defi- | +# | nitions. | +# '----------------------------------------------------------------------' + # Called with exactly one variable: the template ID. Example: # "check_mk-kernel.util:guest,steal,system,user,wait". def page_pnp_template(): @@ -1232,6 +1245,7 @@ def render_graph_pnp(graph_template, translated_metrics): return graph_title + "\n" + rrdgraph_arguments + "\n" + rrdgraph_commands + "\n" + #. # .--Hover-Graph---------------------------------------------------------. # | _ _ ____ _ |

8 years, 7 months

Updated bug entries #2355

by Mathias Kettner

Module: check_mk Branch: master Commit: 88e4f014903eaba4ee477b61b12a8d742b98dd8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88e4f014903eab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 22:19:45 2016 +0100 Updated bug entries #2355 --- .bugs/2355 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2355 b/.bugs/2355 index 23e8fd0..efff8a3 100644 --- a/.bugs/2355 +++ b/.bugs/2355 @@ -1,10 +1,13 @@ Title: cups_queues: Agent provides no output anymore Component: checks -State: open +Class: bug +State: done Date: 2015-09-26 10:35:31 Targetversion: 1.2.8 -Class: bug Werk #2504 changes the cups check for apcupsd. After this modification the cups check does not provide output anymore. The revert repairs the output of this check. + +2016-02-06 22:19:43: changed state open -> done +Already fixed in October '15

8 years, 7 months

#3167 FIX apc_inrow_airflow: fix exception in displaying parameters in WATO services list

by Mathias Kettner

Module: check_mk Branch: master Commit: 089f6a5d9390c58dd8894978067fc2b5a214a5d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=089f6a5d9390c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 22:14:15 2016 +0100 #3167 FIX apc_inrow_airflow: fix exception in displaying parameters in WATO services list Problem was due to mixup of integer and float. --- .bugs/2353 | 7 +++++-- .werks/3167 | 9 +++++++++ ChangeLog | 1 + checks/apc_inrow_airflow | 20 +++++++++++++------- web/plugins/wato/check_parameters.py | 8 ++++---- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.bugs/2353 b/.bugs/2353 index f3b1fac..6b77c06 100644 --- a/.bugs/2353 +++ b/.bugs/2353 @@ -1,12 +1,15 @@ Title: Error messages from discovery output of check parameters Component: wato -State: open +Class: bug +State: done Date: 2015-09-11 21:21:42 Targetversion: 1.2.8 -Class: bug If you perform a discovery and display the check parameters of the checks, there will be displayed several messages with invalid check parameters. This or similar messages will be showed: 85 is int but float is required Noticed on APC devices. + +2016-02-06 22:13:21: changed state open -> done +Fixed ValueSpec, converted default values to float. diff --git a/.werks/3167 b/.werks/3167 new file mode 100644 index 0000000..cb33507 --- /dev/null +++ b/.werks/3167 @@ -0,0 +1,9 @@ +Title: apc_inrow_airflow: fix exception in displaying parameters in WATO services list +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454793206 +Class: fix + +Problem was due to mixup of integer and float. diff --git a/ChangeLog b/ChangeLog index a8191dc..68e6c7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -254,6 +254,7 @@ * 3069 FIX: unitrend_backup: fixed broken plugin output * 2930 FIX: juniper_cpu_util: Better detection, find more devices... * 3163 FIX: Treat interface name '1' and '01' as identical when grouping interfaces... + * 3167 FIX: apc_inrow_airflow: fix exception in displaying parameters in WATO services list... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/apc_inrow_airflow b/checks/apc_inrow_airflow index 85ee8fd..755cd16 100644 --- a/checks/apc_inrow_airflow +++ b/checks/apc_inrow_airflow @@ -25,12 +25,17 @@ # Boston, MA 02110-1301 USA. -apc_inrow_airflow_default_levels = { "level_low" : ( 5.0 , 2.0 ), "level_high" : ( 10.0, 11.0 ) } +apc_inrow_airflow_default_levels = { + "level_low" : ( 5.0 , 2.0 ), + "level_high" : ( 10.0, 11.0 ), +} + def inventory_apc_inrow_airflow(info): if info: return [ (None, "apc_inrow_airflow_default_levels")] + def check_apc_inrow_airflow(_no_item, params, info): flow = saveint(info[0][0])/100.0 state = 0 @@ -39,22 +44,23 @@ def check_apc_inrow_airflow(_no_item, params, info): warn, crit = params['level_low'] if flow < crit: state = 2 - message = "to low" + message = "too low" elif flow < warn: state = 1 - message = "to low" + message = "too low" warn, crit = params['level_high'] - if flow > crit: + if flow >= crit: state = 2 - message = "to high" - elif flow > warn: + message = "too high" + elif flow >= warn: state = 1 - message = "to high" + message = "too high" perf = [ ("flow", flow, warn, crit ) ] return state, "Current: %.2fl/s %s" % ( flow, message ), perf + check_info["apc_inrow_airflow"] = { "check_function" : check_apc_inrow_airflow, "inventory_function" : inventory_apc_inrow_airflow, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 40b9fb3..842cfbe 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8552,8 +8552,8 @@ register_check_parameters( Tuple( title = _("Lower levels"), elements = [ - Integer(title = _( "Warning if below"), unit=_("l/s")), - Integer(title = _( "Critical if below"), unit=_("l/s")) + Float(title = _("Warning if below"), unit=_("l/s"), default_value = 5.0, allow_int=True), + Float(title = _("Critical if below"), unit=_("l/s"), default_value = 2.0, allow_int=True) ] ) ), @@ -8561,8 +8561,8 @@ register_check_parameters( Tuple( title = _("Upper levels"), elements = [ - Integer(title = _( "Warning at"), unit=_("l/s")), - Integer(title = _( "Critical at"), unit=_("l/s")) + Float(title = _("Warning at"), unit=_("l/s"), default_value = 10.0, allow_int=True), + Float(title = _("Critical at"), unit=_("l/s"), default_value = 11.0, allow_int=True) ] ) ),

8 years, 7 months

Updated bug entries #2340

by Mathias Kettner

Module: check_mk Branch: master Commit: e598eb7916d2e8826ede0e888808f3712444a718 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e598eb7916d2e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:59:35 2016 +0100 Updated bug entries #2340 --- .bugs/2340 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2340 b/.bugs/2340 index 2bb5215..d899254 100644 --- a/.bugs/2340 +++ b/.bugs/2340 @@ -1,9 +1,12 @@ Title: cmk --rrd-convert does not take service desription into account Component: core -State: open +Class: bug +State: works4me Date: 2015-08-31 10:18:59 Targetversion: 1.2.8 -Class: bug Create a rule for all services beginning with CPU. But it affects all services. + +2016-02-06 21:59:31: changed state open -> works4me +Seems to work now. Probably during rework of RRD creation.

8 years, 7 months

Updated bug entries #2334

by Mathias Kettner

Module: check_mk Branch: master Commit: 15d35d23fc903ed3cd8e454eddd614dcf8dee433 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15d35d23fc903e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:55:20 2016 +0100 Updated bug entries #2334 --- .bugs/2334 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2334 b/.bugs/2334 index 74c5564..6e32668 100644 --- a/.bugs/2334 +++ b/.bugs/2334 @@ -1,9 +1,9 @@ Title: WATO check group cpu_load cannot parse default levels of cpu.loads checks Component: checks -State: open +Class: bug +State: done Date: 2015-05-19 17:20:10 Targetversion: 1.2.8 -Class: bug If you enabled the display of the check parameters in the WATO services view then an error is being displayed: @@ -11,3 +11,6 @@ view then an error is being displayed: Invalid check parameter: The data type of the value does not match any of the allowed alternatives.! The parameter is: (5, 10) The varname is: checkgroup_parameters:cpu_load + +2016-02-06 21:55:18: changed state open -> done +Had already been fixed.

8 years, 7 months

Updated bug entries #2343

by Mathias Kettner

Module: check_mk Branch: master Commit: 000325772083062a76c47442c6f61ed125adea02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00032577208306… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 22:03:40 2016 +0100 Updated bug entries #2343 --- .bugs/2343 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/2343 b/.bugs/2343 index 2dae09c..bb63581 100644 --- a/.bugs/2343 +++ b/.bugs/2343 @@ -1,9 +1,9 @@ Title: cmk --inventory-as-check does not take into account disabled services Component: core -State: open +Class: bug +State: works4me Date: 2015-07-15 16:09:54 Targetversion: 1.2.8 -Class: bug If I disable the 'Log .*$' Services with a 'Disable Services' rule, cmk --inventory-as-check still reports the unchecked Log services, @@ -15,3 +15,7 @@ If I only disable the logwatch _check_, but not the _service_, cmk --inventory-as-check works as expected, i.e. no unchecked services are reported, neither logwatch not DISK IO Summary services. + +2016-02-06 22:03:36: changed state open -> works4me +Seems to work now. Probably due to the rewrite of the discovery +mechanisms

8 years, 7 months

Updated bug entries #2321

by Mathias Kettner

Module: check_mk Branch: master Commit: 6af4c83b50c4070e86967f69a1afc26a331f2058 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6af4c83b50c407… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:51:15 2016 +0100 Updated bug entries #2321 --- .bugs/2321 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.bugs/2321 b/.bugs/2321 index a2dd548..b2891a7 100644 --- a/.bugs/2321 +++ b/.bugs/2321 @@ -2,6 +2,9 @@ Title: notify.py: subprocess p.communicate() calls may block when plugins output Component: notifcation State: open Date: 2015-11-19 13:38:58 -Targetversion: 1.2.8 +Targetversion: future Class: bug +MK: Problem unclear. Is it a problem that a short blocking might occur? Then +that is not the fault of communicate() but of the fact that the execution +of the script may take time.

8 years, 7 months

Updated bug entries #2320

by Mathias Kettner

Module: check_mk Branch: master Commit: dd7f9d6edc7f7ed0825ff1b168ab1c7dfec681aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd7f9d6edc7f7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 6 21:38:57 2016 +0100 Updated bug entries #2320 --- .bugs/2320 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2320 b/.bugs/2320 index 5197be3..d6ad28c 100644 --- a/.bugs/2320 +++ b/.bugs/2320 @@ -1,9 +1,12 @@ Title: Interval configured in "regular service discovery" is handled differently in cores Component: core -State: open +Class: bug +State: works4me Date: 2015-10-29 16:07:59 Targetversion: 1.2.8 -Class: bug The global settings interval is used only as normal interval on cmc(?) and e.g. with nagios core this is handled differently. + +2016-02-06 21:38:53: changed state open -> works4me +Seems to have been fixed already.

8 years, 7 months

← Newer
1
...
24
25
26
27
28
29
30
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016