Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: #0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Mo nitor the Temperature and the Humidity on Knürr RMS Devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 42480a49c0168b77cb467b73e1f7a4ff86fe672a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42480a49c0168b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 29 10:24:48 2014 +0200 #0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices --- .werks/185 | 8 ++++ ChangeLog | 1 + checkman/knuerr_rms_humidity | 15 +++++++ checkman/knuerr_rms_temp | 14 ++++++ checks/knuerr_rms_humidity | 55 ++++++++++++++++++++++++ checks/knuerr_rms_temp | 55 ++++++++++++++++++++++++ pnp-templates/check_mk-knuerr_rms_humidity.php | 1 + pnp-templates/check_mk-knuerr_rms_temp.php | 1 + web/plugins/perfometer/check_mk.py | 2 + web/plugins/wato/check_parameters.py | 15 +++++++ 10 files changed, 167 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=42480a49c0…

10 years, 1 month

Check_MK Git: check_mk: #1064 FIX Fixed rare issue with WATO communication in distributed setups ( different OS versions)

by Lars Michelsen

Module: check_mk Branch: master Commit: 32dc33df48e4734f8aa39a527a684af089b0b3c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32dc33df48e473… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 16:24:38 2014 +0200 #1064 FIX Fixed rare issue with WATO communication in distributed setups (different OS versions) In distributed setups where the python versions differ, especially the remote site is older than Python 2.5 and the central site is newer than this, it might happen that the communication between these both sites is not possible anymore since werk #0984 (2014-06-23 / 1.2.5i4). This commit makes the communication work again with older python versions. This has been tested with Python 2.4. It might also work with python 2.3 - but is untested yet. --- .werks/1064 | 13 +++++++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 50 +++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/.werks/1064 b/.werks/1064 new file mode 100644 index 0000000..f8bd111 --- /dev/null +++ b/.werks/1064 @@ -0,0 +1,13 @@ +Title: Fixed rare issue with WATO communication in distributed setups (different OS versions) +Level: 1 +Component: wato +Version: 1.2.5i6 +Date: 1406557188 +Class: fix + +In distributed setups where the python versions differ, especially the remote site is older +than Python 2.5 and the central site is newer than this, it might happen that the communication +between these both sites is not possible anymore since werk #0984 (2014-06-23 / 1.2.5i4). + +This commit makes the communication work again with older python versions. This has been tested +with Python 2.4. It might also work with python 2.3 - but is untested yet. diff --git a/ChangeLog b/ChangeLog index 5f92d9f..36b3588 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 1051 FIX: tcp_conn_stats: fix missing performance data... + WATO: + * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... + 1.2.5i5: Core & Setup: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e203f14..451cc8d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16994,17 +16994,53 @@ def validate_all_hosts(hostnames, force_all = False): import base64 try: import ast -except: - ast = None + literal_eval = ast.literal_eval +except ImportError: + # Python <2.5 compatibility + try: + from compiler import parse + import compiler.ast + def literal_eval(node_or_string): + _safe_names = {'None': None, 'True': True, 'False': False} + + if isinstance(node_or_string, basestring): + node_or_string = parse(node_or_string, mode='eval') + if isinstance(node_or_string, compiler.ast.Expression): + node_or_string = node_or_string.node + + def _convert(node): + if isinstance(node, compiler.ast.Const) and isinstance(node.value, + (basestring, int, float, long, complex)): + return node.value + elif isinstance(node, compiler.ast.Tuple): + return tuple(map(_convert, node.nodes)) + elif isinstance(node, compiler.ast.List): + return list(map(_convert, node.nodes)) + elif isinstance(node, compiler.ast.Dict): + return dict((_convert(k), _convert(v)) for k, v + in node.items) + elif isinstance(node, compiler.ast.Name): + if node.name in _safe_names: + return _safe_names[node.name] + elif isinstance(node, compiler.ast.UnarySub): + return -_convert(node.expr) + raise ValueError('malformed string') + + return _convert(node_or_string) + except: + literal_eval = None def mk_eval(s): - if ast and not config.wato_legacy_eval: - return ast.literal_eval(base64.b64decode(s)) - else: - return pickle.loads(base64.b64decode(s)) + try: + if literal_eval and not config.wato_legacy_eval: + return literal_eval(base64.b64decode(s)) + else: + return pickle.loads(base64.b64decode(s)) + except: + raise MKGeneralException(_('Unable to parse provided data: %s') % html.attrencode(repr(s))) def mk_repr(s): - if ast and not config.wato_legacy_eval: + if literal_eval and not config.wato_legacy_eval: return base64.b64encode(repr(s)) else: return base64.b64encode(pickle.dumps(s))

10 years, 1 month

Check_MK Git: check_mk: #1142 FIX winperf_ts_sessions: fix computation, check has never really worked

by Mathias Kettner

Module: check_mk Branch: master Commit: 1e05f308896a155629b525285437abda456dace1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e05f308896a15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 15:47:20 2014 +0200 #1142 FIX winperf_ts_sessions: fix computation, check has never really worked --- .werks/1142 | 9 +++++++++ ChangeLog | 1 + checks/winperf_ts_sessions | 10 +++++----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/1142 b/.werks/1142 new file mode 100644 index 0000000..bf500e3 --- /dev/null +++ b/.werks/1142 @@ -0,0 +1,9 @@ +Title: winperf_ts_sessions: fix computation, check has never really worked +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406555200 + + diff --git a/ChangeLog b/ChangeLog index 5f92d9f..4ca5388 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.5i6: Checks & Agents: * 1051 FIX: tcp_conn_stats: fix missing performance data... + * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked 1.2.5i5: diff --git a/checks/winperf_ts_sessions b/checks/winperf_ts_sessions index 0498ceb..113abf6 100644 --- a/checks/winperf_ts_sessions +++ b/checks/winperf_ts_sessions @@ -31,7 +31,7 @@ # 4 1 rawcount # 6 0 rawcount -# Counters, relative to the base ID (2102) +# Counters, relative to the base ID (e.g. 2102) # 2 Total number of Terminal Services sessions. # 4 Number of active Terminal Services sessions. # 6 Number of inactive Terminal Services sessions. @@ -43,7 +43,7 @@ def inventory_winperf_ts_sessions(info): def check_winperf_ts_sessions(_unused, params, info): if not info or len(info) == 1: return 3, "Performance counters not available" - total, active, inactive = [ int(l[0]) for l in info[1:4] ] + total, active, inactive = [ int(l[1]) for l in info[1:4] ] state = 0 state_txt = [] @@ -52,11 +52,11 @@ def check_winperf_ts_sessions(_unused, params, info): txt = '%d %s' % (val, title) if key in params: if val > params[key][0]: - state = max(state, 2) - txt += ' (!!)' + state = 2 + txt += '(!!)' elif val > params[key][1]: state = max(state, 1) - txt += ' (!)' + txt += '(!)' state_txt.append(txt) perfdata = [ ('active', active, ), ('inactive', inactive) ]

10 years, 1 month

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 8855aafaf33f7386d661dde42b6e1e0804169387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8855aafaf33f73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 15:46:11 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b4fd007..d98057a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1142 +1152

10 years, 1 month

Check_MK Git: check_mk: Small code cleanup in mk_jolokia

by Mathias Kettner

Module: check_mk Branch: master Commit: 1fc70c7da2ec2298f780a5943d58b8e37c62d3b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fc70c7da2ec22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 14:34:10 2014 +0200 Small code cleanup in mk_jolokia --- agents/plugins/mk_jolokia | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index ae0a013..679e27d 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -239,12 +239,12 @@ socket.setdefaulttimeout(1.0) # of dicts). for inst in instances: for varname, value in [ - ( "server", server ), - ( "port", port ), - ( "user", user ), + ( "server", server ), + ( "port", port ), + ( "user", user ), ( "password", password ), - ( "mode", mode ), - ( "suburi", suburi ), + ( "mode", mode ), + ( "suburi", suburi ), ( "instance", instance )]: if varname not in inst: inst[varname] = value @@ -253,6 +253,3 @@ for inst in instances: inst["instance"] = inst["instance"].replace(" ", "_") query_instance(inst) - - -

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #2165

by Andreas Boesl

Module: check_mk Branch: master Commit: 5b2bb3a0ff6b3e0983e6f6491b3a391eceabe869 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b2bb3a0ff6b3e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 28 14:00:05 2014 +0200 Updated bug entries #2165 --- .bugs/2165 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2165 b/.bugs/2165 new file mode 100644 index 0000000..7977f4f --- /dev/null +++ b/.bugs/2165 @@ -0,0 +1,7 @@ +Title: WATO: Host tag descriptions are cut in some screens, if they are too long +Component: multisite +State: open +Date: 2014-07-28 13:56:32 +Targetversion: future +Class: nastiness +

10 years, 1 month

Check_MK Git: check_mk: fixed textarea auto resize (off by 6 pixel)

by Andreas Boesl

Module: check_mk Branch: master Commit: 74507567c2fcce1bf26b4d9a11ab6feb4ff7ba90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74507567c2fcce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 28 13:15:08 2014 +0200 fixed textarea auto resize (off by 6 pixel) --- web/htdocs/js/checkmk.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 29c97da..d211411 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1663,8 +1663,7 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } function valuespec_textarea_resize(oArea) { - oArea.style.height = 'auto'; - oArea.style.height = oArea.scrollHeight + "px"; + oArea.style.height = (oArea.scrollHeight - 6) + "px" ; }

10 years, 1 month

Check_MK Git: check_mk: Fixed error in windows agent which lead to compiler errors on newer

by Lars Michelsen

Module: check_mk Branch: master Commit: 4cf8c420aa4618bbdfded2358e9354247114bdc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cf8c420aa4618… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 13:12:10 2014 +0200 Fixed error in windows agent which lead to compiler errors on newer ubuntu versions --- agents/windows/check_mk_agent.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 5889c94..91e2864 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2523,7 +2523,7 @@ bool handle_script_config_variable(char *var, char *value, script_type type) user = lstrip(var + 7); runas_include* tmp = new runas_include(); - memset(tmp, 0, sizeof(tmp)); + memset(tmp, 0, sizeof(*tmp)); if (user) snprintf(tmp->user, sizeof(tmp->user), user); @@ -3931,7 +3931,7 @@ bool handle_mrpe_config_variable(char *var, char *value) user = lstrip(var + 7); runas_include* tmp = new runas_include(); - memset(tmp, 0, sizeof(tmp)); + memset(tmp, 0, sizeof(*tmp)); if (user) snprintf(tmp->user, sizeof(tmp->user), user);

10 years, 1 month

Check_MK Git: check_mk: #1051 FIX tcp_conn_stats: fix missing performance data

by Mathias Kettner

Module: check_mk Branch: master Commit: cc8de0bc675f13b6aefc4f310e7a8786be30689d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc8de0bc675f13… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 12:18:22 2014 +0200 #1051 FIX tcp_conn_stats: fix missing performance data Due to a recent code rework the TCP Connections check had output invalid performance data. This has been fixed. --- .werks/1051 | 9 +++++++++ ChangeLog | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.werks/1051 b/.werks/1051 new file mode 100644 index 0000000..18a0517 --- /dev/null +++ b/.werks/1051 @@ -0,0 +1,9 @@ +Title: tcp_conn_stats: fix missing performance data +Level: 1 +Component: checks +Version: 1.2.5i6 +Date: 1406542655 +Class: fix + +Due to a recent code rework the TCP Connections check had output invalid +performance data. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 9036286..5f92d9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i6: + Checks & Agents: + * 1051 FIX: tcp_conn_stats: fix missing performance data... + 1.2.5i5: Core & Setup:

10 years, 1 month

Check_MK Git: check_mk: tcp_conn_stats: fix missing performance data

by Mathias Kettner

Module: check_mk Branch: master Commit: 42d3c3726a27a32a305ad3524f5929552f0c6690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42d3c3726a27a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 12:14:41 2014 +0200 tcp_conn_stats: fix missing performance data --- checks/tcp_conn_stats | 8 +++++--- modules/check_mk_base.py | 14 ++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 032afcc..55fc841 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -49,10 +49,10 @@ def check_tcp_conn_stats(item, params, info): stats = dict(info) for stat_state, hex in tcp_conn_stats_states: num = int(stats.get(stat_state, stats.get(hex, 0))) + state = 0 if num > 0: # Only check positive counts infotext = "%s: %d" % (stat_state, num) - state = 0 - perf = [state, num] + perf = [stat_state, num] levels = params.get(stat_state) if levels: warn, crit = levels @@ -64,7 +64,9 @@ def check_tcp_conn_stats(item, params, info): elif num >= warn: state = 1 infotext += " (warning at %d)" % warn - yield state, infotext, [perf] + else: + infotext = None + yield state, infotext, [perf] check_info["tcp_conn_stats"] = { diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2494e02..61984e2 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1142,7 +1142,8 @@ def convert_check_result(result): return subresults[0] # Several sub results issued with multiple yields. Make that worst sub check - # decide the total state, join the texts and performance data + # decide the total state, join the texts and performance data. Subresults with + # an infotext of None are used for adding performance data. else: perfdata = [] infotexts = [] @@ -1150,11 +1151,12 @@ def convert_check_result(result): for subresult in subresults: st, text = subresult[:2] - infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) - if st == 2 or status == 2: - status = 2 - else: - status = max(status, st) + if text != None: + infotexts.append(text + ["", "(!)", "(!!)", "(?)"][st]) + if st == 2 or status == 2: + status = 2 + else: + status = max(status, st) if len(subresult) == 3: perfdata += subresult[2]

10 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014