Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: updated werk #2316

by Andreas Boesl

Module: check_mk Branch: master Commit: 521a22989cb9baba56f5f7edfe13e7f6f2cdc93d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=521a22989cb9ba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 26 14:25:45 2015 +0200 updated werk #2316 --- .werks/2316 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.werks/2316 b/.werks/2316 index e43e107..83029bb 100644 --- a/.werks/2316 +++ b/.werks/2316 @@ -1,4 +1,4 @@ -Title: windows agent: fixed formatting errors in cached agent sections +Title: windows agent: fix garbled output of cached agent plugins Level: 2 Component: checks Class: fix @@ -7,4 +7,5 @@ State: unknown Version: 1.2.7i3 Date: 1435308547 - +If you configured a <i>cache_age</i> for plugins in your <i>check_mk.ini</i> +file, those plugins delivered broken output. This has been fixed.

9 years

Check_MK Git: check_mk: Formalized lots of checks for new graphing frontend

by Mathias Kettner

Module: check_mk Branch: master Commit: b4516cd33d867622e59214cbbef7b050f04b07a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4516cd33d8676… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 26 14:22:59 2015 +0200 Formalized lots of checks for new graphing frontend --- web/htdocs/metrics.py | 18 +- web/plugins/metrics/check_mk.py | 2338 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 2214 insertions(+), 142 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b4516cd33d…

9 years

Check_MK Git: check_mk: #2346 FIX Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules

by Lars Michelsen

Module: check_mk Branch: master Commit: b9f6742731bc124eb214354bb07a8f290b384807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9f6742731bc12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 13:34:57 2015 +0200 #2346 FIX Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules --- .werks/2346 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.werks/2346 b/.werks/2346 new file mode 100644 index 0000000..5f0a289 --- /dev/null +++ b/.werks/2346 @@ -0,0 +1,9 @@ +Title: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1435318469 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 129bb11..c926dc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ WATO: * 2344 FIX: Improved validation of selected rules when editing BI aggregations... + * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c7a256d..ac18fe1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8995,16 +8995,19 @@ def mode_notifications(phase): if html.check_transaction(): options["show_user_rules"] = not not html.var("_show_user") config.save_user_file("notification_display_options", options) + return elif html.has_var("_show_backlog"): if html.check_transaction(): options["show_backlog"] = not not html.var("_show_backlog") config.save_user_file("notification_display_options", options) + return elif html.has_var("_show_bulks"): if html.check_transaction(): options["show_bulks"] = not not html.var("_show_bulks") config.save_user_file("notification_display_options", options) + return elif html.has_var("_replay"): if html.check_transaction():

9 years

Check_MK Git: check_mk: New key for graph definitions: optional_metrics

by Mathias Kettner

Module: check_mk Branch: master Commit: 135113889098295edd3524bcbebbb62ab699bfcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13511388909829… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 26 11:36:44 2015 +0200 New key for graph definitions: optional_metrics --- web/htdocs/metrics.py | 43 +++++++++++++++++++++++++++++++++++++-- web/plugins/metrics/check_mk.py | 13 ++++-------- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index fce0a6a..fcd3343 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -836,9 +836,13 @@ def get_graph_templates(translated_metrics): for graph_template in graph_info: if graph_possible(graph_template, translated_metrics): yield graph_template + elif graph_possible_without_optional_metrics(graph_template, translated_metrics): + html.debug("JA") + yield graph_without_missing_optional_metrics(graph_template, translated_metrics) def graph_possible(graph_template, translated_metrics): + for metric_definition in graph_template["metrics"]: try: evaluate(metric_definition[0], translated_metrics) @@ -847,13 +851,48 @@ def graph_possible(graph_template, translated_metrics): # Allow graphs to be disabled if certain (better) metrics # are available - if "not_if_have" in graph_template: - for var in graph_template["not_if_have"]: + if "conflicting_metrics" in graph_template: + for var in graph_template["conflicting_metrics"]: if var in translated_metrics: return False return True + +def graph_possible_without_optional_metrics(graph_template, translated_metrics): + if "optional_metrics" in graph_template: + return graph_possible(graph_template, + add_fake_metrics(translated_metrics, graph_template["optional_metrics"])) + + +def graph_without_missing_optional_metrics(graph_template, translated_metrics): + working_metrics = [] + + for metric_definition in graph_template["metrics"]: + try: + evaluate(metric_definition[0], translated_metrics) + working_metrics.append(metric_definition) + except: + pass + + reduced_graph_template = graph_template.copy() + reduced_graph_template["metrics"] = working_metrics + html.debug(reduced_graph_template) + return reduced_graph_template + + + +def add_fake_metrics(translated_metrics, metric_names): + with_fake = translated_metrics.copy() + for metric_name in metric_names: + with_fake[metric_name] = { + "value" : 1.0, + "scale" : 1.0, + "unit" : unit_info[""], + "color" : "#888888", + } + return with_fake + # Called with exactly one variable: the template ID. Example: # "check_mk-kernel.util:guest,steal,system,user,wait". def page_pnp_template(): diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 34ea12c..e206d69 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1802,7 +1802,7 @@ graph_info.append({ "scalars" : [ "load1:warn", "load1:crit", - ] + ], }) graph_info.append({ @@ -1988,12 +1988,10 @@ graph_info.append({ ], }) -# TODO: Warum sind die in einem Graphen? Kann man -# die irgendwie addieren? graph_info.append({ "metrics" : [ - ( "deadlocks", "line" ), - ( "lockwaits", "line" ), + ( "deadlocks", "area" ), + ( "lockwaits", "stack" ), ], }) @@ -2003,9 +2001,6 @@ graph_info.append({ ], }) -# TODO: Warum auch hier line? Sollte mit -# areas arbeiten. Habe das mal umgestellt, aber noch -# nicht getestet. graph_info.append({ "metrics" : [ ( "tablespace_used", "area" ), @@ -2116,7 +2111,7 @@ graph_info.append({ ("mem_lnx_active", "area"), ("mem_lnx_inactive", "area"), ], - "not_if_have" : [ "mem_lnx_active_anon" ], + "conflicting_metrics" : [ "mem_lnx_active_anon" ], }) graph_info.append({

9 years

Check_MK Git: check_mk: #2316: windows agent: fixed formatting errors in cached agent sections

by Andreas Boesl

Module: check_mk Branch: master Commit: 14c76bb3d8ba20cc57d1b76e5deb92a6b62a7c51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14c76bb3d8ba20… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 26 10:55:38 2015 +0200 #2316: windows agent: fixed formatting errors in cached agent sections --- .werks/2316 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent.cc | 5 +++-- agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 179043 -> 179043 bytes agents/windows/install_agent.exe | Bin 159950 -> 160001 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 13 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/2316 b/.werks/2316 new file mode 100644 index 0000000..e43e107 --- /dev/null +++ b/.werks/2316 @@ -0,0 +1,10 @@ +Title: windows agent: fixed formatting errors in cached agent sections +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435308547 + + diff --git a/ChangeLog b/ChangeLog index 129bb11..e3d0274 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... * 1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... + * 2316 FIX: windows agent: fixed formatting errors in cached agent sections Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/agents/windows/build_version b/agents/windows/build_version index bc3d544..0f11735 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -186 +196 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d40a833..9ab768b 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index ed24348..85549ab 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4531cea..9a9653f 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3102,7 +3102,7 @@ void output_external_programs(SOCKET &out, script_type type) { // Determine chache_info text char cache_info[32]; - snprintf(cache_info, sizeof(cache_info), ":cached(%d:%d)", (int)cont->buffer_time, cont->max_age); + snprintf(cache_info, sizeof(cache_info), ":cached(%d,%d)", (int)cont->buffer_time, cont->max_age); int cache_len = strlen(cache_info) + 1; // We need to parse each line and replace any <<<section>>> with <<<section:cached(123455678,3600)>>> @@ -3117,7 +3117,8 @@ void output_external_programs(SOCKET &out, script_type type) { int length = strlen(line); int cr_offset = line[length-1] == '\r' ? 1 : 0; - if (length >=8 && (!strncmp(line, "<<<", 3) && !strncmp(line+length-cr_offset-3, ">>>", 3))) + if (length >=8 && strncmp(line, "<<<<", 4) && (!strncmp(line, "<<<", 3) && + !strncmp(line+length-cr_offset-3, ">>>", 3))) { // The return value of snprintf seems broken (off by 3?). Great... write_bytes = length - cr_offset - 3 + 1; // length - \r - <<< + \0 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4d488dd..ab87943 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index ed21e07..971b791 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 20352f8..5bba86d 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index a58557b..1ca41df 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 61dc03a..0159fcf 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 51d42c2..4fcb964 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 4ef5457..5d2d67b 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

9 years

Check_MK Git: check_mk: keepalive mode: changed variable checking is now performed in verbose mode, not in debug mode

by Lars Michelsen

Module: check_mk Branch: master Commit: ab0ce98ac248fbbc54197bb14a1d18f99cf1c1d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab0ce98ac248fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 10:35:27 2015 +0200 keepalive mode: changed variable checking is now performed in verbose mode, not in debug mode --- modules/check_mk.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6a1f48b..270b032 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5245,6 +5245,9 @@ def do_check_keepalive(): num_checks = 0 # count total number of check cycles read_packed_config() + + # TODO: This is not used at all in keepalive mode except that compute_check_parameters() + # adds variables to this set. But it is not checked in this mode. Should be removed. global vars_before_config vars_before_config = set([]) @@ -5253,8 +5256,9 @@ def do_check_keepalive(): global total_check_output total_check_output = "" - if opt_debug: - before = copy_globals() + + if opt_verbose: + original_global_vars = copy_globals() ipaddress_cache = {} @@ -5268,7 +5272,7 @@ def do_check_keepalive(): read_packed_config() cleanup_globals() reset_global_caches() - before = copy_globals() + original_global_vars = copy_globals() continue elif not cmdline: @@ -5360,15 +5364,19 @@ def do_check_keepalive(): cleanup_globals() # Prepare for next check - # Check if all global variables are clean, but only in debug mode - if opt_debug: - after = copy_globals() - for varname, value in before.items(): - if varname not in ignore_changed_global_variables and value != after[varname]: - sys.stderr.write("WARNING: global variable %s has changed: %r ==> %s\n" - % (varname, value, repr(after[varname])[:50])) - new_vars = set(after.keys()).difference(set(before.keys())) - if (new_vars): + # Check if all global variables are clean, but only in verbose logging mode + if opt_verbose: + new_global_vars = copy_globals() + for varname, value in original_global_vars.items(): + if varname not in ignore_changed_global_variables and value != new_global_vars[varname]: + if opt_verbose > 1: + sys.stderr.write("WARNING: global variable %s has changed: %r ==> %r\n" + % (varname, value, new_global_vars[varname])) + else: + sys.stderr.write("WARNING: global variable %s has changed: %s ==> %s\n" + % (varname, repr(value)[:50], repr(new_global_vars[varname])[:50])) + new_vars = set(new_global_vars.keys()).difference(set(original_global_vars.keys())) + if new_vars: sys.stderr.write("WARNING: new variable appeared: %s\n" % ", ".join(new_vars)) sys.stderr.flush()

9 years

Check_MK Git: check_mk: Excluding normally changing vars during checking from changed vars check

by Lars Michelsen

Module: check_mk Branch: master Commit: 670d45b7532cc197dec71538b99aba84eb94ca2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=670d45b7532cc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 10:33:42 2015 +0200 Excluding normally changing vars during checking from changed vars check --- modules/check_mk.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 755818a..6a1f48b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5364,7 +5364,7 @@ def do_check_keepalive(): if opt_debug: after = copy_globals() for varname, value in before.items(): - if value != after[varname]: + if varname not in ignore_changed_global_variables and value != after[varname]: sys.stderr.write("WARNING: global variable %s has changed: %r ==> %s\n" % (varname, value, repr(after[varname])[:50])) new_vars = set(after.keys()).difference(set(before.keys())) @@ -5411,6 +5411,13 @@ def keepalive_read_line(): # | Code for reading the configuration files. | # '----------------------------------------------------------------------' +# These variables shal be ignored when performing checks which global +# variables have been changed during runtime of e.g. the Check_MK +# keepalive mode +ignore_changed_global_variables = [ + 'all_hosts_untagged', + 'all_clusters_untagged', +] # Now - at last - we can read in the user's configuration files def all_nonfunction_vars(): @@ -5564,8 +5571,7 @@ def read_config_files(with_conf_d=True, validate_hosts=True): vars_after_config = all_nonfunction_vars() ignored_variables = set(['vars_before_config', 'parts', 'hosttags' ,'seen_hostnames', - 'all_hosts_untagged', 'all_clusters_untagged', - 'taggedhost' ,'hostname']) + 'taggedhost' ,'hostname'] + ignore_changed_global_variables) errors = 0 for name in vars_after_config: if name not in ignored_variables and name not in vars_before_config:

9 years

Check_MK Git: check_mk: Fixed if.include based checks were modifying global if_inventory_porttypes list during inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: 1239298b7e7430529fa01b56f1e322061d43128e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1239298b7e7430… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 10:26:43 2015 +0200 Fixed if.include based checks were modifying global if_inventory_porttypes list during inventory --- checks/if.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/if.include b/checks/if.include index 82346a4..abceeb5 100644 --- a/checks/if.include +++ b/checks/if.include @@ -211,7 +211,9 @@ def inventory_if_common(info, has_nodeinfo = False): settings = host_extra_conf_merged(g_hostname, inventory_if_rules) uses_description = settings.get('use_desc', if_inventory_uses_description) uses_alias = settings.get('use_alias', if_inventory_uses_alias) - porttypes = settings.get('porttypes', if_inventory_porttypes) + # Need to copy porttypes as the discovery function appends to the list below. + # The check must not modify the global if_inventory_porttypes configuration variable. + porttypes = settings.get('porttypes', if_inventory_porttypes)[:] portstates = settings.get('portstates', if_inventory_portstates) match_alias = settings.get('match_alias') match_desc = settings.get('match_desc')

9 years

Check_MK Git: check_mk: #2344 FIX Improved validation of selected rules when editing BI aggregations

by Lars Michelsen

Module: check_mk Branch: master Commit: bd7617fbe9cc12b75cfcac92abee4ed11698285e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd7617fbe9cc12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 26 08:40:54 2015 +0200 #2344 FIX Improved validation of selected rules when editing BI aggregations In previous versions it was possible to create a non working BI configuration using the BI editor by creating an aggregation which calls a BI rules which needs one or several arguments, but not providing any argument in the BI aggregation. Saving this configuration was possible and caused problems in different places of the GUI, for example the report editor when rendering the BI filters. The editor has been extended to do a better validation to prevent this kind of misconfiguration. --- .werks/2344 | 17 +++++++++++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 15 ++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/.werks/2344 b/.werks/2344 new file mode 100644 index 0000000..1ac61d3 --- /dev/null +++ b/.werks/2344 @@ -0,0 +1,17 @@ +Title: Improved validation of selected rules when editing BI aggregations +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1435300730 + +In previous versions it was possible to create a non working BI configuration +using the BI editor by creating an aggregation which calls a BI rules which +needs one or several arguments, but not providing any argument in the BI aggregation. +Saving this configuration was possible and caused problems in different places +of the GUI, for example the report editor when rendering the BI filters. + +The editor has been extended to do a better validation to prevent this kind of +misconfiguration. diff --git a/ChangeLog b/ChangeLog index 79d1fb3..129bb11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group + WATO: + * 2344 FIX: Improved validation of selected rules when editing BI aggregations... + Notifications: * 2313 FIX: notification bulking: fixed exception for plugins which are not configured with checkboxes, e.g. sms diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f3736fe..c7a256d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16980,6 +16980,18 @@ def convert_aggregation_to_bi(aggr): convaggr = (bi_constants["DISABLED"],) + convaggr return convaggr + +def validate_bi_rule_call(value, varprefix): + rule_id, arguments = value + aggregations, aggregation_rules = load_bi_rules() + rule_params = aggregation_rules[rule_id]['params'] + + if len(arguments) != len(rule_params): + raise MKUserError(varprefix+"_1_0", _("The rule you selected needs %d argument(s) (%s), " + "but you configured %d arguments.") % + (len(rule_params), ', '.join(rule_params), len(arguments))) + + # Not in global context, so that l10n will happen again def declare_bi_valuespecs(aggregation_rules): global vs_aggregation, aggregation_choices, vs_bi_node @@ -17002,7 +17014,8 @@ def declare_bi_valuespecs(aggregation_rules): size = 12, title = _("Arguments:"), ), - ] + ], + validate = validate_bi_rule_call, ) host_re_help = _("Either an exact host name or a regular expression exactly matching the host "

9 years

Check_MK Git: check_mk: #2315 FIX windows agent: BOM replacement, fixed incorrect byte offset

by Andreas Boesl

Module: check_mk Branch: master Commit: 168d9d8252bd2689bdb22257f9105ae54db0526c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=168d9d8252bd26… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 25 14:59:12 2015 +0200 #2315 FIX windows agent: BOM replacement, fixed incorrect byte offset The windows agent did not correctly detect byte order marks for plugins using an UTF-8 encoding. UTF-16 was working as intented. --- .werks/2315 | 11 +++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes agents/windows/install_agent-64.exe | Bin 179003 -> 179043 bytes agents/windows/install_agent.exe | Bin 159944 -> 159950 bytes 11 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2315 b/.werks/2315 new file mode 100644 index 0000000..d6bb9cf --- /dev/null +++ b/.werks/2315 @@ -0,0 +1,11 @@ +Title: windows agent: BOM replacement, fixed incorrect byte offset +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1435237065 +Class: fix + +The windows agent did not correctly detect byte order marks for +plugins using an UTF-8 encoding. UTF-16 was working as intented. + diff --git a/ChangeLog b/ChangeLog index 77a897d..79d1fb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... * 1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM + * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... Multisite: * 2314 FIX: Availability: fixed exception when grouping by host or service group diff --git a/agents/windows/build_version b/agents/windows/build_version index dc37bbd..bc3d544 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -184 +186 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e2b1c00..d40a833 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index a502431..ed24348 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7920a85..4531cea 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3089,7 +3089,7 @@ void output_external_programs(SOCKET &out, script_type type) else if ( strlen(cont->buffer_work) >= 3 && (unsigned char)cont->buffer_work[0] == 0xEF && (unsigned char)cont->buffer_work[1] == 0xBB && - (unsigned char)cont->buffer_work[1] == 0xBF ) + (unsigned char)cont->buffer_work[2] == 0xBF ) { cont->buffer_work[0] = '\n'; cont->buffer_work[1] = '\n'; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index aedf9a1..4d488dd 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index d768c91..ed21e07 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 012d67e..20352f8 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index a79dfa6..61dc03a 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 0fdc8e5..51d42c2 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015